diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-26 16:40:21 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-26 16:40:21 +0000 |
| commit | eda876442a1d6f52b9eeeca2ed97969bf1c0a604 (patch) | |
| tree | 59c6700a7c5c0c721375147550e1fda64170e745 /dev-embedded | |
| parent | restrict=test bug #279330; eapi=3; removed unneeded check of vdr's extpatch v... (diff) | |
| download | gentoo-2-eda876442a1d6f52b9eeeca2ed97969bf1c0a604.tar.gz gentoo-2-eda876442a1d6f52b9eeeca2ed97969bf1c0a604.tar.bz2 gentoo-2-eda876442a1d6f52b9eeeca2ed97969bf1c0a604.zip | |
Fix dependencies. Call python_pkg_setup().
(Portage version: 2.2.0_alpha19_p2/cvs/Linux x86_64)
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/bitbake/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-embedded/bitbake/bitbake-1.10.2.ebuild | 11 | ||||
| -rw-r--r-- | dev-embedded/bitbake/bitbake-9999.ebuild | 11 |
3 files changed, 13 insertions, 15 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/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() { |