changed udev rules installations to use udev.eclass (a cleaner way to virtualize udev)

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

4 files changed, 16 insertions, 17 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 8ceb87f7a1c3..c58e61e0b762 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/trousers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.39 2012/12/11 14:05:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.40 2012/12/11 15:57:04 axs Exp $
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> trousers-0.3.6-r1.ebuild,
+  trousers-0.3.10.ebuild:
+  converted rules installations to use udev.eclass for recent ebuilds
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> trousers-0.3.6-r1.ebuild:
   virtualized references to sys-fs/udev
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index cb84abddcbe7..38adbeea661a 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -7,15 +7,15 @@ AUX tcsd.initd 954 SHA256 c3944c51317c8e1a3019ec062f091cdb2e11b974852a22e0fb8f0e
 AUX trousers-0.3.5-nouseradd.patch 439 SHA256 927040d4ef30657717a75318320330f12364a624e0ce6f0d2e6a25c53e5ba11b SHA512 d5f218fb2cd50e81eed2fc3fb48c613f33e17be9be39368e6d0aef5cd2237ef4505736bebc00b30e3133cab81ac2551edbdb8d83aaab0614cbc1747b34bff806 WHIRLPOOL eb01c789159dab0b662065ce155e27f7dbbb5bf5a41c470598be08dcb41fafd77c242c77618f2c118d943b716dea95934bed19c7fd5634442a9b17bd74a943dd
 DIST trousers-0.3.10.tar.gz 1658652 SHA256 eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530 SHA512 1835246f846d20bc1b2731d68440a9ca45865fcd52ad847d95485e4b126fae8bec09feaad559c27d83e243d92b8adc3a67934bff2034b318df075842fe9df4f0 WHIRLPOOL 7a27ef57b0038178cbf384c9fdec2d2e3e58dbeb5e5bc1503d2a7058a8312df54fa72b87968554631e4b5e483ae5e8c5e0a2367346bf3ae001b523a507ceff40
 DIST trousers-0.3.6.tar.gz 1335084 SHA256 91025f60248af44df192e8df16fa6b0c0f1e48c54f6dc51626567ed95758b0d6 SHA512 a9eba2f8e06b163c29e2e9079e62240d96dc630d12fbe61aa0c6b2bc93f88d7f528ae0cabae1de82aba9676e91c2c338da2ce1690bbf21b768af803f7cdff6c3 WHIRLPOOL b13e46f3e2f95bd28a4ad3f7686638709d2484b56ac96f98823f56aafd1be852275a1831ae82a1b11b4eb3e4e9ad051012e59368425374b918e41ecf41d70f01
-EBUILD trousers-0.3.10.ebuild 2992 SHA256 1750d343ab8d25bbd88434a65d6b415e443489d4a07689ea4397102c2b343b39 SHA512 a5fe4f1ee693d1c5bf61ad92575d5e1613783d89f7f1ddbf3bfea532b3f3034b24021692e2e81e6a86807a35b2255f7620cc20ae98b06aa1c11b50e9f085991f WHIRLPOOL 4de8b361780b32635c1e8dfb5248167017f85ba9ce0bbda81f7f585cfef9f98442ae5e4c9dac45ede96d411d3f73184574ca5688f62f1d5edfc48bacf5cbb00d
-EBUILD trousers-0.3.6-r1.ebuild 3249 SHA256 ea18a509f96de73bb57b91056e544b2382e144b4cb0788771c5f0d3ad87ed34b SHA512 5010649b347901239f77e35e0f9fc54e6583fc7fd57a1f2b9bd65cce439569baa91f530c30044c6f8a94a34b3721003857871176caa8945ffe5af41e01927572 WHIRLPOOL 60a27d7a39255f9be02efbd14a4c07bfddb2da636cfd77b509ff6c8247ff0c501dd8de8cdcaa6eaa899cc137a320eb3d0e70eaf8f230ea19a566327ec59e4144
+EBUILD trousers-0.3.10.ebuild 2954 SHA256 99bc28b5233c4079a16654ea88f2282a0fa55af30aaad3e066b79ebd6640ecb0 SHA512 34a2601a57d67109875fe5ccbafc47af165823673b4e79a2984640d9fa6d079b5e170b16fd56b9c1eb73b638b0ae9765512dd740a583a0db75107ca0dcd1091a WHIRLPOOL 8070237846bdc75a9a1c83b96bd5f68709c23ff387f45e39244d4ba8b346018f065387aa97d2787a207e985215284ea5e3df5eb85a2d098148ccc31843b304a0
+EBUILD trousers-0.3.6-r1.ebuild 3013 SHA256 ad0f6f3f560ac0fe2201c4c35535d3485677a212baaacd16abf8cf36e9926c44 SHA512 64c5ac6c675a7656137941fae6219331ecb973b39c6c75a81b9c4bea2700ed223093dfd4260be6f9534b449b6101d56a7c71ce80c02add795481637989d198bf WHIRLPOOL 580d273eb84c1c3542df46e5352739bc3fd6c8abfbdadfbb68094c3bd11ae271b5c8a12ca03c826637d8e0b3cbee6ba3edc404d85f8c3ee0ac0ed0647b1b1dbf
 EBUILD trousers-0.3.6.ebuild 2976 SHA256 5a08fc9d3d8e8cbb941015f8c5f00addda7792f47ec417777419fa6d7fb27eb9 SHA512 2120db171f95c29e7971c85c76c4378c348a6ce728c1c34073c271e6e55576ed42020307d2677ad0a74e81a9b7f9acb0bb699ae839298b82873ae85915a1a995 WHIRLPOOL 1e75ae789c402baa2a928bd1518b68da36e0b9ffc5f21074eb7bfdd7f094e9896ee6b7f9673729b9268c1dce1d78615a42a373a90cf1b8a5d9766626c279fd7d
-MISC ChangeLog 7115 SHA256 2e32acde310cc107377d0dcac710710ada63ee63808a135a7b16412c315bb7c1 SHA512 2bcf494267f64814861e2cd3e231f91f06f12fbfa4466e16796c0a3260412024ffb7618733a87d50a70ca154a809e39f226d20d3da85fc72e2b2ac3e1fd1cee3 WHIRLPOOL dde29937bbc8c631f935f9ab496c0b03769eadf246df15ecc6844effd796f0fb7eddea31a35a6d2a090b20c2d21a7d323eda295d7e384e23a0c285fb50f27911
+MISC ChangeLog 7287 SHA256 dd40f1e626c321bdda4efcd70a02ad359b56dc3eda9490c9dab9be0ba75caffa SHA512 a92448a26aaf14c985832cecc9dd8f036b0906d241add2903746bede1ca0f0fbb64eb9ee848b1eaeb09b71ac8cf568efb83e5da590e9f92d67b64a570ec4e5ac WHIRLPOOL 948bce73d1dead75c7e3a83a89bb77c8d3ff23da6336f5e158fc3fcb1240045bc80ce2496c27a6813bd9a339722b5862fe28117398737b033e45e3f0ba443614
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHPaIACgkQ2ugaI38ACPACiQD/V9rKo8frtUp0qjG2f+FVkcw7
-IfiQ+0BZlTB6JfleF5sA/04YnO17V8LYq+dRRD5l3fReflNbQpn5DzaDYOT18HZx
-=Z4em
+iF4EAREIAAYFAlDHV98ACgkQ2ugaI38ACPDc8QEAkTzZ+lqhQOLAN3GtwJy9Q/7E
+0aBzhFiYtAC+bvnXcrsA/0LYVdWKAnoAQuj9EwF0FsJQ9ZL1ufLig02RvVWmMu+P
+=t5a2
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/trousers/trousers-0.3.10.ebuild b/app-crypt/trousers/trousers-0.3.10.ebuild
index 38e67900fe65..054bdeff2c94 100644
--- a/app-crypt/trousers/trousers-0.3.10.ebuild
+++ b/app-crypt/trousers/trousers-0.3.10.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/app-crypt/trousers/trousers-0.3.10.ebuild,v 1.3 2012/11/16 14:51:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.10.ebuild,v 1.4 2012/12/11 15:57:04 axs Exp $
 
 EAPI=4
 
@@ -89,8 +89,7 @@ src_install() {
 	use doc && dodoc doc/*
 	newinitd "${FILESDIR}"/tcsd.initd tcsd
 	newconfd "${FILESDIR}"/tcsd.confd tcsd
-	insinto "$(udev_get_udevdir)"/rules.d
-	doins "${FILESDIR}"/61-trousers.rules
+	udev_dorules "${FILESDIR}"/61-trousers.rules
 	fowners tss:tss /var/lib/tpm
 	rm -f "${ED}"/usr/lib*/libtspi.la
 }
diff --git a/app-crypt/trousers/trousers-0.3.6-r1.ebuild b/app-crypt/trousers/trousers-0.3.6-r1.ebuild
index d2617bfd69f4..45597b789846 100644
--- a/app-crypt/trousers/trousers-0.3.6-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.6-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/app-crypt/trousers/trousers-0.3.6-r1.ebuild,v 1.3 2012/12/11 14:05:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6-r1.ebuild,v 1.4 2012/12/11 15:57:04 axs Exp $
 
 EAPI="3"
 
-inherit autotools eutils linux-info user toolchain-funcs
+inherit autotools eutils linux-info user udev toolchain-funcs
 
 #MY_P="${PN}-${PV%.*}-${PV##*.}"
 
@@ -89,11 +89,7 @@ src_install() {
 	use doc && dodoc doc/*
 	newinitd "${FILESDIR}/tcsd.initd" tcsd
 	newconfd "${FILESDIR}/tcsd.confd" tcsd
-	# note: if package needs /usr mounted for rules processing then rules need to always be installed in /usr
-	local udevdir=/lib/udev
-	has_version virtual/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins "${FILESDIR}"/61-trousers.rules
+	udev_dorules "${FILESDIR}"/61-trousers.rules
 	fowners tss:tss /var/lib/tpm
 }