Added a block on eselect-1.0.3 for eselect-opengl-1.0.3. Bumped to eselect-opengl-1.0.4 to be compatible with eselect-1.0.3.

Package-Manager: portage-2.1.1_pre1-r5

5 files changed, 143 insertions, 13 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index 544912f6bb0f..74963cbf827b 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.15 2006/06/30 22:25:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.16 2006/07/06 09:29:41 kugelfang Exp $
+
+*eselect-opengl-1.0.4 (06 Jul 2006)
+
+  06 Jul 2006; Danny van Dyk <kugelfang@gentoo.org>
+  eselect-opengl-1.0.3.ebuild, +eselect-opengl-1.0.4.ebuild:
+  Added a block on eselect-1.0.3 for eselect-opengl-1.0.3. Bumped to
+  eselect-opengl-1.0.4 to be compatible with eselect-1.0.3.
 
   30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
   eselect-opengl-1.0.3.ebuild:
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index 9a548d09ed1f..bde39dc2c2d3 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -1,14 +1,22 @@
-DIST glext.h-29.bz2 33215 RMD160 b21868b31524c2309658d65682b4528823126ae5 SHA256 d28e3bdb2f9ffb9f62e0f04d8eab99aa01b846bb206c984a0f0e9f20d53f78f0
-DIST glxext.h-11.bz2 5900 RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe SHA256 b9ac4265313fda0bbd051b1bec803733f307c040ac9bd02a4c536302375415e0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST glext.h-29.bz2 33215 RMD160 b21868b31524c2309658d65682b4528823126ae5 SHA1 4635a7a73169e6516fbf4d214b36352568fad24e SHA256 d28e3bdb2f9ffb9f62e0f04d8eab99aa01b846bb206c984a0f0e9f20d53f78f0
+DIST glxext.h-11.bz2 5900 RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe SHA1 51dc76e10814a7b990086bc013c2ac0e5e06631d SHA256 b9ac4265313fda0bbd051b1bec803733f307c040ac9bd02a4c536302375415e0
 DIST opengl.eselect-1.0.3.bz2 3290 RMD160 feb6efefaff1ba498f655dbef9eabd6bb120d3da SHA256 e7a5fe8c399d65f41ca8a672720c266c300cd1b9214a578d88432e2705952cc7
-EBUILD eselect-opengl-1.0.3.ebuild 2690 RMD160 229e3934b03277f917e2258f19ef433e1ea51907 SHA1 15718c202a6d000213248fb657956a7e226256ea SHA256 8cd476ba459948e3363caf8253c59bcf6b4b0e9d3a1382033c616bf064f33aac
-MD5 e0a64caf246c182e3e4d5c5ee702269f eselect-opengl-1.0.3.ebuild 2690
-RMD160 229e3934b03277f917e2258f19ef433e1ea51907 eselect-opengl-1.0.3.ebuild 2690
-SHA256 8cd476ba459948e3363caf8253c59bcf6b4b0e9d3a1382033c616bf064f33aac eselect-opengl-1.0.3.ebuild 2690
-MISC ChangeLog 2384 RMD160 58b070254483fef9636e89bb11c407b1f0b441df SHA1 7b70d300ac8b1f5be6dc333aee9519bc2fd2d237 SHA256 6fac14104bdf4ef32f917e5d6f8a758f7b669322a54d3374c1ebe10e52d39d97
-MD5 3382e65f598b48e60b59d098320db4ac ChangeLog 2384
-RMD160 58b070254483fef9636e89bb11c407b1f0b441df ChangeLog 2384
-SHA256 6fac14104bdf4ef32f917e5d6f8a758f7b669322a54d3374c1ebe10e52d39d97 ChangeLog 2384
+DIST opengl.eselect-1.0.4.bz2 3309 RMD160 340581edf9ba6f9cdb5d8bbfa62c838c384630bd SHA1 4d813fb7f4095dbc27f6e22fa9bbe107e5350217 SHA256 7c7535b4ca3630e9ad76cd25c332b8798e80a072f5b3d67dc535e4dac6b385ae
+EBUILD eselect-opengl-1.0.3.ebuild 2718 RMD160 bf26088677688a9b5d0c2c9c93f65c915efb4cc8 SHA1 a9a4a14ccab4aeb6cd59588aa9aa5a0085bb68c1 SHA256 cb5bbdec9ae355ccc71a8f56bc507881c6412b1bd1d061990c4295c56999c3fa
+MD5 9c6b501f720f597f19260aa86927445c eselect-opengl-1.0.3.ebuild 2718
+RMD160 bf26088677688a9b5d0c2c9c93f65c915efb4cc8 eselect-opengl-1.0.3.ebuild 2718
+SHA256 cb5bbdec9ae355ccc71a8f56bc507881c6412b1bd1d061990c4295c56999c3fa eselect-opengl-1.0.3.ebuild 2718
+EBUILD eselect-opengl-1.0.4.ebuild 2702 RMD160 1fe4c030baed55e12139054e8bd3c978d72064e0 SHA1 9df20baebfbb00b12b1d91dde4e24de2090998f4 SHA256 afd74d979a2d01409cdfb6ae330bb00bdd5f5c6fcb147d40afc5115ad343e6b7
+MD5 e47b5b9167d4f28443840529184baea6 eselect-opengl-1.0.4.ebuild 2702
+RMD160 1fe4c030baed55e12139054e8bd3c978d72064e0 eselect-opengl-1.0.4.ebuild 2702
+SHA256 afd74d979a2d01409cdfb6ae330bb00bdd5f5c6fcb147d40afc5115ad343e6b7 eselect-opengl-1.0.4.ebuild 2702
+MISC ChangeLog 2664 RMD160 9ecadbed6f9d7878d3481ecb26c83c523894e6cf SHA1 57d5a8dcb320e57a91102052eaf1402fac7afe7a SHA256 a1877d75dbfeea31283a58bc37926de67e9e6fb18f370814ebf05059d6f598dc
+MD5 062437c6c051d4c645c93e8d70512763 ChangeLog 2664
+RMD160 9ecadbed6f9d7878d3481ecb26c83c523894e6cf ChangeLog 2664
+SHA256 a1877d75dbfeea31283a58bc37926de67e9e6fb18f370814ebf05059d6f598dc ChangeLog 2664
 MISC metadata.xml 366 RMD160 1e4b0bac744189f46350b440bf36112272a69baa SHA1 52b8b9b7d1cbcd2bcf4d988aaaf7bf744244fd77 SHA256 19c4ff0460724296bd0a9bc7e6c385de2b46b0cbd7b1384dab7f656811861445
 MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366
 RMD160 1e4b0bac744189f46350b440bf36112272a69baa metadata.xml 366
@@ -16,3 +24,13 @@ SHA256 19c4ff0460724296bd0a9bc7e6c385de2b46b0cbd7b1384dab7f656811861445 metadata
 MD5 c754528caa14e7d416d6797d6c39e18e files/digest-eselect-opengl-1.0.3 687
 RMD160 d7175183a7c8942328bfcf0d9b127159540716c3 files/digest-eselect-opengl-1.0.3 687
 SHA256 a1589a573fd749d1e3cb5ca31a494640d823eb92f81cff86baeb90cd121983b5 files/digest-eselect-opengl-1.0.3 687
+MD5 c7f05058e47026b6ba736955cfc29907 files/digest-eselect-opengl-1.0.4 687
+RMD160 5c2a0cdbe60f1169ca92e33534f33ce68c33ac6d files/digest-eselect-opengl-1.0.4 687
+SHA256 7fe3f9d7442392eadacd0e9f2c5424ade0e63ce131799e9ad65cd5f500b946ba files/digest-eselect-opengl-1.0.4 687
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFErNqg5mJXAu5GbtIRAgPlAJsEZretJGg0RnKcIyW/4+eydSVoDQCfWcwx
+3QxOGIVc8T3fiPOrsVjTsTM=
+=eBmJ
+-----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild
index 110dd7b29950..5b55c2f6c86c 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild,v 1.10 2006/06/30 22:25:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild,v 1.11 2006/07/06 09:29:41 kugelfang Exp $
 
 inherit multilib
 
@@ -25,7 +25,8 @@ IUSE=""
 RESTRICT="multilib-pkg-force"
 
 DEPEND="app-arch/bzip2"
-RDEPEND=">=app-admin/eselect-1.0_rc1"
+RDEPEND=">=app-admin/eselect-1.0_rc1
+	!>=app-admin/eselect-1.0.3"
 
 S=${WORKDIR}
 
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.4.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.4.ebuild
new file mode 100644
index 000000000000..ad040cfea2b2
--- /dev/null
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.4.ebuild,v 1.1 2006/07/06 09:29:41 kugelfang Exp $
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenGL interface being used"
+HOMEPAGE="http://www.gentoo.org/"
+
+# Source:
+# http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
+# http://oss.sgi.com/projects/ogl-sample/ABI/glxext.h
+
+GLEXT="29"
+GLXEXT="11"
+
+SRC_URI="mirror://gentoo/glext.h-${GLEXT}.bz2
+	 mirror://gentoo/glxext.h-${GLXEXT}.bz2
+	 mirror://gentoo/opengl.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+RESTRICT="multilib-pkg-force"
+
+DEPEND="app-arch/bzip2"
+RDEPEND=">=app-admin/eselect-1.0_rc1"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	mv opengl.eselect-${PV} opengl.eselect
+	mv glext.h-${GLEXT} glext.h
+	mv glxext.h-${GLXEXT} glxext.h
+
+	# Small bugfix
+	sed -i 's/ACTION/action/' opengl.eselect
+}
+
+pkg_preinst() {
+	# It needs to be before 04multilib
+	[ -f "${ROOT}/etc/env.d/09opengl" ] && mv ${ROOT}/etc/env.d/09opengl ${ROOT}/etc/env.d/03opengl
+
+	OABI="${ABI}"
+	for ABI in $(get_install_abis); do
+		if [ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]; then
+			einfo "Removing libMesaGL.so from xorg-x11 profile.  See bug #47598."
+			rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so
+		fi
+		if [ -e "${ROOT}/usr/$(get_libdir)/libMesaGL.so" ]; then
+			einfo "Removing libMesaGL.so from /usr/$(get_libdir).  See bug #47598."
+			rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL.so
+		fi
+
+		for f in ${ROOT}/usr/$(get_libdir)/libGL.so.* ${ROOT}/usr/$(get_libdir)/libGLcore.so.* ${ROOT}/usr/$(get_libdir)/libnvidia-tls* ${ROOT}/usr/$(get_libdir)/tls/libnvidia-tls* ; do
+			[[ -e ${f} ]] && rm -f ${f}
+		done
+	done
+	ABI="${OABI}"
+	unset OABI
+}
+
+pkg_postinst() {
+	local impl="$(eselect opengl show)"
+	if [[ -n "${impl}" ]] ; then
+		eselect opengl set "${impl}"
+	fi
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins opengl.eselect
+
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if has_multilib_profile && [ "${MLTEST/set_abi}" = "${MLTEST}" ]; then
+		OABI="${ABI}"
+		for ABI in $(get_install_abis); do
+			# Install default glext.h
+			insinto /usr/$(get_libdir)/opengl/global/include
+			doins ${WORKDIR}/glext.h || die
+			doins ${WORKDIR}/glxext.h || die
+		done
+		ABI="${OABI}"
+		unset OABI
+	else
+		# Install default glext.h
+		insinto /usr/$(get_libdir)/opengl/global/include
+		doins ${WORKDIR}/glext.h || die
+		doins ${WORKDIR}/glxext.h || die
+	fi
+}
diff --git a/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.4 b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.4
new file mode 100644
index 000000000000..40181e43f76f
--- /dev/null
+++ b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.4
@@ -0,0 +1,9 @@
+MD5 507d51b4e824b6a94f28c0e5d6793598 glext.h-29.bz2 33215
+RMD160 b21868b31524c2309658d65682b4528823126ae5 glext.h-29.bz2 33215
+SHA256 d28e3bdb2f9ffb9f62e0f04d8eab99aa01b846bb206c984a0f0e9f20d53f78f0 glext.h-29.bz2 33215
+MD5 2a8cc2e018a4fd8699d614718e61843e glxext.h-11.bz2 5900
+RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe glxext.h-11.bz2 5900
+SHA256 b9ac4265313fda0bbd051b1bec803733f307c040ac9bd02a4c536302375415e0 glxext.h-11.bz2 5900
+MD5 99ad3bfa2e5049b71a3b029a671ded35 opengl.eselect-1.0.4.bz2 3309
+RMD160 340581edf9ba6f9cdb5d8bbfa62c838c384630bd opengl.eselect-1.0.4.bz2 3309
+SHA256 7c7535b4ca3630e9ad76cd25c332b8798e80a072f5b3d67dc535e4dac6b385ae opengl.eselect-1.0.4.bz2 3309