From b16cbecb4704291504098de9b291ad2c211679b9 Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Wed, 11 Jan 2012 18:57:07 +0000
Subject: [PATCH] We need newer udev for udev_enumerate_add_match_tag usage,
 DEPENDing on 164-r2 as it's the older version I have tested it works (bug
 #398499 by Peter Gantner). Remove old.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
---
 .../system-config-printer-common/ChangeLog    | 11 ++-
 .../system-config-printer-common/Manifest     | 12 +--
 .../system-config-printer-common-1.3.3.ebuild | 93 -------------------
 .../system-config-printer-common-1.3.7.ebuild |  6 +-
 4 files changed, 17 insertions(+), 105 deletions(-)
 delete mode 100644 app-admin/system-config-printer-common/system-config-printer-common-1.3.3.ebuild

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index f809d3319f18..8252bce4e583 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/system-config-printer-common
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.55 2011/12/29 17:12:18 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.56 2012/01/11 18:57:07 pacho Exp $
+
+  11 Jan 2012; Pacho Ramos <pacho@gentoo.org>
+  -system-config-printer-common-1.3.3.ebuild,
+  system-config-printer-common-1.3.7.ebuild:
+  We need newer udev for udev_enumerate_add_match_tag usage, DEPENDing on 164-r2
+  as it's the older version I have tested it works (bug #398499 by Peter
+  Gantner). Remove old.
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org>
   system-config-printer-common-1.3.7.ebuild:
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 172b9a8bc20b..a49a3a3c38f2 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -3,18 +3,16 @@ Hash: SHA1
 
 AUX system-config-printer-common-1.3.3-split.patch 4750 RMD160 5570ac03f404556d07c4d4034ed5dd17f29afcf3 SHA1 5bd72fd6b8adb757f089a97784bf1f2c21d25317 SHA256 391cf80675c55787afadb3ffe3556ad7830802b4f959b0e04838f00c5b1d7cbc
 AUX system-config-printer-common-1.3.5-split.patch 4624 RMD160 ec78e57b1cb15f0072193a9f31b2331111286840 SHA1 f0a23a1503d0e928d500dabfeeb530933969884f SHA256 fc865303bf8c40b8a2964fed7cad48c6e943312be1be631951cca5b3b81a490d
-DIST system-config-printer-1.3.3.tar.xz 994588 RMD160 274786bc7805d86229bf7da411cc038a0f15200e SHA1 44f0f199251bf5dcec16cf9c9d5536448e719a51 SHA256 5001a4fc1616cd2b7a578055e6cd8bee0afa3f9ce3b29cc04971385cf4af7ea2
 DIST system-config-printer-1.3.6.tar.xz 988332 RMD160 6981d300468a547877345c7842b5930fbaf4cbb9 SHA1 7c2365b6f3dd0ccdedddcd9788d736227ce7858f SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013
 DIST system-config-printer-1.3.7.tar.xz 990392 RMD160 26a88af68bd8d376c5aeed2e83a9dadf9b850a5f SHA1 7020aa0f07db4a2d301949468bb67fe4c1867712 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a
-EBUILD system-config-printer-common-1.3.3.ebuild 2038 RMD160 7fce50bc35bd661990ce18ee270174ad3f27be94 SHA1 00f7eace3b47c8a851347cc3addaa7275b766d5d SHA256 2c01ce2b633afef1a9679383600bfa3346a8df27a7c04d8fd7fde6f35e603301
 EBUILD system-config-printer-common-1.3.6.ebuild 2034 RMD160 6a5ce961b091433cf3d5b84a7fac0b88128c963a SHA1 9710025201dcc59b109331fdccc755de6816737d SHA256 b7265ecc347ee9da09518b8d2f8b64f84a8e9cc0bb9dcbe217e827514fab08ef
-EBUILD system-config-printer-common-1.3.7.ebuild 2039 RMD160 6bc9335c0b352dceafa44414de1678beb348d094 SHA1 38e77aaf159087b68e81596a645dfffc0298b47b SHA256 2ec4a75a237efaf5e590658bad677095db9ccafbb532e2e4a5e345570e79639a
-MISC ChangeLog 11384 RMD160 43f0202964eb36cf0147054d90b28ee9b83fcaa9 SHA1 5cec4c25d11fd8714659ddbe45380e015f99f545 SHA256 56a3ade799a1074c94d123f53caaced7790752c9c37213c76ac73837a9a77ead
+EBUILD system-config-printer-common-1.3.7.ebuild 2048 RMD160 36b11e41a13e8d02e4e12eead527262c7734437d SHA1 2f17f6f508a13e18da09156295ea1f3d85ad62c5 SHA256 1b628e50565dade1e7b5b5b6575d622fc732bcbf3e5e665880016f066096fb57
+MISC ChangeLog 11700 RMD160 db9b9d362bed5a361767e291ca133e53f9066edb SHA1 1b24cfd431fcaa5fcd1c9b7442481389e2e13b57 SHA256 e0f518b3407357ab96dd2cabf7170d9e128c32fb0c0e9921cbd5c9e1b241b510
 MISC metadata.xml 269 RMD160 cb38f7cfbdb499867255963abc339ddddf5a76df SHA1 ec25a6b2b03cc49b554ef0e822c1acad1384a3d0 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk78n3gACgkQCaWpQKGI+9QjZQCdGxXWq+B1rN0Cacw6WUArd+/L
-wa8AnimvyeSb2a2odXfQZgo2Fp9MoxPw
-=YOyk
+iEYEARECAAYFAk8N24kACgkQCaWpQKGI+9SgdQCghEwQH/l54PIJAQgco8xtJIeb
+slcAnRvX31OQhDk7awX/jfvUtkhLMCW8
+=q3mi
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.3.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.3.ebuild
deleted file mode 100644
index 1dee718185fa..000000000000
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-common/system-config-printer-common-1.3.3.ebuild,v 1.11 2011/10/23 21:37:20 tetromino Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-WANT_AUTOMAKE="1.11"
-inherit python autotools
-
-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/system-config-printer/1.3/${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.53
-	>=dev-python/pygobject-2.21.5:2
-	>=net-print/cups-1.4.6[dbus]
-	sys-fs/udev
-	virtual/libusb:0
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	doc? ( dev-python/epydoc )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-admin/system-config-printer:0
-	!<app-admin/system-config-printer-gnome-${PV}
-	policykit? ( sys-auth/polkit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.3-split.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-nls \
-		--with-udev-rules
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r html/ || die "installing html docs failed"
-	fi
-
-	emake DESTDIR="${ED}" install \
-		udevrulesdir=/lib/udev/rules.d \
-		udevhelperdir=/lib/udev \
-		|| die "emake install failed"
-
-	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
-}
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
index 4c9fe4539e26..5252b894ce4f 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.7.ebuild,v 1.4 2011/12/29 17:12:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild,v 1.5 2012/01/11 18:57:07 pacho Exp $
 
 EAPI="3"
 
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	>=dev-python/pycups-1.9.53
 	>=dev-python/pygobject-2.21.5:2
 	>=net-print/cups-1.4.6[dbus]
-	sys-fs/udev
+	>=sys-fs/udev-164-r2
 	virtual/libusb:0
 "
 DEPEND="${COMMON_DEPEND}
-- 
2.26.2