Version bump, drop old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 112 insertions, 41 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 42a51bdaf834..25c5cb1e2e64 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.189 2014/03/27 14:45:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.190 2014/04/06 09:02:58 pacho Exp $
+
+*emul-linux-x86-baselibs-20140406 (06 Apr 2014)
+
+  06 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-baselibs-20140406.ebuild,
+  -emul-linux-x86-baselibs-20130224.ebuild:
+  Version bump, drop old
 
 *emul-linux-x86-baselibs-20131008-r22 (27 Mar 2014)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index 290a397bbb89..4fc3233a2239 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -14,9 +14,8 @@ AUX remove-native-20131008-r20 7616 SHA256 b0b36f6f2bcb6e5ad2b144aaa4758ea06b1fe
 AUX remove-native-20131008-r21 7826 SHA256 09ed62dd71438115e5039f4f6e6ce3b852f2f590a87cc57f7281d1b093fc4f5c SHA512 7538dd2e99c18e2c824743e35ae84bd746d4934daf8b96b2c8c3c53b42acdbd89e952e2392cadea02950aade500df0ddaaa4a69b7b7879dd063f270572e4c432 WHIRLPOOL d94643ded2d3d8baf652bb446f7a856cbeffde7b8531d3f76421d81eb01876c19ce56df075108b4f9d47665b0f63d3f5a50764e6a6cb3e82d5a67dfff2234696
 AUX remove-native-20131008-r22 7849 SHA256 9735802343096e0d3a4dee9c16f9a5f6fc771861787768f993bdc125dbc5959e SHA512 94332c514825cb76c4964b1eee88883d0dbe197edcc2d587346a52dbf7892fc31ef71cbbdb8b3cf2a5e3ce610b451f0f57887c64ea476838608bb8cf3eb8df7a WHIRLPOOL e3ae73b5297006fb0fd506bff54ebebdaa7d6c1adf9f7fdb887061d0190e1687459b7b28e55edc220cd3fcb650bb608f8b2b50dc71263fd9fb33655f0e3e1365
 AUX remove-native-20131008-r6 6437 SHA256 45f8a25fe1335a5d9269e9476a292eef757cb55c57de7c9f78953a574f502120 SHA512 398e903b473336dafb154f4e24aae448adc540778fb5b8c3f4600e9a85d5d80f46ccaef5a485b1daf53b3a2ebfe99514ba7404af4b363ce352328223a763c6de WHIRLPOOL 59b0da70ac0eed8fd862bc5e1731cfe6767749e05d2596f704bddbfea9f1bc62f1695b1b4ec81a6ea7f1456ee776e628222a339612836788d325bc3f6bb3fa0b
-DIST emul-linux-x86-baselibs-20130224.tar.xz 41844860 SHA256 4f303b9d73ff1c0040e034922229bdbe4c0587cade9532ec900f55faf92875a1 SHA512 baa649128fc68ae718f1d105ed2b78641990547686aeb3c6539ef6314b255ec0f4a407e36d4b32926fce0b72f186bfb0633a9d6eb939bc0884f099afc3bcefaa WHIRLPOOL 3c2779524095a3791d08e4b0668b3b76bac427857695d7004e28eedea910a3ea5973390598aea244b23a836e918ed383b1ad3b03b03b4beaff95f42584aec219
 DIST emul-linux-x86-baselibs-20131008.tar.xz 55992196 SHA256 83c077c2d0668502c26abb4c30e1bd9ebd3eb4d2fdb2bab3ec57331a3df2b449 SHA512 4ec890f8bab877a576024c4d932906a486b5d584026c8a89563735d520258dce6a47a47e41ec5cae32be89d697a903844f15b9c2a16338a0d34c4cc46cd781ef WHIRLPOOL 0ec725072c8fbd1b0e8649f715e6a4e26ea9462c9ed290f0f42a5b606cdfa6736f839396ac6a967cfce9c864e5da4cc2082ce2db83cc4a9cb49824e7b975bb20
-EBUILD emul-linux-x86-baselibs-20130224.ebuild 1049 SHA256 f97fb9dbbaf9c1ffcf23466b3540f491ba94a7c9cb514f93a2221aa91284569b SHA512 89280d3e3f91e8b8de001a1d1de3eb143b232d44e92110a67e07e0996683ca7a2b4bf1e23d5946be70dd45432f9a449779787741ef7aca84147bdb71621ad553 WHIRLPOOL 3ddc44d25f36e7ea70d8460712bef445da3bab8f92899893aff32db8223edd3d79e5c2709ac9862afdc3cf71695db25dff82de757e43ac46ba7b2475cc9195b4
+DIST emul-linux-x86-baselibs-20140406.tar.xz 60312556 SHA256 0f242404c5323c4773cbc1c23abe43cc039b826e431d6b78949a4717af4540e1 SHA512 61450a5f9a63458c29e7e0421e77ca6ef25dc50355678a9e0dee1eb50ca23869790e1293ad130ee363be0b19592d735045c8e4a542bcb76a212c68ecdee9382e WHIRLPOOL e00ccbb07a9875dedd25033246fb9367a2610dc2b11541501777270ec00e1ceab880f4f351f2a63663917312699b73626776005584b556935d51716a982a2aa3
 EBUILD emul-linux-x86-baselibs-20131008-r11.ebuild 2751 SHA256 6460afabcc0ba75dd166cb1173f1663950ae432c78ab471c4e62c1a3ce35d021 SHA512 b130fcb35752a4cecc379a483d10cd47bd97d6d9495217c78389874d3adf6e651e281f80605cc0f31d77f079c1164cef43e3ecefd95c42cd4136a31d6bb8912d WHIRLPOOL 7b35dfb9081e03e1ea733f3d1a0ee52d41384403af15c7dc6044f7e4996a7fb2e4232ca2e65d04ce4656c14fea1163d717558f6727f6bb44f902f006f022133d
 EBUILD emul-linux-x86-baselibs-20131008-r12.ebuild 2798 SHA256 8b4ee42dfa852b0714e7204e6523af8b6c3056de3a6fc52b8ccf81be07c906ae SHA512 8f7286b4c5e361af87260f1a5670faea2fa5ee15299d1945243468fd2acf2515d5fa932b5a69d56ec6080918a5a971138d34c58c87d56221ddfe578b1d1cfbd5 WHIRLPOOL 3b9d733a4133e23676a3e5682e57c59a6297b2bcb3d4e8b7bb2b015579cd869b3339ce9534352c2c4c09410029294dba0cce18d23fd732d3ac638b620067cb1c
 EBUILD emul-linux-x86-baselibs-20131008-r13.ebuild 2853 SHA256 a999c6c3473264e8b8cff0353b866f6426fe46d45867ad2db7855bc39083db05 SHA512 b743df094dd105205e3bf15bd3178cfcd50d35000c65b5e11afe211299d26df6ed3e1982231c0ab39078ef2280f77947b164afdd15f74ada0437c9ea539bd8a2 WHIRLPOOL a9be6b1db8ba35c16119be0a6a170ef667d1acc48f65668403a97662cabd32bb416d0e3587a3c04a15345a7d6de52464ce77444f6a4a7da54870043707a036a0
@@ -30,16 +29,13 @@ EBUILD emul-linux-x86-baselibs-20131008-r20.ebuild 3486 SHA256 537dcd28097a56556
 EBUILD emul-linux-x86-baselibs-20131008-r21.ebuild 3535 SHA256 81f565884a942d28214ebd3d7053d1b7338464e67114cdc75ab1542f7ef0fe32 SHA512 82e4295f9b8459180e1652b7e77c776911b8a43883ffcea012f4d03ab43e60e4f9aa9ba999ceb6c0ea066f5306901008a3c0f31ddbc165d214a0ce855184cd9e WHIRLPOOL e214dded73098624b532ad0206107f4e751bc2a886d9b4e39720a6e6cca50358cec53e8dc42111ef51ffdf4eeb66f2de39dde4f4fec0b603153d3621ed68be34
 EBUILD emul-linux-x86-baselibs-20131008-r22.ebuild 3576 SHA256 0c78e0eb0000b75898802f692e504f62d45fb9dff32a486a249df2d28964b082 SHA512 bf183d13fc8ba50468865338910965b6c2925325146fecace11f5c5ea94d48031079b8740f538c9aa8b0131f665593171397c460107d19b96009e24a09f3edf1 WHIRLPOOL d8f92571fcde85bc37997f045315244dacf36d9b98061c44dfd82c21a188f09a0ca93f66e0e1d7797b93603a6f6f105ccbffa46861dbce282691504b9b037a63
 EBUILD emul-linux-x86-baselibs-20131008-r6.ebuild 2640 SHA256 252da31ceba4785999f0a8b0f14cec5774f6a3ff17c9a82727ba1d2bf3a15488 SHA512 e164798766d65557ebc8ed1e09cc0bd08e5bfa25bc08b15368776b5c5419a91b30aabd15807801b5b1256d8c08425ceddd3007ed8942ee0c2022d79c141cf35a WHIRLPOOL 4be307fedb38042115b04b5bfc0441c636a5e0259ed534d64587b8399c0356c0aa94621ae56f3a58c9bcf13a49398ef54aee28f8dd459f86b3700be27a5dfed5
-MISC ChangeLog 36948 SHA256 9857d219ccf1e4551d31a2d54782105d7d0d8eb17357b3f54c88a1139584e455 SHA512 9337aca9c8c8fe12553aa6df1185aabff15517807427f278214bf381f4adef3533bebfa5144c3cf8e9d2d43a43ab6386a7ffe396535679783b8d3ea8c550d7a3 WHIRLPOOL 1addfd1077b4c08ee9fbb3011d568adee2fc72a9755f750a98834292f4b57efe8cca57ed42bebbc7ffe63bbd99eabad4c074c8a77004c6fb29b601980361e328
+EBUILD emul-linux-x86-baselibs-20140406.ebuild 3568 SHA256 647e60c096a6b5f616263167cb513f1b014b0f7666cdd8d983a9d3c6f8c0a70c SHA512 dc38cb33cde3b760acadbe134aecaca2896060daeecdf018c48453247610b6ebea2f893a3a9ec9caa2f1088077158a646da263d777308a22d5dbbbaffe6e7560 WHIRLPOOL 324944534448cb9a1866478a149e37780af2dfde507d29036567291f698b4caaffba414b0e509f2e0e66079dfd32adcfc3f3e4eee119709a41872ffcfd75ac22
+MISC ChangeLog 37153 SHA256 5a363ab35d5119d341705353ccd0356a3cded88382cb853e9b8df44a2c773a2e SHA512 a38a40cf60571accc4c2cd6514b39acfa26012a2e8f2bed11f89d1b0410d9a52bc69918f9c49b74f74a4c1c36e3d656785c8f048e1b6f07e91ca73fb97749db5 WHIRLPOOL 677c9d68a5bec3fc6a683060a5d5a326fae116314074390cc06ca9bb0ddeee6a726958a7cd2a3b87248a38316f787c78d324d06f61487078758905df7c202e2f
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTNDhaAAoJEEdUh39IaPFNT/8IAJwezCxFxcVyACyq48OPbrvu
-LoV+6IJlmSFNgvJbapkQbmtjRzsj3WE9NA1giISRsQZb/ctWbLZh4McuSXzbGNK2
-+ystC2mwVkp1B8g0t0gMKDaryBSFcKv0cbxSl1mqo2vUgDaf0qtUPMwUouomKEbn
-5tD7NNlLau+OB7/LRGZjvym4Ym4UYBDYhAdDoHwQI9ZU4gYkBUfdGwGWjRpgn5DF
-4eQ6wo5yJI0dqCtA4PEOXk+mJUlok5NxIS6di4n0WqeIOsRgKiwei1d2G51M+ndA
-T97g4pgna9PLt0zmI4+ie7hnAbdGhxEi5copTVSel8fOVtskjDXUic6Q5zwMJkM=
-=9fAE
+iEYEAREIAAYFAlNBGEMACgkQCaWpQKGI+9QE1ACfcAhE+q99F3gW/UiwTOj9XcyO
+hJIAmQHCGAEgATpyYZLy74tWl8CQuSut
+=qW3N
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224.ebuild
deleted file mode 100644
index 8996c4798011..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 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-20130224.ebuild,v 1.2 2013/03/16 15:18:18 pacho 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"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	>=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
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild
new file mode 100644
index 000000000000..13a74f93c43b
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild
@@ -0,0 +1,98 @@
+# 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-20140406.ebuild,v 1.1 2014/04/06 09:02:58 pacho 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-devel/gettext-0.18.3.2[abi_x86_32(-)]
+		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
+		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
+		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
+		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
+		dev-libs/libgcrypt:11[abi_x86_32(-)]
+		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
+		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
+		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
+		>=sys-apps/file-5.18-r1[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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
+}
+
+src_install() {
+	emul-linux-x86_src_install
+
+	if use abi_x86_32; then
+		local x86_libdir=$(get_abi_LIBDIR x86)
+		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
+		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
+		doenvd 99emul-linux-x86-baselibs
+
+		mkdir -p "${ED}${LIBDIR}"
+		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
+	fi
+}