summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2014-02-25 12:40:00 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2014-02-25 12:40:00 +0000
commit0efd3a30322680881a1236eb4e42cb1754819323 (patch)
tree71279af6f0583d22a37c9379c04bd3950da54280 /dev-util/osc
parentUse virtual/python-argparse instead dev-python/argparse (bug #502328) (diff)
downloadgentoo-2-0efd3a30322680881a1236eb4e42cb1754819323.tar.gz
gentoo-2-0efd3a30322680881a1236eb4e42cb1754819323.tar.bz2
gentoo-2-0efd3a30322680881a1236eb4e42cb1754819323.zip
we want python[xml] not pyxml.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'dev-util/osc')
-rw-r--r--dev-util/osc/ChangeLog6
-rw-r--r--dev-util/osc/osc-0.143.0.ebuild4
-rw-r--r--dev-util/osc/osc-9999.ebuild6
3 files changed, 10 insertions, 6 deletions
diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index 061755200e4c..19fb785e5348 100644
--- a/dev-util/osc/ChangeLog
+++ b/dev-util/osc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/osc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.26 2014/02/23 16:26:00 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.27 2014/02/25 12:40:00 scarabeus Exp $
+
+ 25 Feb 2014; Tomáš Chvátal <scarabeus@gentoo.org> osc-0.143.0.ebuild,
+ osc-9999.ebuild:
+ we want python[xml] not pyxml.
*osc-0.143.0 (23 Feb 2014)
diff --git a/dev-util/osc/osc-0.143.0.ebuild b/dev-util/osc/osc-0.143.0.ebuild
index f2728e084c8c..5bb21f6fb650 100644
--- a/dev-util/osc/osc-0.143.0.ebuild
+++ b/dev-util/osc/osc-0.143.0.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.143.0.ebuild,v 1.1 2014/02/23 16:26:00 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.143.0.ebuild,v 1.2 2014/02/25 12:40:00 scarabeus Exp $
EAPI=5
EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
if [[ "${PV}" == "9999" ]]; then
EXTRA_ECLASS="git-2"
@@ -34,7 +35,6 @@ KEYWORDS="~amd64 ~x86"
DEPEND="
dev-python/urlgrabber[${PYTHON_USEDEP}]
- dev-python/pyxml[${PYTHON_USEDEP}]
app-arch/rpm[python,${PYTHON_USEDEP}]
dev-python/m2crypto[${PYTHON_USEDEP}]
${PYTHON_DEPS}
diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index 70f53a544c6e..b836046d1b75 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.13 2013/07/24 17:40:50 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.14 2014/02/25 12:40:00 scarabeus Exp $
EAPI=5
EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
if [[ "${PV}" == "9999" ]]; then
EXTRA_ECLASS="git-2"
@@ -34,7 +35,6 @@ KEYWORDS="~amd64 ~x86"
DEPEND="
dev-python/urlgrabber[${PYTHON_USEDEP}]
- dev-python/pyxml[${PYTHON_USEDEP}]
app-arch/rpm[python,${PYTHON_USEDEP}]
dev-python/m2crypto[${PYTHON_USEDEP}]
${PYTHON_DEPS}