gentoo resync : 22.04.2018

4 files changed, 6 insertions, 12 deletions

diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index b154b864f730..eaef1d51b466 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -5,8 +5,8 @@ DIST jpegsrc.v6b.tar.gz 613261 BLAKE2B d08406bebcbec9aa0197ef7854f163dc12d916e7e
 DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaad6bee06e9b95b803bf756beb6ad61abc76c889d53dfcd05139286ec870372d50d2b79bf28b32d0e8d50a2ab SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
 DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
-EBUILD jpeg-6b-r12.ebuild 1253 BLAKE2B a9bfd0f21ae1f3f1b96b9effce1f731620f1b0da53138ac897c8cc67c2c5ac1d868a093cbc5624c58d7226813269457987a0dc01a9d6eb13d5c464ab87d37965 SHA512 cb3ec5945863b4bab44d32dbb14aaced20e3960ab64cfaf220cec225685d57ca617e01502364887d9f6925b60950bfd8f7e8dbe89e29d931aeb44ac918fa055b
-EBUILD jpeg-8d-r1.ebuild 2069 BLAKE2B 83224207c0bd3fb14947a3c7bc506fcd5c9d20f9c17fcbc89cdccadaf40318cd3f6e0f2da72fb21faa206640d76538a185f6a3a29d1bd662b877de083c049f31 SHA512 dea7fd89d094be0cb90e9b99d3f0e9353bca3045a2ca8a110b6eafdbdc27fd2fe5a01c3911697f065e474c1d7b58cdcd39a82552281200b8ed3870a914f549fe
-EBUILD jpeg-8d-r2.ebuild 1532 BLAKE2B 7cb616d69fbad57a538c50f08ecce6a4c76c455724b280d51bbff2dc6707329e8db15e040a1c7ca2bf607dabd1690045cc7ad5cacd66185b01da3abda9386e04 SHA512 66faaee06b6243bfaf5ac512ebc14042b6b41a5c24de53ea376f0fb8b8959ec135bf7789dba6935d96e367059e8d04abb8198a229a47892f4c7df0f94ed677b7
+EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
+EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
+EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
 EBUILD jpeg-9c.ebuild 2001 BLAKE2B ceef32043af8ff6f786033bddedcd6d7bd5d585b14592dc2c70def0eed0a643d81fdea2b446a9d82105f7046e7fd7cf06b98e01b1d4284b0dd14aeab68547de9 SHA512 c0e11739e642b72a6c8b5708cd3a149272b3776226a0fb05fbed4050770b8a233be301eb0c2844a1afac4812c156cb84e9d7bf9a19ad1819802c67cd28cfa810
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-6b-r12.ebuild b/media-libs/jpeg/jpeg-6b-r12.ebuild
index 3555b6c14cf5..1bd42de6f2c7 100644
--- a/media-libs/jpeg/jpeg-6b-r12.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r12.ebuild
@@ -20,9 +20,7 @@ IUSE=""
 
 DOCS=""
 
-RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
index 6c3a792a6132..2c7155f00bd5 100644
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r1.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="!media-libs/libjpeg-turbo:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="!media-libs/libjpeg-turbo:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
index 445113902da4..410e55d3088d 100644
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r2.ebuild
@@ -17,9 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 RDEPEND="!=media-libs/jpeg-8*:0
-	!<media-libs/libjpeg-turbo-1.3.0-r2
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	!<media-libs/libjpeg-turbo-1.3.0-r2"
 DEPEND="${RDEPEND}"
 
 DOCS=""