Fixes for bug #25598 and bug #24415, general cleanup.

4 files changed, 41 insertions, 15 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index a2261122ecc8..25c1ab3c6e86 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xfree-drm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.35 2003/07/29 00:24:51 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.36 2003/08/12 05:51:01 spyderous Exp $
+
+  12 Aug 2003; root <root@gentoo.org> xfree-drm-4.3.0-r6.ebuild:
+  Fixes for bug #25598 and bug #24415, general cleanup.
 
   28 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
   xfree-drm-4.3.0-r6.ebuild:
diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest
index b8d43b7f19f3..0749ec1f4fee 100644
--- a/x11-base/xfree-drm/Manifest
+++ b/x11-base/xfree-drm/Manifest
@@ -1,12 +1,12 @@
-MD5 b340ab262c964f235620a98d7626d6b9 files/digest-xfree-drm-4.3.0-r2 166
-MD5 ac5dd043f538e9fed0825d46d6e999e4 files/digest-xfree-drm-4.3.0-r4 168
-MD5 e8df58fc40e04737c8a8e140c5903c44 files/digest-xfree-drm-4.3.0-r5 168
-MD5 e2a80ba64ac1f308ac67a4ccbb0ecdcc files/digest-xfree-drm-4.3.0-r6 171
-MD5 08d125fc239e02143fe64d48dcadb64c files/digest-xfree-drm-4.3.0-r3 169
-MD5 623a952c638765805bc608db2210d2b9 ChangeLog 7286
+MD5 95031b57d9dcca766546fd6758a8241d ChangeLog 7408
+MD5 cd0b06404869599fa61bb7976be237a2 metadata.xml 476
 MD5 5841333d3b65fe40becb5a2561c209e5 xfree-drm-4.3.0-r2.ebuild 2648
 MD5 d1e79ddb524db49430631325d0c10d7d xfree-drm-4.3.0-r3.ebuild 2892
 MD5 9211d43b4a5030e30830ce2c2e85ec1d xfree-drm-4.3.0-r4.ebuild 4047
 MD5 253a4b1701bf8181b5552b488ea25e5b xfree-drm-4.3.0-r5.ebuild 4199
-MD5 cd0b06404869599fa61bb7976be237a2 metadata.xml 476
-MD5 5e3dd2e610a789c1fbac642596f7d9b4 xfree-drm-4.3.0-r6.ebuild 4379
+MD5 670781741b8597281d44f5e2d5ea5712 xfree-drm-4.3.0-r6.ebuild 4950
+MD5 b340ab262c964f235620a98d7626d6b9 files/digest-xfree-drm-4.3.0-r2 166
+MD5 08d125fc239e02143fe64d48dcadb64c files/digest-xfree-drm-4.3.0-r3 169
+MD5 ac5dd043f538e9fed0825d46d6e999e4 files/digest-xfree-drm-4.3.0-r4 168
+MD5 e8df58fc40e04737c8a8e140c5903c44 files/digest-xfree-drm-4.3.0-r5 168
+MD5 916b08e6047de0eeabce236b45a16b34 files/digest-xfree-drm-4.3.0-r6 169
diff --git a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r6 b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r6
index aee50384a833..47da13b6e139 100644
--- a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r6
+++ b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r6
@@ -1,2 +1,2 @@
 MD5 26820c1cf12ba2b2b71b4a3806875e9c linux-drm-4.3.0-kernelsource-20030714.tar.gz 329112
-MD5 c62bb971597b46815e731f389a184e72 xfree-drm-4.3.0-r6-gentoo-0.3.tar.bz2 543850
+MD5 7c6e58d1dc5c5d5f768937c832c08236 xfree-drm-4.3.0-r6-gentoo-0.4.tar.bz2 9280
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
index a3eafb4439fe..7f38bd36b07f 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild,v 1.6 2003/08/03 04:45:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild,v 1.7 2003/08/12 05:51:01 spyderous Exp $
 
 # Small note:  we should prob consider using a DRM only tarball, as it will ease
 #              some of the overhead on older systems, and will enable us to
@@ -18,7 +18,7 @@ inherit eutils xfree
 RESTRICT="nostrip"
 
 SNAPSHOT="20030714"
-PATCHVER="0.3"
+PATCHVER="0.4"
 
 S="${WORKDIR}/drm"
 DESCRIPTION="Xfree86 Kernel DRM modules"
@@ -71,7 +71,7 @@ if [ `use sis || vcards sis` ]
 then
 	VIDCARDS="${VIDCARDS} sis.o"
 fi
-if use i8x0 &>/dev/null
+if use i8x0
 then
 	VIDCARDS="${VIDCARDS} i810.o i830.o"
 fi
@@ -80,8 +80,8 @@ then
 	VIDCARDS="${VIDCARDS} gamma.o"
 fi
 
-vcards i810 &>/dev/null && VIDCARDS="${VIDCARDS} i810.o"
-vcards i830 &>/dev/null && VIDCARDS="${VIDCARDS} i830.o"
+vcards i810 && VIDCARDS="${VIDCARDS} i810.o"
+vcards i830 && VIDCARDS="${VIDCARDS} i830.o"
 
 src_unpack() {
 # Is this necessary with the fixed Makefile?
@@ -106,6 +106,10 @@ src_unpack() {
 	[ "${ARCH}" = "ppc" ] && \
 		epatch ${PATCHDIR}/${PF}-drm-ioremap.patch
 
+	# Fix for bug #25598
+	[ "${ARCH}" = "ppc" ] && \
+		epatch ${PATCHDIR}/${PF}-rage128-timeout.patch
+
 # Pfeifer said this patch is ok for any kernel >= 2.4 <spyderous>
 #	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 4 ] && \
 	if [ -r /usr/src/linux/mm/rmap.c ]
@@ -145,6 +149,25 @@ src_install() {
 	dodoc README*
 	exeinto /usr/X11R6/bin
 	doexe dristat
+
+	einfo "Stripping binaries..."
+	# This bit I got from Redhat ... strip binaries and drivers ..
+	# NOTE:  We do NOT want to strip the drivers, modules or DRI modules!
+	for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \
+		grep -v ' shared object,' | \
+		sed -n -e 's/^\(.*\):[  ]*ELF.*, not stripped/\1/p')
+	do
+	if [ -f ${x} ]
+		then
+			# Dont do the modules ...
+			if [ "${x/\/lib\/modules}" = "${x}" ]
+			then
+				echo "`echo ${x} | sed -e "s|${D}||"`"
+				strip ${x} || :
+			fi
+		fi
+	done
+
 }
 
 pkg_postinst() {