4 files changed, 13 insertions, 132 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 1a46ada03b87..d49746e4f67b 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.142 2013/08/01 20:24:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.143 2013/08/01 20:41:55 ssuominen Exp $
+
+  01 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> -jpeg-6b-r10.ebuild,
+  -jpeg-8d-r1.ebuild:
+  old
 
 *jpeg-6b-r11 (01 Aug 2013)
 
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 1dd64df80abd..851a3346baf1 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -8,22 +8,20 @@ DIST jpegsrc.v6b.tar.gz 613261 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade7139
 DIST jpegsrc.v8d.tar.gz 991456 SHA256 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3 SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753 WHIRLPOOL 7489605809b43cfac02230b89013075806df32246b37eb12ac05ef890ee690f85744887e296f5a21fa64012570aa298d2aa54e4469066f4c21dd40141f3bd8a8
 DIST jpegsrc.v9.tar.gz 987900 SHA256 c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535 SHA512 c6a2fa316fad8230ffd137469643276f1fef52667536712eae69b24afeea283415e8182a284c0457b54c6e49d6e93cf90d7ace1f2fed129c1e7f64b51c699c29 WHIRLPOOL e8b597539e10e68e085a750580b498320b664684d475cf75221a6643287d4e210ee3758f017149a3c2f461e0d9eb625d5930ae7c02862307761e62e4e2b57231
 DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
-EBUILD jpeg-6b-r10.ebuild 1250 SHA256 8869e094930e07a779d3c667e3dc0c8942aa6f3290025f484d6a3e6a3b2b46c5 SHA512 67b400dd5c54c86d6c572178ab78bf436c8012ebeb60bd81871fcb47793b0b2e47a767a672fbb8ac33a910a89c39302bf05c6a949ed99c30900f693774c527f6 WHIRLPOOL c65f94d0c7fd699c6502d91b79d76405004efd573dffc8d0636533366ea784f62710ea1fb4ad930a668dc11b92ff44c42269ed42874ea8a9555b4c62597ca409
 EBUILD jpeg-6b-r11.ebuild 1312 SHA256 14d5983ee55cc8353112059600b710dcd7d4d399d9554a541415ef828360bfb7 SHA512 5678e6e21724e345c125009839dfdd7fc1987e29e05173be587d5a7c8fda5a7abe8803d1b2cb00e39ec1a0770c32d80c695fa40e1c5879e1e3fa61e15958e44b WHIRLPOOL 78092f87d39abbd64091e69fcbcee1e6d5196229da1c48a231d37258ce690d1b25f77b48c950db2f6f3b717dfe24cb29149fddb33436ff9ed8fefc36890d91ab
 EBUILD jpeg-6b-r9.ebuild 1029 SHA256 881c863315fc55c042a97f544d156bdc0ce4a35a064199fe1364b5f0e9cdda27 SHA512 ebe66ae2058dcca128c3fd3f98f71077908804b00e6e69242cc426cf1d895e0af6fa2e49e09d0873db4efbf0077fbe7c78b6cf2a86e3d3f30d8725c2cdcc682d WHIRLPOOL 92b0d6b876399c5d68f34e1d882599a763ecd89a62bf9363b9bfe3946c50e88ac5ff5287a982b36e6e508171e085d52e8d6222295845bcf3c0233c0c198d18f4
-EBUILD jpeg-8d-r1.ebuild 2301 SHA256 1ed66f2121dd886b7cf005c60d4d271d473c8c261e8980de0ecc4f086325cfe3 SHA512 13e0ffb05c0c9fa7944b00c314ef73e661396699bd0bf0de6036be75015553a3be04cba74ca801787353fd19937e4017bf445dca9813a1ca45adbc57328a60ff WHIRLPOOL 10650af17ada9fb70d65dbccc37e8e30bb2994cc20899474234f89a0847d74af228783d2b346904d3b20ba7ed696c3b3a5ab38d3500b308494d4efc496471166
 EBUILD jpeg-8d.ebuild 2005 SHA256 ae6e19520cbbf02c0797fc93d211a51ded7c8e6ba51e6040c69efbd701df2368 SHA512 a8d56cbea40e314cc740efc14e29e8f6eb7dc22ddb802bfe88a453ca095d830b401c37aada1ba0e6c5d066b1160dec0daf146062a007e92eb8ec8c4316395fbd WHIRLPOOL 356b760b3375b921f79690e35d9eb0975f72caf42faa3d7e3f6e9aec41e780ee4ddf5b34189cd7c5196f5b444e6463de703999fefbe8aac37937e7dd3c51420b
 EBUILD jpeg-9.ebuild 2086 SHA256 40bccba10b3e60651c0b57058ff895edde2aa54517a4e55cc8c203e5a5514ed9 SHA512 91244e4015deb53d6ae9c735b1842cfec41b7a818752433233417a9ff66c4b4b466c68250dbd9b933300b80d8ea3e41f1fa9ec7836426230733c0fe5365e966a WHIRLPOOL 9b029fb3ac0fec968e37ac212807ff5e14e546667978788676ac425beedbd0653e9645dac0ce85515dedcd301ae2f401831e742a09eb942db6a6045e0c22e6b2
-MISC ChangeLog 17476 SHA256 aaa215ab0dd490ade2eebd74531ad95cf8258716100e8cd414a7ead538f32d86 SHA512 1cc79596a626625a1f39df39c215b65cd03b8a48dd14188819179ff5772bfbe8eccef26acd655b671ddef01d3b541f42d69cd4f014a8e5749c3ab299c167dc8d WHIRLPOOL 5224b1893e23559520f5196f48905b63d1913a225f59a2e1b922117ab0f707fb8856f0dbeae53f80f27b0030266efbc060e7ad1e124480d35475565548c7a549
+MISC ChangeLog 17580 SHA256 7bf5799281573bac026355c2f5893b764c0a6739f3dc1e98245fef207595007c SHA512 d5bf0f62c117df7537aea241372cedf704ad7092674eeded9fde93b00398484f919c8f0ea19a99ce633a82bd673ab9ab2dcbe0f39b3c65c8666cdc4a4ab3934c WHIRLPOOL 706018185c64cfc6b6ea88190f9b7cb5b922b232e35423504109470c1b3a7612d39b864d52bbb12b5a5eac0e77d3ce5806f47629ad69f9740c5ac4106d6a320c
 MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR+sORAAoJEEdUh39IaPFNZYcH/1t+hIJUaFZRgVBmPBxcaF7K
-S029IZSw155QK7ynlFDicQPgugd07b9od1bZDMfDRGqEgpF8IswKhaK9k3/Kzepp
-WtvTSj0wK5g100Xsy7XqM0ADprWu9LhREmmVi/vmsRISDn0ZuU96yZS5kuEVCx8K
-r+iwi1ujff7n52LAvyDhRC2oxl8WhCzqxH5a3ToR0nErfN6/Ov4M3IBSDTxd28sK
-qxLRU4GyjWvqWnxLszlRV1nVhVy96n0oynybpm3UsQNLeCijztcz3wsBTL7tP9Sx
-dsnzK2qbA/laWha/4KdwGn7muUoVfW1ykWTsTiFlPXAMx52DI2BT98JN6kTcaiY=
-=uEUQ
+iQEcBAEBCAAGBQJR+se7AAoJEEdUh39IaPFNqnUH/33ZALMCiw0IZXmQfcuT3DU1
+iNMStME3gjQ4uartecxOlzBFvtcJ4fX496MpiRXyPgdBN00BzuLVZFeTkazEx0XB
+iL7yl2GG78hpg1w9RQ5yJITah0IhtZdb5rEJ+kvmkl3uqb3RujDXYal6S3wvwgyX
+s77Hz62x01HYqxH2VTX+sT+fP76yB0/EsJi9571JffQLCTrxNY7T9+w954zbTNya
+CsOjPezB8SwSeoqamWpguegttUArSh3qKy1JgGLZJrqjoEVGad8GsKBAexKkg/RS
+0YBrJigoGNB6Y98/zRaUpQEwfUeSDOtC/BSolOPnAxvkrPYJmGRNVyfAVFnPR8U=
+=6vJp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jpeg/jpeg-6b-r10.ebuild b/media-libs/jpeg/jpeg-6b-r10.ebuild
deleted file mode 100644
index ac81eb7a0592..000000000000
--- a/media-libs/jpeg/jpeg-6b-r10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r10.ebuild,v 1.2 2013/08/01 15:47:03 aballier Exp $
-
-EAPI=5
-
-# this ebuild is only for the libjpeg.so.62 SONAME for ABI compat
-
-PATCH_VER=1
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="library to load, handle and manipulate images in the JPEG format (transition package)"
-HOMEPAGE="http://www.ijg.org/"
-SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
-	http://dev.gentoo.org/~ssuominen/${P}-patchset-${PATCH_VER}.tar.xz"
-
-LICENSE="IJG"
-SLOT="62"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-DOCS=""
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	elibtoolize
-}
-
-multilib_src_configure() {
-	tc-export CC
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		--disable-static \
-		--enable-maxmem=64
-}
-
-multilib_src_compile() {
-	emake libjpeg.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libjpeg.so.62.0.0 libjpeg.so.62
-}
diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
deleted file mode 100644
index b3b304dc13f3..000000000000
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild,v 1.2 2013/07/31 16:10:51 aballier Exp $
-
-EAPI=5
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-MY_PN=libjpeg8
-MY_PV=1
-
-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/${MY_PN:0:4}/${MY_PN}/${MY_PN}_${PV}-${MY_PV}.debian.tar.gz"
-
-LICENSE="IJG"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-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 [[ ${ABI} == ${DEFAULT_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
-}
-
-pkg_postinst() {
-	ewarn "If you are switching from media-libs/libjpeg-turbo you might need to"
-	ewarn "rebuild reverse dependencies:"
-	ewarn
-	ewarn "# emerge gentoolkit"
-	ewarn "# revdep-rebuild --library libjpeg.so.8"
-}