4 files changed, 5 insertions, 159 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index e170a9a690a8..482bd12358bc 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.162 2014/02/20 14:16:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.163 2014/02/21 19:22:23 ssuominen Exp $
+
+  21 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> -jpeg-6b-r11.ebuild,
+  -jpeg-6b-r9.ebuild, -jpeg-8d.ebuild:
+  old
 
   20 Feb 2014; Agostino Sarubbo <ago@gentoo.org> jpeg-8d-r1.ebuild:
   Stable for sparc, wrt bug #491150
diff --git a/media-libs/jpeg/jpeg-6b-r11.ebuild b/media-libs/jpeg/jpeg-6b-r11.ebuild
deleted file mode 100644
index 56da0e40c5a5..000000000000
--- a/media-libs/jpeg/jpeg-6b-r11.ebuild
+++ /dev/null
@@ -1,49 +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-r11.ebuild,v 1.1 2013/08/01 20:24:09 ssuominen 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=""
-
-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(-)] )"
-DEPEND="${RDEPEND}"
-
-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-6b-r9.ebuild b/media-libs/jpeg/jpeg-6b-r9.ebuild
deleted file mode 100644
index 530f5c5bcd3c..000000000000
--- a/media-libs/jpeg/jpeg-6b-r9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild,v 1.6 2012/12/16 16:12:57 ulm Exp $
-
-# this ebuild is only for the libjpeg.so.62 SONAME for ABI compat
-
-EAPI=4
-PATCH_VER=2
-inherit eutils libtool multilib toolchain-funcs
-
-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
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-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=""
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	elibtoolize
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--enable-shared \
-		--disable-static \
-		--enable-maxmem=64
-}
-
-src_compile() {
-	emake libjpeg.la
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)
-	doexe .libs/libjpeg.so.62
-}
diff --git a/media-libs/jpeg/jpeg-8d.ebuild b/media-libs/jpeg/jpeg-8d.ebuild
deleted file mode 100644
index e89055fa8041..000000000000
--- a/media-libs/jpeg/jpeg-8d.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8d.ebuild,v 1.6 2012/12/16 16:12:57 ulm Exp $
-
-EAPI=4
-inherit eutils libtool toolchain-funcs
-
-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"
-
-DOCS="change.log example.c README *.txt"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
-	elibtoolize
-}
-
-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 \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64 \
-		${ldverscript}
-}
-
-src_compile() {
-	default
-
-	# Build exifautotran and jpegexiforient
-	cd ../debian/extra
-	emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# 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"
-}