Version bump (bug #357855) and old versions clean up.

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

6 files changed, 38 insertions, 127 deletions

diff --git a/sys-apps/usb_modeswitch/ChangeLog b/sys-apps/usb_modeswitch/ChangeLog
index 65bd9d196353..286843dd3de8 100644
--- a/sys-apps/usb_modeswitch/ChangeLog
+++ b/sys-apps/usb_modeswitch/ChangeLog
@@ -1,6 +1,14 @@
 # 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.14 2011/02/12 18:15:49 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.15 2011/03/08 00:47:18 rafaelmartins Exp $
+
+*usb_modeswitch-1.1.7 (08 Mar 2011)
+
+  08 Mar 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  -usb_modeswitch-1.1.2.ebuild, -files/usb_modeswitch-1.1.2-makefile.diff,
+  -usb_modeswitch-1.1.3.ebuild, -usb_modeswitch-1.1.3-r1.ebuild,
+  +usb_modeswitch-1.1.7.ebuild:
+  Version bump (bug #357855) and old versions clean up.
 
 *usb_modeswitch-1.1.6 (12 Feb 2011)
 
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 04ab068ef438..9b0c668ee293 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,31 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX usb_modeswitch-1.1.2-makefile.diff 917 RMD160 f799abc6c226ab4b2d280b4c05e623a7941b1479 SHA1 f855598874d46800b2b1759c309b0d4c28fa4e75 SHA256 4c7c1675fbd97899bcf70f5cac667e04e011e29fa21e116bcf429a537344ed0e
-DIST usb-modeswitch-1.1.2.tar.bz2 35001 RMD160 1c07b99eb50a1713d98360cd28d8d9fe7194db29 SHA1 f13a11205b8511a3bec478c18dbc2a578aba9e6e SHA256 df26395e07a4e286d6a51d6dd3f8374024a10e1b51ef8c07f105da443268f0f3
-DIST usb-modeswitch-1.1.3.tar.bz2 35937 RMD160 676bd1a3a9b55799498af6823e3b424407dcd48a SHA1 c13c1b5ff15140786e2a66775cd58fe43c3abf14 SHA256 7d5f0a45ac03eb578678b1f0c99df924b55de40d684aa02f890958c3fe3fcafb
 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-data-20100418.tar.bz2 13967 RMD160 a302929c589605dd63ba742ea416559b33b4ee32 SHA1 3a8baed9005e5f7f7dc64563badf62bf8abf767a SHA256 dd316f5f9e456da26fd2ce7b84ffdc065a1ea725492a79401cf1012a94c09453
-DIST usb-modeswitch-data-20100623.tar.bz2 14638 RMD160 5bdf0b599c4f6fc0575a222db190d9f794e52830 SHA1 2ace57211714f292cbb8bbc728a447bfa1fd5684 SHA256 929c47990984f563fb16ccb005a6750f923ac08a110016917e58e8be2d026a25
-DIST usb-modeswitch-data-20100707.tar.bz2 14964 RMD160 b2ca2a0ac18a3c86a2c01521286da7555258dbc4 SHA1 3bb406ba0cf394a737e8b8afcf1f1078d65f98e6 SHA256 427adf0728884d3001d019926b34ca7170455c5c40e8dd19e7517759e381b886
+DIST usb-modeswitch-1.1.7.tar.bz2 41602 RMD160 68c37802c6df1c5fa746e7526bb0bed56a9aa399 SHA1 bf3c1d24a12de62eedd185a3ab5615d3a63b7a47 SHA256 b069ff4557b602e013d8f994894c047b1b10c4280b8207be058259cc6cd7dd08
 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
-EBUILD usb_modeswitch-1.1.2.ebuild 1160 RMD160 865aed749053a00503abcba5e251e31f01bbe78d SHA1 de6ebc964873601739496c6f4908168a3289cc92 SHA256 a7673974875eabca4a068ccb5768fc3d13e5cfecc0f28314352a57818ccfd193
-EBUILD usb_modeswitch-1.1.3-r1.ebuild 1059 RMD160 82ec6f226b9f7e40d754ae17b165d910133518fd SHA1 dc4f4b6bc37c8b8c7f619e7327fb8abada106ea9 SHA256 8d0b5d1aff433a6af02a887c9d395a5dd77767d4e13791e1a626db0b09542a24
-EBUILD usb_modeswitch-1.1.3.ebuild 1056 RMD160 bd367117f731e1ba8a04324534e7b88b1179f063 SHA1 0a92d218fcc9bfbd291195ca90ef57e824ac5dc4 SHA256 0ea29c1bfb2e042314523f014dd098ec0e948f86a2e2a0002e79dd073cd0395e
+DIST usb-modeswitch-data-20110227.tar.bz2 18026 RMD160 d0afa241df375d228d1592a4a29584fdb9f8b813 SHA1 5f60c313b3b6fa6ae8b5da747b3af0dce8e0378e SHA256 f5930cf1c14ccfeaa226297aa7e2eea1b375fe6b79e010bf384a01eb2b6741a2
 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
-MISC ChangeLog 2559 RMD160 0c7655bb686af868c6ed1ebea9c1b9adb60844e4 SHA1 3253b562a562470c576b0a98c6450dc1f8e720d1 SHA256 47c1af4b4530387631cc3af92ed9108467ef6f627f72b278ca8772d335c24d50
+EBUILD usb_modeswitch-1.1.7.ebuild 1198 RMD160 4e614c6fb4a558dfb53247853a988d242ec65339 SHA1 c21822692e68ae2e40b96d6247b3cab081c32237 SHA256 a834cfca450f6149d6f7af691f7db1b92d929f0566523e5757e74e1f80e1f5f1
+MISC ChangeLog 2885 RMD160 2fb66001722cdc41d74a1976b3307ff2c18a14c2 SHA1 88c59e63830a9267dd644dfd39ca5f304b5d38d8 SHA256 6ace60b1e084c0f4fdb4373eb6a655bee219f2d1e7a03447c003e02d7252d2af
 MISC metadata.xml 260 RMD160 684f6baa659b932d9dd4c6d9b631ee7334f54672 SHA1 b78600aedbadc86e5dc2736a9f1987b11596a6c6 SHA256 c9f6474185b42a5ea223d0c4b92294576e3ed1d64c6988947c160c5977a9603d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNVs5hAAoJEMmH5mwCk1NvLycH/3OGFtn5mnRCae0u4Q4wphGD
-j01PkP+tV0uMu/pwW9OHhLup8fszYOfbtiiLtrsN9kQiZHmyZqLnfp9adSLfrHhx
-qCkhEZKhqNvu8rgTiKdFqZfXM+IIUyInVezYP51CcBgZ8kzVL17g/jXpKl+uqdzn
-UmnwfbHlvHzmwA4oP0vgbGXZI+unPoOzzrQ+vDBdSeHFAQcm3pIICTtHPhsjUfxo
-A1ZmRB9sKwhvUj+YOYs866T/W0YLuc/FXzO1+0vBR/oIG+tcMf64RKNnbm8Xcwfm
-oG8wj13inLKbUVuJOqFOsarYlJsQ0cfbngJ5NBaKdQysyTeLKclQEj8hOIX8fFY=
-=ypDK
+iQEcBAEBAgAGBQJNdXyjAAoJEMmH5mwCk1Nv40IH/3hXysyROZx+9vqAEeOx5OXU
++aiuuE/fUlTtyhNSrdMsAbhxps3BYmKSQFI0Fi33TGTE4wzVp0arTS2o7Hi25zrW
+eQyDV7K6fnnTxak9zltF2LmzVPgci3gEvgDCjg+1hbQuhNRdS4imbeBWhdiap8nf
+bq9KIetQDAXfRtojRSDvBnDbP2hXaST6ZYMsngzSANem3TVlZKpKgIvRMWT6P/O4
+ue+lOc7VQ0RAjnLYLYZeQMCqg7NFVK6ShJKF1etS84z1qTNZwnjnEbeNrmy8zxaI
+l+E2YjcrQ6XZFqb5133fXtGADbNxyuNx4gJ58ozq9bOddkOMSZO1H+3lIO9fWZI=
+=I9Yz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usb_modeswitch/files/usb_modeswitch-1.1.2-makefile.diff b/sys-apps/usb_modeswitch/files/usb_modeswitch-1.1.2-makefile.diff
deleted file mode 100644
index 80bc6abb900e..000000000000
--- a/sys-apps/usb_modeswitch/files/usb_modeswitch-1.1.2-makefile.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- usb-modeswitch-1.1.2/Makefile	2010-04-17 20:27:11.000000000 +0200
-+++ usb-modeswitch-1.1.2-1/Makefile	2010-05-14 21:00:13.000000000 +0200
-@@ -15,17 +15,16 @@
- all:        $(PROG)
- 
- $(PROG): $(OBJS)
--	$(CC) -o $(PROG) $(OBJS) $(CFLAGS)
-+	$(CC) -o $(PROG) $(OBJS) $(CFLAGS) $(LDFLAGS)
- 
- clean:
- 	$(RM) usb_modeswitch
- 
- install: all
--	install -d $(SBINDIR)
--	install --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
--	install --mode=755 usb_modeswitch.tcl $(UDEVDIR)/usb_modeswitch
--	install --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
--	install --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
-+	install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
-+	install -D --mode=755 usb_modeswitch.tcl $(UDEVDIR)/usb_modeswitch
-+	install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
-+	install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
- 
- 
- uninstall:
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.2.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.2.ebuild
deleted file mode 100644
index 96cf69ef0082..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 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.2.ebuild,v 1.1 2010/05/14 21:20:24 hanno Exp $
-
-EAPI="2"
-inherit multilib toolchain-funcs eutils
-
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-DATA_VER="20100418"
-DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/"
-SRC_URI="http://www.draisberghof.de/usb_modeswitch/${MY_P}.tar.bz2
-	http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="=virtual/libusb-0*"
-RDEPEND="${DEPEND}
-		 dev-lang/tcl"
-# TCL rdep is not an error. The runner script is written in it.
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.diff"
-}
-
-src_install() {
-	UDEVDIR="/$(get_libdir)/udev/"
-	emake install DESTDIR="${D}" UDEVDIR="${D}/${UDEVDIR}" || die
-	cd "${WORKDIR}/usb-modeswitch-data-${DATA_VER}"
-	emake files-install DESTDIR="${D}" UDEVDIR="${D}/${UDEVDIR}" || die
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.3-r1.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.3-r1.ebuild
deleted file mode 100644
index 4d1b0ba40244..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 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.3-r1.ebuild,v 1.1 2010/07/12 09:33:23 ssuominen Exp $
-
-EAPI=2
-inherit multilib toolchain-funcs
-
-MY_P=${PN/_/-}-${PV}
-DATA_VER=20100707
-
-DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/"
-SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	http://www.draisberghof.de/${PN}/${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}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	local udevdir="/$(get_libdir)/udev/"
-	emake install DESTDIR="${D}" UDEVDIR="${D}/${udevdir}" || die
-	cd ../${PN/_/-}-data-${DATA_VER}
-	emake files-install DESTDIR="${D}" UDEVDIR="${D}/${udevdir}" || die
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.3.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.7.ebuild
index 94f4bed52e9b..4b0e9420a29b 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.3.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.7.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3.ebuild,v 1.1 2010/06/26 10:52:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/usb_modeswitch-1.1.7.ebuild,v 1.1 2011/03/08 00:47:18 rafaelmartins Exp $
 
-EAPI=2
+EAPI="2"
 inherit multilib toolchain-funcs
 
-MY_P=${PN/_/-}-${PV}
-DATA_VER=20100623
+MY_PN="${PN/_/-}"
+MY_P="${MY_PN}-${PV}"
+DATA_VER="20110227"
 
 DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
 HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/"
 SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	http://www.draisberghof.de/${PN}/${PN/_/-}-data-${DATA_VER}.tar.bz2"
+	http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,15 +23,21 @@ DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}
 	dev-lang/tcl" # usb_modeswitch script is tcl
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e 's/-s //' Makefile || die 'sed failed.'
+}
 
 src_compile() {
 	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
-	local udevdir="/$(get_libdir)/udev/"
-	emake install DESTDIR="${D}" UDEVDIR="${D}/${udevdir}" || die
-	cd ../${PN/_/-}-data-${DATA_VER}
-	emake files-install DESTDIR="${D}" UDEVDIR="${D}/${udevdir}" || die
+	local udevdir="${D}/$(get_libdir)/udev"
+	emake DESTDIR="${D}" UDEVDIR="${udevdir}" install || die
+
+	cd ../"${MY_PN}-data-${DATA_VER}"
+	emake DESTDIR="${D}" RULESDIR="${udevdir}/rules.d" files-install db-install \
+		|| die 'emake install failed.d'
 }