Use virtual/udev instead of sys-fs/udev wrt #444398

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 33 insertions, 23 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index df91f9b1311d..2ffe687aba31 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.84 2012/11/18 23:48:17 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.85 2012/12/02 22:56:02 ssuominen Exp $
+
+  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  system-config-printer-common-1.3.9-r2.ebuild,
+  system-config-printer-common-1.3.11-r1.ebuild,
+  system-config-printer-common-1.3.12.ebuild:
+  Use virtual/udev instead of sys-fs/udev wrt #444398
 
   18 Nov 2012; Maciej Mrozowski <reavertm@gentoo.org>
   files/system-config-printer-common-1.3.12-split.patch:
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index d1dcdccd73c9..7691b9177e03 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -7,15 +7,19 @@ AUX system-config-printer-common-1.3.9-split.patch 4636 SHA256 bcd20fcd357ce1730
 DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
 DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
 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 1992 SHA256 79133ad3ac7cbecfe2cb58c39e78ba0eb90aeabdfd48b87be49cab9073125211 SHA512 8b0131cb1805985dce7a9863ec0ab0f20c8b9dac4df81cd72a940b1d1a8ecc029dd96e0b8f7120202f66e43cbc02f1e284cd1a11bf56018cd74f15afbbe47230 WHIRLPOOL 18d24bb64770d954b3454473bbb007a3c5b414774d6b87b2ede0f7e79e596a106302dd85bd4bb753894da651929c0b8e12b3abcd791c55d0e568cdb69fe5b242
-EBUILD system-config-printer-common-1.3.12.ebuild 1997 SHA256 f99ca5c24a1c1df6aa1d0910dedf6aa59ca0a75b327dcb54db5ec8c995a457c1 SHA512 f57a8542921d4e1ac81b4f23f356a8b3ef9c0dc01bb8eb154a28a98fad2fce3854ad651ab30a8d9aa22d3767d245186d4114cccbc4609ff9901773ae9a106e5c WHIRLPOOL e3d3d31e35054043776badfd459f6efa456151d73853bf2060f072d88480172a4b10775a89dbe11becd69a960251d58fc8c08a23e2045218c0706f91ed2e47e1
-EBUILD system-config-printer-common-1.3.9-r2.ebuild 2093 SHA256 c6f31ffbea94b869d34c70790fcf40a3e94086595a8de1ef03560d5301383c10 SHA512 6ea49ab7d1c48476ba24f3f6b60a390a7eb47cf673fb2c175d7e54d17f513874c1fed0d987c8244c0d0cab523c1a2dfef6ab32628d45773f7eff30abab14c865 WHIRLPOOL 9ecaf7b4fe3c8e8d04c888122710fe0d76ba2988307ad3527c321802440595edbfeb82423a0bb31dc0dfa64f09de80797cf43c3e0fe8211a1ccccd4b5b686c5f
-MISC ChangeLog 17448 SHA256 234019eb9e7126158e694027c649c80d1ed4ee590f1c39886b09647d457c95d7 SHA512 609628c34655402fc2329fd2e3f2873e5f627a0c70e73a8d85b6c0121886b969bff042a67c7ce3e7302ce84c09b5375d6a83d38820bb9ed5957fa5fd8ecdeba4 WHIRLPOOL f5667d84104b2a57982ba1a41f141d7d0948e1a21951fed835031c4370598b36de2c4b0bda5df8e9eea80f467a215032712ca7f3a562f8f0470ac7769628615f
+EBUILD system-config-printer-common-1.3.11-r1.ebuild 1943 SHA256 bb96ab65aacdf6978d8e84c8cee818a317710cccb5924eca6efd1cbf69d7956d SHA512 3891afe01af2f3a7b1ac7ca48d65066848c1048cc2458e564750238dd690fe51b0fb523eeb2418d8a12bbc6b2a652babfb9ae32d2d34c729a518f98878d9d9f6 WHIRLPOOL f2f6a17b71c1fb4000381b7a54d7f7b314f020d0244ef8904b544ead8c277af2c972a48e3b1095ab98b8ce61dd138ed606e69304f76f1932c04c0072f852f2a5
+EBUILD system-config-printer-common-1.3.12.ebuild 1950 SHA256 0ebfe4f1dc3323f1f6993dafcd619feb4fb082d220495e4bc290da1ba1b41669 SHA512 02ca3a49e889f48aac70f3c9af6f56658e46c29e595dbbc7c9dbff1f33424a18180a73a28db0537d1fc431fe6a4b67de0b9058de98560d6a40960333ec13d8a7 WHIRLPOOL 517db8d29d55b8ca7e9b5897b8213a16a3a209483e58d177911e5c2314fe8c15adb41858991c8492693f38f8c62d1cfdea51fa2342c60eaf5f327dcd52e1fb11
+EBUILD system-config-printer-common-1.3.9-r2.ebuild 2120 SHA256 69b4266dc03418ba0065b89441725228d0b9a404bb5a649edf37ddb50899d47d SHA512 d18373ce198edef35a185093a409fcde22fcfa922b2e7a1fad689749af67360fe9178fdf2ed5f71b84065fe1006062a39358227dd76fa9e0c3ff32c1c13449cf WHIRLPOOL 3c3308e74958b34c38e1d09d8e481cb4ca0bbcd2af34f1cc4c3718ad917f9e853e129c88df040cc6dd6311e141dd02d7d176dd6d989b89ea82a58382fe9ca91a
+MISC ChangeLog 17701 SHA256 e1e8a214d68b44a0d9f616cf9096c536582bedbd30335e6077ad230ae3afe146 SHA512 1accb9800e695431866ad50dd77ea5cf709ac3d696a613adc5bb52a1d8035de9775a27695e1bca1d16cb7c68850cdb35dcab1e793864e40455f28f39b75aed8e WHIRLPOOL b703c8681f29a48d5a4400e6708a43f44dd401e1c6e5bbff9fa192b5f32a21780f4a6cb36faef9f9c73b30a004476d6bae8a85240768dc7875ba42f0202057e6
 MISC metadata.xml 269 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a SHA512 2e9634524d34d3ca8b09f3212921325a7460449aff6d5307a7ee547a9d386207d772198d762ef0338325864449474a16c92653547cbdceb214ec5c9a0d9d417d WHIRLPOOL 4a6977f8e8520c7d8d5ce51b169c13d3f7fbf7bdaaaf43e03f827aa7e89017a7119ffc3b944ca5fb8ee0cff35f81a7e3d3c92682a58bc53cc361516b19c717e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCpc8EACgkQFuHa/bHpVdu8aACfcc5RctRFvPpLzwE6loABNVon
-DkEAoIemE+nqbrW8WIxsuxvcH8jO0Gva
-=69Z0
+iQEcBAEBCAAGBQJQu9yEAAoJEEdUh39IaPFN69sH/0/fqkx6J6zLIE1chdZxAsCc
+fPHPGg7auWMi3FGiGai+ChyXMBYRkA2BQ95DL2Rbtc0FhfrQIC0bl0XQqL/a58EA
+QCwfY4Hfd8I+L99Aj6WseA/5K/IGumxIp51cpYBystHvn738hett2+X95ATMnn7P
+EeY/qgcc5cCztWI472OTQNxg6aq81fnDY8Q8ji/qmQFQZgcRr4K0gPDRUp3MbnzO
+xz8561itKlqGt6gm21iiZijYBKiDfAfUXMHjktFryQswbhVxtZHBYNDqFYLcuBPq
+n6heDY3wJHIWF6hKBHVncfK0hdBIPKrOGYC7rZdOrWcfoVU2Mo+xLiC86Yy67u8=
+=j3dM
 -----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 36bb7792a312..bf9574dc3ab7 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,13 +1,13 @@
 # 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.5 2012/09/30 17:37:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.11-r1.ebuild,v 1.6 2012/12/02 22:56:02 ssuominen Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2:2.6"
 WANT_AUTOMAKE="1.11"
 
-inherit autotools eutils python toolchain-funcs
+inherit autotools eutils python toolchain-funcs udev
 
 MY_P=${PN%-common}-${PV}
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	dev-python/pycurl
 	>=dev-python/pygobject-2.21.5:2
 	net-print/cups[dbus]
-	>=sys-fs/udev-164-r2
+	>=virtual/udev-171
 	virtual/libusb:1
 "
 DEPEND="${COMMON_DEPEND}
@@ -72,8 +72,8 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		udevhelperdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" \
-		udevrulesdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
+		udevhelperdir="$(udev_get_udevdir)" \
+		udevrulesdir="$(udev_get_udevdir)/rules.d" \
 		install
 
 	dodoc AUTHORS ChangeLog README
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
index 98d57d3a539c..423763a703ab 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
@@ -1,13 +1,13 @@
 # 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.12.ebuild,v 1.1 2012/11/06 03:13:28 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild,v 1.2 2012/12/02 22:56:02 ssuominen Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2:2.6"
 WANT_AUTOMAKE="1.11"
 
-inherit autotools eutils python toolchain-funcs
+inherit autotools eutils python toolchain-funcs udev
 
 MY_P=${PN%-common}-${PV}
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	dev-python/pycurl
 	>=dev-python/pygobject-2.21.5:2
 	net-print/cups[dbus]
-	>=sys-fs/udev-172
+	>=virtual/udev-171
 	virtual/libusb:1
 "
 DEPEND="${COMMON_DEPEND}
@@ -72,8 +72,8 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		udevhelperdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" \
-		udevrulesdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
+		udevhelperdir="$(udev_get_udevdir)" \
+		udevrulesdir="$(udev_get_udevdir)/rules.d" \
 		install
 
 	dodoc AUTHORS ChangeLog README
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild
index 39c7ac2f99fa..d892fd372a65 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild
@@ -1,12 +1,12 @@
 # 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-r2.ebuild,v 1.4 2012/07/18 21:11:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild,v 1.5 2012/12/02 22:56:02 ssuominen Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 WANT_AUTOMAKE="1.11"
-inherit eutils python autotools
+inherit eutils python autotools udev
 
 MY_P="${PN%-common}-${PV}"
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	dev-python/pycurl
 	>=dev-python/pygobject-2.21.5:2
 	<net-print/cups-1.6.0[dbus]
-	>=sys-fs/udev-164-r2
+	>=virtual/udev-171
 	virtual/libusb:0
 "
 DEPEND="${COMMON_DEPEND}
@@ -77,8 +77,8 @@ src_install() {
 	fi
 
 	emake DESTDIR="${ED}" install \
-		udevrulesdir=/lib/udev/rules.d \
-		udevhelperdir=/lib/udev \
+		udevrulesdir="$(udev_get_udevdir)/rules.d" \
+		udevhelperdir="$(udev_get_udevdir)" \
 		|| die "emake install failed"
 
 	python_convert_shebangs -q -r $(python_get_version) "${ED}"