use udev.eclass for rules installation (a cleaner virtualization of udev)

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

4 files changed, 17 insertions, 21 deletions

diff --git a/media-gfx/argyllcms/ChangeLog b/media-gfx/argyllcms/ChangeLog
index fc0f94842e17..5d8c98d46d6d 100644
--- a/media-gfx/argyllcms/ChangeLog
+++ b/media-gfx/argyllcms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/argyllcms
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.29 2012/12/11 14:11:12 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.30 2012/12/11 16:10:46 axs Exp $
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> argyllcms-1.4.0.ebuild,
+  argyllcms-1.4.0-r1.ebuild:
+  use udev.eclass for rules installation (a cleaner virtualization of udev)
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> argyllcms-1.4.0.ebuild,
   argyllcms-1.4.0-r1.ebuild:
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index c9ae3187f243..587d5fd09a0a 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 AUX argyllcms-1.4.0-CVE-2012-4405.patch 583 SHA256 1a161b912a192e6a0a2d16d74a1734b4b61c303b641a3b5c164dab60166be0be SHA512 30c121ce72608d2bf1dedc9fa1e7d13c7c46b756cdc348131f1199873082c37d4c48a3d927596bb6e7c788fe4afbf331d442a56208cf5acf16079a4d15bc8cb3 WHIRLPOOL e975d9e9e3af36478b19fff37bc862d91aeb904626854d2dfec4e7ea1cdad8e143884128058fa599779638ae4505085f4ff05a20bce0ed958652af8e13244147
 AUX argyllcms-1.4.0-jpeg.patch 1111 SHA256 15403ab2480d43f8d2247d0ba6a535e1761c15e286d5eb144470f694b70194e3 SHA512 6f8f55f02f37118e3cec928c8b3d7bdef2b2049a05b217492b9606121f8596a4810f59d7c24ebd97215ad0bc06ab3ada968630772727bc1c02db2a00c3d8aed0 WHIRLPOOL 5a20a27e465a77c2e10303ace389f98bad519ca436c1b661cc96f9ad583547f29c63cb515c2fa7deab7eb056fdf773fbe39c2ba924bdeb02bb71764c6c40e5e5
 DIST Argyll_V1.4.0_src.zip 15242860 SHA256 d33134704d2964db69f9e61eb73188632fe2058cdf57aeaa56e64a264e02b1a8 SHA512 edb9ff1b0a965e79a26c0138afe16472fd18236b55b7262135d70bfc7405001a55d2ada4251111fcbaa0b6f73a3fa2faa2cfe07b3413c8a5ecea04c87e5646ae WHIRLPOOL 7b777f43c9a34966d3fee8ab67010d7253da4054e107749ffe67c4f834c3977a2889c3d0d5035b7e1d186d669c4ead69e2a912682631598630f12056d45acd6b
-EBUILD argyllcms-1.4.0-r1.ebuild 2384 SHA256 bd8e9b0ef952eb5fe994fd13d668dba17b6eebaf485d702e5de3f8a4b3e71235 SHA512 80c556ddaea84c0838d5f1a964326a2a43e068a5f4755964fdac0f195dab68ff9c999c2b9f49f085e7f89490f2ac98e3a7c4c81d28d30aecbd4ab27054b57c1e WHIRLPOOL 8e617de0ce699237460657e901ec91106f7e3fe8559f8ef645d66f5a7a17e6878c14375975d88340ad5ef4e163b75124b5ed56a4b7a0704746b009338502ca5a
-EBUILD argyllcms-1.4.0.ebuild 2494 SHA256 c7608c85966a57316b455f8639566b6ac1d03255d144a117cd18a97bcc256f48 SHA512 dc22615aebf52dd848f9a2208e1c8c2d941f2f354c48a118b1c3e3709384f83ba02533edc61611f5a6c2ee97cb9107e5cefd95237fabb43f4bf28e441f09549a WHIRLPOOL df0501a9bad3d0c29967fb944f8fca9a95138b6a2acc94f6c48162151d19da2385544649c0559c14e4a3f1a17138319adaefe1bb301e554150e026cb04b4f61e
-MISC ChangeLog 5540 SHA256 66bdb612ec30884d492b1c39d37688340ad712554aca6e3bf41af4346112f401 SHA512 5f3ff851fd73dcaae4ffc9a392d4d78b08d6935c2e7c863c8e2721f2af280041aae00b5ff3699768762467b8b4daba022158722d0d46d88eee145484528e24fd WHIRLPOOL 0dc11b0c8c1fa6a7e17237557d76f73735590b39c0fa099eb4119dce6473a9f8601f755cadf69d89056ba17fd0876520d2a2edafc771c784c3fb1a77d08ba532
+EBUILD argyllcms-1.4.0-r1.ebuild 2153 SHA256 c7262ca199a31c372a42a0a9168629136e1de714ef2eb2d98dd0a72ffee8a306 SHA512 e0cc0d5ca2a3ecec6e9622d6dd49607323f1e1ad35d4687b7f75c6bd502976f98dcd9825c7654edf0e9314d5b7f0ab12dca2e11367691624924e7331f5dae1f1 WHIRLPOOL cda8bdc335e3c2fe1cb49e7b6a6e8984328a9c4e848492d5cf147efaba47df432410d8657fbb662d2e2ef7d92496cf514a35ad38ecf8aa2f645a4d8742b2616c
+EBUILD argyllcms-1.4.0.ebuild 2268 SHA256 6e09257eed66c8a4b1354bc7697fec4075d553cbd96796297d50abdff451ab78 SHA512 9b071447deb82ae9867b388f45132322b12fb774c7eee78b90ab1574556167dc96dce59391a8538b2fed3d579089dcab6e3e6e2a21e334e0c117571c1481d8df WHIRLPOOL a39649b9d15a0e84d28004e893720471834061b5983500f6ee54a80fe83828e74dd9b1488e9ee2389d22b208b5a5ca403b38af4cbd409316841af11fea9ff6a5
+MISC ChangeLog 5719 SHA256 a77309cd94023eb92ab679dd27e05d1fbca6c81bd51fcf2314efb9c2dd21e61a SHA512 d07c77641605be66f5bcfa93290cd7c0af61a86c1a5ff52f617cda4f3ce6670fe7e427b0ee17466014fb5fc660c4c378943597fb2edae5eff55876c2c1a5ac10 WHIRLPOOL 1c1c0909eb1896d2c5fad43fb8902402c690a845070ae636f63e992a0106eb678fdda03d072eb144b708c05e16d166ae14094d659574e352c19943fc4ed7611b
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHPw4ACgkQ2ugaI38ACPAWFAD/ZtPmFWrPr7SO5PD/AiST+P6z
-fa0NlP/ru1+mIBfQFtkA/1Bmdyb+PiYcaiDxe+gH47am1bXtzdOw9JdtX01586Ki
-=i+8K
+iF4EAREIAAYFAlDHWxQACgkQ2ugaI38ACPBuwAEAgdGP4ULsCTnG+ZXTufVZtAUG
+u0QrsrRSJf+X1vhlBZwA/0RrU1iAuzJs1cTZ5rLMlCQYXdNs/oFz+jgBPatRCj33
+=edIs
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild
index 30ecaceaed25..00b12be89b1d 100644
--- a/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild,v 1.4 2012/12/11 14:11:11 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild,v 1.5 2012/12/11 16:10:46 axs Exp $
 
 EAPI=5
 
-inherit base toolchain-funcs
+inherit base udev toolchain-funcs
 
 MY_P="Argyll_V${PV}"
 DESCRIPTION="Open source, ICC compatible color management system"
@@ -72,11 +72,7 @@ src_install() {
 	insinto /usr/share/${PN}/ref
 	doins   ref/*
 
-	# note: if package needs /usr mounted for rules to succeed, rules should always be installed to /usr
-	local udevdir=/lib/udev
-	has_version virtual/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins libusb/55-Argyll.rules
+	udev_dorules libusb/55-Argyll.rules
 }
 
 pkg_postinst() {
diff --git a/media-gfx/argyllcms/argyllcms-1.4.0.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
index c003bfea7815..75a4bbc4de82 100644
--- a/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0.ebuild,v 1.5 2012/12/11 14:11:12 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0.ebuild,v 1.6 2012/12/11 16:10:46 axs Exp $
 
 EAPI=4
 
-inherit base toolchain-funcs
+inherit base udev toolchain-funcs
 
 MY_P="Argyll_V${PV}"
 DESCRIPTION="Open source, ICC compatible color management system"
@@ -71,11 +71,7 @@ src_install() {
 	insinto /usr/share/${PN}/ref
 	doins   ref/*
 
-	# note: if package needs /usr mounted for rules to succeed, rules should always install to /usr
-	local udevdir=/lib/udev
-	has_version virtual/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins libusb/55-Argyll.rules
+	udev_dorules libusb/55-Argyll.rules
 }
 
 pkg_postinst() {