Do not use pkg_setup vars before pkg_setup, bug 168051

Package-Manager: portage-2.1.2-r12

6 files changed, 32 insertions, 71 deletions

diff --git a/media-video/spca5xx/ChangeLog b/media-video/spca5xx/ChangeLog
index 202f8a72f860..410c7fd30f21 100644
--- a/media-video/spca5xx/ChangeLog
+++ b/media-video/spca5xx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/spca5xx
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/ChangeLog,v 1.26 2006/11/17 12:03:26 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/ChangeLog,v 1.27 2007/03/08 09:46:07 genstef Exp $
+
+  08 Mar 2007; <genstef@gentoo.org> -spca5xx-20060202.ebuild,
+  spca5xx-20060301.ebuild, spca5xx-20060402.ebuild:
+  Do not use pkg_setup vars before pkg_setup, bug 168051
 
 *spca5xx-20060501-r2 (17 Nov 2006)
 
diff --git a/media-video/spca5xx/Manifest b/media-video/spca5xx/Manifest
index 8df94d328008..4615e96f8a0f 100644
--- a/media-video/spca5xx/Manifest
+++ b/media-video/spca5xx/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX spca-20060501-2.6.18.patch 433 RMD160 457e16a863a78d0690b27155e7eab53f4af7b84d SHA1 d5183a65ace55b9ba3a1db92d6fa359118f00219 SHA256 c8cf5190ec60756eb531a8d0cf2bdb03c55d825daff83d6e5d5b2d0096f317c7
 MD5 7071693a1c26d7a2d29a33a9e66d7845 files/spca-20060501-2.6.18.patch 433
 RMD160 457e16a863a78d0690b27155e7eab53f4af7b84d files/spca-20060501-2.6.18.patch 433
@@ -13,22 +10,17 @@ AUX spca-20060501-defines.patch 523 RMD160 fb552bb37282516f525c3d0a94907b962cf07
 MD5 2896ecaf4977c19608d10a92ba3d8135 files/spca-20060501-defines.patch 523
 RMD160 fb552bb37282516f525c3d0a94907b962cf071dc files/spca-20060501-defines.patch 523
 SHA256 7f89425e507fd3685dca5f0e980fc83267bec0f0e24c707b6299b5a9a61d93a5 files/spca-20060501-defines.patch 523
-DIST spca5xx-20060202.tar.gz 193391 RMD160 c39344edd063bc8159737279c773d9e5daca243d SHA1 eb204ee311d80ef27daba6c02fc1babaf8c78560 SHA256 514a8c57240b0c7767ba359d85b7980b7eaae6021f3117ae26fa562c2c562724
 DIST spca5xx-20060301.tar.gz 194600 RMD160 02e2cfd8952dcebde0f8b9a87d27a13627d354bc SHA1 a05611f83c7d57f1ed1deed93685b2c9d9976313 SHA256 8442d95b80b90bc4b21d44f2e1dd7582a35d8d3c7ad1bd4bb25116f89d729669
 DIST spca5xx-20060402.tar.gz 195622 RMD160 8b18c6e6ce4b394ce657f8abc32a202d66736b3e SHA1 630378040d386aa5d11836d3a89a8b0c8cb78e2a SHA256 f144f476e393e0ebd75d2eca4fde28c20b78b887c925fdff5e5139adece7fcf5
 DIST spca5xx-20060501.tar.gz 192817 RMD160 68997c92f29f4abf7487bd6d80662738aadb6471 SHA1 0e56e2aa986345f0beba1dd14c9807a26f366dc7 SHA256 b8049142742cc81bc945aadefb40d173aeb447e428ec62a93e781032ea9b40c2
-EBUILD spca5xx-20060202.ebuild 717 RMD160 0ffc54103d7714c7d57c1af34a432cc689172cda SHA1 4c942a2abc2bc3267711abf2ab8afd22ef18503c SHA256 484619ed97cd19526a5e866143276dd457efd03ee0cf313194e20dce0d814ec6
-MD5 e362453ffa000a9512efc4128b6ff1c1 spca5xx-20060202.ebuild 717
-RMD160 0ffc54103d7714c7d57c1af34a432cc689172cda spca5xx-20060202.ebuild 717
-SHA256 484619ed97cd19526a5e866143276dd457efd03ee0cf313194e20dce0d814ec6 spca5xx-20060202.ebuild 717
-EBUILD spca5xx-20060301.ebuild 718 RMD160 85e2db02153e7808758819bb1c166b7b9eb6d9ed SHA1 9bee0670705f8403c5669492a6328fee133dcad2 SHA256 0f710e2267e3b2a6cfe26ce25e9e3cad90ba4120ac99c47a433ac916575706d8
-MD5 8ff6f6b0c991e3b6ada780a03f4b0ecc spca5xx-20060301.ebuild 718
-RMD160 85e2db02153e7808758819bb1c166b7b9eb6d9ed spca5xx-20060301.ebuild 718
-SHA256 0f710e2267e3b2a6cfe26ce25e9e3cad90ba4120ac99c47a433ac916575706d8 spca5xx-20060301.ebuild 718
-EBUILD spca5xx-20060402.ebuild 720 RMD160 6efe8e67e63a1959c7dcba3a1ad68de34e3406ab SHA1 b5d617325384377272c453dde4307eb676461dc1 SHA256 23ea650723a6b0907b7d59c9340fd11bd74866d2a1bc815b4b7159a4c4e07719
-MD5 8892aedfa7f4f1e2246460ca2d9a3db2 spca5xx-20060402.ebuild 720
-RMD160 6efe8e67e63a1959c7dcba3a1ad68de34e3406ab spca5xx-20060402.ebuild 720
-SHA256 23ea650723a6b0907b7d59c9340fd11bd74866d2a1bc815b4b7159a4c4e07719 spca5xx-20060402.ebuild 720
+EBUILD spca5xx-20060301.ebuild 756 RMD160 68b37cd19057ad260378c66f291dcaa909e0de63 SHA1 a421f669a5ca144cfdee34f92ea19d6fc597dd59 SHA256 3740429b3b94f8c81e89556744565b2d17f3b58e06a629158c379d601ff6ac1c
+MD5 d99ff06ba15fb61266d259d491faeb43 spca5xx-20060301.ebuild 756
+RMD160 68b37cd19057ad260378c66f291dcaa909e0de63 spca5xx-20060301.ebuild 756
+SHA256 3740429b3b94f8c81e89556744565b2d17f3b58e06a629158c379d601ff6ac1c spca5xx-20060301.ebuild 756
+EBUILD spca5xx-20060402.ebuild 758 RMD160 57fe5556e450272a7fcc62c0970ee976f501b8a9 SHA1 2ab2d7a0611a5dd3c424fa0d75aef4c919d5ddab SHA256 6810722b3348673972dfd3a964a4cee51f0608deadca8e6710b5d5d681d5a92e
+MD5 e240da179db7a3fbd052650ae022eda8 spca5xx-20060402.ebuild 758
+RMD160 57fe5556e450272a7fcc62c0970ee976f501b8a9 spca5xx-20060402.ebuild 758
+SHA256 6810722b3348673972dfd3a964a4cee51f0608deadca8e6710b5d5d681d5a92e spca5xx-20060402.ebuild 758
 EBUILD spca5xx-20060501-r1.ebuild 915 RMD160 74d2c53fd8b7b2f29f9aff8415ae4c0056483fa7 SHA1 3eab4c7808a929384df5dc8c4809e62413e90e55 SHA256 e9e81c0e9606351ada35d420b00526dc763c357a88bbb4d2f7340b01cc26ab07
 MD5 be7ee62c46dd4dd2eb9574a05831347c spca5xx-20060501-r1.ebuild 915
 RMD160 74d2c53fd8b7b2f29f9aff8415ae4c0056483fa7 spca5xx-20060501-r1.ebuild 915
@@ -41,17 +33,14 @@ EBUILD spca5xx-20060501.ebuild 848 RMD160 9e69056fc6a16d5641782bc503a866546cbcf1
 MD5 674b827a6e25374f13deec09f019dd0c spca5xx-20060501.ebuild 848
 RMD160 9e69056fc6a16d5641782bc503a866546cbcf199 spca5xx-20060501.ebuild 848
 SHA256 61e3789ca18b98f337b492e0f78348273774a04c32b9b835774c082166b978fc spca5xx-20060501.ebuild 848
-MISC ChangeLog 4014 RMD160 b5336edb2a8469e0290f2aa6331168b75585449b SHA1 83c21bb8d58f174ecdac7806cbfa0dc349c4566e SHA256 9d1da1e5e1fa526a810aa754eb87efcc1180c3aa67becd53dee3f1203ab07b35
-MD5 c9be70f7f0e7b37ab26ad830710e7749 ChangeLog 4014
-RMD160 b5336edb2a8469e0290f2aa6331168b75585449b ChangeLog 4014
-SHA256 9d1da1e5e1fa526a810aa754eb87efcc1180c3aa67becd53dee3f1203ab07b35 ChangeLog 4014
+MISC ChangeLog 4189 RMD160 7892e144b7133865f58a8670026efcc6a43f4ee6 SHA1 627783924ebc3bebd4692cee50db7c24b6a364be SHA256 b844de6e8119b40eb5b42d728bb0ed47f3991eceb9af8a1719b795caa7e30a85
+MD5 d0607007b057b7c2c172490ef075b348 ChangeLog 4189
+RMD160 7892e144b7133865f58a8670026efcc6a43f4ee6 ChangeLog 4189
+SHA256 b844de6e8119b40eb5b42d728bb0ed47f3991eceb9af8a1719b795caa7e30a85 ChangeLog 4189
 MISC metadata.xml 224 RMD160 38404e7e41fb07335d42010dc13acf089800ff81 SHA1 7a8b4b22614bfad69b006ed05d773db39af7194a SHA256 5c462d2f7ca491a9e8be04d0a498050b974c31258b264a3ee7a1495d63780502
 MD5 334e4f71306cef3c0456b8ba59bbbfe8 metadata.xml 224
 RMD160 38404e7e41fb07335d42010dc13acf089800ff81 metadata.xml 224
 SHA256 5c462d2f7ca491a9e8be04d0a498050b974c31258b264a3ee7a1495d63780502 metadata.xml 224
-MD5 d8b18fc09ac42f533bfa22a93d9f0611 files/digest-spca5xx-20060202 250
-RMD160 3e0e270d1ec6f6bcf4db059e61236107477edebb files/digest-spca5xx-20060202 250
-SHA256 e0a1396b64cad182873760370bcdf3ded972a2e21e347a5abe83512408f1e78b files/digest-spca5xx-20060202 250
 MD5 81765ce15c0f5417f1ef4865f8a0ccb0 files/digest-spca5xx-20060301 250
 RMD160 5f17a6e9887192e46cd569acb5e9fc99915b026a files/digest-spca5xx-20060301 250
 SHA256 a2ec48624e1f3c85a7c6ca462738b8b2736a8a2bba5a6c919f9e1b54ecd16a2e files/digest-spca5xx-20060301 250
@@ -67,10 +56,3 @@ SHA256 f19c6d77b0c2e40209575780dcae6e3ecdea36012c668947d85805699f5ddfdd files/di
 MD5 cf47d0f77665bce00f04fd3a0bd0d44a files/digest-spca5xx-20060501-r2 250
 RMD160 3d3f61a3c574a3828520809c3cf7f99bbb1d0de2 files/digest-spca5xx-20060501-r2 250
 SHA256 f19c6d77b0c2e40209575780dcae6e3ecdea36012c668947d85805699f5ddfdd files/digest-spca5xx-20060501-r2 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFXaU8t2vP6XvVdOcRAltdAJ9w3EKzh7KARTHPTEmSI583sFVL4gCgjPsw
-iJpyS2KvE7tUa13NtLaA+rA=
-=1Olb
------END PGP SIGNATURE-----
diff --git a/media-video/spca5xx/files/digest-spca5xx-20060202 b/media-video/spca5xx/files/digest-spca5xx-20060202
deleted file mode 100644
index 0d2dc7ff89f0..000000000000
--- a/media-video/spca5xx/files/digest-spca5xx-20060202
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5cd947396b2a0ce40e51c6edb205cc39 spca5xx-20060202.tar.gz 193391
-RMD160 c39344edd063bc8159737279c773d9e5daca243d spca5xx-20060202.tar.gz 193391
-SHA256 514a8c57240b0c7767ba359d85b7980b7eaae6021f3117ae26fa562c2c562724 spca5xx-20060202.tar.gz 193391
diff --git a/media-video/spca5xx/spca5xx-20060202.ebuild b/media-video/spca5xx/spca5xx-20060202.ebuild
deleted file mode 100644
index e943190a8dd0..000000000000
--- a/media-video/spca5xx/spca5xx-20060202.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20060202.ebuild,v 1.1 2006/02/14 16:28:33 puggy Exp $
-
-inherit linux-mod
-
-DESCRIPTION="spca5xx driver for webcams."
-HOMEPAGE="http://mxhaard.free.fr/spca5xx.html"
-SRC_URI="http://mxhaard.free.fr/spca50x/Download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-RESTRICT=""
-DEPEND=""
-RDEPEND=""
-
-MODULE_NAMES="spca5xx(usb/video:)"
-BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-BUILD_TARGETS="default"
-
-src_unpack() {
-	unpack ${A}
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	dodoc CHANGELOG INSTALL README
-	linux-mod_src_install
-}
diff --git a/media-video/spca5xx/spca5xx-20060301.ebuild b/media-video/spca5xx/spca5xx-20060301.ebuild
index 3ea206d8253c..853124fb0d02 100644
--- a/media-video/spca5xx/spca5xx-20060301.ebuild
+++ b/media-video/spca5xx/spca5xx-20060301.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20060301.ebuild,v 1.2 2006/04/14 15:54:11 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20060301.ebuild,v 1.3 2007/03/08 09:46:07 genstef Exp $
 
 inherit linux-mod
 
@@ -16,9 +16,13 @@ DEPEND=""
 RDEPEND=""
 
 MODULE_NAMES="spca5xx(usb/video:)"
-BUILD_PARAMS="KERNELDIR=${KV_DIR}"
 BUILD_TARGETS="default"
 
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
 src_unpack() {
 	unpack ${A}
 	convert_to_m ${S}/Makefile
diff --git a/media-video/spca5xx/spca5xx-20060402.ebuild b/media-video/spca5xx/spca5xx-20060402.ebuild
index 8322482e7543..8f18be0ad20a 100644
--- a/media-video/spca5xx/spca5xx-20060402.ebuild
+++ b/media-video/spca5xx/spca5xx-20060402.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20060402.ebuild,v 1.1 2006/04/14 15:54:11 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20060402.ebuild,v 1.2 2007/03/08 09:46:07 genstef Exp $
 
 inherit linux-mod
 
@@ -16,9 +16,13 @@ DEPEND=""
 RDEPEND=""
 
 MODULE_NAMES="spca5xx(usb/video:)"
-BUILD_PARAMS="KERNELDIR=${KV_DIR}"
 BUILD_TARGETS="default"
 
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
 src_unpack() {
 	unpack ${A}
 	convert_to_m ${S}/Makefile