reverting

4 files changed, 14 insertions, 16 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index df1e078fce29..7db1884b7009 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.20 2003/06/14 23:29:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.21 2003/06/15 16:45:59 seemant Exp $
+
+  15 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r3.ebuild:
+  reverting
 
   14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r3.ebuild:
   Magnade in #gentoo-dev fixed up the Makefile so that it installs all the
diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest
index 2b3f10727359..8cdc724e957b 100644
--- a/x11-base/xfree-drm/Manifest
+++ b/x11-base/xfree-drm/Manifest
@@ -1,5 +1,5 @@
 MD5 6b1f0d725e8037cbf3c62d9ebee51ec8 xfree-drm-4.3.0-r2.ebuild 2655
-MD5 5853dd848fbdd3943cefe011b3a828ea xfree-drm-4.3.0-r3.ebuild 2735
-MD5 78d23914ab6de58cf0a26922b9b9f7a5 ChangeLog 4771
+MD5 699f722817d2891237c20f413c3f7bf0 xfree-drm-4.3.0-r3.ebuild 2735
+MD5 037c95f3871be82e099bd06fe7d8ba8b ChangeLog 4863
 MD5 b340ab262c964f235620a98d7626d6b9 files/digest-xfree-drm-4.3.0-r2 166
 MD5 d2bb006be1b50e349552bd96611568e7 files/digest-xfree-drm-4.3.0-r3 165
diff --git a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r3 b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r3
index b603e980dce5..cafca99c729f 100644
--- a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r3
+++ b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r3
@@ -1,2 +1,2 @@
 MD5 08360d2df9a900fd8e418b8c0d778f15 linux-drm-4.3.0-kernelsource-20030504.tar.gz 219677
-MD5 c5d5442a2b71e699def9c51f1962bcb6 xfree-drm-4.3.0-r3-gentoo-patches.tar.bz2 6634
+MD5 2cc9177bfca61bbe692484954d797250 xfree-drm-4.3.0-r3-gentoo.tar.bz2 6601
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild
index d972c588c4bf..39e172ad7c2c 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r3.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-r3.ebuild,v 1.2 2003/06/14 23:29:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild,v 1.3 2003/06/15 16:45:59 seemant 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
@@ -21,7 +21,7 @@ S="${WORKDIR}/drm"
 DESCRIPTION="Xfree86 Kernel DRM modules"
 HOMEPAGE="http://www.xfree.org"
 SRC_URI="mirror://gentoo/linux-drm-${PV}-kernelsource-${SNAPSHOT}.tar.gz
-	mirror://gentoo/${PF}-gentoo-patches.tar.bz2"
+	mirror://gentoo/${PF}-gentoo.tar.bz2"
 # Latest tarball of DRM sources can be found here:
 #
 #   http://www.xfree86.org/~alanh/
@@ -74,7 +74,7 @@ then
 	then
 		VIDCARDS="r128.o radeon.o"
 	else
-		VIDCARDS="all"
+		VIDCARDS="mga.o tdfx.o r128.o radeon.o sis.o i810.o i830.o gamma.o"
 	fi
 fi
 
@@ -100,27 +100,22 @@ src_compile() {
 	ln -sf Makefile.linux Makefile
 	einfo "Building DRM..."
 	make ${VIDCARDS} \
-		TREE="/usr/src/linux/include" KV="${KV}" || die
+		TREE="/usr/src/linux/include" KV="${KV}"
 	make dristat || die
 }
 
 src_install() {
 
 	einfo "installing DRM..."
-	if [ "${VIDCARDS}" = "all" ]; then
-		VIDCARDS=""
-	else
-		VIDCARDS="DRM_MODULES=\"${VIDCARDS}\""
-	fi
 	make \
 		TREE="/usr/src/linux/include" \
 		KV="${KV}" \
 		DESTDIR="${D}" \
-		${VIDCARDS} \
+		MODS="${VIDCARDS}" \
 		install || die
 	dodoc README*
-	into /usr/X11R6
-	dobin dristat
+	exeinto /usr/X11R6/bin
+	doexe dristat
 }
 
 pkg_postinst() {