gentoo resync : 27.03.2018

4 files changed, 2 insertions, 142 deletions

diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 036d6b1dd4ea..b9609be2c8c7 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -3,14 +3,10 @@ AUX jpeg-8d-CVE-2013-6629.patch 459 BLAKE2B 7657e4c2584d23e2997ec9d4ac8242b4d7ce
 DIST jpeg-6b-patchset-1.tar.xz 2592 BLAKE2B 6518fc5e94dcb4cecbb2d9f4edd2ad297d1f7b64f3da4f03ab54acc6eb9f11374091b7337b005a76f644c6795cdddc2ea032a9f41c9a9a3f5e06e0ba9f02f939 SHA512 6deb845a08f4ac6b88c47803b528842cedd145fb12295060d52553b8c803ba192478306496701a409c796c264ceaed0988575ae8f7717e2e7b24da5733bc9c2b
 DIST jpegsrc.v6b.tar.gz 613261 BLAKE2B d08406bebcbec9aa0197ef7854f163dc12d916e7e7df466e5408e715aa20738c047f0f709699311186e17da443af9afc208765f74bcc51a7bab2284c54351868 SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe
 DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaad6bee06e9b95b803bf756beb6ad61abc76c889d53dfcd05139286ec870372d50d2b79bf28b32d0e8d50a2ab SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
-DIST jpegsrc.v9a.tar.gz 1000034 BLAKE2B 24fffc050d30af27c52ace25f716858e882f88e6353c3a7369a9598a483a786b716b5c0dcab1e3582d2b23fe578b4bcd72ebc4434f6ca62a6593d53327613b6c SHA512 9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b
-DIST jpegsrc.v9b.tar.gz 1022609 BLAKE2B 334b7d3df800ed2c3e1b5ee2fea40a350c0b4024f5a368efb488b9f782b3d006a691fc53574fa6ad4ff944b69c93478d2d7759635196277774f360511ecff3f9 SHA512 74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c
 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-9a.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b
-EBUILD jpeg-9b.ebuild 2035 BLAKE2B 959e8dfd3c8f73a7e8420c03d56f9d1c5b7b84fb92b0c2967b410378ad593d4e4190bdf726ff290654b7dce29b14c530bd2108a3137d4124c0f45f9db9cfecd2 SHA512 9382789c9d079b01d7a9105f75c742d466de0b5726b06a84e36a10c37ea21ec753e2ae1eab03a2f2660e7876eb054bbda20a7aa9688900b54a78e4a510e9607b
-EBUILD jpeg-9c.ebuild 2006 BLAKE2B 0a7e33926485fa5faaedd172f82e86a9db17c1472787839266c6018d31ca901c5f6e82fcdba1e11fc10af2183d9cc262c761b611518c36f3defdc2d57a3886a4 SHA512 4dccb83f9f985013c9528f63d9783d5cc0ce16fbe837fdf90ac8904132eec7179bdc4a18dca62678f88b2989815bc081ac720c456f4c6f93fe94f47c993d57a5
+EBUILD jpeg-9c.ebuild 2005 BLAKE2B ba19767d2300fd34fa597724f883afbff855e3033e4d3db709971908f2ae8efd92f31ec11d3aa79513a4a1975375a927fea76aea615b712ad4df04b7522c5633 SHA512 3c32c16e347953b8f8ef394e3046761d9d90e6002382ac332fefc3a1892563dabf206fb03f0aca0e15fcb70ec3234e80d63de45e781c0cc0f2d0e57d47521f30
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-9a.ebuild b/media-libs/jpeg/jpeg-9a.ebuild
deleted file mode 100644
index 098a4530dd5e..000000000000
--- a/media-libs/jpeg/jpeg-9a.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
-	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
-
-LICENSE="IJG"
-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(-)] )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
-	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
-	local ldverscript=
-	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64 \
-		${ldverscript}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		# Build exifautotran and jpegexiforient
-		cd ../debian/extra
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	dodoc change.log example.c README *.txt
-
-	# Install exifautotran and jpegexiforient
-	newdoc ../debian/changelog changelog.debian
-	cd ../debian/extra
-	emake \
-		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-		install
-	# Remove +x bits from man pages.
-	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
-}
diff --git a/media-libs/jpeg/jpeg-9b.ebuild b/media-libs/jpeg/jpeg-9b.ebuild
deleted file mode 100644
index 098a4530dd5e..000000000000
--- a/media-libs/jpeg/jpeg-9b.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
-	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
-
-LICENSE="IJG"
-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(-)] )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
-	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
-	local ldverscript=
-	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64 \
-		${ldverscript}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		# Build exifautotran and jpegexiforient
-		cd ../debian/extra
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	dodoc change.log example.c README *.txt
-
-	# Install exifautotran and jpegexiforient
-	newdoc ../debian/changelog changelog.debian
-	cd ../debian/extra
-	emake \
-		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-		install
-	# Remove +x bits from man pages.
-	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
-}
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 8f4c74e0f092..7e321582b75d 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 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"
+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"
 
 DEPEND=""