virtualize udev by using udev.eclass to determine udevdir

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

5 files changed, 28 insertions, 23 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index 1b07518ca624..d4a684b6de2c 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.122 2012/11/20 20:06:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.123 2012/12/11 16:29:23 axs Exp $
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> libmtp-1.1.4.ebuild,
+  libmtp-1.1.5.ebuild, libmtp-9999.ebuild:
+  virtualize udev by using udev.eclass to determine udevdir
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> libmtp-1.1.5.ebuild:
   Stable for x86, wrt bug #441374
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 01305e2f95a3..e1c14802420b 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST libmtp-1.1.4.tar.gz 696838 SHA256 4c6c5cdb46959d9903e98c22e906407909b5bff996b7e1970dc2ee228e3e1460 SHA512 0ed5a8b880bfd89a2dd4557e8c4e5c87ccc81d8fe515b97fd85143e3ba9465c6eed708462e2cf26b78450361866a4d430ba19fb566ceb090aa97e91d94c994cf WHIRLPOOL 31d335f21bc328ec246771492b04402b5f5f4aa133742667b2804cd949f60d8df73c9b58e9a2f7388c1cb9a7d652a75aae453ebbe9ea8d9f5569719d34959b7a
 DIST libmtp-1.1.5.tar.gz 723925 SHA256 787679171baf8b3cf2fcc03196c705ab4d7cbc969bd71f9d3696be1ce7f1c63a SHA512 da870e32f737b349d4e84a72891a9deddc1b2064a1e716fbda1ab7f99becf701eec28b890dba269aa2ba889c60446b9f48afc99b375c328d3d5e7970d9718b12 WHIRLPOOL 226c2566ad533751a377c17e501996c767b61b09abde6a6430c2fb81230937002e1e9177d8a21516a026166c039051309732fc4a36c356f7c76dabe32b625346
-EBUILD libmtp-1.1.4.ebuild 1443 SHA256 e4e2526acc6ed3148304e52ffb3b8fb5d69d65d88d9888563140b6a37fa6688a SHA512 bfbaaa35e30fa666a5accb9ebd5e5e794d5d42edb7fae694cbd957bb17687a667eb1f18af1ede438de8f8b061acfa88f88bef4a48be2e1a78726af703541bb1f WHIRLPOOL 2ff4f9d10b1c3dd2924e681ae8d4417aa2923a1c2aee365a7865dcc0d4b58ff7928efab75336e3fc990e145701f1944df892f6fe840094ae8e55a5f7a844fa2a
-EBUILD libmtp-1.1.5.ebuild 1438 SHA256 6267677804a525a996be598d500eed3c9c8d01900435e8766fce5666a040252a SHA512 037e766cfd5513c1e8f8ec17b3587805690e99e62cc770b8f38ada0c7273a0793898ddcd4b3950b1538daebe2da50177a37608816103e4fc42e1afc7b53db8db WHIRLPOOL 90bfe12415a7dc18a67c627d444ed22aa81155ec52840c0d2d77d6d6c9d33351b873595c09cc0d7a888699bea6795bc8b2fcd83d89c3b4cc887c5dc56fac4d92
-EBUILD libmtp-9999.ebuild 1448 SHA256 8e0343de5511f5b9aeee2434562fa85bd42da1398c84add545f925317276c4b0 SHA512 3176e827228d25c8c9fb651f44d9fc4e971ea814f4c566fd30a4aa948ba155542c915abefe8083329bf10cf129d9611fc0303b89e5fa91b219726051a78ba03a WHIRLPOOL dee1c91d31996759aa2db5fa59ff5db45ab3a1268fdb2257ebc7a52f7ae794035189ae21153ffd13684ed37f7e5d4f68eef5a81d7e1bf6451816d4386a720ad0
-MISC ChangeLog 15199 SHA256 68b0a0a54af5f595989acd9ffccd7cc8e9ee9e9456e53c14a82a3e18e99a19c1 SHA512 e597dbfdfbf8d3258391248216995d6bf5419fb5feeba4ac4877cf94358968be9f7380eeb4929dcc74eecbbe0b810a4734f768d6d7a72db771ac5f2ca5f54c41 WHIRLPOOL 32a3c095d3d4c0bd0b57d16162deeb7e364ed501c7b171c79411d7f4fd555a6010f1d15ba87af4ae4146ba6a8ac34d47723c71e36d7b83ba64617358f975839d
+EBUILD libmtp-1.1.4.ebuild 1341 SHA256 2af42d13e99fddcae3edb0e1dae15af5a5847a8a47de88658549c476dfc995a7 SHA512 fd2065497db2b2851a5a6726b5d2f1485b5e64620aa6ef0c88a6d4438f712d07c17706b95f8df68aef77d370e2cec2a3d59eeda80243f08fdaa716b3864090c9 WHIRLPOOL 3e00ad5baf2545e007fef0d6f97838190a0f6a3dabf7acf5c152d709bb1f376cd2848b59c4f17bf76e245de6bb8339a62c24c528976f470158d6b346c3baaa9e
+EBUILD libmtp-1.1.5.ebuild 1341 SHA256 27ed384eaaf783b765cdf3a41efea8876b85442222f42901b33ee490b20be6ac SHA512 9fe019777472f387baf36fc9114f69855b9ec962e4c52cc5f726ed6781b202f150492943bd06bffc8d8e16b9d073ed7922a8dd7ddf98f2ca75d6832679e8fc53 WHIRLPOOL 766434b21cf4b5c8d144d632ce8a77c34cd692c35e03846c4288639f13f2441800b3cbb17edbe39ab68ecca5e759dd8ac4841852151e57e05347ed29878c1bb0
+EBUILD libmtp-9999.ebuild 1345 SHA256 091e893b3cccb5403b3b163376f977cad1f65384b507111fd89c0519130fc006 SHA512 fd0671f624caf83a65b8d34ebe2322d35bfc0c8fcca6fa8fbba2bf3aa5ffc05b95da5e7b0d786ed3ec5cc41808025f0f683ac55aece80b66827d162a24b9b09f WHIRLPOOL 26928101269d2e208f3ae4d3ddb04d5fccdd1eb658af94b1f3c81d21ba42f2afffb2d493f0724982929b642879df950937ec40cd1b3e07b211a68bbdff917ea0
+MISC ChangeLog 15373 SHA256 3c4461fa7adffc4d7c292f872555072e6025107e1b2c2a38c8f0c5a3cfb501c7 SHA512 c5998357d1861925f35483ae44c3b70f4696b56d9ee01b8b2e52c5ca97886233a0b9381b55ff3e65f090ebc25deea89f63ad897ad426132f1b63da27a3df475c WHIRLPOOL 382c2c3c31abe97768908cd32d5ecedbf0d198626a79344c7a6053cf75f38b8a8301d0eb0d095f9b77433d88a99abe157fc9b245f4838aabfee85dae4a00f294
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDHX3EACgkQ2ugaI38ACPAGOQD+JiI94EnHbZQRHS1TBegxK3G6
+jYm/FC53zFlmr7JY0DkBAIvVjTT7S9bgarRP0ad+Ccb4+jL4VzbldHJOnS38tZ37
+=DZ2u
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libmtp/libmtp-1.1.4.ebuild b/media-libs/libmtp/libmtp-1.1.4.ebuild
index 977659bb419c..95aaacb85080 100644
--- a/media-libs/libmtp/libmtp-1.1.4.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.4.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-libs/libmtp/libmtp-1.1.4.ebuild,v 1.5 2012/09/20 11:35:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.4.ebuild,v 1.6 2012/12/11 16:29:23 axs Exp $
 
 EAPI=4
 
-inherit autotools eutils user toolchain-funcs
+inherit autotools eutils udev user toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
@@ -41,14 +41,11 @@ src_prepare() {
 }
 
 src_configure() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="${udevdir}" \
+		--with-udev="$(udev_get_udevdir)" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }
diff --git a/media-libs/libmtp/libmtp-1.1.5.ebuild b/media-libs/libmtp/libmtp-1.1.5.ebuild
index 0c973a112191..c3c9ad6a8716 100644
--- a/media-libs/libmtp/libmtp-1.1.5.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.5.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-libs/libmtp/libmtp-1.1.5.ebuild,v 1.6 2012/11/20 20:06:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.5.ebuild,v 1.7 2012/12/11 16:29:23 axs Exp $
 
 EAPI=4
 
-inherit autotools eutils user toolchain-funcs
+inherit autotools eutils udev user toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
@@ -41,14 +41,11 @@ src_prepare() {
 }
 
 src_configure() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="${udevdir}" \
+		--with-udev="$(udev_get_udevdir)" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index 45a3cd02b413..488a6201531a 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.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-libs/libmtp/libmtp-9999.ebuild,v 1.5 2012/08/23 10:56:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.6 2012/12/11 16:29:23 axs Exp $
 
 EAPI=4
 
-inherit autotools eutils user toolchain-funcs
+inherit autotools eutils udev user toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
@@ -41,14 +41,11 @@ src_prepare() {
 }
 
 src_configure() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="${udevdir}" \
+		--with-udev="$(udev_get_udevdir)" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }