Fix dependencies. Call python_pkg_setup().

Package-Manager: portage-2.2.0_alpha19_p2/cvs/Linux x86_64

4 files changed, 16 insertions, 32 deletions

diff --git a/dev-embedded/bitbake/ChangeLog b/dev-embedded/bitbake/ChangeLog
index 1c4ca510f5ea..d8899bef7f54 100644
--- a/dev-embedded/bitbake/ChangeLog
+++ b/dev-embedded/bitbake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/bitbake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.26 2011/01/26 07:19:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.27 2011/01/26 16:40:21 arfrever Exp $
+
+  26 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  bitbake-1.10.2.ebuild, bitbake-9999.ebuild:
+  Fix dependencies. Call python_pkg_setup().
 
 *bitbake-1.10.2 (26 Jan 2011)
 
diff --git a/dev-embedded/bitbake/Manifest b/dev-embedded/bitbake/Manifest
index 44692e801114..8aa0829bce12 100644
--- a/dev-embedded/bitbake/Manifest
+++ b/dev-embedded/bitbake/Manifest
@@ -1,23 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST bitbake-1.10.2.tar.gz 162966 RMD160 bafe8a0fe62d56b56f99572e3df0696024349e0d SHA1 9a6e0f4b3ba388f6d8bb86139a886b1a3a95b065 SHA256 06607bb805e8d6cfd53290633fe2a2f10d9aa1bb2e057db4185a6685dc62c5e4
 DIST bitbake-1.8.12.tar.gz 126371 RMD160 63218a463317dad5aa5de8b9c2cc6c82b24ef855 SHA1 14cdad62c3486069fd23c5a96e2949e2a1eb8646 SHA256 ee81df164f8476dfe44c1841a27b3a0db49dea382c38d5ffb7e19a4747ca17af
 DIST bitbake-1.8.18.tar.gz 128809 RMD160 cdc2000eb08d86e682f00d656c3dcaf33798824b SHA1 95ef599a2c71cd956222f3288805db2945f75791 SHA256 1bdc5ec02a4e4ce3b90393d8ae731e1453530c7d781de847dbff4f17b9446dbf
-EBUILD bitbake-1.10.2.ebuild 1116 RMD160 3b9cad854f49036de9c3be222769a6e384e2dbf9 SHA1 2665f8b7c10bbcd475724b5ffb26f203907a743b SHA256 2f7ef8c520100c2eca6210731e4f39746135395fe3c6604d322f02d95dd163d9
+EBUILD bitbake-1.10.2.ebuild 1173 RMD160 d382a1522c6018e7dc74098665a6a44c8b14b9f3 SHA1 7284c38e482785135c7ebeddea94045b6875a315 SHA256 9318415f994be699ef19fac9f5ebe73e658c4a4c351dbfdce89fc5b9966f6183
 EBUILD bitbake-1.8.12.ebuild 568 RMD160 e641982f39eb767ba431dec36b570d6a411836f6 SHA1 ac445f69c48d6175a6702348daf09f6f4d4d0268 SHA256 1629c0349d6a9d1d16f2c6d7e765abc0019ad31d64aae9c92a139306a51cf830
 EBUILD bitbake-1.8.18-r1.ebuild 715 RMD160 27dc965066c2cf2c4c3963daa97393280f571d9b SHA1 1bcfc419bba812192a958d7b9b79167e8ade92f4 SHA256 c92b556a5df5a5008767e095e1cc1b7015a1c187ce8f1ec6cf2be7673a4bc001
-EBUILD bitbake-9999.ebuild 1098 RMD160 0d33cc7881c9d8a7cdc460c92a6025f3a9479b4b SHA1 e13eeb0358c4dcaee33965a2a6b58d1dc1ba59a9 SHA256 5a9d8cedbe7e620394b1218de0e6417e7ed9ed1135a590baaa65a0b42b39946e
-MISC ChangeLog 3810 RMD160 f6ec73dd44b4605900aead45d5fdf6eb9a85a5c5 SHA1 fa3ad11569065a654f31a700338a934e11bc6f86 SHA256 78e3337487b8fad442bb398ca6b8840a67bbf4095e9833434f0cc107b51ae882
+EBUILD bitbake-9999.ebuild 1155 RMD160 5d79f6108cbacb57e799c816e3c8cc659d2f1df9 SHA1 7419c53d8cbb360fffdafcb9319fc82fd7217541 SHA256 536307bf8f02c20e3b58f72ef538af966bd7bbc23bc3b0df04a2bbfb1ff80164
+MISC ChangeLog 3974 RMD160 14b8dade069a9b7b7dbfe059a91e88afbc8e31de SHA1 8ce286ba3cc5f84c9a35301eaae93b0482e71ba6 SHA256 7126925e7cba79fcc0ca807d0afee05380c4b4ebcb15fd782a06dd1218375552
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNP8sJAAoJEEqz6FtPBkyjpdoH/25oPX8NGU6piSAWyawQgBld
-npxb0aT/BL8EsmVGDuOCtvbORvao9IsbRPA+m8BC2sg5TNIEv6bmO3gPwGWgs5Gi
-by1vn9HGyQV9TO+NEk7Vjh8I/EMs7sIb5lmKdH+eVPxhkpRNGAxdSwIdE41QNPS3
-ZVaB0V/4W6eH7l98Axs1rJ+wOy9hPWn1WNy4iNYul2fwWUiFbUZ/6qkBjf7BLAkp
-RZYTP/nW0K0xNL8wss29TnUluk+B5XIE7jeV3R1/J5pf3vc9ATdhwoZ4hkbBDkYL
-FNHJL7F77y9Sl21bB1biHDQH2ozN3wE4IPJ5nLIjF1hRgbVgmdY1dHIF92kZFLo=
-=SKDL
------END PGP SIGNATURE-----
diff --git a/dev-embedded/bitbake/bitbake-1.10.2.ebuild b/dev-embedded/bitbake/bitbake-1.10.2.ebuild
index 15d1c4c43951..ea6fa1cfbb48 100644
--- a/dev-embedded/bitbake/bitbake-1.10.2.ebuild
+++ b/dev-embedded/bitbake/bitbake-1.10.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild,v 1.1 2011/01/26 07:19:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild,v 1.2 2011/01/26 16:40:21 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
 
-inherit distutils python
+inherit distutils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
@@ -24,16 +24,13 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc"
 
-RDEPEND="
-	|| (
-		>=dev-lang/python-2.5[sqlite]
-		>=dev-python/pysqlite-2.3.2
-	)"
+RDEPEND="|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt )"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-embedded/bitbake/bitbake-9999.ebuild b/dev-embedded/bitbake/bitbake-9999.ebuild
index f9adf760bb3e..dfef58dd91e5 100644
--- a/dev-embedded/bitbake/bitbake-9999.ebuild
+++ b/dev-embedded/bitbake/bitbake-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.7 2011/01/26 07:19:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.8 2011/01/26 16:40:21 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
 
-inherit distutils python
+inherit distutils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
@@ -24,16 +24,13 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc"
 
-RDEPEND="
-	|| (
-		>=dev-lang/python-2.5[sqlite]
-		>=dev-python/pysqlite-2.3.2
-	)"
+RDEPEND="|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt )"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {