Bump with libs from xorg-7.0.

Package-Manager: portage-2.1_pre6-r2

8 files changed, 125 insertions, 123 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 23de566cb5c2..f4f028900aa0 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.37 2006/03/09 01:45:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.38 2006/03/17 15:44:44 herbs Exp $
+
+*emul-linux-x86-xlibs-7.0 (17 Mar 2006)
+
+  17 Mar 2006; Herbie Hopkins <herbs@gentoo.org>
+  -emul-linux-x86-xlibs-2.2.1.ebuild, -emul-linux-x86-xlibs-2.2.1-r1.ebuild,
+  +emul-linux-x86-xlibs-7.0.ebuild:
+  Bump with libs from xorg-7.0, include clientside dri modules (bug 115605) to
+  better support 32bit opengl apps with oss drivers. Don't install opengl
+  header files so as not to confuse eselect-opengl (bug 109922).
 
   09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   emul-linux-x86-xlibs-2.2.1.ebuild, emul-linux-x86-xlibs-2.2.1-r1.ebuild,
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 1684f15e47d7..8e595804c86d 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,40 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 feaaf962036e9bbc52f164f54104fceb ChangeLog 7102
-RMD160 4c431dcea38fcad67de1b104326179ec56b528b2 ChangeLog 7102
-SHA256 a1babb04c7786f395bf692c7b8be110870afdd29aad567a3a4ca0a429ac12e5f ChangeLog 7102
-MD5 8d91c46d0cda8b7fea92b701f4644a69 emul-linux-x86-xlibs-2.2.1-r1.ebuild 1163
-RMD160 85c4217f65f041e6161af2bf89dc9841ef2f4523 emul-linux-x86-xlibs-2.2.1-r1.ebuild 1163
-SHA256 5fa4ee19bfe85669e6abb726bc71b9dd13833e900dcd8a85578f0ce69be2fb48 emul-linux-x86-xlibs-2.2.1-r1.ebuild 1163
-MD5 787decbb9fbe5e280318493ac876583f emul-linux-x86-xlibs-2.2.1.ebuild 1152
-RMD160 1bc5c612da7065d91ced3f13d7cb40f83c3390ae emul-linux-x86-xlibs-2.2.1.ebuild 1152
-SHA256 5d890c4409c0cbe1c3572eb38fb155b2f421a494c470c33405c61a66e31a1e31 emul-linux-x86-xlibs-2.2.1.ebuild 1152
+MD5 389d5a30056bb95e05fef8131b224bd7 ChangeLog 7520
+RMD160 48dd5a6c13330b0fb6df332e6aae11e581c37228 ChangeLog 7520
+SHA256 4ba3be5bce80b3a8806a91795572462cd13244e1a1c9750395d28f155e8be4a8 ChangeLog 7520
 MD5 3c85f072d44dae5de7f17247818ed613 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1163
 RMD160 3758a6e4064d2c46ae37d7857032a7de8368a551 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1163
 SHA256 8b814d2e2bf2c15c10ddd140658c0b26a399835f6e9b7bc787cf531e6e8a7321 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1163
 MD5 954df312f95e787f49dc34965fc4f07a emul-linux-x86-xlibs-2.2.2.ebuild 1152
 RMD160 6537c30b16dc35f463382a491b0744e47321eddc emul-linux-x86-xlibs-2.2.2.ebuild 1152
 SHA256 2355673f0f94183ba8452cdcbaa824549783fb6b4c94ccae9f42444a1d836a27 emul-linux-x86-xlibs-2.2.2.ebuild 1152
-MD5 0393dcaadf58787ed27c9f9207de7cea files/digest-emul-linux-x86-xlibs-2.2.1 80
-RMD160 fe174a9e47494af7ba385808a1856581c47ffb80 files/digest-emul-linux-x86-xlibs-2.2.1 80
-SHA256 f41e9fcd6e563236cd21d5068e36285accc2d9d34e7bbc62660410e47d0f4e4f files/digest-emul-linux-x86-xlibs-2.2.1 80
-MD5 0393dcaadf58787ed27c9f9207de7cea files/digest-emul-linux-x86-xlibs-2.2.1-r1 80
-RMD160 fe174a9e47494af7ba385808a1856581c47ffb80 files/digest-emul-linux-x86-xlibs-2.2.1-r1 80
-SHA256 f41e9fcd6e563236cd21d5068e36285accc2d9d34e7bbc62660410e47d0f4e4f files/digest-emul-linux-x86-xlibs-2.2.1-r1 80
+MD5 bdc7908e58e0056144a3a30b8929601b emul-linux-x86-xlibs-7.0.ebuild 2087
+RMD160 af8335f04e9e3ad5a77955a76384c20d8c32b7d5 emul-linux-x86-xlibs-7.0.ebuild 2087
+SHA256 e3bf7437d7fd6dd5ae4e7cbeadb75936a2b0f7a7719f992bef8f16bc361c0410 emul-linux-x86-xlibs-7.0.ebuild 2087
 MD5 db234ca6317b37de497f2d1433116e6c files/digest-emul-linux-x86-xlibs-2.2.2 286
 RMD160 45c0a9982e1d94b4a07b1e66193705e118d8fb41 files/digest-emul-linux-x86-xlibs-2.2.2 286
 SHA256 b9fb15ae79bdd68fd6f24d9eb3134946b3185ea4ea22d2a9849ab718c31b90ea files/digest-emul-linux-x86-xlibs-2.2.2 286
 MD5 db234ca6317b37de497f2d1433116e6c files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
 RMD160 45c0a9982e1d94b4a07b1e66193705e118d8fb41 files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
 SHA256 b9fb15ae79bdd68fd6f24d9eb3134946b3185ea4ea22d2a9849ab718c31b90ea files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
+MD5 468baea4637e3ef81d4513e7a55235a2 files/digest-emul-linux-x86-xlibs-7.0 3034
+RMD160 dd5b333762508d173adea7fa229e1b224612c424 files/digest-emul-linux-x86-xlibs-7.0 3034
+SHA256 d6183243915fee4bbfbcb3cc93bee4cfed79c6eb21d82c7e3708e1bc65e74f7a files/digest-emul-linux-x86-xlibs-7.0 3034
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
 SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFED4irAiZjviIA2XgRAqBVAKCzMdebj69dfjn9maV3WXQFIkSffACbB2um
-zgTYPzdAnJ9eQ6aU2rFWfJU=
-=1oJg
+iD8DBQFEGtl42G5bA0cA/ScRAqdVAJ9ZwxUoplt8d7fklQXrVzqF868/VgCfUOYs
+SuLPndQBGNFh1Suc6FYIX9E=
+=5JEn
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1-r1.ebuild
deleted file mode 100644
index 8a77f06122e1..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 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.2.1-r1.ebuild,v 1.2 2006/03/09 01:45:02 flameeyes 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}
-
-RESTRICT="nostrip"
-
-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/emul-linux-x86-xlibs-2.2.1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1.ebuild
deleted file mode 100644
index 7eb3c3f4e313..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 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.2.1.ebuild,v 1.2 2006/03/09 01:45:02 flameeyes 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? ( x11-base/opengl-update )
-	 virtual/libc
-	 >=app-emulation/emul-linux-x86-baselibs-2.0"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-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/opengl-update --use-old
-	fi
-}
-
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0.ebuild
new file mode 100644
index 000000000000..5f96f084ebd5
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 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-7.0.ebuild,v 1.1 2006/03/17 15:44:44 herbs 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
+		video_cards_ati? mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2
+		video_cards_i810? mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2
+		video_cards_mga? mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2
+		video_cards_s3virge? mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2
+		video_cards_savage? mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2
+		video_cards_sis? mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2
+		video_cards_tdfx? mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2
+		video_cards_trident? mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2
+		video_cards_via? mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE_VIDEO_CARDS="
+	video_cards_ati
+	video_cards_i810
+	video_cards_mga
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_sis
+	video_cards_tdfx
+	video_cards_trident
+	video_cards_via"
+
+IUSE="opengl ${IUSE_VIDEO_CARDS}"
+
+DEPEND=""
+
+RDEPEND="opengl? app-admin/eselect-opengl
+	 virtual/libc
+	 >=app-emulation/emul-linux-x86-baselibs-2.5"
+
+S=${WORKDIR}
+
+RESTRICT="nostrip"
+
+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.2.1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1
deleted file mode 100644
index 258dbb40892a..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3ffb22742958f8f4a0e5f90557bd555 emul-linux-x86-xlibs-2.2.1.tar.bz2 4644402
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1-r1
deleted file mode 100644
index 258dbb40892a..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3ffb22742958f8f4a0e5f90557bd555 emul-linux-x86-xlibs-2.2.1.tar.bz2 4644402
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0
new file mode 100644
index 000000000000..a3a6b27a1e18
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0
@@ -0,0 +1,30 @@
+MD5 c60ceb055cb8519f6ab12a6905b30155 emul-linux-x86-xlibs-7.0.tar.bz2 2931348
+RMD160 b3d9b908b4cfd8e8ea90e902275ee493603a1db3 emul-linux-x86-xlibs-7.0.tar.bz2 2931348
+SHA256 221a88959ca4fe4aea3f267f62ab0d7d50133c6e851150079427a95872eb6390 emul-linux-x86-xlibs-7.0.tar.bz2 2931348
+MD5 bf2fa2e8b937b767bcf16a2be8afff74 emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
+RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
+SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
+MD5 e36bba25dd4955e761c9099695aae319 emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
+RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
+SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
+MD5 21a1f60641146ca5d3331ea982f97c7f emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
+RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
+SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
+MD5 fe34e55e1dd5bc73904bbc4e96a3a134 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
+RMD160 3df360b409e0432234f37c7662d8fca7fe74c5cd emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
+SHA256 18fc5da1288a623ff2c0cd6ee5b177d90d3e634209c96675d244f8b435cdae93 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
+MD5 ada4398fc3e8845683fc5d1fbd2d16b2 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
+RMD160 9545cadecc0dfa9dec1a801850fed63cb92b9a37 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
+SHA256 33e82602e7c57e42e86ebcd29fc3fd568a06ada9091ba8484d3cbfda9d2a6230 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
+MD5 b0c2ebaea9b235b7c98287871ee3294f emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
+RMD160 c980124403a183435ef7328c36decb857d4e344c emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
+SHA256 b93c61db78c67de7188ac6e20edd8f39db5af9df58283c613e94d147742dac84 emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
+MD5 57cf19d69012a5e682516ee214605cc4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
+RMD160 6d70e3d16c903a8383a1168687363d7626318c8a emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
+SHA256 e07cdf5f4d682c1856b83c5b06765b24ca51fb8f29f0d5c7ce7992ea499a0ca4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
+MD5 cb538216fe6a7e5de5214a7715d3a6ef emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
+RMD160 8460f56d6829d41c042c040bab830084dd1b9958 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
+SHA256 d393ba2e1ba8cddd9b3861afdd7f19520b258400f76df8cd5c8fc056671256e5 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
+MD5 b91b5b76579259e59f7593c4733fa772 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
+RMD160 201d284ab22ac501ec7b20b2ca419696326f1532 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
+SHA256 5a64d00eb39684e32f6b1aa045437fb6883e4a090303a70c8e6a7fc3f4e6a995 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605