Now dies with error instead of compiling all modules when none are specified. Also doesn't compile modules twice anymore.

4 files changed, 29 insertions, 17 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index 7db1884b7009..a301d3a738ed 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2003/06/15 16:45:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.22 2003/06/27 08:26:12 spyderous Exp $
+
+  27 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r3.ebuild:
+  Now dies with error instead of compiling all modules when none are specified.
+  Also doesn't compile modules twice anymore.
 
   15 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r3.ebuild:
   reverting
diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest
index 8cdc724e957b..991de632feed 100644
--- a/x11-base/xfree-drm/Manifest
+++ b/x11-base/xfree-drm/Manifest
@@ -1,5 +1,5 @@
+MD5 660024b24f58e82eaec81e7b1d3041ce ChangeLog 5076
 MD5 6b1f0d725e8037cbf3c62d9ebee51ec8 xfree-drm-4.3.0-r2.ebuild 2655
-MD5 699f722817d2891237c20f413c3f7bf0 xfree-drm-4.3.0-r3.ebuild 2735
-MD5 037c95f3871be82e099bd06fe7d8ba8b ChangeLog 4863
+MD5 0ed345e1687362bd46dbb26d1b3958e8 xfree-drm-4.3.0-r3.ebuild 2917
 MD5 b340ab262c964f235620a98d7626d6b9 files/digest-xfree-drm-4.3.0-r2 166
-MD5 d2bb006be1b50e349552bd96611568e7 files/digest-xfree-drm-4.3.0-r3 165
+MD5 08d125fc239e02143fe64d48dcadb64c files/digest-xfree-drm-4.3.0-r3 169
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 cafca99c729f..88d8a7b0949d 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 2cc9177bfca61bbe692484954d797250 xfree-drm-4.3.0-r3-gentoo.tar.bz2 6601
+MD5 1a580ba8b0059590c9884007acd20bca xfree-drm-4.3.0-r3-gentoo-0.2.tar.bz2 6619
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 39e172ad7c2c..b4532f01c8b0 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.3 2003/06/15 16:45:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild,v 1.4 2003/06/27 08:26:12 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
@@ -16,12 +16,13 @@ DEBUG="yes"
 RESTRICT="nostrip"
 
 SNAPSHOT="20030504"
+PATCHVER="0.2"
 
 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.tar.bz2"
+	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
 # Latest tarball of DRM sources can be found here:
 #
 #   http://www.xfree86.org/~alanh/
@@ -68,19 +69,25 @@ if [ "`use gamma`" ]
 then
 	VIDCARDS="${VIDCARDS} gamma.o"
 fi
-if [ -z "${VIDCARDS}" ]
-then
-	if [ "${ARCH}" = "ppc" ]
-	then
-		VIDCARDS="r128.o radeon.o"
-	else
-		VIDCARDS="mga.o tdfx.o r128.o radeon.o sis.o i810.o i830.o gamma.o"
-	fi
-fi
+
+# This builds everything if none of the cards are in USE.
+#if [ -z "${VIDCARDS}" ]
+#then
+#	if [ "${ARCH}" = "ppc" ]
+#	then
+#		VIDCARDS="r128.o radeon.o"
+#	else
+#		VIDCARDS="mga.o tdfx.o r128.o radeon.o sis.o i810.o i830.o gamma.o"
+#	fi
+#fi
 
 src_unpack() {
 	if [ ! -f /usr/src/linux/include/config/MARKER ] ; then
-		die "Please compile kernel sources"
+		die "Please compile kernel sources."
+	fi
+
+	if [ -z "${VIDCARDS}" ] ; then
+		die "Please choose at least one video card."
 	fi
 
 	unpack ${A}