From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- dev-qt/qtimageformats/Manifest | 4 +-- dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild | 4 +-- .../qtimageformats/qtimageformats-5.12.4-r1.ebuild | 30 ++++++++++++++++++++++ dev-qt/qtimageformats/qtimageformats-5.12.4.ebuild | 29 --------------------- 4 files changed, 33 insertions(+), 34 deletions(-) create mode 100644 dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild delete mode 100644 dev-qt/qtimageformats/qtimageformats-5.12.4.ebuild (limited to 'dev-qt/qtimageformats') diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index ba35b83384d7..49dfd429fbda 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -1,5 +1,5 @@ DIST qtimageformats-everywhere-src-5.12.3.tar.xz 1793076 BLAKE2B 59dced7576a50441c704c8debf4a86bb4db7cfb752922020d2932ee2295805b27ece866f3f86e3f89b308e28cfb720fb9c6fa782f29f45e1c3b14fd733096c87 SHA512 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc DIST qtimageformats-everywhere-src-5.12.4.tar.xz 1793912 BLAKE2B b74d328bc8ae7a56294734d8f52f2d7a845f9026d246672927298971a01d0f5942b5ff84121a19acbd7359f8768d3248895a16290da7b26eca5a66b8201dc824 SHA512 e9adab3b7e1f5a0679e1924eb08718f2c6c53073f83018c9243886f7e1b084940bb9a642f46d76fae21552c4a76c655482536ae873cd4cfead4876a3561ebe8f -EBUILD qtimageformats-5.12.3.ebuild 610 BLAKE2B 1ba8a71e4df388692b8e0c7b69631f15a72d36620918f2fe04996e886d9d8fbc5b0eacb1c45058be712b9fb2288fbfce3d443e564682853ec3f3a67eeb4d3ab8 SHA512 a5a4c60a3489c05e0c3762761f82b802094ba1fe1a984cd0135e345ce9db751e48f4abd9a3620f0d71eec5110581336e767f8dbac1382c522e95b3ddd2438696 -EBUILD qtimageformats-5.12.4.ebuild 614 BLAKE2B a7632b701e54d0822b223a7d70a88a06cd9ddd1cce38584c1c2a0da8eb38fafad7572807e88333454cfae99d2738dfdb889e2c29a27b54a519388ca7028ecae9 SHA512 1dd4bce8f3350e2f98964304871206dbaf4183d752c3eb573eaa820e0dd03f04dfde61f5c705be6ae8c4fc1ebc61cc121a65dee53b5165a716f40c19eaaaeb64 +EBUILD qtimageformats-5.12.3.ebuild 535 BLAKE2B 6127b3746d0b8dfa12f3fd7fd5fb5fc65984a539b9110449462829131cd5f63f3d2428c7d754126564b0a92743a895cfc9aecff39cb741adf7e46ef9781ce689 SHA512 2f3807091be97592ff6a3228389fbe9877d9791a76990d1ed637af1f0caf62ed2b12a4c71cfb277b90f25ae4193573d9a51994fd61b5dcb9a1249a93243865c6 +EBUILD qtimageformats-5.12.4-r1.ebuild 674 BLAKE2B 5771237aefd18c9302d6c89494ae211a28c389f06b6b2c22796395350b9cbe8de3fab260a4db4c55b1918e855a4afb1a647d5da4c2c9aaecf54733a9ca8dd4d3 SHA512 f0dbc5327a9df26d90d7151a974ae18e3d709964fad26bf73576d9e0779575633b30081332a9b55bace930f5c68ea217237c9ca7aebf7acf9d7f7d2efdc74d43 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild index 8178c9f3f4f2..a244180237eb 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild @@ -10,20 +10,18 @@ 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 qt5-build_src_configure } diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild new file mode 100644 index 000000000000..a7eace7d6d78 --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit qt5-build + +DESCRIPTION="Additional format plugins for the Qt image I/O system" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" +fi + +IUSE="mng" + +DEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtgui-${PV} + media-libs/libwebp:= + media-libs/tiff:0 + mng? ( media-libs/libmng:= ) +" +RDEPEND="${DEPEND}" + +src_configure() { + 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.12.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.4.ebuild deleted file mode 100644 index 5327581bba2c..000000000000 --- a/dev-qt/qtimageformats/qtimageformats-5.12.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Additional format plugins for the Qt image I/O system" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" -fi - -IUSE="jpeg2k 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 - qt5-build_src_configure -} -- cgit v1.2.3