summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-01-05 08:56:59 +0000
committerTim Harder <radhermit@gentoo.org>2013-01-05 08:56:59 +0000
commite856cf16d66aaae02ec966951dad8bf272fc6250 (patch)
treead09007921a0c4cb8f78f21dc2073888f38da3e4 /dev-embedded
parentRemove old. (diff)
downloadgentoo-2-e856cf16d66aaae02ec966951dad8bf272fc6250.tar.gz
gentoo-2-e856cf16d66aaae02ec966951dad8bf272fc6250.tar.bz2
gentoo-2-e856cf16d66aaae02ec966951dad8bf272fc6250.zip
Simplify dependencies.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/bitbake/ChangeLog8
-rw-r--r--dev-embedded/bitbake/bitbake-1.17.0.ebuild19
-rw-r--r--dev-embedded/bitbake/bitbake-9999.ebuild19
3 files changed, 18 insertions, 28 deletions
diff --git a/dev-embedded/bitbake/ChangeLog b/dev-embedded/bitbake/ChangeLog
index 1d4a83a31bbb..6fa043642e57 100644
--- a/dev-embedded/bitbake/ChangeLog
+++ b/dev-embedded/bitbake/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-embedded/bitbake
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.52 2012/12/08 09:32:11 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.53 2013/01/05 08:56:59 radhermit Exp $
+
+ 05 Jan 2013; Tim Harder <radhermit@gentoo.org> bitbake-1.17.0.ebuild,
+ bitbake-9999.ebuild:
+ Simplify dependencies.
08 Dec 2012; Tim Harder <radhermit@gentoo.org> -bitbake-1.15.1-r1.ebuild,
-bitbake-1.15.2.ebuild:
diff --git a/dev-embedded/bitbake/bitbake-1.17.0.ebuild b/dev-embedded/bitbake/bitbake-1.17.0.ebuild
index 4538d85a2214..1975b0249a92 100644
--- a/dev-embedded/bitbake/bitbake-1.17.0.ebuild
+++ b/dev-embedded/bitbake/bitbake-1.17.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.17.0.ebuild,v 1.1 2012/12/08 09:31:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.17.0.ebuild,v 1.2 2013/01/05 08:56:59 radhermit Exp $
EAPI="5"
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_USE="sqlite"
inherit distutils-r1 vcs-snapshot
@@ -23,17 +24,9 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="doc"
-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
- )
- dev-python/ply
+RDEPEND="dev-python/ply
dev-python/progressbar"
-DEPEND="${RDEPEND}
- doc? ( dev-libs/libxslt )"
+DEPEND="doc? ( dev-libs/libxslt )"
src_prepare() {
if ! use doc ; then
diff --git a/dev-embedded/bitbake/bitbake-9999.ebuild b/dev-embedded/bitbake/bitbake-9999.ebuild
index 0de744294191..4116be9f43df 100644
--- a/dev-embedded/bitbake/bitbake-9999.ebuild
+++ b/dev-embedded/bitbake/bitbake-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.11 2012/12/08 09:31:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.12 2013/01/05 08:56:59 radhermit Exp $
EAPI="5"
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_USE="sqlite"
inherit distutils-r1 vcs-snapshot
@@ -23,17 +24,9 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="doc"
-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
- )
- dev-python/ply
+RDEPEND="dev-python/ply
dev-python/progressbar"
-DEPEND="${RDEPEND}
- doc? ( dev-libs/libxslt )"
+DEPEND="doc? ( dev-libs/libxslt )"
src_prepare() {
if ! use doc ; then