virtualize udev dependency, get udevdir via udev.eclass

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

6 files changed, 29 insertions, 29 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 37b049ac8619..8f1757bae7e6 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.255 2012/11/30 15:47:05 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.256 2012/12/11 17:01:02 axs Exp $
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> hplip-3.12.9-r1.ebuild,
+  hplip-3.12.10a.ebuild, hplip-3.12.10a-r1.ebuild, hplip-3.12.11.ebuild:
+  virtualize udev dependency, get udevdir via udev.eclass
 
 *hplip-3.12.11 (30 Nov 2012)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 2721b172a68a..6ee32894b7c0 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,16 +6,16 @@ DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7
 DIST hplip-3.12.11.tar.gz 21932088 SHA256 c5b81167b21aa4ee6bdf3f5c120bfa050d0c794608da8bcc32e2580234919ffa SHA512 78593060f60a906e993ed4b2753fc41e7dae7a35a7697b87008b730fb893b3f4c54d488b7bb0d2fca72bd356dc963b2c2ca68c2797c5860f7052141bd0a81ea7 WHIRLPOOL 7983dc0f08ed38e5ae3ac9bde28f900f1315ad6d6cbd5773221799ea6c9ad9225ea35cb5be8537e4f6045b23c56a9e1776b6b337c91b626afa4e91416b830252
 DIST hplip-3.12.9-patches-2.tar.xz 10328 SHA256 d992fdf42bbcde92de9f4256308b3b35b74e3fcae50704d59eaf26bd2beab5b4 SHA512 846b9cc96b1eefcbc0960c312a60ab8913b6db109bfa828d19f1e9cdfccc47e193d582767d828437dbebc9ec1c0617a590e8f3f2e744d9f5bddb6056d43fe6a7 WHIRLPOOL 5d63763f11d8f91a6506301ec2c7e37c1f9e5693c83d818f67129a42c7489fd9ed09c0a06f216af72c21f488cefc6f2b455a010fc504e3fc7b12b877190e9d9b
 DIST hplip-3.12.9.tar.gz 21314003 SHA256 e7361b9d6e968ce3306dc438e622a4412156e7c2d71b2a6face5952cf52e23c4 SHA512 bf0f498d7516c4b7653799c043dd6336a620be31680e1419bf09f9fd52492fc92f59e030df5110f89615c16d27ecad0169c83c938651a7fa7257057ccf5d30eb WHIRLPOOL 1059cf4216b60752c4f6da299f2dd86bdb26be7171275107280953225a9d1d729b135ba0f7990a8ed757fd52880612718bd846abb68ecbf61652923db88ca425
-EBUILD hplip-3.12.10a-r1.ebuild 7416 SHA256 5e759a2d574e19457da8d7a79aa62c35a63527f69ead28363988146a86316849 SHA512 cbc18147d1b11a8a6d7e5b7fe7d0617d9823d45d9d91de929a5727f81f5fc9df11580a9e8910ce0f0537f08d31ff2053a89508dd74b67211211f933ef571119f WHIRLPOOL f48ba76716c57dbb90f0cff0f10cfb47544fef0cad8c1ad7caaf3783d93141d7e61c459c6d32f9859ee07456c995f10eeab9a56a218a6cfe78d4d848fbdcfa6e
-EBUILD hplip-3.12.10a.ebuild 6830 SHA256 ad2fe05fdb57ea49e25d17bcc53b027d01b936d21ed9f1d4272bc5061b2ea630 SHA512 fadf90e95414e34e4a7409961a4c1fb35d20274b104a74be6b01d5c4629c4b49881eae6681a64ecacba4901c81ae79ecbda35d207593c7aff46e9f192220583d WHIRLPOOL 3c5cbd7defb0951caca4a033197709d8f8e90cf9282beeac213a54e05b96eea4c6212e4dc9408d5895feffec47b0067d61783b916e44a5076d9c498af2d9f5c1
-EBUILD hplip-3.12.11.ebuild 7412 SHA256 06cf5811be96e7d83c7dd61838e90c2e714c11854655f07bb36efb977aa94bd2 SHA512 aeafe27aa16c33bf35fb0a38977f1c905b4199829c59b573bb4cf337e8f35dffeb82ddeb2337c2ed2228a0a594c272631974a9116b8aebb6d268d44806147a87 WHIRLPOOL 728b5989bb9b9f84254ba8793806984af363b8778f413469961f01c0438c4ce370957f5c0e852cdb6d9ce6041d9e997c70335bde378d6ef972ac22db9a8ce990
-EBUILD hplip-3.12.9-r1.ebuild 6619 SHA256 12b3ee023ecfae0eb98961c5a9db66e835f65ec9ccf1348b28be798e2464c30e SHA512 ff9b035b634dbedbb864b45b692b5a10207a40f0dd56824bc15cd482b81a78f4639b4d0d96769322fa60da64fd7816e7af6f0b01906e0ab56a5e6fe1c734dbde WHIRLPOOL 8e79187c7620d6b9426c551541eaa6a6230e5374f184fb62c1e282c3b249eccad750d9e75550b7bb4763d17e75dac060dcd942f154f0f8d4dd41240bd0a8c2f1
-MISC ChangeLog 44334 SHA256 508e4dec068be2c33b0a1ca4318a45fa2a531c708db5c35f336542618984f041 SHA512 e43c96aeb91740a673b538c9105308ec2b5df6c153e9205e010d6dc87eb31866133546a0f54489c9ad7fd0e52a0ce87ce86561f9e1b06f38a17385fc776119e7 WHIRLPOOL 52fffb6d2cda29434aae1962317127d5a5a691b27aacc0cc739730f0d4fe1c65092fa05af8a26c71d212002a9da2e3134fbafbf693c740016096f2f0dc8d62e0
+EBUILD hplip-3.12.10a-r1.ebuild 7358 SHA256 2852ac5ce14bb8ac9312c4ad0593b822c8c8bc9cbaddbf86a7fad6fa08b73af9 SHA512 eccf8419e831a12ade270dddde33513774cbe8374a311f0f99e469007f55d772fba884fe364ec469c37e81b1527e5a9a2b103149447e9ed87ca96c47d182ca97 WHIRLPOOL 7bbcb1dd02e34e6d4d43b332eb8628001253e9ebec2113d3b88b6dadd987e0d0a205f8e22e5f1c910e741242d27658211e8a23ed74c256a7c0c71f52b92d1ad1
+EBUILD hplip-3.12.10a.ebuild 6770 SHA256 59daa524bd7d0692b44748c3d16a92d7d7897bf189cbde9dc60ee2ec9b5a8164 SHA512 6e1ad629bc8e8a985f1f6540698d5bdd5e8c250f44a1832fe2b26d63636c109eab5b6146e6a0a9a508c7fa80d3c7f9ac5976e5fcf5f7267d212f2a46ee430c93 WHIRLPOOL 9e1cd1a793edbf60e951afeca5a5e454fca8c0c2a5cbfba56d7cee8ae08a908260d636b60b6855b7a154bcd17bbc558a08b1e611e80a4d6e529f69c28d3f1e14
+EBUILD hplip-3.12.11.ebuild 7352 SHA256 6c57b67b8207c80d4fe00592ccf7d2ba38546388c070c5a81bb7c65a4b3062c5 SHA512 9edc0edce681bd2f934eb7c5ef1ca30e2e51442fcd78c448900a599f7759ae746bd5abeb691e06de88ea00bce35f520b06482e8f92378f0891447461110efd2f WHIRLPOOL 7286f4debe51dde5c6642f0b83e45a0c24691d2545ed92e7ba15f6489bf1a23636cce809a2bb38ab91c06f435a8c523adcf317577a5c93635bbdb514833b7338
+EBUILD hplip-3.12.9-r1.ebuild 6561 SHA256 b6abe336d4ad5d7ad590fc236bf67d3a6a70ed47cd378fd9a365a3877d9d63b7 SHA512 bb8feaf2859b0978b64fc2c0b0735dcb77aca4cdda67d889102230342b919ffc5431b5b2ac99eff1a39cd365098c7d86703a8b83123f4ce57859a63b4b8d5b95 WHIRLPOOL 03d33aa4843d06e8bba95cc7fcc2415c165a7aaf2ce7c6a0bd9c91fa3199e73b2eb8314b4772714dd74a9c72bc584c14ed0adcc1d88219a5a0d04e10daf7611c
+MISC ChangeLog 44536 SHA256 132fb219acb6255ca30d3f49848c28bd202c3e55c51aa74b748ec8ec64a12265 SHA512 5bc51cb1ba94807cb193e78b7db0fe8bc2851041fe4df12b518cae7b54b541f50837ccece929672471043f19e9a65e42d005d58f3500e8d1f3897318850fed75 WHIRLPOOL 06bd027cc7d7b63f11475a35afa3db7f12ffe8c371db85b92d62ef122bc8bd19b805f173dd8232adfec8dcdbdb19030341293d92c7fdd50066d11bff1f27d2b0
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC41PsACgkQlcuUeyFa0U0+hwCfT+4VyqPkHaahDblKq/FPtKqM
-br8AnRPsWo1i4XV65SyyO/W3W9KcFH7h
-=uxQF
+iF4EAREIAAYFAlDHZuAACgkQ2ugaI38ACPA3rQD/etwRkVpeqtace5QNaJIklFSv
+9HG+zuTusleF/EvxT2MBAJEZcyeE/FJqHDMK3a2ZNAvXDo+y6JGIJIRf8IQFr/dY
+=SAAb
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.12.10a-r1.ebuild b/net-print/hplip/hplip-3.12.10a-r1.ebuild
index 51a7373c327f..b92b22dc3c4b 100644
--- a/net-print/hplip/hplip-3.12.10a-r1.ebuild
+++ b/net-print/hplip/hplip-3.12.10a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a-r1.ebuild,v 1.1 2012/11/18 12:13:48 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a-r1.ebuild,v 1.2 2012/12/11 17:01:02 axs Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"
 PYTHON_USE_WITH_OPT="!minimal"
 
-inherit eutils fdo-mime linux-info python autotools toolchain-funcs
+inherit eutils fdo-mime linux-info python udev autotools toolchain-funcs
 
 DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -49,7 +49,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!minimal? (
 		dev-python/pygobject:2
-		kernel_linux? ( >=sys-fs/udev-114 )
+		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
 		scanner? (
 			dev-python/imaging
 			X? ( || (
@@ -117,8 +117,7 @@ src_prepare() {
 	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
 	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	local udevdir="$(udev_get_udevdir)"
 	sed -i -e "s|/etc/udev|${udevdir}|g" \
 		$(find . -type f -exec grep -l /etc/udev {} +) || die
 
diff --git a/net-print/hplip/hplip-3.12.10a.ebuild b/net-print/hplip/hplip-3.12.10a.ebuild
index 2b3b8758007d..33a6ac56cc36 100644
--- a/net-print/hplip/hplip-3.12.10a.ebuild
+++ b/net-print/hplip/hplip-3.12.10a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a.ebuild,v 1.8 2012/11/28 20:20:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a.ebuild,v 1.9 2012/12/11 17:01:02 axs Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"
 PYTHON_USE_WITH_OPT="!minimal"
 
-inherit eutils fdo-mime linux-info python autotools toolchain-funcs
+inherit eutils fdo-mime linux-info python udev autotools toolchain-funcs
 
 DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -49,7 +49,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!minimal? (
 		dev-python/pygobject:2
-		kernel_linux? ( >=sys-fs/udev-114 )
+		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
 		scanner? (
 			dev-python/imaging
 			X? ( || (
@@ -106,8 +106,7 @@ src_prepare() {
 	epatch "${WORKDIR}"
 
 	# Fix for Gentoo bug #345725
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	local udevdir=$(udev_get_udevdir)
 	sed -i -e "s|/etc/udev|${udevdir}|g" \
 		$(find . -type f -exec grep -l /etc/udev {} +) || die
 
diff --git a/net-print/hplip/hplip-3.12.11.ebuild b/net-print/hplip/hplip-3.12.11.ebuild
index d196238c230a..edb322d6c603 100644
--- a/net-print/hplip/hplip-3.12.11.ebuild
+++ b/net-print/hplip/hplip-3.12.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.11.ebuild,v 1.1 2012/11/30 15:47:05 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.11.ebuild,v 1.2 2012/12/11 17:01:02 axs Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"
 PYTHON_USE_WITH_OPT="!minimal"
 
-inherit eutils fdo-mime linux-info python autotools toolchain-funcs
+inherit eutils fdo-mime linux-info python udev autotools toolchain-funcs
 
 DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -49,7 +49,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!minimal? (
 		dev-python/pygobject:2
-		kernel_linux? ( >=sys-fs/udev-114 )
+		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
 		scanner? (
 			dev-python/imaging
 			X? ( || (
@@ -117,8 +117,7 @@ src_prepare() {
 	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
 	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	local udevdir=$(udev_get_udevdir)
 	sed -i -e "s|/etc/udev|${udevdir}|g" \
 		$(find . -type f -exec grep -l /etc/udev {} +) || die
 
diff --git a/net-print/hplip/hplip-3.12.9-r1.ebuild b/net-print/hplip/hplip-3.12.9-r1.ebuild
index 2cfb5c5a8bb5..ff98d1c674f4 100644
--- a/net-print/hplip/hplip-3.12.9-r1.ebuild
+++ b/net-print/hplip/hplip-3.12.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.9-r1.ebuild,v 1.6 2012/10/20 11:54:01 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.9-r1.ebuild,v 1.7 2012/12/11 17:01:02 axs Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"
 PYTHON_USE_WITH_OPT="!minimal"
 
-inherit eutils fdo-mime linux-info python autotools toolchain-funcs
+inherit eutils fdo-mime linux-info python udev autotools toolchain-funcs
 
 DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -48,7 +48,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!minimal? (
 		dev-python/pygobject:2
-		kernel_linux? ( >=sys-fs/udev-114 )
+		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
 		scanner? (
 			dev-python/imaging
 			X? ( || (
@@ -105,8 +105,7 @@ src_prepare() {
 	epatch "${WORKDIR}"
 
 	# Fix for Gentoo bug #345725
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	local udevdir="$(udev_get_udevdir)"
 	sed -i -e "s|/etc/udev|${udevdir}|g" \
 		$(find . -type f -exec grep -l /etc/udev {} +) || die