[gentoo-commits] proj/qt:master commit in: dev-qt/qtimageformats/

[Andreas Sturmlechner]

commit:     6c0793e41beae72360f3b00f0025de94cd5788c7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 12:55:14 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
 }