Version bump, drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)

3 files changed, 58 insertions, 31 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/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
+}