old

(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)

3 files changed, 5 insertions, 91 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 8db0d2d99e5b..594fb6bcf650 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.127 2012/02/15 00:38:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.128 2012/02/15 00:40:07 ssuominen Exp $
+
+  15 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> -jpeg-7-r1.ebuild,
+  -jpeg-8b.ebuild:
+  old
 
 *jpeg-8d (15 Feb 2012)
 
diff --git a/media-libs/jpeg/jpeg-7-r1.ebuild b/media-libs/jpeg/jpeg-7-r1.ebuild
deleted file mode 100644
index a9a85149dc89..000000000000
--- a/media-libs/jpeg/jpeg-7-r1.ebuild
+++ /dev/null
@@ -1,40 +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-7-r1.ebuild,v 1.4 2012/01/28 00:01:19 ssuominen Exp $
-
-# this ebuild is only for the libjpeg.so.7 SONAME for ABI compat
-
-EAPI=4
-PATCH_VER=2
-inherit eutils libtool multilib
-
-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://gentoo/${PN}-6b-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	epatch "${WORKDIR}"/patch/60_all_jpeg-maxmem-sysconf.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static \
-		--enable-maxmem=64
-}
-
-src_compile() {
-	emake libjpeg.la
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)
-	doexe .libs/libjpeg.so.7
-}
diff --git a/media-libs/jpeg/jpeg-8b.ebuild b/media-libs/jpeg/jpeg-8b.ebuild
deleted file mode 100644
index 92923fc855f8..000000000000
--- a/media-libs/jpeg/jpeg-8b.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8b.ebuild,v 1.10 2011/01/06 00:03:56 ssuominen Exp $
-
-EAPI="3"
-
-DEB_PV="7-1"
-DEB_PN="libjpeg7"
-DEB="${DEB_PN}_${DEB_PV}"
-
-inherit eutils libtool multilib
-
-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/${DEB_PN}/${DEB}.diff.gz"
-
-LICENSE="as-is"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${DEB}.diff
-	cp "${FILESDIR}"/Makefile.in.extra debian/extra/Makefile.in
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
-	elibtoolize
-	# hook the Debian extra dir into the normal jpeg build env
-	sed -i '/all:/s:$:\n\t./config.status --file debian/extra/Makefile\n\t$(MAKE) -C debian/extra $@:' Makefile.in
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc change.log example.c README *.txt
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}