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

[Michael Palimaka]

commit:     b5a142607213637d3801ab12cd9b9fe2cd43d87a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 01:10:16 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 01:10:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b5a14260

dev-qt/qtimageformats: introduce jpeg2k and mng USE flags

qt_use_compile_test is being used deliberately as this module isn't using the
new-style configuration system yet.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 dev-qt/qtimageformats/qtimageformats-5.10.0.ebuild    | 12 +++++++++---
 dev-qt/qtimageformats/qtimageformats-5.10.9999.ebuild | 12 +++++++++---
 dev-qt/qtimageformats/qtimageformats-5.9.9999.ebuild  | 12 +++++++++---
 dev-qt/qtimageformats/qtimageformats-5.9999.ebuild    | 12 +++++++++---
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtimageformats/qtimageformats-5.10.0.ebuild b/dev-qt/qtimageformats/qtimageformats-5.10.0.ebuild
index 3285265e..39c6b552 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.10.0.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.10.0.ebuild
@@ -10,14 +10,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE=""
+IUSE="jpeg2k mng"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}
-	media-libs/jasper:=
-	media-libs/libmng:=
 	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
+	qt5-build_src_configure
+}

diff --git a/dev-qt/qtimageformats/qtimageformats-5.10.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.10.9999.ebuild
index 3285265e..39c6b552 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.10.9999.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.10.9999.ebuild
@@ -10,14 +10,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE=""
+IUSE="jpeg2k mng"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}
-	media-libs/jasper:=
-	media-libs/libmng:=
 	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
+	qt5-build_src_configure
+}

diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.9999.ebuild
index 3285265e..39c6b552 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.9.9999.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.9.9999.ebuild
@@ -10,14 +10,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE=""
+IUSE="jpeg2k mng"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}
-	media-libs/jasper:=
-	media-libs/libmng:=
 	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
+	qt5-build_src_configure
+}

diff --git a/dev-qt/qtimageformats/qtimageformats-5.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9999.ebuild
index 3285265e..39c6b552 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.9999.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.9999.ebuild
@@ -10,14 +10,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE=""
+IUSE="jpeg2k mng"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}
-	media-libs/jasper:=
-	media-libs/libmng:=
 	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
+	qt5-build_src_configure
+}