Cleaned up ebuild and use eselect opengl instead of opengl-update.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 73 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 9f42f8d43d17..1b3c8b885928 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.30 2005/05/22 10:11:27 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.31 2005/08/26 19:21:44 eradicator Exp $
+
+*emul-linux-x86-xlibs-2.1-r1 (26 Aug 2005)
+
+  26 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +emul-linux-x86-xlibs-2.1-r1.ebuild:
+  Cleaned up ebuild and use eselect opengl instead of opengl-update.
 
   22 May 2005; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-xlibs-2.1.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 767df89adc76..6d6d38c29a25 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,8 +1,20 @@
-MD5 6b12255efd4b12726c3426edf0b86628 ChangeLog 5452
-MD5 1bc94040ae985ed43cf336d4e8a854b6 emul-linux-x86-xlibs-1.2-r7.ebuild 2356
-MD5 ad51a611fffb16ad146d0e15b653fe64 emul-linux-x86-xlibs-2.1.ebuild 1199
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 544475b32f0e4eb0fc363ae20f97b813 ChangeLog 5667
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
+MD5 ad51a611fffb16ad146d0e15b653fe64 emul-linux-x86-xlibs-2.1.ebuild 1199
+MD5 18f8cd2aff37076230afc8093f15dd2b emul-linux-x86-xlibs-2.1-r1.ebuild 1142
+MD5 1bc94040ae985ed43cf336d4e8a854b6 emul-linux-x86-xlibs-1.2-r7.ebuild 2356
 MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
 MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r7 78
 MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1 78
+MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1-r1 78
+MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r7 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDD2vjArHZZzCEUG0RAu8TAJ9RqDV/8qM8sPqjF06eI/pFPXB1OQCfbUXE
+Jfe2dug+GDIYJhDyNsvUcRI=
+=3EKL
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.1-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.1-r1.ebuild
new file mode 100644
index 000000000000..14f267244965
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.1-r1.ebuild,v 1.1 2005/08/26 19:21:44 eradicator Exp $
+
+inherit multilib
+
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="opengl"
+
+DEPEND=""
+
+RDEPEND="opengl? ( app-admin/eselect-opengl )
+	 virtual/libc
+	 >=app-emulation/emul-linux-x86-baselibs-2.0"
+
+S=${WORKDIR}
+
+pkg_preinst() {
+	# Check for bad symlink before installing, bug 84441.
+	if [ -L /emul/linux/x86/usr/lib/X11 ]; then
+		rm -f /emul/linux/x86/usr/lib/X11
+	fi
+}
+
+src_install() {
+	cp -RPvf ${WORKDIR}/* ${D}/
+
+	local libdir="lib32"
+	if has_multilib_profile; then
+		libdir=$(get_abi_LIBDIR x86)
+	fi
+
+	dodir /usr/${libdir}/opengl
+	dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11
+}
+
+pkg_postinst() {
+	#update GL symlinks
+	if use opengl ; then
+		/usr/bin/eselect opengl set --use-old
+	fi
+}
+
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.1-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.1-r1
new file mode 100644
index 000000000000..d0620de23900
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.1-r1
@@ -0,0 +1 @@
+MD5 719b6fc06cc4a085f7a43dee626c2105 emul-linux-x86-xlibs-2.1.tar.bz2 4614195