gentoo resync : 06.08.2019

4 files changed, 13 insertions, 16 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index c96965569e87..e8f6b63dea9f 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -15,7 +15,7 @@ AUX netpbm-10.76.00-test.patch 6005 BLAKE2B 0c8b0d9b1d7a0c5b139f85eb3a91838cc496
 DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
-EBUILD netpbm-10.66.00.ebuild 5635 BLAKE2B 67ac7c65d38383dcbb448c4f3d4ebc47e7bc290a1f5c47e394d5946fc15ab6635c2980993472da0a3ecad886414bd4ce17e9b429914fa162b84ff357350a4d99 SHA512 768b550d7dd600b849fd31ce60204c76194eaebca4de61709e1c214d7e13841f701096915d4d1357148d7533a40946598a77799378216242f9da7645113b9a15
-EBUILD netpbm-10.70.00.ebuild 5376 BLAKE2B 0bbf72c60c2c6fd4c843885b2674d3120e48c172a5932cf3d43db0334851a240038ecb3fb14e5ab31c7bbff26dff20021cc1aa429df8897e642dfc6ed3a0448b SHA512 9787fae7edf2669e450896a65c0cd99f23d2d9acefbb108fb6dd12580ce0f87d3fa0de136648c7ba681e06f9f6109d8ad1b8525cb340d01415947df75103cd34
-EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B aeb0adb71ffec5f6d1d0f3fc3b6adcdad5aaa64c61111b775d68b130314c68de512ae4e997af72d0105c7ada16057891aa98d7fdd30a3b612e226689749b9e54 SHA512 1da8159a4911df0b233632c3a2b955384efb369bd4d4f521203fdef3809ce872ea423721cd2e59ab8d3706886c47be88c6939d5718e2b03d542ae2580e6d4efe
+EBUILD netpbm-10.66.00.ebuild 5574 BLAKE2B 493ee7587d52bd88f2f64e6cd07707f69181aa8043016845fce991553c2c4387a0b46b62878850246a4682f77bf7f1fe787e65605ffd513dd14c49b61597c2a4 SHA512 177862ad6c682bb5ed506abefbdbdc7fe709f4013663c6858fdcd0f4b5aad57fcf1593e504c673062e8c8394a5b2bf05e7c78aa51a5200c27684c1f2ad2635eb
+EBUILD netpbm-10.70.00.ebuild 5315 BLAKE2B bfa0d92288326dd24e7603f52fd0fce2b1da33748c3285670748ebb2db186f0fb4788d2905199081736c526a778c6a681216f43bf5dbf05580b9f50264126e7c SHA512 9f1c6e869297c52d1232cfdbffd7ebb14343d96ab49c620896e0a69fcfac32be0b34731e7a5a67ca60aa981f4aba6787b74cdd3233150957195c84909a2949d4
+EBUILD netpbm-10.76.00.ebuild 5205 BLAKE2B 27bfe092440c6889d3d43c1c31e5ede375ac856d01d602fb3ffde2cc08ea68e52bc5d12cefe486c9155b870fc60be1b74ba9ae7cedfa34267131affa26bb524d SHA512 4d70735e1029fd633d4cbde1c9f768ce71030dd48dc7c0f27045671cb9bff0a288bbb157e2ac123c09090162ca5a73360217f4ed1af46f540327465768181bbe
 MISC metadata.xml 434 BLAKE2B 255ab7ddedd5e4558e9303c0c9fe5d1d6e13096e3ef7ba269d68908f1cb74d63af273ef9b2ceb97a7462750fa795a6d6f54dae1e70972b44cfbb749250ed65e6 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f
diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
index 9beba62062d6..82fe3af25620 100644
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.66.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper )
 	png? ( >=media-libs/libpng-1.4:0 )
 	rle? ( media-libs/urt )
 	svga? ( media-libs/svgalib )
@@ -81,7 +80,7 @@ src_prepare() {
 	del=(
 		pnmtofiasco fiascotopnm # We always disable fiasco
 		$(usex jbig '' 'jbigtopnm pnmtojbig')
-		$(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+		jpeg2ktopam pamtojpeg2k # jasper has been removed
 		$(usex rle '' 'pnmtorle rletopnm')
 		$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
 	)
@@ -148,7 +147,7 @@ src_configure() {
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
 	JBIGHDR_DIR =
-	JASPERLIB = $(netpbm_config jpeg2k jasper)
+	JASPERLIB = NONE
 	JASPERHDR_DIR =
 	URTLIB = $(netpbm_config rle)
 	URTHDR_DIR =
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index d43ef5f78bfc..97a05287f209 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper )
 	png? ( >=media-libs/libpng-1.4:0 )
 	rle? ( media-libs/urt )
 	svga? ( media-libs/svgalib )
@@ -74,7 +73,7 @@ src_prepare() {
 		pnmtofiasco fiascotopnm # We always disable fiasco
 		$(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
 		$(usex jbig '' 'jbigtopnm pnmtojbig')
-		$(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+		jpeg2ktopam pamtojpeg2k # jasper has been removed
 		$(usex rle '' 'pnmtorle rletopnm')
 		$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
 	)
@@ -141,7 +140,7 @@ src_configure() {
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
 	JBIGHDR_DIR =
-	JASPERLIB = $(netpbm_config jpeg2k jasper)
+	JASPERLIB = NONE
 	JASPERHDR_DIR =
 	URTLIB = $(netpbm_config rle)
 	URTHDR_DIR =
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index af7d4100ce2d..10dd2b062d5d 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper )
 	png? ( >=media-libs/libpng-1.4:0 )
 	postscript? ( app-text/ghostscript-gpl )
 	rle? ( media-libs/urt )
@@ -137,7 +136,7 @@ src_configure() {
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
 	JBIGHDR_DIR =
-	JASPERLIB = $(netpbm_config jpeg2k jasper)
+	JASPERLIB = NONE
 	JASPERHDR_DIR =
 	URTLIB = $(netpbm_config rle)
 	URTHDR_DIR =