Search modprobe also in /usr/bin wrt #416223

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

3 files changed, 71 insertions, 16 deletions

diff --git a/sys-apps/usb_modeswitch/ChangeLog b/sys-apps/usb_modeswitch/ChangeLog
index 75548e50e80f..f3cb15151b27 100644
--- a/sys-apps/usb_modeswitch/ChangeLog
+++ b/sys-apps/usb_modeswitch/ChangeLog
@@ -1,6 +1,12 @@
 # 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.31 2012/06/20 03:17:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.32 2012/07/13 10:20:58 ssuominen Exp $
+
+*usb_modeswitch-1.2.3_p20120531-r1 (13 Jul 2012)
+
+  13 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +usb_modeswitch-1.2.3_p20120531-r1.ebuild:
+  Search modprobe also in /usr/bin wrt #416223
 
 *usb_modeswitch-1.2.3_p20120531 (20 Jun 2012)
 
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 4b54b0f9d45a..f97aac974bbb 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST usb-modeswitch-1.2.3.tar.bz2 254562 RMD160 7ef606b865ab1463483d4d3a5332013a003bac1b SHA1 3d6115ebde38d70ba68ecdb27ab55e059884a5c2 SHA256 924bf9357241c3d2de37b381ebbe82818fa3fd19fcffdc2dcaf2b5d17d29723b
-DIST usb-modeswitch-data-20120120.tar.bz2 19551 RMD160 81dde8100c81c526cc67f8c44fb125447c19a501 SHA1 7288db828998d12f59fe25f89c5c9ba4cd78e185 SHA256 bce6b8cbbf293fe519584b63815fe7f665e8238e6e138151d8cf7cc85a7a7b0f
-DIST usb-modeswitch-data-20120531.tar.bz2 20390 RMD160 28c82ab426bfb1361f22e89d70625df9d74f085d SHA1 0cd0d4220e372f879538ce696bca7f053731bbb2 SHA256 eed06c3b8d93e69dc708e20d4c621c52e9e9a6325df87cc627c3ef4608b206a9
-EBUILD usb_modeswitch-1.2.3-r1.ebuild 1228 RMD160 27c0558735cdd5513ec54040bbd96a3e5561c2e1 SHA1 1722dddb3d1344ce0d02cec56e1339520f90769c SHA256 9ff56112043057a8cb668942d8df1de21e1506205e27b7102697a38f5f4092be
-EBUILD usb_modeswitch-1.2.3.ebuild 1223 RMD160 ce531b2bf8abbec981b8c3e0cc6914d6892fe0ca SHA1 2722e1aa51b0863fbcd49856dc8ec56de98136e8 SHA256 7676beb8c73766e334d31f00594cb125a7882311f4661f2c7e0ac28947b3dadd
-EBUILD usb_modeswitch-1.2.3_p20120531.ebuild 1240 RMD160 6defb3dbe5d8cc3613bdeeb3b314a1c2c6c54655 SHA1 3404c97365c21097641f621c0bb367ca420ba1a3 SHA256 f426bbd485f70bfd6b2f4b4b98e5bc94528fe71d8ac9ffbb5222c32afcfaaf28
-MISC ChangeLog 5325 RMD160 32166fe118e423be6cf8630695b1b06d27f95567 SHA1 1071051cd6f840e4ab679cb3af68297756cdd149 SHA256 9de0032cd367faea7d53e8cab4e1f063dd9f2128ac1d677d3cb5fd4b72447103
-MISC metadata.xml 276 RMD160 9ca78cf737628871dde71949d9662f3f23b22439 SHA1 ae9827e55d1b8c7885c771aa12edb61acb06c04f SHA256 ea938beea477b5ab48f8460a5a1536869dca05fa50b3e308fbb4bee7985bc80a
+DIST usb-modeswitch-1.2.3.tar.bz2 254562 SHA256 924bf9357241c3d2de37b381ebbe82818fa3fd19fcffdc2dcaf2b5d17d29723b SHA512 dca0f7d5e5b7b66588a2b2a6d8f09a3cabc103a0dc9c03e7b41f0bfe9645801a3f4f04e87b4abe046f943754f23ad66414e813748307212cc814e8eaa9213839 WHIRLPOOL 8efe68921e1fec925d508811bdd01f46b76a9e0859404c962ed364712ff298bc26326c632d5dfc4c34958dde63c479f3d7e8d2569254d9c9ff2935dd62fb0b9c
+DIST usb-modeswitch-data-20120120.tar.bz2 19551 SHA256 bce6b8cbbf293fe519584b63815fe7f665e8238e6e138151d8cf7cc85a7a7b0f SHA512 2624e0c96ecce2fee0b2e81b0b0b15d6829dfc4c37d70cb22a41ed5bee87df0f090ad5dbb4f6a2b52dcd7ad308526556c24798b76519ad9bbd87fc9da8b978db WHIRLPOOL f9ec0bcc4b029868fc2917c4559fbf08e52d42645eb314a507c4c296d3a8d1adfcca7b91afc1ad150e968496bc2951ec253879a0cadf99f9ca2992fd59a9a5a6
+DIST usb-modeswitch-data-20120531.tar.bz2 20390 SHA256 eed06c3b8d93e69dc708e20d4c621c52e9e9a6325df87cc627c3ef4608b206a9 SHA512 7fe8b1c5c0ddd8aea15554055e1c384786bd7e0f0c008409dd4eaf49c0967e7d7882bbbae22c810b5aa7a08cf8382eaa516087d0ac88a6fc15364acab7c46eb8 WHIRLPOOL b2bbe4f994e33461cecb5c953e0625c94d3605f97ff8651e084ae5e2f69aa92bc0dceba150f4e39ca21058cb4bebfceee59128990b775a4f2e01a35292a3134d
+EBUILD usb_modeswitch-1.2.3-r1.ebuild 1228 SHA256 9ff56112043057a8cb668942d8df1de21e1506205e27b7102697a38f5f4092be SHA512 bbeb625ee30deeeca1c8499b4a0edf826be8303c9873a1c8c07358e60d139a7f0d7f8cb0f8335d814842ad41ccf9deda7a205cd4713b802c889bbb4405fec42d WHIRLPOOL a023458be25c0d6fc39cfeb679d42f1397cb1745271d227db8d1a0542054f4a3297eace765342611a47f5dfcaf91187181fe2651e73ad7052bdb7eaf1d234277
+EBUILD usb_modeswitch-1.2.3.ebuild 1223 SHA256 7676beb8c73766e334d31f00594cb125a7882311f4661f2c7e0ac28947b3dadd SHA512 97cb6e8c9aafb81d92de731b44374c02ec3155e0bcd809622f6c0ec5c0e4243ebff99e509566efbea47f6b2f9c39db639801b326770aaa0e879ea1e7a2e8a3e5 WHIRLPOOL fa869711107245ecfa5f27c7a99bfebb0c250d4fd056e3f8baecb696294ddec77a85fa5d04ae16f3f00d933036f5217d380697e7dc96d28cf28cc9b6abb25cb7
+EBUILD usb_modeswitch-1.2.3_p20120531-r1.ebuild 1313 SHA256 84baa5bf9828e0395da81802a7397bc377b47545cdd1f286af0470647615c48a SHA512 6d976ab08d5fc9545864243552565a8127fc198835faea20b709317e417e550abc4436aa4c997eb95eb42de6687bc9f152678c8c1d0eaddb6a6e1073a7be8ae6 WHIRLPOOL d38cfdd6c0e5a7bdffc4c7a2fdd528e6701264a136d7506114b5d1ca2a689888472662d7f262732ee7983f75aeca31ad3fe0a4cbcf032cd0256c736ee2862f1e
+EBUILD usb_modeswitch-1.2.3_p20120531.ebuild 1240 SHA256 f426bbd485f70bfd6b2f4b4b98e5bc94528fe71d8ac9ffbb5222c32afcfaaf28 SHA512 421cd22442560d075a91e894e49c361dafaebe0c02c4e422f1c40bd31787936893b6eef3aae7c639d4186d4287ec29c1cedf782eacce235d6fb6e4ffeec8c053 WHIRLPOOL 9ba6d0e39e3a4595b53117c649f65ce56c602a2ce5c09967752234fee6727d7c6caef63c25ea4c26ca9ebf8a2cddacab160972a332a0149db21546d29b5974a8
+MISC ChangeLog 5522 SHA256 26428fd394f96ea327f87c523af42a3cccc26f6d72cc3a23caf014f7c1923d58 SHA512 55f75944cff32a01ae1387a2429a1986b2f8fb1d991a1fbb28ceb4326e7c51f196a50980970d0db7ce0721ca2d6148db484c11a27c572a7586dd8f7941ef16ab WHIRLPOOL aa3bee3bf38635424ddbf39f3a1e0ce11fbbc1c2bf0e7f3dd22f3405dddda6bd61aa5a09ddf5c0ec8ec3dc9fe6f5ee91d2ecabbe1c4db3c3ba2905d059f9778d
+MISC metadata.xml 276 SHA256 ea938beea477b5ab48f8460a5a1536869dca05fa50b3e308fbb4bee7985bc80a SHA512 fa644be40832b01059bdfaf20194168c067f6680a03695f4c1225c6389da7b4f47fdcbfd805fdbe4a03962959523c2909dbace996bf99b3ffb8509167eba5aea WHIRLPOOL dca90515c84d7c0490daf1c19d5881158dea64bcbd4ba03d440780fc4da03ab6dcc6c8eae12c6425f7d7e81fc1a0c29f668493d3669f0a7375c0ce790c62472d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP4T+aAAoJEEdUh39IaPFNi3sH/0TMnxUVmQkFgPPHZ+hilD6P
-pUf18l+BOGPlPUm5mdlvaJyCuoKkujvNAQYHXGUTzRvY2mvrYrYOLaMXiOAjmKMM
-8fH3XuN8KvEsLySTunjgIKmlG+xZThDt3psZ0dtFLJpo63lhNE032ZFGz8K3u+xr
-9CO6ITIefh7M3EnuBRoHsHvm+gTI0n/Gzj8dWKZ6a1iGXC6TZ0o21ryOoQTZ5NyZ
-vV32xKN+2NAp+vsubJndxsOIpMh/KfoUFWCfNmqMySNxuqOr1GpG+QFHB2xBivix
-Tyqne2IkfaYCnW76kaEaJ03dYV9Dj5KwH/cvayTuu+gspCwhZfUAhKo+ly0JH90=
-=Nilt
+iQEcBAEBAgAGBQJP//UYAAoJEEdUh39IaPFNcccH/RX8ey3w5QOtGyiR8nqMHKKi
+LjFjRxU5WTZtaDjR5MVAILG8q8uwQKPobGQFrBnBnqre7FsUaJTd1mk/FJ3GLSAD
+oKmVp3MFkTrKkMqW3TJTT1dMZHEAB+h8tLLptDhs8cdsuVAbU4QGUcE5v3KhjgxW
+JGFhnMPLLKFbgoI/Dv1827NWm2ggKeZmy0yexWqxEB51mLgMEXA+/NUbc1rGKd4v
+TCEuI8+HHOubbXdOODdysE7v++4djS8xGpBuZ/KJy9JWReomhlVtg4c3lCekIOZB
+GmpTR5fjktTnsofmWe897n+TzaEgzPmGOAB4eHdVpMuShHeEM40yJtvTFUZbORE=
+=19Za
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.3_p20120531-r1.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.3_p20120531-r1.ebuild
new file mode 100644
index 000000000000..f349ab005d7a
--- /dev/null
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.3_p20120531-r1.ebuild
@@ -0,0 +1,48 @@
+# 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-r1.ebuild,v 1.1 2012/07/13 10:20:58 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=""
+
+DEPEND="virtual/libusb:0"
+RDEPEND="${DEPEND}
+	dev-lang/tcl" # usb_modeswitch script is tcl
+
+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}" install
+	dodoc ChangeLog README
+
+	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
+	emake DESTDIR="${D}" files-install db-install
+	docinto data
+	dodoc ChangeLog README
+	popd >/dev/null
+}