Bump to fix ROOT != /. Remove an unneeded sed from the ebuild as well.

Package-Manager: portage-2.1.2_pre2-r5

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index 1acb5b1041cd53989f5390bc7acaf8706cd8872e..70db6642ca61ec076c803e39db3526513b669396 100644 (file)
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2006/10/08 13:11:41 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.18 2006/10/10 00:21:23 dberkholz Exp $
+
+*eselect-opengl-1.0.5 (10 Oct 2006)
+
+  10 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +eselect-opengl-1.0.5.ebuild:
+  Bump to fix ROOT != /. Remove an unneeded sed from the ebuild as well.
 
   05 Oct 2006; Danny van Dyk <kugelfang@gentoo.org>
   eselect-opengl-1.0.3.ebuild, eselect-opengl-1.0.4.ebuild:

diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index e52e2773ab48d8d2a77211af97ae4ed76027105d..08ffd6939b7aac2241639dc18562989eccce3413 100644 (file)
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -1,10 +1,8 @@
------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 SHA1 c08939ab6e8eb3f5abfe8f3ece4e81525b244478 SHA256 e7a5fe8c399d65f41ca8a672720c266c300cd1b9214a578d88432e2705952cc7
 DIST opengl.eselect-1.0.4.bz2 3309 RMD160 340581edf9ba6f9cdb5d8bbfa62c838c384630bd SHA1 4d813fb7f4095dbc27f6e22fa9bbe107e5350217 SHA256 7c7535b4ca3630e9ad76cd25c332b8798e80a072f5b3d67dc535e4dac6b385ae
+DIST opengl.eselect-1.0.5.bz2 3365 RMD160 1bd3a537e2703c9d240c8c94d3e609ba2d009866 SHA1 c0aad648804ab1079a4377bc7bf44784136e1818 SHA256 b54ffa9831f86bd7effeea8931ab72e5ac417a2948d634969630039144166cc0
 EBUILD eselect-opengl-1.0.3.ebuild 2716 RMD160 804c10e27e458a0cb8accf0b272367227e359653 SHA1 51d0ca175667aa53f6efa6c3baece5f3b8e94c1d SHA256 6d575d285c6d2db1d72e1d22cbe905068cb00dbf2c3d43560a56fcc5c33463b1
 MD5 45ea82bebde2dc1e55c4d13d70a070d3 eselect-opengl-1.0.3.ebuild 2716
 RMD160 804c10e27e458a0cb8accf0b272367227e359653 eselect-opengl-1.0.3.ebuild 2716
@@ -13,10 +11,14 @@ EBUILD eselect-opengl-1.0.4.ebuild 2700 RMD160 45a316523d91a3d835a989de97d642644
 MD5 ca71dbabd0272db206aa1c4821e103db eselect-opengl-1.0.4.ebuild 2700
 RMD160 45a316523d91a3d835a989de97d64264476f4d7e eselect-opengl-1.0.4.ebuild 2700
 SHA256 dc63a7ca5f8aa1ce7f2a442a28593dacf9d30b7252ec011c6d4ee0cc3c933ccf eselect-opengl-1.0.4.ebuild 2700
-MISC ChangeLog 2810 RMD160 979c9f961159c8b54d65f62a33a3b91d4e046260 SHA1 6d0cebe665458f2e0691a0263c897a90ea153ab1 SHA256 840ae54310b1d690abb9073f6abe0947750138a2a468a473d79792c88cd4f96f
-MD5 54281ba13e16b19c738c84e4acdcee8c ChangeLog 2810
-RMD160 979c9f961159c8b54d65f62a33a3b91d4e046260 ChangeLog 2810
-SHA256 840ae54310b1d690abb9073f6abe0947750138a2a468a473d79792c88cd4f96f ChangeLog 2810
+EBUILD eselect-opengl-1.0.5.ebuild 2641 RMD160 1c97d592c65c47849c7c69df7b4c78c60e16226d SHA1 45a36992e4e4024df440524c0b99c4a6282c784f SHA256 673a0357a9775451022c12e8965971b6e649636112c22206cc574205423d05cb
+MD5 d3d9b6e588c92cdce13c877c7bf10e70 eselect-opengl-1.0.5.ebuild 2641
+RMD160 1c97d592c65c47849c7c69df7b4c78c60e16226d eselect-opengl-1.0.5.ebuild 2641
+SHA256 673a0357a9775451022c12e8965971b6e649636112c22206cc574205423d05cb eselect-opengl-1.0.5.ebuild 2641
+MISC ChangeLog 3008 RMD160 877f0349dbe51c1aa71ca68bc84b2df90d61b98a SHA1 05bbba188e558f59b6b3d9c84718cb5f133e62bd SHA256 be7ace4999868e2e402e9d6c70fac2a2e0522dc76cf45b7e42d5a13e7a3819b0
+MD5 93019de03a882242589f59f0e39657ac ChangeLog 3008
+RMD160 877f0349dbe51c1aa71ca68bc84b2df90d61b98a ChangeLog 3008
+SHA256 be7ace4999868e2e402e9d6c70fac2a2e0522dc76cf45b7e42d5a13e7a3819b0 ChangeLog 3008
 MISC metadata.xml 366 RMD160 1e4b0bac744189f46350b440bf36112272a69baa SHA1 52b8b9b7d1cbcd2bcf4d988aaaf7bf744244fd77 SHA256 19c4ff0460724296bd0a9bc7e6c385de2b46b0cbd7b1384dab7f656811861445
 MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366
 RMD160 1e4b0bac744189f46350b440bf36112272a69baa metadata.xml 366
@@ -27,10 +29,6 @@ SHA256 a1589a573fd749d1e3cb5ca31a494640d823eb92f81cff86baeb90cd121983b5 files/di
 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)
-
-iD8DBQFFKP9T5mJXAu5GbtIRAsxfAJ0Ysf6qmdpSUUH+zIFz9oYGLgeH5ACfcYth
-3HK/GH8zI2Dknvn7Gr9vk/8=
-=lWYp
------END PGP SIGNATURE-----
+MD5 e82d2dd7818f77075eaf39f0ce983f2c files/digest-eselect-opengl-1.0.5 687
+RMD160 7b9ca0fdd1541ae9c279d126dd62db6509007cb8 files/digest-eselect-opengl-1.0.5 687
+SHA256 5f2e6400107f8708b782f2233e1d1299870dad53950de56f90c98d3970b3c1d5 files/digest-eselect-opengl-1.0.5 687

diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.5.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.5.ebuild
new file mode 100644 (file)
index 0000000..439bc82
--- /dev/null
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.5.ebuild
@@ -0,0 +1,92 @@
+# 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.5.ebuild,v 1.1 2006/10/10 00:21:23 dberkholz 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.3"
+
+S=${WORKDIR}
+
+src_unpack() {
+       unpack ${A}
+
+       mv opengl.eselect-${PV} opengl.eselect
+       mv glext.h-${GLEXT} glext.h
+       mv glxext.h-${GLXEXT} glxext.h
+}
+
+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.5 b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.5
new file mode 100644 (file)
index 0000000..b1dfbf3
--- /dev/null
+++ b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.5
@@ -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 4ba2fa0635638a8d64cd21c7cc1281ca opengl.eselect-1.0.5.bz2 3365
+RMD160 1bd3a537e2703c9d240c8c94d3e609ba2d009866 opengl.eselect-1.0.5.bz2 3365
+SHA256 b54ffa9831f86bd7effeea8931ab72e5ac417a2948d634969630039144166cc0 opengl.eselect-1.0.5.bz2 3365