old, and unbreak the stable ebuild while at it for people missing /lib64 -> /lib symlink

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

6 files changed, 16 insertions, 176 deletions

diff --git a/sys-apps/usb_modeswitch/ChangeLog b/sys-apps/usb_modeswitch/ChangeLog
index 77672a950385..49d200b4cab8 100644
--- a/sys-apps/usb_modeswitch/ChangeLog
+++ b/sys-apps/usb_modeswitch/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2012/03/15 07:04:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.25 2012/03/15 07:07:08 ssuominen Exp $
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -usb_modeswitch-1.1.4.ebuild, -usb_modeswitch-1.1.7.ebuild,
+  -usb_modeswitch-1.1.8.ebuild, -usb_modeswitch-1.2.1.ebuild:
+  old
 
 *usb_modeswitch-1.2.3 (15 Mar 2012)
 
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.4.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.4.ebuild
deleted file mode 100644
index 52fc68de04d5..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.4.ebuild
+++ /dev/null
@@ -1,38 +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.4.ebuild,v 1.3 2010/10/10 10:22:58 phajdan.jr Exp $
-
-EAPI=2
-inherit multilib toolchain-funcs
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV}
-DATA_VER=20100826
-
-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}/${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}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	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
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.7.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.7.ebuild
deleted file mode 100644
index d456188af7ea..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.7.ebuild,v 1.3 2011/08/07 03:16:56 phajdan.jr Exp $
-
-EAPI="2"
-inherit multilib toolchain-funcs
-
-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}/${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}"
-
-src_prepare() {
-	sed -i -e 's/-s //' Makefile || die 'sed failed.'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	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'
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.8.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.8.ebuild
deleted file mode 100644
index 8b6876157aa1..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.8.ebuild,v 1.1 2011/07/30 23:01:20 rafaelmartins Exp $
-
-EAPI="4"
-inherit multilib toolchain-funcs
-
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-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/"
-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}"
-
-src_prepare() {
-	sed -i -e 's/-s //' Makefile || die 'sed failed.'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	local udevdir="${D}/$(get_libdir)/udev"
-	emake DESTDIR="${D}" UDEVDIR="${udevdir}" install
-
-	cd ../"${MY_PN}-data-${DATA_VER}"
-	emake DESTDIR="${D}" RULESDIR="${udevdir}/rules.d" files-install db-install
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.9.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.9.ebuild
index 8ba943727798..8b2da4b468bd 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.1.9.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-1.1.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.9.ebuild,v 1.3 2011/10/04 21:31:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/usb_modeswitch-1.1.9.ebuild,v 1.4 2012/03/15 07:07:08 ssuominen Exp $
 
-EAPI="4"
-inherit multilib toolchain-funcs
+EAPI=4
+inherit toolchain-funcs
 
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-DATA_VER="20110805"
+MY_PN=${PN/_/-}
+MY_P=${MY_PN}-${PV}
+DATA_VER=20110805
 
 DESCRIPTION="USB_ModeSwitch is a tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
 HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/"
@@ -23,10 +23,10 @@ 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.'
+	sed -i -e 's/-s //' Makefile || die
 }
 
 src_compile() {
@@ -34,7 +34,7 @@ src_compile() {
 }
 
 src_install() {
-	local udevdir="${D}/$(get_libdir)/udev"
+	local udevdir="${D}/lib/udev"
 	emake DESTDIR="${D}" UDEVDIR="${udevdir}" install
 
 	cd ../"${MY_PN}-data-${DATA_VER}"
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.1.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.1.ebuild
deleted file mode 100644
index e92d3aa9f048..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.1.ebuild,v 1.1 2012/01/01 17:50:04 rafaelmartins Exp $
-
-EAPI="4"
-inherit multilib toolchain-funcs
-
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-DATA_VER="20111023"
-
-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}/${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}"
-
-src_prepare() {
-	sed -i -e 's/-s //' Makefile || die 'sed failed.'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	local udevdir="${D}/$(get_libdir)/udev"
-	emake DESTDIR="${D}" UDEVDIR="${udevdir}" install
-
-	cd ../"${MY_PN}-data-${DATA_VER}"
-	emake DESTDIR="${D}" RULESDIR="${udevdir}/rules.d" files-install db-install
-}