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

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 22 insertions, 16 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/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}"