Use udev.pc pkg-config file to query correct udevhelperdir and udevrulesdir.

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

3 files changed, 107 insertions, 5 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 1c139411f291..b2a23f0ddced 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,12 @@
 # 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.77 2012/08/06 00:10:17 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.78 2012/08/08 17:15:29 ssuominen Exp $
+
+*system-config-printer-common-1.3.11-r1 (08 Aug 2012)
+
+  08 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +system-config-printer-common-1.3.11-r1.ebuild:
+  Use udev.pc pkg-config file to query correct udevhelperdir and udevrulesdir.
 
 *system-config-printer-common-1.3.11 (06 Aug 2012)
 
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 0c47cc30d6b4..bf4d98572130 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -5,14 +5,19 @@ AUX system-config-printer-common-1.3.9-cups_filters_path.patch 962 SHA256 ca11a0
 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 2003 SHA256 0782a2572cd4ff2fe6027c65bf510043a2c969245b7fea00c63c77a3efad94ee SHA512 63d8a8e30f9f1725082e41e2b4f5fd9d326f1057b624cf7bbef2f2d910e52b45ee3dbb7f9cd858311c9dc870406b4988a32350804f02a892937a6bdfa4f84045 WHIRLPOOL 8e2c55df036c6c97520eb2c27a4d70357cb4449ac7b5a2d4386ef89cf606e0276f7bff152a63c07a62f28f9896eab82bba692e02ba517b96dac2b4696fa8a5bd
 EBUILD system-config-printer-common-1.3.11.ebuild 1905 SHA256 6de5ee3d762698ffb631aaf0e90d07f332b2e6c1105f9ab4c16ceca88c5b94b4 SHA512 bf087ad2526d76afebddedd7f4c768a86a13dedddd716ba28125a2f49db412a8f56eb17d13bc0b968b9952a67fda0dbb1e25aa1b63557159ca035cad371376c8 WHIRLPOOL c764b492c2d19f8d85a589284db75c65d43f02b039a319eb18a5fb688eb91d3c15ac44053be925b988566f3d3aae32edf08872a1e0ef0cb63634d87531e0f746
 EBUILD system-config-printer-common-1.3.9-r2.ebuild 2093 SHA256 c6f31ffbea94b869d34c70790fcf40a3e94086595a8de1ef03560d5301383c10 SHA512 6ea49ab7d1c48476ba24f3f6b60a390a7eb47cf673fb2c175d7e54d17f513874c1fed0d987c8244c0d0cab523c1a2dfef6ab32628d45773f7eff30abab14c865 WHIRLPOOL 9ecaf7b4fe3c8e8d04c888122710fe0d76ba2988307ad3527c321802440595edbfeb82423a0bb31dc0dfa64f09de80797cf43c3e0fe8211a1ccccd4b5b686c5f
-MISC ChangeLog 16166 SHA256 6d4af60ea4cd8467bd924e376caa60108cd33c0c5138a17ea09ca6aac29e9745 SHA512 5316b7a2b7f3d195bcb7915b49ababba02aedc69d719a0c6c1c923f0fd1baf167cca653039ede815b0d1d02da9c273b8fbf7c56a415f0a199c3e616398c4e09a WHIRLPOOL 77059a2b1816996e40b993cbd6cbe010c4ad4de0abf3445a3e330687d174b12a6f9265f8a7e745d3d8999fc241ecb587b47a335b647197e626a287a5a5d4d10c
+MISC ChangeLog 16406 SHA256 589afe3257985842b414179c29bfd5c2af175452ec9528f1bcdaa85bff6bc561 SHA512 03636cdbdd10531af84d42709aae418ffcdecce6bcd9192c9a5ae0cf7117f8204f6a34c4cfb65ed4df37b6971bdf8c000026dc537a6a8910283d66b25c627436 WHIRLPOOL a71edb2f76688a4832f3ca95bb52660f04bcbed12c2b9feffa47dcacec14fedeed3c9952288c1379048c4f64add4346eb77f67165fda14cc456e34f9b2e597c6
 MISC metadata.xml 269 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a SHA512 2e9634524d34d3ca8b09f3212921325a7460449aff6d5307a7ee547a9d386207d772198d762ef0338325864449474a16c92653547cbdceb214ec5c9a0d9d417d WHIRLPOOL 4a6977f8e8520c7d8d5ce51b169c13d3f7fbf7bdaaaf43e03f827aa7e89017a7119ffc3b944ca5fb8ee0cff35f81a7e3d3c92682a58bc53cc361516b19c717e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAfC20ACgkQFuHa/bHpVdtaMgCffmzdpfsm2zB0K2IdCk7jrXxF
-kdwAn3PgUp+MkZvjPp5EWeZYKQxpQhS6
-=DEHh
+iQEcBAEBCAAGBQJQIp6hAAoJEEdUh39IaPFNR2kH/2r8q1oLr3okLrfdz2HmK9sQ
++BmUMtRvNKM7jJon7IJj6M6mKfQKmRE5YDsFpvquvOYCuKtfouZOvXRT+nbY7fTT
+65cSSYWbFAA2DJCmE4PQNCmkOnif7gQfwDe5L8iso48Sh4Y8CWiDuxCR6GJ0mi4R
+3XX6fzxcwirCCBTSTSVJW54KAJLQpSari6UH5P3NSnsiHYnWGfUZksONkkVlSvCk
+5jbHnikzNb1kXb38U14D3S/9eZ8ZBht8xQCg9kAe4x3UpGgwV41Ki/kU5WlOCqIi
+EhUng6XO8Daja4mO3Y1sc2ItYeE+GKgXPifpwM3fB/1EFoKv+PLxqOnUWqxX6lA=
+=DCWJ
 -----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
new file mode 100644
index 000000000000..e7386a08bbef
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild
@@ -0,0 +1,91 @@
+# 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.1 2012/08/08 17:15:29 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+WANT_AUTOMAKE="1.11"
+
+inherit autotools eutils python toolchain-funcs
+
+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="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" \
+		udevrulesdir="$($(tc-getPKG_CONFIG) --variable=udevdir 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
+}