Version bump, remove old.

(Portage version: 2.1.10.7/cvs/Linux x86_64)

5 files changed, 52 insertions, 56 deletions

diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index 8539fbf7f41a..7dccfadb4e23 100644
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.12 2011/02/18 18:04:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.13 2011/07/22 19:17:10 pacho Exp $
+
+*emul-linux-x86-opengl-20110722-r99 (22 Jul 2011)
+*emul-linux-x86-opengl-20110722 (22 Jul 2011)
+
+  22 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-opengl-20100915.ebuild,
+  -emul-linux-x86-opengl-20110129.ebuild,
+  -emul-linux-x86-opengl-20110129-r99.ebuild,
+  +emul-linux-x86-opengl-20110722.ebuild,
+  +emul-linux-x86-opengl-20110722-r99.ebuild:
+  Version bump, remove old.
 
   18 Feb 2011; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-opengl-20110129-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild
deleted file mode 100644
index 7f4493ad8869..000000000000
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 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-20100915.ebuild,v 1.2 2010/10/04 12:50:47 hwoarang Exp $
-
-inherit emul-linux-x86
-
-LICENSE="LGPL-2 MIT"
-
-KEYWORDS="-* amd64 ~amd64-linux"
-IUSE=""
-
-DEPEND="app-admin/eselect-opengl"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
-	!<app-emulation/emul-linux-x86-xlibs-20100611
-	media-libs/mesa"
-
-src_unpack() {
-	emul-linux-x86_src_unpack
-	rm -f "${S}/usr/lib32/libGL.so" || die
-}
-
-pkg_postinst() {
-	#update GL symlinks
-	eselect opengl set --use-old
-}
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129.ebuild
deleted file mode 100644
index bacc8d24557a..000000000000
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 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-20110129.ebuild,v 1.2 2011/02/12 20:19:59 hwoarang Exp $
-
-inherit emul-linux-x86
-
-LICENSE="BSD LGPL-2 MIT kilgard"
-
-KEYWORDS="-* amd64 ~amd64-linux"
-
-DEPEND="app-admin/eselect-opengl"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
-	!<app-emulation/emul-linux-x86-xlibs-20100611
-	media-libs/mesa"
-
-src_unpack() {
-	emul-linux-x86_src_unpack
-	rm -f "${S}/usr/lib32/libGL.so" || die
-}
-
-pkg_postinst() {
-	#update GL symlinks
-	eselect opengl set --use-old
-}
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722-r99.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722-r99.ebuild
new file mode 100644
index 000000000000..a01794e7ccf1
--- /dev/null
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722-r99.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 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-20110722-r99.ebuild,v 1.1 2011/07/22 19:17:10 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}-r99.tar.xz"
+
+LICENSE="BSD LGPL-2 MIT kilgard"
+
+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
+	>=app-emulation/emul-linux-x86-baselibs-20110722-r99
+	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-20110129-r99.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild
index af4f50370c7b..3eecee0be36b 100644
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129-r99.ebuild
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 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-20110129-r99.ebuild,v 1.2 2011/02/18 18:01:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild,v 1.1 2011/07/22 19:17:10 pacho Exp $
+
+EAPI="4"
 
 inherit emul-linux-x86
 
 LICENSE="BSD LGPL-2 MIT kilgard"
 
-SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}-r99.tar.bz2"
-
 KEYWORDS="-* ~amd64 ~amd64-linux"
 
 DEPEND="app-admin/eselect-opengl
@@ -16,14 +16,15 @@ RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
 	!<app-emulation/emul-linux-x86-xlibs-20100611
 	media-libs/mesa"
 
-src_unpack() {
-	emul-linux-x86_src_unpack
+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
+	eselect opengl set --use-old || die
 	# And the same for mesa (bug #355393)
 	eselect mesa set 32bit --auto || die
 }