(#47598) Stop installing libMesaGL -- it's a remnant from years ago and shouldn't be used. Any app using it is broken.

Package-Manager: portage-2.0.51-r14

4 files changed, 15 insertions, 14 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 6f71474df3ea..8d890a0c7136 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.304 2005/01/25 18:35:04 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.305 2005/01/25 21:05:12 spyderous Exp $
+
+  25 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild, xorg-x11-6.8.1.902.ebuild:
+  (#47598) Stop installing libMesaGL -- it's a remnant from years ago and
+  shouldn't be used. Any app using it is broken.
 
   25 Jan 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.1.902.ebuild:
   Add ~sparc keyword for testing --- builds and runs for me.  Track for sparc
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 297464fc18a0..43750550f147 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,15 +1,15 @@
-MD5 fdea7f53e41be3dfda7734968d7884d9 ChangeLog 72306
+MD5 a31252ad8f952c82da18e8c28d3b7b87 ChangeLog 72547
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 a8051c491706514a17657504c7d5ba69 xorg-x11-6.7.0-r3.ebuild 38098
-MD5 c0d41a324fbeec16bd3fba37971f5086 xorg-x11-6.8.1.902-r1.ebuild 50809
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
 MD5 c0f8e417ca09b7e0a6cb0df5345c9ade xorg-x11-6.8.0-r4.ebuild 52258
 MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453
-MD5 10bf8e6194a7ef3b34ba5d448b3ae9fa xorg-x11-6.8.1.902.ebuild 50163
-MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517
+MD5 67d85a2c027b1f4a2c0cc89a1d149232 xorg-x11-6.8.1.902-r1.ebuild 50716
+MD5 ce42c938819216d0ca122f33b4d2b8ab xorg-x11-6.8.1.902.ebuild 50073
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
 MD5 fa94b81b33045020143c8d9ded15a3ac files/digest-xorg-x11-6.8.0-r4 911
-MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
 MD5 31a8fa39480a7053afd4ebd7493c09c4 files/digest-xorg-x11-6.8.1.901-r1 517
 MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902 517
+MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517
+MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild
index af96bdb1d9d6..93b58b7d166b 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild,v 1.6 2005/01/24 10:28:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902-r1.ebuild,v 1.7 2005/01/25 21:05:12 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1128,8 +1128,7 @@ dynamic_libgl_install() {
 		local x=""
 		for x in ${D}/usr/$(get_libdir)/libGL.so* \
 			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a \
-			${D}/usr/$(get_libdir)/libMesaGL.so; do
+			${D}/usr/$(get_libdir)/libGL.a; do
 			if [ -f ${x} -o -L ${x} ]; then
 				# libGL.a cause problems with tuxracer, etc
 				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib
@@ -1270,7 +1269,6 @@ fix_opengl_symlinks() {
 	# Create required symlinks
 	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
 	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libMesaGL.so
 }
 
 #################
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
index b86a208e01ff..44475f59ac92 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.22 2005/01/25 18:35:04 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.23 2005/01/25 21:05:12 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1169,8 +1169,7 @@ setup_dynamic_libgl() {
 		local x=""
 		for x in ${D}/usr/$(get_libdir)/libGL.so* \
 			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a \
-			${D}/usr/$(get_libdir)/libMesaGL.so; do
+			${D}/usr/$(get_libdir)/libGL.a; do
 			if [ -f ${x} -o -L ${x} ]; then
 				# libGL.a cause problems with tuxracer, etc
 				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib
@@ -1278,7 +1277,6 @@ fix_opengl_symlinks() {
 	# Create required symlinks
 	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
 	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libMesaGL.so
 }
 
 #################