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

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

5 files changed, 27 insertions, 110 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/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'
 }