summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2009-12-30 22:23:44 +0000
committerSebastian Pipping <sping@gentoo.org>2009-12-30 22:23:44 +0000
commit9717869775e148ae07b67037e75ed6d0b64d1699 (patch)
tree67858986500dbd99285b001c5ae34e5788a1bf14 /app-portage
parentVersion bump. Add support for --python2 / --python3 options (bug #296220). (diff)
downloadgentoo-2-9717869775e148ae07b67037e75ed6d0b64d1699.tar.gz
gentoo-2-9717869775e148ae07b67037e75ed6d0b64d1699.tar.bz2
gentoo-2-9717869775e148ae07b67037e75ed6d0b64d1699.zip
app-portage/layman: Fix dependencies
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/layman/ChangeLog6
-rw-r--r--app-portage/layman/layman-1.1.1.ebuild6
-rw-r--r--app-portage/layman/layman-1.2.3.ebuild10
-rw-r--r--app-portage/layman/layman-1.2.4.ebuild10
-rw-r--r--app-portage/layman/layman-9999.ebuild10
5 files changed, 30 insertions, 12 deletions
diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 2f40ee4ef5b0..813c4bc8459a 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-portage/layman
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.81 2009/12/29 11:45:14 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.82 2009/12/30 22:23:44 sping Exp $
+
+ 30 Dec 2009; Sebastian Pipping <sping@gentoo.org> layman-1.1.1.ebuild,
+ layman-1.2.3.ebuild, layman-1.2.4.ebuild, layman-9999.ebuild:
+ Fix dependency for xml.dom.minidom imports
29 Dec 2009; Sebastian Pipping <sping@gentoo.org> layman-1.1.1.ebuild:
Add dependency on pyxml for xml.dom.minidom (bug #264263)
diff --git a/app-portage/layman/layman-1.1.1.ebuild b/app-portage/layman/layman-1.1.1.ebuild
index 3ea9f7df59c3..c0d3db785aa1 100644
--- a/app-portage/layman/layman-1.1.1.ebuild
+++ b/app-portage/layman/layman-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild,v 1.15 2009/12/29 11:45:14 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild,v 1.16 2009/12/30 22:23:44 sping Exp $
EAPI="2"
NEED_PYTHON=2.5
@@ -16,7 +16,9 @@ SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="subversion test"
-COMMON_DEPS="dev-python/pyxml"
+COMMON_DEPS="|| (
+ dev-lang/python[xml]
+ ( dev-lang/python dev-python/pyxml ) )"
DEPEND="${COMMON_DEPS}
test? ( dev-util/subversion )"
RDEPEND="${COMMON_DEPS}
diff --git a/app-portage/layman/layman-1.2.3.ebuild b/app-portage/layman/layman-1.2.3.ebuild
index 98ec4faf840f..6bb50bb6d9b1 100644
--- a/app-portage/layman/layman-1.2.3.ebuild
+++ b/app-portage/layman/layman-1.2.3.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild,v 1.10 2009/05/24 22:09:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild,v 1.11 2009/12/30 22:23:44 sping Exp $
EAPI="2"
+NEED_PYTHON=2.5
inherit eutils distutils
@@ -15,9 +16,12 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="git subversion test"
-DEPEND="dev-python/pyxml
+COMMON_DEPS="|| (
+ dev-lang/python[xml]
+ ( dev-lang/python dev-python/pyxml ) )"
+DEPEND="${COMMON_DEPS}
test? ( dev-util/subversion )"
-RDEPEND=">=dev-lang/python-2.5
+RDEPEND="${COMMON_DEPS}
git? ( dev-util/git )
subversion? (
|| (
diff --git a/app-portage/layman/layman-1.2.4.ebuild b/app-portage/layman/layman-1.2.4.ebuild
index 92441baaaf1d..cf841604796e 100644
--- a/app-portage/layman/layman-1.2.4.ebuild
+++ b/app-portage/layman/layman-1.2.4.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.4.ebuild,v 1.2 2009/12/05 00:44:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.4.ebuild,v 1.3 2009/12/30 22:23:44 sping Exp $
EAPI="2"
+NEED_PYTHON=2.5
SUPPORT_PYTHON_ABIS="1"
inherit eutils distutils
@@ -16,9 +17,12 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="git subversion test"
-DEPEND="dev-python/pyxml
+COMMON_DEPS="|| (
+ dev-lang/python[xml]
+ ( dev-lang/python dev-python/pyxml ) )"
+DEPEND="${COMMON_DEPS}
test? ( dev-util/subversion )"
-RDEPEND=">=dev-lang/python-2.5
+RDEPEND="${COMMON_DEPS}
git? ( dev-util/git )
subversion? (
|| (
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index a6519c98a313..bdc7f6127009 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.1 2009/12/29 00:29:40 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.2 2009/12/30 22:23:44 sping Exp $
EAPI="2"
+NEED_PYTHON=2.5
SUPPORT_PYTHON_ABIS="1"
inherit eutils distutils git
@@ -17,10 +18,13 @@ SLOT="0"
KEYWORDS=""
IUSE="git subversion test"
-DEPEND="dev-python/pyxml
+COMMON_DEPS="|| (
+ dev-lang/python[xml]
+ ( dev-lang/python dev-python/pyxml ) )"
+DEPEND="${COMMON_DEPS}
test? ( dev-util/subversion )
app-text/xmlto"
-RDEPEND=">=dev-lang/python-2.5
+RDEPEND="${COMMON_DEPS}
git? ( dev-util/git )
subversion? (
|| (