Version bump, drop old

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

4 files changed, 64 insertions, 37 deletions

diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index d0c15a86b7ea..cd69d1ff4724 100644
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.35 2013/11/22 19:33:06 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.36 2014/04/06 09:10:42 pacho Exp $
+
+*emul-linux-x86-opengl-20140406 (06 Apr 2014)
+
+  06 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-opengl-20140406.ebuild,
+  -emul-linux-x86-opengl-20130224.ebuild:
+  Version bump, drop old
 
   22 Nov 2013; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-opengl-20131008.ebuild:
diff --git a/app-emulation/emul-linux-x86-opengl/Manifest b/app-emulation/emul-linux-x86-opengl/Manifest
index 640e7a786679..16a80876e712 100644
--- a/app-emulation/emul-linux-x86-opengl/Manifest
+++ b/app-emulation/emul-linux-x86-opengl/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST emul-linux-x86-opengl-20130224.tar.xz 62753352 SHA256 6c2d102af8f7bffa24e514641bfd1b4c23dec991afb6ef8509113281659f10a1 SHA512 8359bda53b14bce5f7f815da88f45a1b4a497a8e12fa98767d1260ebf92eac8726e43f0b7a0a98749d8c2561941915eb7b5c63d298f0913bf60da2933ed1a568 WHIRLPOOL 7f8accad8140b4c44b42b583fc9667398baf4fe1460c3b0f41fc597811430df0aefa3b3b27d90a7d60c4ed5fb346874c6565b9558aa23a663b4df0d3525124ec
 DIST emul-linux-x86-opengl-20131008.tar.xz 70368588 SHA256 eaf5434b28a997b47512e71ee4527ee25d2de0343c2a89564173b8aa121a60e4 SHA512 c1751ce1b3b164bbc0203f4cb5d6482f0041818fe86217553b70aa1aeecf078d3291675daa3d22c6cc01cf71accdfc05550229f955476435744c04f8cefc5e30 WHIRLPOOL c11ab8e999690229b3aae74f14ff953c3ba9214089960440d5c44b606ecad240b04ca35e8053b6f145178b42412294099f4499cd1fc25248612c34b4378de676
-EBUILD emul-linux-x86-opengl-20130224.ebuild 827 SHA256 ebbed0b1abb45bc01c6cbade9ef3bcc7808e9210d9157ea4e2ea3d2cab3d6b4a SHA512 ae069027eb732121d22a2a3698930f7b14788464adace3acb686c5cc3e6140a159155cf62625a692706af08da5bdd71d8163a10b58ef6d450a78f1a0f68c7f6b WHIRLPOOL dad264bf4c9368006981f5cb93253bd03826a2b634527a2bbcc8cd76224a8120379d3cb17a89bf1d3387c2b8156c3f50f97f0fe5f38646d45750002481a32e3d
+DIST emul-linux-x86-opengl-20140406.tar.xz 76722156 SHA256 356ab424e5ecb136d16c2ae4e320c908b457c3d1b012fd361079f27c1776ce6b SHA512 c4e926394490c16a226bc141a69d004bdf7a0ae543d349936b137a1c282121e0b68c9302bbe8fbb773df4728014043cd8184db1d2b03f385b1dc713c39035b41 WHIRLPOOL 94ed3c1d05e950087bf52879ceb40ad41d0ceb5c2bc71f9a30dfcc1c95dd1ab5104691b43c15a26166b0d7642d950957982218ff10de9541bcc5e36be6999d37
 EBUILD emul-linux-x86-opengl-20131008.ebuild 1356 SHA256 ad585824915873efc994dd2631b6a3c8820721bed7bfac448ceae04909b3ba87 SHA512 aa9d87051d6fb5713d5a1b11ee10c0d466a596db0e08652c10b4c60fb8529f93ced5a33529d2a9156c197fcd5a16b42e92b334d5366f3be2a091e55b429f45e7 WHIRLPOOL cb9e3b81a7b533486af402ba4cdc9db3841b6f0bfae867c5f15198e92735ce28546082116704a2909ca4885a779a8b12309efaf1a765bd2015a62f85c59a5631
-MISC ChangeLog 7208 SHA256 042929653c1ad7a99140acd37975d5774b746858b95ea67bfc5c5799d866423d SHA512 3ebedb1c6555f8805ce89f49235462d161029d8f0df85dc441f08a9ba252422bb572e3adb213d9be865baeba26f99c33406cfe78e596214d49816eaefafe5262 WHIRLPOOL 2e04bc8d04f6188c75982965cad7b0127f1a3ce507b04d821e6e74f10455eb4fff4639d22490ac458af0a6a2eb2ec9ee5aae14e84c05f0b7e9c04fc6b5d9373f
+EBUILD emul-linux-x86-opengl-20140406.ebuild 1357 SHA256 c3c60700362b7174a880a9ace247464d840f2c8ddce1b1661d9927e3bea7fca5 SHA512 6dba7d42a7f7b6710bec5a9e5342b380e5b96894b09dae40d21ea505e2074c6b6ce8c697b6ad8cedc85e46d9235fb8be26438d5a81f5d479031ef692d9854c92 WHIRLPOOL 01292c42c7f4678f303c51e5474514c78f65423a420dcba849c6d8cae2aef21bd9a0432c9c65dc9bce32ebd411ddadecffce2a1882165c039260301901c875dc
+MISC ChangeLog 7411 SHA256 83e6f5c3aee5e01c138541da0cd1ed3e5085b2d661dc776cefb2c3bc74d0ba35 SHA512 134eb306b137f18bc5390f3c99104ea1785be357b79fd6990bd634beb1fc10bf04fa6abf241b970999c616bfe50d1af7bf9fd131812a23bf7452e00644008cf7 WHIRLPOOL 5d0de0fd468b271ef67df2011bfa00dc3cffa7351dd52bb2b0c50cc2f2a4975a2ef1544a4479312110227afb3c12414d5769e38f4caa96f5e6c93d4e16510be6
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKPsXMACgkQCaWpQKGI+9S+jACfZapD0yOb4uGQtoQVmMWPVasP
-j+AAniJWLyzuPYOvjIyzDi0jPv59x51S
-=deph
+iEYEAREIAAYFAlNBGhMACgkQCaWpQKGI+9TGagCfV3UOKnEAyq263leCkZ0URHWv
+UJcAoIHocVsJGR3L5paP09ZP/xDT9xGV
+=tpnw
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild
deleted file mode 100644
index 5d2764d9ebc8..000000000000
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild
+++ /dev/null
@@ -1,29 +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-opengl/emul-linux-x86-opengl-20130224.ebuild,v 1.2 2013/03/16 15:22:17 pacho Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="BSD MIT LGPL-3 SGI-B-2.0"
-
-KEYWORDS="-* amd64 ~amd64-linux"
-
-DEPEND="app-admin/eselect-opengl
-	>=app-admin/eselect-mesa-0.0.9"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
-	!<app-emulation/emul-linux-x86-xlibs-20100611
-	media-libs/mesa"
-
-src_prepare() {
-	emul-linux-x86_src_prepare
-	rm -f "${S}/usr/lib32/libGL.so" || die
-	rm -f "${S}/usr/lib32/libGL.so.1" || die
-}
-
-pkg_postinst() {
-	# Update GL symlinks
-	eselect opengl set --use-old || die
-	# And the same for mesa (bug #355393)
-	eselect mesa set 32bit --auto || die
-}
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140406.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140406.ebuild
new file mode 100644
index 000000000000..2a3a1768ab40
--- /dev/null
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140406.ebuild
@@ -0,0 +1,49 @@
+# 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-opengl/emul-linux-x86-opengl-20140406.ebuild,v 1.1 2014/04/06 09:10:42 pacho Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
+LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="abi_x86_32"
+
+DEPEND="app-admin/eselect-opengl
+	>=app-admin/eselect-mesa-0.0.9"
+RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
+	!<app-emulation/emul-linux-x86-xlibs-20100611
+	media-libs/mesa
+
+	!abi_x86_32? (
+		!media-libs/freeglut[abi_x86_32(-)]
+		!media-libs/glew[abi_x86_32(-)]
+		!media-libs/glu[abi_x86_32(-)]
+		!media-libs/mesa[abi_x86_32(-)]
+	)
+	abi_x86_32? (
+		media-libs/freeglut[abi_x86_32(-)]
+		media-libs/glew[abi_x86_32(-)]
+		media-libs/glu[abi_x86_32(-)]
+		media-libs/mesa[abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	use abi_x86_32 && return
+	emul-linux-x86_src_prepare
+	rm -f "${S}/usr/lib32/libGL.so" || die
+	rm -f "${S}/usr/lib32/libGL.so.1" || die
+}
+
+src_install() {
+	use abi_x86_32 || emul-linux-x86_src_install
+}
+
+pkg_postinst() {
+	use abi_x86_32 && return
+	# Update GL symlinks
+	eselect opengl set --use-old || die
+	# And the same for mesa (bug #355393)
+	eselect mesa set 32bit --auto || die
+}