Use udev.pc pkg-config file to determine UDEVDIR and RULESDIR for compability with sys-fs/udev >= 187.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 76 insertions, 10 deletions

diff --git a/sys-apps/usb_modeswitch/ChangeLog b/sys-apps/usb_modeswitch/ChangeLog
index 057072347f02..eb1e66e74481 100644
--- a/sys-apps/usb_modeswitch/ChangeLog
+++ b/sys-apps/usb_modeswitch/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2012/07/13 10:24:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.35 2012/08/06 08:19:55 ssuominen Exp $
+
+*usb_modeswitch-1.2.3_p20120531-r2 (06 Aug 2012)
+
+  06 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +usb_modeswitch-1.2.3_p20120531-r2.ebuild:
+  Use udev.pc pkg-config file to determine UDEVDIR and RULESDIR for compability
+  with sys-fs/udev >= 187.
 
   13 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   -usb_modeswitch-1.2.3.ebuild, -usb_modeswitch-1.2.3-r1.ebuild,
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index fcfa191ccb52..5ab919f48a5a 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST usb-modeswitch-1.2.3.tar.bz2 254562 SHA256 924bf9357241c3d2de37b381ebbe82818fa3fd19fcffdc2dcaf2b5d17d29723b SHA512 dca0f7d5e5b7b66588a2b2a6d8f09a3cabc103a0dc9c03e7b41f0bfe9645801a3f4f04e87b4abe046f943754f23ad66414e813748307212cc814e8eaa9213839 WHIRLPOOL 8efe68921e1fec925d508811bdd01f46b76a9e0859404c962ed364712ff298bc26326c632d5dfc4c34958dde63c479f3d7e8d2569254d9c9ff2935dd62fb0b9c
 DIST usb-modeswitch-data-20120531.tar.bz2 20390 SHA256 eed06c3b8d93e69dc708e20d4c621c52e9e9a6325df87cc627c3ef4608b206a9 SHA512 7fe8b1c5c0ddd8aea15554055e1c384786bd7e0f0c008409dd4eaf49c0967e7d7882bbbae22c810b5aa7a08cf8382eaa516087d0ac88a6fc15364acab7c46eb8 WHIRLPOOL b2bbe4f994e33461cecb5c953e0625c94d3605f97ff8651e084ae5e2f69aa92bc0dceba150f4e39ca21058cb4bebfceee59128990b775a4f2e01a35292a3134d
 EBUILD usb_modeswitch-1.2.3_p20120531-r1.ebuild 1311 SHA256 7b12762da9cddb207f0501de967f997298139898e47494a7c9cffc78bb5f80e8 SHA512 3366a48d11eb291662ff222bdd48a4ada598b4b0d93c496a9361fc790adb57c02c1142bbbab4b9added37c4d99c4b75366d3ce1843c8297aa527328d27525bae WHIRLPOOL 9705eb2f163eb66714028c835c2273cf4166b6b20b7e64bfa1e65a9adce55a80f3931dba3bc85c448530bfbb876b45b459fb3df817e85a91ac601a53221fcccf
-MISC ChangeLog 5808 SHA256 ef3c19f4ce6f8834fcb40db6f93ee133bdc64aa576b56d4ccd2f06b6cce97f63 SHA512 be1170820d588619415374fd0fe543277423cb57de30036bb8641bd77b49ded97ed71c5fcfbacb186b0807e4d847743d6568f33827340f52f05439d444210f19 WHIRLPOOL 3ebd637e729216693fd678a274724174374fc4f6de5805c32c0df37be98b9b0b23a9a2dfab1859892855bb0fb154663604df5530fa6b043782efcb5936bab674
+EBUILD usb_modeswitch-1.2.3_p20120531-r2.ebuild 1543 SHA256 0b31f656167af832b08eff81cd71fd35adebf0a75f65626d68ed787e48417165 SHA512 aba6ac2f8e625a0060b1323321acedfa433056a60e3a871e06fc221b19fe5c3808078635bc1658b1f857d16512468c878255f6f641cd3ee33a962ee133350ba9 WHIRLPOOL 96cfa509bd4eee9b7225c2c681c0e0c6d0d99e2065445dc0188b738092df009e50af5b41828b2524e2c822e80945f3be90a11f128eaa93d1d882256d032a4611
+MISC ChangeLog 6065 SHA256 fefda854a25cb272882d981342c95df3641b1c959530d25f61937ff611bc3b9e SHA512 8e8deee9d1af315774c2da08ee2cc33d34fe533023bf864075e8593516f511db335efc2377ddfa29935b9ab09971ec9564f324edb55d53eb3e1cbe5d0f74b965 WHIRLPOOL 12e14596ee030bf46a65224ae11213d2f04986542d11e97bf570d774a02e20888c4a042add098e0b689823f476246382ae10e33b8ac625678b0f9d843917ca1c
 MISC metadata.xml 276 SHA256 ea938beea477b5ab48f8460a5a1536869dca05fa50b3e308fbb4bee7985bc80a SHA512 fa644be40832b01059bdfaf20194168c067f6680a03695f4c1225c6389da7b4f47fdcbfd805fdbe4a03962959523c2909dbace996bf99b3ffb8509167eba5aea WHIRLPOOL dca90515c84d7c0490daf1c19d5881158dea64bcbd4ba03d440780fc4da03ab6dcc6c8eae12c6425f7d7e81fc1a0c29f668493d3669f0a7375c0ce790c62472d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP//X9AAoJEEdUh39IaPFN8PcIAI/TL8e/EFcQjjdZ7fGpuyFB
-nlAIkcQGZ0rgDkFCju5QjynMjeTtZZYyDT0pmpuWidtMQuNv1IlUtIqqOAuR/kI9
-Q+lQUk4YnlhAyLJoFqbE0nRQLwaKR3BUfI1WVDr3cOQR9ABcokDHi8H8iytQqsh5
-Lw11bOleXZJ1C1sZA3/JxXfhA2F900ZqRM3LSdpQdVqN6x2xITU98MTQvViwbgfE
-c2G5POK6e9LHtVL1DjGpY6XZ972nnTyrN4MpRfUuG8rt4pJxFH2VbOB9anUA0LaN
-T0LoUfznyb66ky0ovcF3sRjX/vCAkdiGcISmOHWB4AU9PFlDqX80VMIf6I0hCYo=
-=knqe
+iQEcBAEBCAAGBQJQH34nAAoJEEdUh39IaPFNE+EH/3mkBOHhly7PHkWO8+iy9dBD
+bfODxJ0I9ZdbAh2jhQKtSpKqO1rjMcpECLD4AQQ6oZOd+q3+23lxcp2KKmSwT/YV
+PA79+yo5V9pKRtxBRP+bV9NKzba//gCu4yYaN3g3ki3pS8bljt0Lp5F8wR9sZZaL
+AdNz6Cl/8vOVXKxCVVqOTma2WEKCJ856smKZVPVjFiXa1kLuAmqh4MpfKGawZirj
+v46MrCsXsWKIbBLVeolbutS5aZ3M6/Oy6EnSxGFYuttpzeo3xnFxzaZ9/xkjtqEu
+2opAJ5NNH4oIDugkSbL0wdoIuDD85bu2Tl83Xsp9VaWQv3oiABO2S+vg+jeZyXI=
+=OGHp
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.3_p20120531-r2.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.3_p20120531-r2.ebuild
new file mode 100644
index 000000000000..4ff5dff926f6
--- /dev/null
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.3_p20120531-r2.ebuild
@@ -0,0 +1,58 @@
+# 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.3_p20120531-r2.ebuild,v 1.1 2012/08/06 08:19:55 ssuominen Exp $
+
+EAPI=4
+inherit linux-info toolchain-funcs
+
+MY_PN=${PN/_/-}
+MY_P=${MY_PN}-${PV/_p*}
+DATA_VER=${PV/*_p}
+
+DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
+HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+	http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="virtual/libusb:0"
+RDEPEND="${COMMON_DEPEND}
+	sys-fs/udev
+	dev-lang/tcl" # usb_modeswitch script is tcl
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="~USB_SERIAL"
+
+src_prepare() {
+	sed -i -e 's:/usr/sbin/modp:/usr/bin/modp:' ${PN}.tcl || die #416223
+	sed -i -e '/install.*BIN/s:-s::' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		UDEVDIR="${D}/$($(tc-getPKG_CONFIG) --variable=udevdir udev)" \
+		install
+
+	dodoc ChangeLog README
+
+	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
+	emake \
+		DESTDIR="${D}" \
+		RULESDIR="${D}/$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
+		files-install db-install
+	docinto data
+	dodoc ChangeLog README
+	popd >/dev/null
+}