Version bump, drop old

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

5 files changed, 52 insertions, 37 deletions

diff --git a/app-emulation/emul-linux-x86-sdl/ChangeLog b/app-emulation/emul-linux-x86-sdl/ChangeLog
index 7725a9a93949..256961309d98 100644
--- a/app-emulation/emul-linux-x86-sdl/ChangeLog
+++ b/app-emulation/emul-linux-x86-sdl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-sdl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.77 2014/05/04 12:23:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.78 2014/05/06 20:57:29 pacho Exp $
+
+*emul-linux-x86-sdl-20140506 (06 May 2014)
+
+  06 May 2014; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-sdl-20140506.ebuild, +files/remove-native-20140506,
+  -emul-linux-x86-sdl-20131008-r1.ebuild,
+  -emul-linux-x86-sdl-20140406-r1.ebuild:
+  Version bump, drop old
 
   04 May 2014; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-sdl-20140406.ebuild:
diff --git a/app-emulation/emul-linux-x86-sdl/Manifest b/app-emulation/emul-linux-x86-sdl/Manifest
index 500adeb6da37..1f8733ed00a5 100644
--- a/app-emulation/emul-linux-x86-sdl/Manifest
+++ b/app-emulation/emul-linux-x86-sdl/Manifest
@@ -3,19 +3,20 @@ Hash: SHA256
 
 AUX remove-native 108 SHA256 20c6b33a813058f2c2bad9f437894a9372041e2a85b10202c36f1671d2cd43b4 SHA512 1a46c95a17c570c59bf14fcd9c461ac2ea355732b6025c6d107fa14ed27cdf43c48be49a973b55ecc5d6eb2c4eb09d458f2769ccc76f5c35970783b83c1eb69c WHIRLPOOL 50635c90c5c6d4f7607e60667014ab26bec823fb54f59c92a772bad576e8f7d631fe22e08f28a625d31eebc5649db4f154167dbe5d8b715a82151e170d936df9
 AUX remove-native-20140406-r1 857 SHA256 e751a4570ee0846388f8b117d81b92c57b6ad90939d027e181aa5b1cc3ae2840 SHA512 096ef4c0ce00b0db285b564ca2f37742c8799e3c9f3b7bfc460ddf39a99585f81991658998dbffabb9840f587225c9204d87dfe150969c900c6d3106819bb2a6 WHIRLPOOL 689141b64fb03d7b80f497ee0cc3b1861b18a5841c74c6f79b81d411a7ca2794b54ffdc8e8755bd7775fde3abb53d342daf2bb56286df40334f319018850b61f
+AUX remove-native-20140506 857 SHA256 e751a4570ee0846388f8b117d81b92c57b6ad90939d027e181aa5b1cc3ae2840 SHA512 096ef4c0ce00b0db285b564ca2f37742c8799e3c9f3b7bfc460ddf39a99585f81991658998dbffabb9840f587225c9204d87dfe150969c900c6d3106819bb2a6 WHIRLPOOL 689141b64fb03d7b80f497ee0cc3b1861b18a5841c74c6f79b81d411a7ca2794b54ffdc8e8755bd7775fde3abb53d342daf2bb56286df40334f319018850b61f
 DIST emul-linux-x86-sdl-20131008.tar.xz 700656 SHA256 199fe646034c025db074aaee9241653a5a966fd2ce0f1408bc0356a62ca1ef02 SHA512 40b1d2831f9572068f22eb02c1515c48e76747ae18a6be6be955c0d4ff042e726cf1e6ca43610edd063f205bd1a12be5051e034c12ff9dcc41101ffc5584acc8 WHIRLPOOL 719fc71cbf56a2d17b15c8d3426d801b373fb0ae7573976838abf35e66e4d2c6845d17c7ee8979f40c8f54c2f33e61aa0120850da03b9651edeab256a8a6d03e
 DIST emul-linux-x86-sdl-20140406.tar.xz 686532 SHA256 fa9a40e2d2e4a3f7f23df22fac50e7d4bb48ab020291d24c1175c3c46233bca3 SHA512 9ecc0a969764e2a211506035aa6694bd59662e4ad00ef38fd74679f30c2521a69648db2aed4d55ec745ce5d48b223897d65fe9534c7589733ee8a124f96d7438 WHIRLPOOL 2f17a575c883758043d760011bbec8de1f46d205b71e643dc0715f87d10d6748864cfba3bb6b7451bccccaad2189b3ddefa7a3861d4ea0e9e6d30bf3d91d4293
-EBUILD emul-linux-x86-sdl-20131008-r1.ebuild 758 SHA256 0ff8521b127cdc0ec3356b81b31d9041576fcff2f038fe4fbdee9cecae3b91a1 SHA512 371d1436e10456fb1b7367f813c4c28715bf8576a431e9925c6f4bcd14118ecf9a7ab56e6cf316737e9abc78bb78e6aa0f6f2fc1fc6af40f107ff36c48079e04 WHIRLPOOL 320df14ca686d90bcbec2c4300059b1ec5a5a7351d7531672f07ddc831587e69ee260c4b29d9e39d4e19b39775df1d3a0c6a9243a392071b5bab75deda6ec6b8
+DIST emul-linux-x86-sdl-20140506.tar.xz 799124 SHA256 88623497f802724a855a02abf382a2f0f7908e885721a7b4f6402bb6ce19f627 SHA512 bebf2898a0ac837a5d9dbaaac975999b655c023c1e2832903e0d7f2ba1d673022168534ed91cab56ea2d75259f273ecb301ed174f8da4e281dbd4c59253fcb6e WHIRLPOOL 1b9c28fa36e82420880a62d26342d3d3f4b73adf5c4835728541c0fbce305943c68ed676e5922115d2f51c796c8fb4cc35e3a7eac88685c4a040d8e1e6d63561
 EBUILD emul-linux-x86-sdl-20131008.ebuild 534 SHA256 9c2d03450015500819b15ca55d4514474ec79500ca553e1167900aea72884b0a SHA512 fadcf1ee8a542c75c5c2e44ece7467e509ccbf43d3e3a596f24c96d6879a50effd3d0ad41ccd39c881d306481449eb237d50c66b8464ebb60bd1b72b8a7a97e2 WHIRLPOOL f8fa2915513cc8dc8808af2cd6366e281c2f15db2dc0b8d325a1c6bb678d620af5e099ce38892b8d02c1c22c80b0346607ad3786cd0f1ca4a3a8f1b3bcfaed99
-EBUILD emul-linux-x86-sdl-20140406-r1.ebuild 1157 SHA256 ffc654f8a2a4386bb55b64757e128770c5c10cadbdee774684ec37fb03e2a4f8 SHA512 25b4745554e5d0357f48e873ea0a6adb7a8518295b55cce2ff0d88cfba0907aace3b7468c7fe49b3ec40d5884ee350d7299458184fcc8ba607ed0f45f066990c WHIRLPOOL 3a06e49563c2e8c2e4edf24e788b5e5fde20da56360e5435fa10207364c7a896eb06d1064d9cf5ba90b33040809ef0059aff09881a655fbf686d52f0c2a03519
 EBUILD emul-linux-x86-sdl-20140406-r2.ebuild 1185 SHA256 a1bb5da33cb04a26aef32dfffcb76c1d0c6019712b4706c1d4c270e61a3ffa0d SHA512 57beee3e83fc4077ff6cbf891b4f714f51d7eddd44339b654f72a36d916f3eba2e3a8688729935e6e2fbbb674bbd6428133bec28634b40630e883e8eab5907ce WHIRLPOOL bbe52248b615e50c0ad638f5d6d8a95a763e9d19ab110f02eae5472d37ee90e048a3fbfc304b99baf06c9565a2e592cc0bb84b0cff74b77786bacf748eacc375
 EBUILD emul-linux-x86-sdl-20140406.ebuild 751 SHA256 b5fbb370bf7dcf3d90a54aa15bc68208300865418f609e92dabadf045872212f SHA512 630a23ad97cd3d880d470c9d3b099f5ad678b6de1d1ff3d07443eb2ab1b25e5345c2d1a454e0ed52964f9a15d73ff9a303a115de36be05d24da4f343d8be27ca WHIRLPOOL 85e51f4d8004aecafdc1cd152f1db5f7406873c4dd7ac9ac29c042b1246c8059394b9c6f283bbd20201aee69fa8a0e5bb56e73fd2c6934edfb01abaded7597ad
-MISC ChangeLog 12191 SHA256 bcf6caa3a06261384892bc3c55369d7ed85d922ca1797de16cb86db0aee6425b SHA512 eccb15ee501b46a7465677c24cb2cd4a6b75a0a99a8af21abf61d1f2072b28e4f10cc8285e7abe4c7203e1d591bba98c4ad3a2b73b2659a212e38468fe02ba03 WHIRLPOOL 8798a0dd0b69448a32adf4487bf48bf22133a2d7b9c27002b0e6084c72618af24caa6ab85e5bac9f04fd959b15f4fa2e0a140dad3fa7680d7912ac0261abe086
+EBUILD emul-linux-x86-sdl-20140506.ebuild 1181 SHA256 f41ce4d9b0835f46733e5de457c151868032b658ce478db8b35f8ddced88e208 SHA512 fd1ee773c13e4cda14a86712ae0ed5c1f5927c41c499473cccb572eb4d607c82a4de3eae4d5953c2c9e57e265d0a51a1f51336b44ccdff3cb9dc58f2f9109247 WHIRLPOOL 9d29667be9f1ea591c6258e0c2ce5879490dee1b417393efc57383cba262b2b2d567de0815a042d00b0a3ff4d0a5e6c831b4eb577f08d28a1f57111cb339ba46
+MISC ChangeLog 12461 SHA256 e71f610750d12776f7a087ed316adad2a06df337154536d5cac1f6202e3cd2ce SHA512 0c5a3ff7b98a9671e31a361f97ac6a925d4c2e831a71ef2fd131d23c4d0a0bde98bdfa3c6096411082b2f605e64af248b7eb3e9e09bdbfd60e84bb9ff3824cd4 WHIRLPOOL bafff32719c02ef753a6f26d9d553b418685e09c63b03e1012f3c94c88d131e3136ff7385916ba1d6268974c3767bd04b3a11ae7c62aaec96aefb1125edd464d
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNmMTwACgkQCaWpQKGI+9SwBgCcDABQzBa7GXkb9jUrAxRccJKt
-DNMAn1OS3Fvn43+wWl5jq5Bb3+rRIHO4
-=+I5+
+iEYEAREIAAYFAlNpTLoACgkQCaWpQKGI+9SA6gCdFQhQquLZXF0rQ5EfZWpdPA58
+4SkAn3KliwtbY0laSTSOmJ7GPnRvWmrs
+=c5hv
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20131008-r1.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20131008-r1.ebuild
deleted file mode 100644
index 17cf8da19bc7..000000000000
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20131008-r1.ebuild
+++ /dev/null
@@ -1,26 +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-sdl/emul-linux-x86-sdl-20131008-r1.ebuild,v 1.1 2013/12/30 07:45:42 aballier Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="LGPL-2 LGPL-2.1 ZLIB"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
-	~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-soundlibs-${PV}
-	~app-emulation/emul-linux-x86-medialibs-${PV}
-	abi_x86_32? (
-		>=media-libs/openal-1.15.1-r1[abi_x86_32(-)]
-	)"
-
-src_prepare() {
-	emul-linux-x86_src_prepare
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
-}
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406-r1.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140506.ebuild
index 2d047e120826..ac5b05840745 100644
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140406-r1.ebuild
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140506.ebuild
@@ -1,6 +1,6 @@
 # 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-sdl/emul-linux-x86-sdl-20140406-r1.ebuild,v 1.1 2014/04/18 22:18:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140506.ebuild,v 1.1 2014/05/06 20:57:29 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -20,6 +20,7 @@ RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
 		>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
 		>=media-libs/sdl-gfx-2.0.24-r1[abi_x86_32(-)]
 		>=media-libs/sdl-image-1.2.12-r1[abi_x86_32(-)]
+		>=media-libs/sdl-mixer-1.2.12-r4[abi_x86_32(-)]
 		>=media-libs/sdl-net-1.2.8-r1[abi_x86_32(-)]
 		>=media-libs/sdl-sound-1.0.3-r1[abi_x86_32(-)]
 		>=media-libs/sdl-ttf-2.0.11-r1[abi_x86_32(-)]
@@ -27,8 +28,9 @@ RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
 	)"
 
 src_prepare() {
-	emul-linux-x86_src_prepare
+	use abi_x86_32 || emul-linux-x86_src_prepare
+}
 
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
+src_install() {
+	use abi_x86_32 || emul-linux-x86_src_install
 }
diff --git a/app-emulation/emul-linux-x86-sdl/files/remove-native-20140506 b/app-emulation/emul-linux-x86-sdl/files/remove-native-20140506
new file mode 100644
index 000000000000..9c20fe148437
--- /dev/null
+++ b/app-emulation/emul-linux-x86-sdl/files/remove-native-20140506
@@ -0,0 +1,30 @@
+usr/lib32/libopenal.so
+usr/lib32/libopenal.so.1
+usr/lib32/libopenal.so.1.15.1
+usr/lib32/pkgconfig/openal.pc
+usr/lib32/libSDL-1.2.so.0
+usr/lib32/libSDL-1.2.so.0.11.4
+usr/lib32/libSDL.so
+usr/lib32/libSDL_image-1.2.so.0
+usr/lib32/libSDL_image-1.2.so.0.8.4
+usr/lib32/libSDL_image.so
+usr/lib32/libSDL_net-1.2.so.0
+usr/lib32/libSDL_net-1.2.so.0.8.0
+usr/lib32/libSDL_net.so
+usr/lib32/libSDL_sound-1.0.so.1
+usr/lib32/libSDL_sound-1.0.so.1.0.2
+usr/lib32/libSDL_sound.so
+usr/lib32/libSDL_ttf-2.0.so.0
+usr/lib32/libSDL_ttf-2.0.so.0.10.1
+usr/lib32/libSDL_ttf.so
+usr/lib32/libalut.so
+usr/lib32/libalut.so.0
+usr/lib32/libalut.so.0.1.0
+usr/lib32/libsmpeg-0.4.so.0
+usr/lib32/libsmpeg-0.4.so.0.1.3
+usr/lib32/libsmpeg.so
+usr/lib32/pkgconfig/SDL_image.pc
+usr/lib32/pkgconfig/SDL_net.pc
+usr/lib32/pkgconfig/SDL_ttf.pc
+usr/lib32/pkgconfig/freealut.pc
+usr/lib32/pkgconfig/sdl.pc