Fails now if the driver is already built in (see bug #101944).

Package-Manager: portage-2.0.51.22-r2

4 files changed, 12 insertions, 6 deletions

diff --git a/media-video/usb-pwc-re/ChangeLog b/media-video/usb-pwc-re/ChangeLog
index 2af6b2b6e8b1..1f04c2b51db3 100644
--- a/media-video/usb-pwc-re/ChangeLog
+++ b/media-video/usb-pwc-re/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/usb-pwc-re
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.14 2005/08/05 11:56:44 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.15 2005/08/10 11:50:07 phosphan Exp $
+
+  10 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> usb-pwc-re-10.0.7.ebuild,
+  usb-pwc-re-10.0.7a.ebuild:
+  Fails now if the driver is already built in (see bug #101944).
 
 *usb-pwc-re-10.0.7a (05 Aug 2005)
 
diff --git a/media-video/usb-pwc-re/Manifest b/media-video/usb-pwc-re/Manifest
index e462519f7870..ce2ce0feac98 100644
--- a/media-video/usb-pwc-re/Manifest
+++ b/media-video/usb-pwc-re/Manifest
@@ -1,6 +1,6 @@
-MD5 97062762657b25c6f02183d4dc6abda2 usb-pwc-re-10.0.7a.ebuild 1335
-MD5 b5f4bf4544543a1ee86aca450aff189d usb-pwc-re-10.0.7.ebuild 1329
-MD5 6e799d1dcf398bd4b3db058880fdc506 ChangeLog 1960
+MD5 b6a1c82065234c1a7100de5f414475f4 usb-pwc-re-10.0.7a.ebuild 1421
+MD5 7f69b2814bb7838f5829dad6a9647e2a usb-pwc-re-10.0.7.ebuild 1418
+MD5 3ea667561ac46a271054dfa96378dbc7 ChangeLog 2134
 MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
 MD5 3808ae386cedb8841b70ea447cf94a4e files/digest-usb-pwc-re-10.0.7 62
 MD5 ea1ff464d19a6150ba089e93eb49f9f1 files/digest-usb-pwc-re-10.0.7a 63
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild
index cad3b408b32a..5cf8e6222cf7 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.0.7.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/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild,v 1.7 2005/07/28 11:25:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild,v 1.8 2005/08/10 11:50:07 phosphan Exp $
 
 
 inherit linux-info toolchain-funcs eutils
@@ -21,6 +21,7 @@ S=${WORKDIR}/pwc-${PV}
 src_compile() {
 	export ARCH="$(tc-arch-kernel)"
 	emake KSRC="${KERNEL_DIR}" || die "make failed"
+	test -f pwc.ko || die "You can't have both at once - a builtin driver and a module."
 }
 
 src_install() {
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild
index cfecd7888807..ce374b7fddf5 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.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/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild,v 1.1 2005/08/05 11:56:44 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild,v 1.2 2005/08/10 11:50:07 phosphan Exp $
 
 
 inherit linux-info toolchain-funcs eutils
@@ -22,6 +22,7 @@ S=${WORKDIR}/pwc-${PV}
 src_compile() {
 	export ARCH="$(tc-arch-kernel)"
 	emake KSRC="${KERNEL_DIR}" || die "make failed"
+	test -f pwc.ko || die "You can't have both at once - a builtin driver and a module."
 }
 
 src_install() {