gentoo resync : 06.08.2019

3 files changed, 6 insertions, 8 deletions

diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 67985c9c0336..f445486d9561 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,6 +2,6 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
-EBUILD gdk-pixbuf-2.36.12.ebuild 4076 BLAKE2B bc49bef8fc97cb3adcbfa5262713d700089f06cc7392bb85faf080ae02804520a6c89e36c024757cfa7f0e865e70a84639d4094d6a45de6968e3fc1953cf08f5 SHA512 516b6f8b9643e86bd19e10172ccc430e38a289f319a521b45ba336a6f87e163b26c51077a9e4a855502c240b7bedd63021a82b878ce1c779581b82e78a82a0de
-EBUILD gdk-pixbuf-2.38.1.ebuild 4086 BLAKE2B 5befd1e92bbae70ff6294fcac99f24d3f23d327295fbd2751c5da9ff8936d495371acbbcedf0eb8853223639e8089325247a18792f8cf82325d2fe3f8a75f8b7 SHA512 b9072ab977f05347445ee0c696113be679b887c4be0c4b5d42f23ca71e2a21fc4d2dd117e57cb28e9fed38143be11cf9ee453e099c0c4dd98589cbaa4b213e2b
+EBUILD gdk-pixbuf-2.36.12.ebuild 4007 BLAKE2B de6f3819c976e33c87a1f9f84fc8d85ce16ca793b147282545a796493cd43b827e034c7a0f5f529f160165781c02465f71859a863c6af8fa9882aa1a8235aa72 SHA512 98f39a76ebec24dc4f22559b487fff324f2b714d3203a5e98d6d4a18e85b4b8ab7f9c584e0f9c57dbb5d3f727e66b932458901408bc20a3c84eac7aafaa6be03
+EBUILD gdk-pixbuf-2.38.1.ebuild 4014 BLAKE2B b9d4e2cee94e4ee563804f6e98ac687063b2604c4a37b9ec64a981e3632beb516d11a9588cab341d9e0dba4fa1ff176fc9d99152fb760191c01b301e160f5ae4 SHA512 b1f1061e9d833667d4ebf4c7107b7446b21d66a6d955f79fdf64043c1fc7ce13b329f11b0a738f4aab3bd2c2104f8733f7f1ff6da4586491fdcb014a259734ec
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index fba332527c16..abf08b26b453 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X debug +introspection jpeg jpeg2k tiff test"
+IUSE="X debug +introspection jpeg tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
 SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )"
@@ -22,7 +22,6 @@ COMMON_DEPEND="
 	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
@@ -74,7 +73,7 @@ multilib_src_configure() {
 	gnome2_src_configure \
 		$(usex debug --enable-debug=yes "") \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
+		--without-libjasper \
 		$(use_with tiff libtiff) \
 		$(multilib_native_use_enable introspection) \
 		$(use_with X x11) \
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
index feca458cf8df..d6594527cccb 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X gtk-doc +introspection jpeg jpeg2k tiff"
+IUSE="X gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
 COMMON_DEPEND="
@@ -20,7 +20,6 @@ COMMON_DEPEND="
 	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
 	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
@@ -66,7 +65,7 @@ multilib_src_configure() {
 		-Dpng=true
 		$(meson_use tiff)
 		$(meson_use jpeg)
-		$(meson_use jpeg2k jasper)
+		-Djasper=false
 		$(meson_use X x11)
 		-Dbuiltin_loaders=png
 		-Drelocatable=false