Version without libjpeg.so.8*

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 87 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index ff83de3b376f..be1513e99252 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.172 2013/12/30 08:37:02 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.173 2014/01/24 11:59:24 ssuominen Exp $
+
+*emul-linux-x86-baselibs-20131008-r9 (24 Jan 2014)
+
+  24 Jan 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +emul-linux-x86-baselibs-20131008-r9.ebuild, files/remove-native:
+  Version without libjpeg.so.8*
 
 *emul-linux-x86-baselibs-20131008-r8 (30 Dec 2013)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r9.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r9.ebuild
new file mode 100644
index 000000000000..627768e1fb13
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r9.ebuild,v 1.1 2014/01/24 11:59:24 ssuominen Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
+	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
+	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
+	openssl tcp_wrappers_license"
+
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32"
+
+DEPEND=""
+RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
+	abi_x86_32? (
+		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
+		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
+		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
+		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
+		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
+		virtual/jpeg:62[abi_x86_32(-)]
+		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
+		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
+		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
+		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
+		|| (
+			>=virtual/udev-206-r1[abi_x86_32(-)]
+			~virtual/udev-204[abi_x86_32(-)] )
+		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
+		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
+		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
+		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
+		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
+		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
+		|| (
+			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
+			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
+		)
+		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
+		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
+		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
+		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
+		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
+		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
+		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
+		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
+		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
+		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
+		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
+	)
+	>=sys-libs/glibc-2.15" # bug 340613
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_prepare() {
+	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
+	emul-linux-x86_src_prepare
+	rm -rf "${S}/etc/env.d/binutils/" \
+			"${S}/usr/i686-pc-linux-gnu/lib" \
+			"${S}/usr/lib32/engines/" \
+			"${S}/usr/lib32/openldap/" || die
+
+	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
+}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native b/app-emulation/emul-linux-x86-baselibs/files/remove-native
index 977b95e6920e..56087efacbd2 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native
@@ -28,9 +28,6 @@ usr/lib32/llvm/libLTO.so
 usr/lib32/llvm/libprofile_rt.so
 usr/lib32/libpng12.so.0
 usr/lib32/pkgconfig/libpng15.pc
-usr/lib32/libjpeg.so
-usr/lib32/libturbojpeg.so
-usr/lib32/libturbojpeg.so.0*
 usr/lib32/libraw1394.so
 usr/lib32/libraw1394.so.11
 usr/lib32/libraw1394.so.11.0.1
@@ -42,6 +39,11 @@ usr/lib32/pkgconfig/libavc1394.pc
 usr/lib32/librom1394.so
 usr/lib32/librom1394.so.0
 usr/lib32/librom1394.so.0.3.0
+usr/lib32/libjpeg.so
+usr/lib32/libturbojpeg.so
+usr/lib32/libturbojpeg.so.0*
+usr/lib32/libjpeg.so.8.0.2
+usr/lib32/libjpeg.so.8
 usr/lib32/libjpeg.so.62
 usr/lib32/libexpat.so
 usr/lib32/libexpat.so.1