Version bump (bug #376753). Removed old.

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

3 files changed, 28 insertions, 19 deletions

diff --git a/sys-apps/usb_modeswitch/ChangeLog b/sys-apps/usb_modeswitch/ChangeLog
index 286843dd3de8..895668db95c2 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.15 2011/03/08 00:47:18 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.16 2011/07/30 23:01:20 rafaelmartins Exp $
+
+*usb_modeswitch-1.1.8 (30 Jul 2011)
+
+  30 Jul 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  -usb_modeswitch-1.1.6.ebuild, +usb_modeswitch-1.1.8.ebuild:
+  Version bump (bug #376753). Removed old.
 
 *usb_modeswitch-1.1.7 (08 Mar 2011)
 
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 9b0c668ee293..fdad87a1dcf8 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA1
 
 DIST usb-modeswitch-1.1.4.tar.bz2 37723 RMD160 e8c33dfd957fefd0b434becf7ec8b9e65ffd3da0 SHA1 1f13cb281c1ad7d891e24cdcac1908509f666557 SHA256 c20abfdf9d46fb83e1b82f961a9f6ec8064bed3304155b6e1af7cf596845d0d0
-DIST usb-modeswitch-1.1.6.tar.bz2 40247 RMD160 29042e3fb301f91db2f75d5e22107a71f1e0c79a SHA1 cc7e71ba51361233fb2eee05e09706b90986fe6f SHA256 3070cd6ea621fbe03efa769a4e78406bffa34af247f1969819487ef2d1ca1f40
 DIST usb-modeswitch-1.1.7.tar.bz2 41602 RMD160 68c37802c6df1c5fa746e7526bb0bed56a9aa399 SHA1 bf3c1d24a12de62eedd185a3ab5615d3a63b7a47 SHA256 b069ff4557b602e013d8f994894c047b1b10c4280b8207be058259cc6cd7dd08
+DIST usb-modeswitch-1.1.8.tar.bz2 34459 RMD160 06d0e18a93cc7be1bf08689180e24c6335062ea8 SHA1 03a86e40c0ba98d2cefdbbee3b062e42c7b85587 SHA256 1a32c5f18afccfb5aecce7b0a743c0a65113eaad266b6a0e33c3f3ae4ac189e3
 DIST usb-modeswitch-data-20100826.tar.bz2 16105 RMD160 56fe385588550faee49de4b3542db6252fdca2f0 SHA1 b787c142452c80683700f0af6d52994ea38e5296 SHA256 a81821d3d9ad9e1d3a31ea11d0da9841ca84350f0b445a8f9ea2dbd142cefb46
-DIST usb-modeswitch-data-20101222.tar.bz2 16871 RMD160 d515e92526c11b83c72c28d78f02b515252c9216 SHA1 adfc827c7bf46bc588cef45a481d3d73b99e9756 SHA256 1ec5767cf6fc16ebf7b8328359399d82338a5048caf18b3442268a5b6dbb4c7e
 DIST usb-modeswitch-data-20110227.tar.bz2 18026 RMD160 d0afa241df375d228d1592a4a29584fdb9f8b813 SHA1 5f60c313b3b6fa6ae8b5da747b3af0dce8e0378e SHA256 f5930cf1c14ccfeaa226297aa7e2eea1b375fe6b79e010bf384a01eb2b6741a2
+DIST usb-modeswitch-data-20110714.tar.bz2 19383 RMD160 afd90776e4f42a8cc80f750f738fdc083dad9f5d SHA1 13ba03089e5fa0c7357dd03eec1ec210796abc42 SHA256 f78891e77f38c7279f620013e357e59e0d43724d155cfb4d40c587c524cf19bf
 EBUILD usb_modeswitch-1.1.4.ebuild 1082 RMD160 6d678be77d14f406b69307f9c472337391df8226 SHA1 e1c3e0a062ab2f58cf9988d9fcb8a03d58e4e3e9 SHA256 7f987ddb601ba9543316cfaacc4654db7563114fd3d4062398ffc74e042b1f2a
-EBUILD usb_modeswitch-1.1.6.ebuild 1128 RMD160 bb585b5f8c642ff122aa9c209ee10ee779e0ef77 SHA1 3249685202b6f3dcd567b2d8ecc604f55a92ae5b SHA256 941f8d0837ca323e74d449a5f856033224eb3faeb688c26bd4c25389cc59600c
 EBUILD usb_modeswitch-1.1.7.ebuild 1198 RMD160 4e614c6fb4a558dfb53247853a988d242ec65339 SHA1 c21822692e68ae2e40b96d6247b3cab081c32237 SHA256 a834cfca450f6149d6f7af691f7db1b92d929f0566523e5757e74e1f80e1f5f1
-MISC ChangeLog 2885 RMD160 2fb66001722cdc41d74a1976b3307ff2c18a14c2 SHA1 88c59e63830a9267dd644dfd39ca5f304b5d38d8 SHA256 6ace60b1e084c0f4fdb4373eb6a655bee219f2d1e7a03447c003e02d7252d2af
+EBUILD usb_modeswitch-1.1.8.ebuild 1148 RMD160 318a412face70e18c11f05a568b75b0bd6bd8a57 SHA1 c314ebc46404d44f59ab9cd9d3319b6c26ad8df5 SHA256 998501d2d19343b821a863e977efc1c5cf3394467e8f082b616e59430488ccc9
+MISC ChangeLog 3088 RMD160 3f137a20a330e0dc0445357dff200190e5ba1092 SHA1 317b5fca3cfc3deb03feba8db3acb8c6cda5f213 SHA256 ddcc82fafe1a42941f1306f42f93a552534fe81d13bc9af57cc0761474b0de68
 MISC metadata.xml 260 RMD160 684f6baa659b932d9dd4c6d9b631ee7334f54672 SHA1 b78600aedbadc86e5dc2736a9f1987b11596a6c6 SHA256 c9f6474185b42a5ea223d0c4b92294576e3ed1d64c6988947c160c5977a9603d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNdXyjAAoJEMmH5mwCk1Nv40IH/3hXysyROZx+9vqAEeOx5OXU
-+aiuuE/fUlTtyhNSrdMsAbhxps3BYmKSQFI0Fi33TGTE4wzVp0arTS2o7Hi25zrW
-eQyDV7K6fnnTxak9zltF2LmzVPgci3gEvgDCjg+1hbQuhNRdS4imbeBWhdiap8nf
-bq9KIetQDAXfRtojRSDvBnDbP2hXaST6ZYMsngzSANem3TVlZKpKgIvRMWT6P/O4
-ue+lOc7VQ0RAjnLYLYZeQMCqg7NFVK6ShJKF1etS84z1qTNZwnjnEbeNrmy8zxaI
-l+E2YjcrQ6XZFqb5133fXtGADbNxyuNx4gJ58ozq9bOddkOMSZO1H+3lIO9fWZI=
-=I9Yz
+iQEcBAEBAgAGBQJONI1GAAoJEMmH5mwCk1NvEC4H+wbP6A0VjSApk1cgeuuvJBHp
+MLLH5mvCju28rWC5d4gq3GwQGoQs+klOt3c3KHwv+ah/oOSzeXbxeX9S6cKglwJs
+ppVMZ1Our46aFvg31wSAvf1+nBH4Koggjsw20dX+PH96P4Yqdo/0Watr8i7FeYV4
+avghuv91VEgmT7gftWn2tkGwWb+aGl6PLHTInmjUimwO0V7ypsj4/26vDEf29OZK
+QVsyeAKVNsXoYpE5jilPoBb2V9eN44JnnnXf1gJckK9H/HVO+rCqCJejYjgW14kU
+lkCKAnjLBRMbjzmymkl/v0H/JHMXPyYcl5zix4A9EwdhmGo5hnJHsyhML1ywBWI=
+=oFlM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.6.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.8.ebuild
index b77e826ffb1f..8b6876157aa1 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.6.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 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.1.6.ebuild,v 1.1 2011/02/12 18:15:49 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/usb_modeswitch-1.1.8.ebuild,v 1.1 2011/07/30 23:01:20 rafaelmartins Exp $
 
-EAPI="2"
+EAPI="4"
 inherit multilib toolchain-funcs
 
 MY_PN="${PN/_/-}"
 MY_P="${MY_PN}-${PV}"
-DATA_VER="20101222"
+DATA_VER="20110714"
 
 DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
 HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/"
@@ -25,15 +25,18 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	sed -i -e 's/-s //' Makefile || die 'sed failed.'
+}
+
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	local udevdir="${D}/$(get_libdir)/udev"
-	emake DESTDIR="${D}" UDEVDIR="${udevdir}" install || die
+	emake DESTDIR="${D}" UDEVDIR="${udevdir}" install
 
 	cd ../"${MY_PN}-data-${DATA_VER}"
-	emake DESTDIR="${D}" RULESDIR="${udevdir}/rules.d" files-install db-install \
-		|| die 'emake install failed.d'
+	emake DESTDIR="${D}" RULESDIR="${udevdir}/rules.d" files-install db-install
 }