Fix compability with sys-fs/udev >= 185 wrt #423423 by Maksim Melnikau

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 163 insertions, 2 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index a62d1851c056..54ead48d8beb 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.73 2012/06/25 07:57:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.74 2012/07/05 09:09:03 ssuominen Exp $
+
+*system-config-printer-common-1.3.9-r3 (05 Jul 2012)
+
+  05 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +system-config-printer-common-1.3.9-r3.ebuild,
+  +files/system-config-printer-common-1.3.9-udev185.patch:
+  Fix compability with sys-fs/udev >= 185 wrt #423423 by Maksim Melnikau
 
   25 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   system-config-printer-common-1.3.9-r2.ebuild:
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index cacff0bfbd2d..962b8a907b65 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX system-config-printer-common-1.3.5-split.patch 4624 SHA256 fc865303bf8c40b8a2964fed7cad48c6e943312be1be631951cca5b3b81a490d SHA512 b639fea7597e6d34a86bc910f24629192d8394f04dce13598fb88521915326fcea51da1e7fc3159325e0f339d1fed060f12427f9ab8941e28983dda11afaf1ae WHIRLPOOL ca6ecbce0480e7292655eacbfbbcf2c61137d65b05918b055b5fd86aec735300d5f81d244e9132983ecfc26b3f6656a815047155842816050d76359869027538
 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
+AUX system-config-printer-common-1.3.9-udev185.patch 1420 SHA256 ea2f55276a91b2d186d7c01439af65febf0f6bdd7503763196a540aa483df221 SHA512 b324235922f5a27e1d1c91d0b913622e3c9861e66483f04bae4211d5ae44d09b18526b8c2d1c089c8669e0d4faa9478b2dc72e014f110943f81882cdfdc373f0 WHIRLPOOL a9ea7f28500aa90993c3bf0fcddaf330295cc737903c19d18801c904abf217721519b714d6df5cbd3420dbd726cefb4c6824d882b172f14ea7f131cfa5ebdbf5
 DIST system-config-printer-1.3.6.tar.xz 988332 SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013 SHA512 22556b44ac56ef4100753c27d3c5e26ff772f305d54bb13753b7c7a965e31d155e8893a0c4688119fd575a17962f22154bb2e518830121498f98dfc1f95d4978 WHIRLPOOL 94b3bdb2ecf08091c2a0d7953136cff86d305c2ce08d990d61841d753f6a2b1d2308384a020789189acf1506f66e2c9f19285f0d4e69aa6ad85cd96950c27ac4
 DIST system-config-printer-1.3.7.tar.xz 990392 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a SHA512 396a1f7dd346c10bda7cfe509a66e69232b55913275fb6026c1c3120a5ce0f37360776ca54c614c14fec83fa4d7af02a1467bc3623ee059b109d09012095ae5d WHIRLPOOL ffeae0a0d61ab11369f959c3d1fd0e0658b90de12c4dbd773c6f7825cc55e1f4834f5cb75af6629baa416a02cf9d2bc55a14e7dc98958decf8bd7f117c91ebd6
 DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
 EBUILD system-config-printer-common-1.3.6.ebuild 2042 SHA256 0e5f543aa37a51f5b9f3dc1e3f845a4292cba1253751fe7d62a702a33968544f SHA512 69c3996fe7c640442fa1d553b574c929f6bfdfc18d8b41900066cc486d1025eeff7665ae3202c29f79daf7eddf47c7a6f3955b091be93f78d04cef5c4f275274 WHIRLPOOL fd049828a1425ac619d6ee0fee080ce8773dcb0e77e792347f970914cd75a95af59c509d712b500df1d4b7c304d32a63691bd3ebe47f8dd0eb82a2bdef62bc0f
 EBUILD system-config-printer-common-1.3.7.ebuild 2051 SHA256 61bf233fc1e67e46c6c94723ffa328a2c87b1ccf9afcc9c9f94dac9371c7e842 SHA512 9d12453611d3dd9bc18fabd9dffa39533ccfd5ef46f013252235d9a68e6dd9441c6f069b1ab63015dd65a0321413496a78208f5ecacd4ee2103b69f88003486e WHIRLPOOL 71bdda338dda73efc1f4cab3ca87d5e964b1e704d2e538352656d67bcd9b0803fa359a5216fe1b7cd5d5fc758ec9de250e069bf54fbe1ab68b2b577ebe129b33
 EBUILD system-config-printer-common-1.3.9-r2.ebuild 2098 SHA256 52a7a0876ba11c3b671b7fec4b33886c4a82cff692334518b405365373f3aac9 SHA512 6458f3f29c092f8b46614b19f7429ca64107012939e00a5f77f95ee90d52fbf17567ff0f66073f48aabad2dd82da07faccc329efbe2ebc4ad98bd2c3119a7b1b WHIRLPOOL 593865a27dccc96af37ff15ea3f035718a543bf1089857ba7392cb06f211e59e7042d528470bc55711ef667749885a2fbdfab37122982c84542faf3414d09b58
-MISC ChangeLog 14700 SHA256 ea9a441e3d533714270bb785fb9f4d985300dbc16b2cb6b7a54422b0c6abc6df SHA512 86461a1a81278e94a5d0863f8af601c2a410bdecdc6502ab9a40c269ee5de0c5c428d5d10cb695ba1032afec2e0bfc725d6d54ccead3d2a74d49d96a23434114 WHIRLPOOL 04a3ddf88b3dc654ff2a28f8664248ad6b25ad4227f625c247d505efd56382394f562db58abbfffde40771ec02dc0b97c80485c65fde117b568d7116ebd07a4a
+EBUILD system-config-printer-common-1.3.9-r3.ebuild 2014 SHA256 980613d011d378087a8ab1628e7489f1354f43d39623cdad82c7b4829fe4f2ff SHA512 87cb47c3ba54c858916b88d9a64533f14568868247bb8b95597fe35bcc7bd9ff383ece5a63776f996efcf00dde48276f5566e786584b8f5944f3a1e74a5f434a WHIRLPOOL 05a430e6d6a56a9819e9698ad436f773575c2c123a5bf55ed8ece5f22836738606cbec056efe0d97f8e8bd53e12b289376445d0c36433dd3fb59fada405eb424
+MISC ChangeLog 14990 SHA256 f612ce4c4fe05a0bb0eddc054852ddf8178c6d907481fbebd4b91dc5caacc38f SHA512 f18d84bc9599ec130e529f8af11c46125c2cd806b3956ac109fbf3c58e0905ab4bdc44e3d67167215775e2cf7efdad21cb913b69913a190c2b0d39e276f435c9 WHIRLPOOL 92d5e22a9d14e33417c54e8b4a75f99fbb32f7bc2f5ed4e96e44084621eeb4391978d6373d34befc8d232582b7747fe83e6b844aeddc7f7544e31887e6a617a6
 MISC metadata.xml 269 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a SHA512 2e9634524d34d3ca8b09f3212921325a7460449aff6d5307a7ee547a9d386207d772198d762ef0338325864449474a16c92653547cbdceb214ec5c9a0d9d417d WHIRLPOOL 4a6977f8e8520c7d8d5ce51b169c13d3f7fbf7bdaaaf43e03f827aa7e89017a7119ffc3b944ca5fb8ee0cff35f81a7e3d3c92682a58bc53cc361516b19c717e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEbBAEBAgAGBQJP9VhlAAoJEEdUh39IaPFNUQ0H+NgspwnhZL7wWP5VCKjAACQk
+RbCfgZJY2Ywb3eUFiFPBNUP2BojEzfEXaG0bKpRUISA5hExtnDOmdVlc6JiK2fWt
++NVzQABHL47Nl5CveTznwwQMNe6FWeTSgdfdkoX8CwMZZ2OyZH4r7ZgQrwkXUMnJ
+DXR7CEPz1Jf3wXxnl23ZzUD9U4VL4zeWxNPVXtYvqAt8nGzBlBiPHDROKgTWDTUz
+BrBbptGAdeTlrA463Drqq8WfFUTGguZIMmET9YrtuaKYZGTY2fHyTAeHyCckuLiq
+6JBlWTXsh7pq9ggSYgJfK8kQwoWuVE/UC3S/Q3pYwzKe43YqY0vj4mUAm5kT9w==
+=ijvr
+-----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-udev185.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-udev185.patch
new file mode 100644
index 000000000000..7be5547229f2
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-udev185.patch
@@ -0,0 +1,45 @@
+From cbacff0c9f7e3e6549c9b33a42e805a935db36e6 Mon Sep 17 00:00:00 2001
+From: Jiri Popelka <jpopelka@redhat.com>
+Date: Tue, 5 Jun 2012 14:28:36 +0200
+Subject: [PATCH] udev: replace udev_get_sys_path() with hard-coded "/sys"
+ (trac #223)
+
+udev_get_sys_path() is no longer provided by libudev
+---
+ udev/udev-configure-printer.c |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
+index 1d89f9a..8d349e4 100644
+--- a/udev/udev-configure-printer.c
++++ b/udev/udev-configure-printer.c
+@@ -451,7 +451,6 @@ device_id_from_devpath (const char *devpath,
+   struct usb_uri_map_entry *entry;
+   struct udev *udev;
+   struct udev_device *dev, *parent_dev = NULL;
+-  const char *sys;
+   const char *idVendorStr, *idProductStr, *serial;
+   char *end;
+   unsigned long idVendor, idProduct;
+@@ -500,8 +499,7 @@ device_id_from_devpath (const char *devpath,
+       *dest = '\0';
+     }
+ 
+-  sys = udev_get_sys_path (udev);
+-  syslen = strlen (sys);
++  syslen = strlen ("/sys");
+   devpathlen = strlen (devpath);
+   syspath = malloc (syslen + devpathlen + 1);
+   if (syspath == NULL)
+@@ -511,7 +509,7 @@ device_id_from_devpath (const char *devpath,
+       exit (1);
+     }
+ 
+-  memcpy (syspath, sys, syslen);
++  memcpy (syspath, "/sys", syslen);
+   memcpy (syspath + syslen, devpath, devpathlen);
+   syspath[syslen + devpathlen] = '\0';
+ 
+-- 
+1.7.10.2
+
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild
new file mode 100644
index 000000000000..381fe5728eab
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r3.ebuild
@@ -0,0 +1,93 @@
+# 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.9-r3.ebuild,v 1.1 2012/07/05 09:09:03 ssuominen 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-1.4.6[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 \
+		"${FILESDIR}"/${PN}-1.3.9-cups_filters_path.patch \
+		"${FILESDIR}"/${PN}-1.3.9-udev185.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
+}