old, and silence repoman while at it

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

4 files changed, 23 insertions, 79 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 96e98527001b..d5e341940d60 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,12 +1,20 @@
 # 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.123 2012/01/27 23:54:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.124 2012/01/28 00:01:19 ssuominen Exp $
+
+  27 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -jpeg-8c.ebuild:
+  old
+
+  27 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> jpeg-6b-r9.ebuild,
+  jpeg-7-r1.ebuild:
+  Remove deprecated blockers.
 
   27 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> jpeg-8c-r1.ebuild:
   amd64/ppc/ppc64/x86 stable wrt #401109
 
   27 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> jpeg-8c-r1.ebuild:
-  pkg_postinst message for users switching from libjpeg-turbo
+  Post installation message warning users to rebuild reverse dependencies
+  if switching from libjpeg-turbo.
 
   31 Dec 2011; Fabian Groffen <grobian@gentoo.org> jpeg-8c-r1.ebuild:
   Marked ~m68k-mint, bug #394955
diff --git a/media-libs/jpeg/jpeg-6b-r9.ebuild b/media-libs/jpeg/jpeg-6b-r9.ebuild
index 88caf6df50e5..170b4af965ef 100644
--- a/media-libs/jpeg/jpeg-6b-r9.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r9.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3 2010/01/18 15:35:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild,v 1.4 2012/01/28 00:01:19 ssuominen Exp $
 
 # this ebuild is only for the libjpeg.so.62 SONAME for ABI compat
 
-EAPI="2"
-
+EAPI=4
+PATCH_VER=2
 inherit eutils libtool multilib toolchain-funcs
 
-PATCH_VER="2"
 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
@@ -19,9 +18,6 @@ SLOT="62"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="!~media-libs/jpeg-6b:0
-	!media-libs/jpeg-compat"
-
 src_prepare() {
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	elibtoolize
@@ -36,10 +32,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake libjpeg.la || die
+	emake libjpeg.la
 }
 
 src_install() {
 	exeinto /usr/$(get_libdir)
-	doexe .libs/libjpeg.so.62 || die
+	doexe .libs/libjpeg.so.62
 }
diff --git a/media-libs/jpeg/jpeg-7-r1.ebuild b/media-libs/jpeg/jpeg-7-r1.ebuild
index be3a6b64e1d2..a9a85149dc89 100644
--- a/media-libs/jpeg/jpeg-7-r1.ebuild
+++ b/media-libs/jpeg/jpeg-7-r1.ebuild
@@ -1,31 +1,23 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3 2010/01/18 15:35:38 ssuominen Exp $
+# $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="2"
-
+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-2.tar.bz2"
+	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=""
 
-DEPEND="!~media-libs/jpeg-7:0"
-
-pkg_setup() {
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libjpeg.so.7 ]]; then
-		rm -f "${ROOT}"/usr/$(get_libdir)/libjpeg.so.7
-	fi
-}
-
 src_prepare() {
 	epatch "${WORKDIR}"/patch/60_all_jpeg-maxmem-sysconf.patch
 	elibtoolize
@@ -33,17 +25,16 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--enable-shared \
 		--disable-static \
 		--enable-maxmem=64
 }
 
 src_compile() {
-	emake libjpeg.la || die
+	emake libjpeg.la
 }
 
 src_install() {
 	exeinto /usr/$(get_libdir)
-	doexe .libs/libjpeg.so.7 || die
+	doexe .libs/libjpeg.so.7
 }
diff --git a/media-libs/jpeg/jpeg-8c.ebuild b/media-libs/jpeg/jpeg-8c.ebuild
deleted file mode 100644
index 689ae4b37cc7..000000000000
--- a/media-libs/jpeg/jpeg-8c.ebuild
+++ /dev/null
@@ -1,51 +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-8c.ebuild,v 1.1 2011/01/19 20:21:41 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://gentoo/${DEB}.diff.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 '{}' +
-}