Fix bug 354301 (depend on python[xml] instead of pyxml). Stricten system-config-printer-common version dependencies. Remove old.

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

5 files changed, 15 insertions, 175 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index 346e7c204188..d7a4b21cfa9f 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.19 2011/01/27 13:24:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.20 2011/02/16 19:00:09 reavertm Exp $
+
+  16 Feb 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  system-config-printer-gnome-1.2.2.ebuild,
+  -system-config-printer-gnome-1.2.4.ebuild,
+  -system-config-printer-gnome-1.2.5.ebuild,
+  system-config-printer-gnome-1.2.6.ebuild:
+  Fix bug 354301 (depend on python[xml] instead of pyxml). Stricten
+  system-config-printer-common version dependencies. Remove old.
 
   27 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   system-config-printer-gnome-1.2.6.ebuild:
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
index dff38f3d91e2..b8400750942f 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild,v 1.8 2010/10/28 18:50:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild,v 1.9 2011/02/16 19:00:09 reavertm Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
 WANT_AUTOMAKE="1.11"
 inherit python autotools
 
@@ -23,10 +24,9 @@ IUSE="gnome-keyring"
 RESTRICT="test"
 
 RDEPEND="
-	>=app-admin/system-config-printer-common-${PV}
+	~app-admin/system-config-printer-common-${PV}
 	dev-python/notify-python
 	>=dev-python/pygtk-2.4
-	dev-python/pyxml
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 "
 DEPEND="${RDEPEND}
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.4.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.4.ebuild
deleted file mode 100644
index bb5443139a5d..000000000000
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.4.ebuild,v 1.5 2010/10/28 18:50:55 reavertm Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-WANT_AUTOMAKE="1.11"
-inherit python autotools
-
-MY_P="${PN%-gnome}-${PV}"
-
-DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
-HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.2/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="gnome-keyring"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-RDEPEND="
-	>=app-admin/system-config-printer-common-${PV}
-	dev-python/notify-python
-	>=dev-python/pygtk-2.4
-	dev-python/pyxml
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu
-he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl
-pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
-for X in ${APP_LINGUAS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.3-split.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Disable installation of translations when LINGUAS not chosen
-	if [[ -z "${LINGUAS}" ]]; then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls"
-	fi
-
-	econf \
-		--with-desktop-vendor=Gentoo \
-		--without-udev-rules \
-		${myconf}
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	python_convert_shebangs -q -r $(python_get_version) "${D}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/system-config-printer
-}
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.5.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.5.ebuild
deleted file mode 100644
index b44986fa1752..000000000000
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.5.ebuild,v 1.3 2010/10/28 18:50:55 reavertm Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-WANT_AUTOMAKE="1.11"
-inherit python autotools
-
-MY_P="${PN%-gnome}-${PV}"
-
-DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
-HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.2/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="gnome-keyring"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-RDEPEND="
-	>=app-admin/system-config-printer-common-${PV}
-	dev-python/notify-python
-	>=dev-python/pygtk-2.4
-	dev-python/pyxml
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu
-he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl
-pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
-for X in ${APP_LINGUAS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.3-split.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Disable installation of translations when LINGUAS not chosen
-	if [[ -z "${LINGUAS}" ]]; then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls"
-	fi
-
-	econf \
-		--with-desktop-vendor=Gentoo \
-		--without-udev-rules \
-		${myconf}
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	python_convert_shebangs -q -r $(python_get_version) "${D}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/system-config-printer
-}
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild
index cf2d7bcee95f..43dbd36a8078 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild,v 1.2 2011/01/27 13:24:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.6.ebuild,v 1.3 2011/02/16 19:00:09 reavertm Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
 WANT_AUTOMAKE="1.11"
 inherit python autotools
 
@@ -26,7 +27,6 @@ RDEPEND="
 	~app-admin/system-config-printer-common-${PV}
 	dev-python/notify-python
 	>=dev-python/pygtk-2.4
-	dev-python/pyxml
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 "
 DEPEND="${RDEPEND}