It should RDEPEND on libusb:1, bug #436032 by Nikoli. Drop old.

Package-Manager: portage-2.1.11.19/cvs/Linux x86_64

4 files changed, 20 insertions, 97 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index dd315b973371..2ee40f1ef1c8 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.79 2012/09/23 13:10:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.80 2012/09/23 21:11:17 pacho Exp $
+
+  23 Sep 2012; Pacho Ramos <pacho@gentoo.org>
+  -system-config-printer-common-1.3.11.ebuild,
+  system-config-printer-common-1.3.11-r1.ebuild:
+  It should RDEPEND on libusb:1, bug #436032 by Nikoli. Drop old.
 
   23 Sep 2012; Agostino Sarubbo <ago@gentoo.org>
   system-config-printer-common-1.3.11-r1.ebuild:
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index d14327bbfc60..6d32369914e0 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX system-config-printer-common-1.3.9-cups_filters_path.patch 962 SHA256 ca11a0ab5b9ce124a0433d79b0c4ac9ce995f73ce12c39ca1e886b76e41b29df SHA512 6f9780fb87cb506788776dcc630a5bf30d071da9e2384c9fe8c7bb5bfa5bf81c67259da90666dde8b41b7230b480c76f6ccaddb4e3275b201cdf6f1e9c850636 WHIRLPOOL 7307c429ae0c1aae8cd6d6369765b67d7215c8eb0a64352ffad433de69ec0b631f70a61cf5647578dbf12105f37a00bdb5f3b87737f0ded8f51a134e7aadaf37
 AUX system-config-printer-common-1.3.9-split.patch 4636 SHA256 bcd20fcd357ce1730e172b753b67a34679342b82881395bc72afc2feded20558 SHA512 34df931edf965afcc93ba7951c3162b1f04d00a5263844b798771baa6860614c112fc18236ed1301a3cdd4732f2a2870b4703cbed75a8696e426fabc2e3fb2a7 WHIRLPOOL bff116ddee7d5b79778a27b83eb0343769513fa06f4dbe22f409ccb0cf56d3c15ab39e681d52823dffa812442e71ed75ffff1af5afec465dc757dbf068ee8241
 DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
 DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
-EBUILD system-config-printer-common-1.3.11-r1.ebuild 1996 SHA256 d25134e918bb9564c02e141900fdbf775e15477e40b8c79b2e7d77c2ad8567c3 SHA512 12758dfd979b9e786f3c741fbb17cd97cc432c7ccc29b54e452bcdf00231b2bec78f6cb51c7bb0bc44c1a505b899f01f120e96fa6c3ef14dad095e7d56f832a9 WHIRLPOOL becfe62a9b2ab9caf57fbdb4ae82b291cc32cc103d11d6e706d4a4effbc5133f58f1b6936f15443764ea9aefdf0d46974a53a00e4c7dcf8054c1970fc76b756f
-EBUILD system-config-printer-common-1.3.11.ebuild 1905 SHA256 6de5ee3d762698ffb631aaf0e90d07f332b2e6c1105f9ab4c16ceca88c5b94b4 SHA512 bf087ad2526d76afebddedd7f4c768a86a13dedddd716ba28125a2f49db412a8f56eb17d13bc0b968b9952a67fda0dbb1e25aa1b63557159ca035cad371376c8 WHIRLPOOL c764b492c2d19f8d85a589284db75c65d43f02b039a319eb18a5fb688eb91d3c15ac44053be925b988566f3d3aae32edf08872a1e0ef0cb63634d87531e0f746
+EBUILD system-config-printer-common-1.3.11-r1.ebuild 1998 SHA256 61e581742998ceb70f1e47343e683fab84b0210f8eee0786feffd3b0e8eb17d0 SHA512 fe755932136eeb355f1f3211ec70731a4cb6235bae54a9c512fd6810060ca9a42eb87d88a069f3fa57bf0bc24b9ab4a38609a94a2c0fbe2d7f4524200b51c24f WHIRLPOOL 1a374906943055d1e68222aad9866924e519beec89c7e423c1e0646571af026a5957b485c9d37de715a70a8c51099223ea8ed0fcb94b430ae67f0c97a4b4ef82
 EBUILD system-config-printer-common-1.3.9-r2.ebuild 2093 SHA256 c6f31ffbea94b869d34c70790fcf40a3e94086595a8de1ef03560d5301383c10 SHA512 6ea49ab7d1c48476ba24f3f6b60a390a7eb47cf673fb2c175d7e54d17f513874c1fed0d987c8244c0d0cab523c1a2dfef6ab32628d45773f7eff30abab14c865 WHIRLPOOL 9ecaf7b4fe3c8e8d04c888122710fe0d76ba2988307ad3527c321802440595edbfeb82423a0bb31dc0dfa64f09de80797cf43c3e0fe8211a1ccccd4b5b686c5f
-MISC ChangeLog 16535 SHA256 170787af15ee2ec6cfbd5b79a9e95ca4408a05be892ddf7646bb8c9cde81f102 SHA512 55a2cf96116403dc7508fb2e64381c57f37452a469755166a108ca97f4db0a97451eb4ecb086a1865bee7c58c0144a4f2a101e6ba01bb0a26e7b68e55ae0760b WHIRLPOOL 4442ae0f40cbacfa79046f64b014918f5db656791487fb7f9eacd49ab9b2f2389d5bbe828eca834282a0e67732d655ed910c43b5a7e8f02ad7d99c3f75774793
+MISC ChangeLog 16746 SHA256 50006643a14ae7d1742195e26217ec30559fc567f7f7973a33605d5fcb7e3389 SHA512 c284e0e11c34005eb0e1fb4f7eebab8fcfae088e4857f1fc92c30c7d2f35883f3e48a6ba59a259449b49f4e8547fcfe531c5190bda4f77704fc42026b8d4af74 WHIRLPOOL 1615ffb06d53bc61c086726714eb5f541a71037c22bde0452807893255a01bb41f78b5283d8b61f3911ecd5334e22924d2ef3857af8f3caf12cca7cee76f114e
 MISC metadata.xml 269 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a SHA512 2e9634524d34d3ca8b09f3212921325a7460449aff6d5307a7ee547a9d386207d772198d762ef0338325864449474a16c92653547cbdceb214ec5c9a0d9d417d WHIRLPOOL 4a6977f8e8520c7d8d5ce51b169c13d3f7fbf7bdaaaf43e03f827aa7e89017a7119ffc3b944ca5fb8ee0cff35f81a7e3d3c92682a58bc53cc361516b19c717e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBfevsACgkQCaWpQKGI+9QqRgCfSXSKG+CswzsOEnEEp92KRlPe
+K5QAnRHBruYqdU2ABr4XO72rg1OoDFIg
+=+r5f
+-----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild
index e78aaa3e5761..5c728e707903 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild,v 1.2 2012/09/23 13:10:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild,v 1.3 2012/09/23 21:11:17 pacho Exp $
 
 EAPI=4
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=dev-python/pygobject-2.21.5:2
 	net-print/cups[dbus]
 	>=sys-fs/udev-164-r2
-	virtual/libusb:0
+	virtual/libusb:1
 "
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.11.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.11.ebuild
deleted file mode 100644
index eb075f9a851e..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.11.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.11.ebuild,v 1.1 2012/08/06 00:10:17 reavertm Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-WANT_AUTOMAKE="1.11"
-
-inherit autotools eutils python
-
-MY_P=${PN%-common}-${PV}
-
-DESCRIPTION="Common modules of Red Hat's printer administration tool"
-HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="doc policykit"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# system-config-printer split since 1.1.3
-COMMON_DEPEND="
-	>=dev-libs/glib-2
-	dev-libs/libxml2[python]
-	dev-python/dbus-python
-	>=dev-python/pycups-1.9.60
-	dev-python/pycurl
-	>=dev-python/pygobject-2.21.5:2
-	net-print/cups[dbus]
-	>=sys-fs/udev-164-r2
-	virtual/libusb:0
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( dev-python/epydoc )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-admin/system-config-printer-gnome-${PV}
-	policykit? ( >=sys-auth/polkit-0.104-r1 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.3.9-split.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-nls \
-		--with-udev-rules
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		udevhelperdir=/lib/udev \
-		udevrulesdir=/lib/udev/rules.d \
-		install
-
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml -r html/
-
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postinst() {
-	python_mod_optimize cupshelpers
-}
-
-pkg_postrm() {
-	python_mod_cleanup cupshelpers /usr/share/system-config-printer
-}