Use udev.eclass for determining correct udevdir for helpers and rules. Use virtual/udev instead of sys-fs/udev. Mark stable for amd64 and x86.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 22 insertions, 17 deletions

diff --git a/sys-apps/usb_modeswitch/ChangeLog b/sys-apps/usb_modeswitch/ChangeLog
index 34b37994f3a4..dd550e32d650 100644
--- a/sys-apps/usb_modeswitch/ChangeLog
+++ b/sys-apps/usb_modeswitch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/usb_modeswitch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.36 2012/08/25 14:16:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.37 2012/11/28 22:53:09 ssuominen Exp $
+
+  28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+  usb_modeswitch-1.2.4_p20120815.ebuild:
+  Use udev.eclass for determining correct udevdir for helpers and rules. Use
+  virtual/udev instead of sys-fs/udev. Mark stable for amd64 and x86.
 
 *usb_modeswitch-1.2.4_p20120815 (25 Aug 2012)
 
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index a06c19a20542..211ae838f591 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -7,17 +7,17 @@ DIST usb-modeswitch-data-20120531.tar.bz2 20390 SHA256 eed06c3b8d93e69dc708e20d4
 DIST usb-modeswitch-data-20120815.tar.bz2 20716 SHA256 8819b5dad54f4aa4738ba2420eca1a14739b2d6e42860c8743561de662115f4c SHA512 b667c5615b97fbd60322f564e70075d2a91d28dd6279de2710b41a00cd1310e59627d924b6ef17854803debba430145035fac04ffb4d8301cc49ae04f174da17 WHIRLPOOL 741f3bdaa3eb582f070e6475111911db8ad075d450c1a91da6371f5b4fa8fb5ed36cf58632dfa1e3577d9dd38b08da6d1b22dc7126fed4b0db184c6554a829d7
 EBUILD usb_modeswitch-1.2.3_p20120531-r1.ebuild 1311 SHA256 7b12762da9cddb207f0501de967f997298139898e47494a7c9cffc78bb5f80e8 SHA512 3366a48d11eb291662ff222bdd48a4ada598b4b0d93c496a9361fc790adb57c02c1142bbbab4b9added37c4d99c4b75366d3ce1843c8297aa527328d27525bae WHIRLPOOL 9705eb2f163eb66714028c835c2273cf4166b6b20b7e64bfa1e65a9adce55a80f3931dba3bc85c448530bfbb876b45b459fb3df817e85a91ac601a53221fcccf
 EBUILD usb_modeswitch-1.2.3_p20120531-r2.ebuild 1543 SHA256 f4539a3918f4b03c9c701b69fae4a55f03456fedf03b5719c887f596afa5b1af SHA512 ac3b2625b4ce1869cccab2050cb5a23a67bedebc818a0e7f825fc82468300857d2cb673ab36ae209922fd402a5ab49e40a4b9bbc0f4ac4c3dad74f0fdf1e3223 WHIRLPOOL f52492f694062909192973d321a8dc77cf13ccfda98201d8c4325b5ade3640a48c001f8e3a3b845ac6e09ad67439d0f9258d9e5da4240dcd7975aacf0d5b94a2
-EBUILD usb_modeswitch-1.2.4_p20120815.ebuild 1550 SHA256 12a8a555bd9ca979b1f96042beea6c2e15e9d11f154a834ab5fa7c2b5f0a063c SHA512 128c3d2616aba46207318e215d04724bbbbbecf224438d49fe6c20ba440f0f49e0006828c05a9b65ebf0ea0ce93a298caf56c3ede63509e960507d8af88fd8e2 WHIRLPOOL 705bf70c7fb1ef7cdf788062f1d91cf50fde4d21cf433da1d77438acfd87a0f0dd678f6428df31f173c77ba3fd3b711049a1dc0e851193df36e74038ee91152f
-MISC ChangeLog 6225 SHA256 7234f2255e280ca1b2617eb130e26e1abe1046d94075d2badffabeef46840d91 SHA512 f60a50b91b9c41cce5d69a530986ab4f4ad36c0544089b81fb7fef02047f60fca7e2fec94e48bc8b58316b648832cd6095b782a3452dc2147d03a0b2171f7063 WHIRLPOOL e335b76f8b9428bdc38b815c2e40133b75c624e1116206a0bc3d9d14b712b99d35c6be2093837300c362adeb5c1538f36ca9d29a0fc9226433cdb46312ceb227
+EBUILD usb_modeswitch-1.2.4_p20120815.ebuild 1500 SHA256 f1eec0f6ddb56621404b39afed0ede3585cc71c16eb3c1cb43bc57bc1f987af9 SHA512 23eaccc1ef5340b32c737e235394ede35fba5d10ab41e5390368c7a64e1dcafad803cead7b21eb25637b8f0afe5cf91bf6d381b42d4d4aa2b61fc6098e1a7e60 WHIRLPOOL 8ff8b8c9d0cc3b94b412291b7d786c2616094fbfe4ea7fdd0fb95d53aa66cabf4f48d62367e4788d2527849f2ca8109b0ec09f46618a95ec8afaf7c69894a26a
+MISC ChangeLog 6468 SHA256 593b7ac951082ae26622b1ee01955371d698a2ce1c586856d842bde026d17eb1 SHA512 1179465ac67a3110e23067ff7e04b75e588d0d13331a0959f508a4397d59a7c5fbae29b98eebe6ceceaad70e335272cee63718815dfd059469aa3f1800cfab84 WHIRLPOOL a1d8115d0df60ad08db4d2652758186948c7b1fe059ec0d9ef8a95a17f6423e8626949aa2f15ff864d39b2270c39dc709289baf87ca9c30482b2b721b8d980c5
 MISC metadata.xml 276 SHA256 ea938beea477b5ab48f8460a5a1536869dca05fa50b3e308fbb4bee7985bc80a SHA512 fa644be40832b01059bdfaf20194168c067f6680a03695f4c1225c6389da7b4f47fdcbfd805fdbe4a03962959523c2909dbace996bf99b3ffb8509167eba5aea WHIRLPOOL dca90515c84d7c0490daf1c19d5881158dea64bcbd4ba03d440780fc4da03ab6dcc6c8eae12c6425f7d7e81fc1a0c29f668493d3669f0a7375c0ce790c62472d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQON4iAAoJEEdUh39IaPFN0C0H/jW3pVDXJv0hty0aCA3mAbP1
-NY6YHjEbV2OySzBhzN8gQxdvN+P+T0I7XXw+6FOCNZq/UcNPIKIRvv4waHUcEon6
-qvrzVDYBhCWkkpTX3sV420bQtXPsZyGjnxLx8xXxlz47UlKrUB9nEKciEKdhwAyR
-tXuOaBTGNhBMA+FM/2Ez0IXKrUcLP0rHhtGs3X+dz4il/Txc2tMNgFwWZ4B+SQaI
-M2QmPXFV1IY00fUqAN0UfYHI4wcCSpq0FxV+KqTj8yrbJVppeLnfVbGeV+EjXzv7
-k5M/0OIjsuDqk9XVlLqgfAslr4v6AlnO8p+hBHRiUe0ZkC21uuj/brZodX845ro=
-=DV6Z
+iQEcBAEBCAAGBQJQtpWeAAoJEEdUh39IaPFNVxoH/iMRRB6FwdFJnVMCuf4uUn4g
+z66X8/+nCZ8l9gz+UwaLWTh4/nAnofXFwZ358jlC7tPxElEKkFKWiM2WzN9NuZW4
+gap/IaK0ucnsDCrIa2pquGf4nynPc/4XROrVdoc37JBYoHirYqFQ5nsVmGshIUmy
+cGSjs3pn+nHeoWdin303UutP9RoGRX5gaKhmHqJXfqRFnGFgKTtJfbO7o9ScJwQH
+qfv5NiRGJZfn9V1F0GcfVyYjjsOFQYqL6WXi4KV+r0LhrHHwUXSXxMXJC4nlEBBL
+zpWxsi/13vJGMG4MZJ1KUUb82GP+5IBSh4hvGP1h881DxcXTUfbJI+XpW8ZEk4M=
+=RXU5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.4_p20120815.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.4_p20120815.ebuild
index a2d0c3cf0cd7..25e58f6d355e 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.4_p20120815.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.4_p20120815.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/usb_modeswitch-1.2.4_p20120815.ebuild,v 1.1 2012/08/25 14:16:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/usb_modeswitch-1.2.4_p20120815.ebuild,v 1.2 2012/11/28 22:53:09 ssuominen Exp $
 
-EAPI=4
-inherit linux-info toolchain-funcs
+EAPI=5
+inherit linux-info toolchain-funcs udev
 
 MY_PN=${PN/_/-}
 MY_P=${MY_PN}-${PV/_p*}
@@ -16,10 +16,10 @@ SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-COMMON_DEPEND="sys-fs/udev
+COMMON_DEPEND="virtual/udev
 	virtual/libusb:0"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/tcl" # usb_modeswitch script is tcl
@@ -42,7 +42,7 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		UDEVDIR="${D}/$($(tc-getPKG_CONFIG) --variable=udevdir udev)" \
+		UDEVDIR="${D}/$(udev_get_udevdir)" \
 		install
 
 	dodoc ChangeLog README
@@ -50,7 +50,7 @@ src_install() {
 	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
 	emake \
 		DESTDIR="${D}" \
-		RULESDIR="${D}/$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
+		RULESDIR="${D}/$(udev_get_udevdir)/rules.d" \
 		files-install db-install
 	docinto data
 	dodoc ChangeLog README