Fixed the double pkg_setup function, see bug #209764

Package-Manager: portage-2.1.3.19

4 files changed, 25 insertions, 75 deletions

diff --git a/media-video/usb-pwc-re/ChangeLog b/media-video/usb-pwc-re/ChangeLog
index 8b0d0cddd4b5..dba02b019675 100644
--- a/media-video/usb-pwc-re/ChangeLog
+++ b/media-video/usb-pwc-re/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/usb-pwc-re
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.34 2007/11/27 11:40:27 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.35 2008/02/13 09:29:55 phosphan Exp $
+
+  13 Feb 2008; Patrick Kursawe <phosphan@gentoo.org>
+  -usb-pwc-re-10.0.12_rc1.ebuild, usb-pwc-re-20061023.042702-r1.ebuild:
+  Fixed the double pkg_setup function, see bug #209764
+
+  13 Feb 2008; Patrick Kursawe <phosphan@gentoo.org>
+  -usb-pwc-re-10.0.12_rc1.ebuild:
+  Removing old version
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org>
   usb-pwc-re-20061023.042702-r1.ebuild:
diff --git a/media-video/usb-pwc-re/Manifest b/media-video/usb-pwc-re/Manifest
index 99773c3fe396..ffb226d7b886 100644
--- a/media-video/usb-pwc-re/Manifest
+++ b/media-video/usb-pwc-re/Manifest
@@ -1,7 +1,5 @@
 AUX config.h.patch 840 RMD160 c60c0c4043cc55544e633add279121529d616227 SHA1 4ed88d21605fed4fe342643733c5619ce41c7f0b SHA256 4d9f1b3a5bed952ba06b298321de12ae0b92ae4e5d5dee08cd119e87dc7d1092
-DIST pwc-10.0.12-rc1.tar.bz2 48861 RMD160 52f526e308494235f0f80c4525d01efc9e2cd107 SHA1 ee26739355381f88848ca40f8f827351a0b9f12f SHA256 dad803c34e902e286a3d6fb052f48b826c62a8ad19a54ced2936da7641b62907
 DIST pwc-v4l2-20061023-042702.tar.bz2 48951 RMD160 c5c902ce50c7daff33984d8179d3c85eb879ba80 SHA1 14ac9014c1887bb218a82623c6a9a946c4fe766f SHA256 f0d41828d92d7598ad03e6c263dc075de95e7e1f24f0c240020384220e9f19e0
-EBUILD usb-pwc-re-10.0.12_rc1.ebuild 1623 RMD160 82a1dc7b031863b0877a09e516ebb69a10e12031 SHA1 03a85a8d6916e432f0e522fbd8ee1efcc362c95f SHA256 ac9f496403242145620318c967059098dd650a3b61ca2d30420d0b8fbd0333c5
-EBUILD usb-pwc-re-20061023.042702-r1.ebuild 1699 RMD160 ac4846991a2cbcafceb39ddcc86e7e7b3f9c1c13 SHA1 7f6888110f43206a16719c92bd7eda52095ead12 SHA256 b524aa9a49b03dba921adea05af36af5b5024219742e4584c4a970fa108add85
-MISC ChangeLog 5050 RMD160 b5364d32ec6b083e5c695672d0fa0d2746ba4d43 SHA1 8584211f11c8db869842709e47e6f4b70f1f266e SHA256 ad9ebf9bfa8356e557dab9c049131ee23767c4c6a8dc65aa80c15abdad836a26
+EBUILD usb-pwc-re-20061023.042702-r1.ebuild 1685 RMD160 5e7946a7e269f673008f101df3e04d88e339a013 SHA1 3431e5b8a43da743d95c6314b8ffe52ce8ae5155 SHA256 82328a270aac09f0719f70b2eab8ba39115cecd372190b7d9d63cb8eb3f7317b
+MISC ChangeLog 5346 RMD160 d7c8ee262de2a6512525be9d15c036d68aa5aefa SHA1 18a4b1c0ace4b753c4066980fd7c75db1201d63d SHA256 f3c01c78bd2f4998defd2e91e44f9c51856980276f9c322acb88843bc54dd293
 MISC metadata.xml 222 RMD160 80472e8fc32f242b944e7df7d2d89996cf40b5bd SHA1 651558716d8136fa0e5de3766a5fdcf29d0e3eec SHA256 452116b01cc5f6f917f8ce8e2d15fb0de73f054c6bbe6632b39174e9deb8b058
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild
deleted file mode 100644
index 53867bef4320..000000000000
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 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.12_rc1.ebuild,v 1.9 2007/07/12 02:40:42 mr_bones_ Exp $
-
-inherit linux-info toolchain-funcs eutils
-
-DESCRIPTION="Free Philips USB Webcam driver for Linux that supports VGA resolution, newer kernels and replaces the old pwcx module."
-HOMEPAGE="http://www.saillard.org/pwc/"
-MY_PV="${PV/_/-}"
-SRC_URI="http://www.saillard.org/pwc/files/pwc-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
-
-IUSE=""
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-
-S=${WORKDIR}/pwc-${MY_PV}
-
-pkg_setup() {
-	if kernel_is 2 6; then
-		if [ "${KV_PATCH}" -ge 18 ] ; then
-			die "In kernel ${KV_FULL} this module is deprecated by the builtin driver."
-		fi
-	fi
-}
-
-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() {
-
-	if kernel_is 2 6; then
-		einfo "Kernel ${KV_FULL} detected!"
-		insinto "/lib/modules/${KV_FULL}/kernel/drivers/usb/media/pwc"
-		doins pwc.ko
-		echo "post-install pwc /sbin/modprobe --force pwcx >& /dev/null 2>&1 || :" > usb-pwcx
-	else
-		eerror "No supported kernel version (2.6) detected."
-	fi
-
-	insinto /etc/modules.d
-
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] ; then
-		# Update module dependency
-		[ -x /sbin/update-modules ] && /sbin/update-modules || /sbin/modules-update
-	fi
-	elog "If you have problems loading the module, please check the \"dmesg\" output."
-}
diff --git a/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild b/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
index 8042f1589c5a..788a8fe2d005 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-20061023.042702-r1.ebuild,v 1.8 2007/11/27 11:40:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild,v 1.9 2008/02/13 09:29:55 phosphan Exp $
 
 inherit linux-mod eutils
 
@@ -28,14 +28,6 @@ ERROR_VIDEO_V4L1_COMPAT="{$P} requires support for the Video For Linux API 1 com
 
 S=${WORKDIR}/pwc-v4l2-${MY_PV}
 
-pkg_setup() {
-	if kernel_is 2 6; then
-		if [ "${KV_PATCH}" -ge 18 ] ; then
-			die "In kernel ${KV_FULL} this module is deprecated by the builtin driver."
-		fi
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -44,10 +36,19 @@ src_unpack() {
 
 pkg_setup() {
 	linux-mod_pkg_setup
+	local msg
 
 	if kernel_is 2 4; then
-		eerror "${P} does not support building against kernel 2.4.x"
-		die "${P} does not support building against kernel 2.4.x"
+		msg="${P} does not support building against kernel 2.4.x"
+		eerror $msg
+		die $msg
+	fi
+	if kernel_is 2 6; then
+		if [ "${KV_PATCH}" -ge 18 ] ; then
+			msg="In kernel ${KV_FULL} this module is deprected by the builtin driver."
+			eerror $msg
+			die $msg
+		fi
 	fi
 }