Release libjpeg.so.9 into the wild and cope with the libjpeg-turbo reverting back to .so.62

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)

3 files changed, 64 insertions, 13 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 70fb398d19d1..1a46ada03b87 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.141 2013/08/01 15:47:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.142 2013/08/01 20:24:09 ssuominen Exp $
+
+*jpeg-6b-r11 (01 Aug 2013)
+
+  01 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> +jpeg-6b-r11.ebuild,
+  jpeg-9.ebuild:
+  Release libjpeg.so.9 into the wild and cope with the libjpeg-turbo reverting
+  back to .so.62
 
   01 Aug 2013; Alexis Ballier <aballier@gentoo.org> jpeg-6b-r10.ebuild:
   add blockers on emul libs and stack it for baselibs -r5
diff --git a/media-libs/jpeg/jpeg-6b-r11.ebuild b/media-libs/jpeg/jpeg-6b-r11.ebuild
new file mode 100644
index 000000000000..56da0e40c5a5
--- /dev/null
+++ b/media-libs/jpeg/jpeg-6b-r11.ebuild
@@ -0,0 +1,49 @@
+# 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-9.ebuild b/media-libs/jpeg/jpeg-9.ebuild
index 4ecfabe5caf0..e1c1bd9b06d7 100644
--- a/media-libs/jpeg/jpeg-9.ebuild
+++ b/media-libs/jpeg/jpeg-9.ebuild
@@ -1,6 +1,6 @@
 # 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-9.ebuild,v 1.2 2013/07/31 10:04:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild,v 1.3 2013/08/01 20:24:09 ssuominen Exp $
 
 EAPI=5
 inherit eutils libtool toolchain-funcs multilib-minimal
@@ -12,11 +12,14 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-# Waiting for libjpeg-turbo to gain .so.9 support!
-KEYWORDS=""
-#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"
+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="!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
@@ -62,11 +65,3 @@ multilib_src_install_all() {
 		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"
-}