From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 050EF138334 for ; Sun, 25 Aug 2019 13:05:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D660E07A5; Sun, 25 Aug 2019 13:05:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05A01E07A5 for ; Sun, 25 Aug 2019 13:05:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91E2934A26A for ; Sun, 25 Aug 2019 13:05:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2F40720 for ; Sun, 25 Aug 2019 13:05:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1566738267.6c0793e41beae72360f3b00f0025de94cd5788c7.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtimageformats/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtimageformats/qtimageformats-5.12.9999.ebuild dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild dev-qt/qtimageformats/qtimageformats-5.14.9999.ebuild dev-qt/qtimageformats/qtimageformats-5.9999.ebuild X-VCS-Directories: dev-qt/qtimageformats/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6c0793e41beae72360f3b00f0025de94cd5788c7 X-VCS-Branch: master Date: Sun, 25 Aug 2019 13:05:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cda37585-9fba-43b3-938a-ce6a03e2c6a9 X-Archives-Hash: c8a4d69626e3b9ccfc37899d60d97e73 commit: 6c0793e41beae72360f3b00f0025de94cd5788c7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 25 12:55:14 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 25 13:04:27 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6c0793e4 dev-qt/qtimageformats: Drop USE jpeg2k, fix USE mng Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtimageformats/qtimageformats-5.12.9999.ebuild | 9 +++++---- dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild | 9 +++++---- dev-qt/qtimageformats/qtimageformats-5.14.9999.ebuild | 9 +++++---- dev-qt/qtimageformats/qtimageformats-5.9999.ebuild | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.9999.ebuild index 5327581b..a7eace7d 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.12.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.12.9999.ebuild @@ -10,20 +10,21 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" fi -IUSE="jpeg2k mng" +IUSE="mng" DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} media-libs/libwebp:= media-libs/tiff:0 - jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) " RDEPEND="${DEPEND}" src_configure() { - qt_use_compile_test jpeg2k jasper - qt_use_compile_test mng libmng + sed -e 's/qtConfig(jasper)/false:/' \ + -i src/plugins/imageformats/imageformats.pro || die + qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro + qt5-build_src_configure } diff --git a/dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild index 5327581b..a7eace7d 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.13.9999.ebuild @@ -10,20 +10,21 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" fi -IUSE="jpeg2k mng" +IUSE="mng" DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} media-libs/libwebp:= media-libs/tiff:0 - jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) " RDEPEND="${DEPEND}" src_configure() { - qt_use_compile_test jpeg2k jasper - qt_use_compile_test mng libmng + sed -e 's/qtConfig(jasper)/false:/' \ + -i src/plugins/imageformats/imageformats.pro || die + qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro + qt5-build_src_configure } diff --git a/dev-qt/qtimageformats/qtimageformats-5.14.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.9999.ebuild index 5327581b..a7eace7d 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.14.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.14.9999.ebuild @@ -10,20 +10,21 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" fi -IUSE="jpeg2k mng" +IUSE="mng" DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} media-libs/libwebp:= media-libs/tiff:0 - jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) " RDEPEND="${DEPEND}" src_configure() { - qt_use_compile_test jpeg2k jasper - qt_use_compile_test mng libmng + sed -e 's/qtConfig(jasper)/false:/' \ + -i src/plugins/imageformats/imageformats.pro || die + qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro + qt5-build_src_configure } diff --git a/dev-qt/qtimageformats/qtimageformats-5.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9999.ebuild index 5327581b..a7eace7d 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.9999.ebuild @@ -10,20 +10,21 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" fi -IUSE="jpeg2k mng" +IUSE="mng" DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} media-libs/libwebp:= media-libs/tiff:0 - jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) " RDEPEND="${DEPEND}" src_configure() { - qt_use_compile_test jpeg2k jasper - qt_use_compile_test mng libmng + sed -e 's/qtConfig(jasper)/false:/' \ + -i src/plugins/imageformats/imageformats.pro || die + qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro + qt5-build_src_configure }