summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-12-18 10:37:38 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-12-18 10:37:38 +0000
commit421737b0e9b627ac264cd20de285f80e663a319a (patch)
tree6b3698b0b78040fcd0c4bc605628402f38dd6b7e /sys-apps/usb_modeswitch
parentFix regression before this hits mirrors. (diff)
downloadgentoo-2-421737b0e9b627ac264cd20de285f80e663a319a.tar.gz
gentoo-2-421737b0e9b627ac264cd20de285f80e663a319a.tar.bz2
gentoo-2-421737b0e9b627ac264cd20de285f80e663a319a.zip
amd64/x86 stable
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-apps/usb_modeswitch')
-rw-r--r--sys-apps/usb_modeswitch/ChangeLog6
-rw-r--r--sys-apps/usb_modeswitch/usb_modeswitch-1.2.5_p20121109.ebuild11
2 files changed, 9 insertions, 8 deletions
diff --git a/sys-apps/usb_modeswitch/ChangeLog b/sys-apps/usb_modeswitch/ChangeLog
index 577fdd637ab9..4de1c704bb52 100644
--- a/sys-apps/usb_modeswitch/ChangeLog
+++ b/sys-apps/usb_modeswitch/ChangeLog
@@ -1,6 +1,10 @@
# 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.39 2012/11/28 23:00:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/ChangeLog,v 1.40 2012/12/18 10:37:38 ssuominen Exp $
+
+ 18 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+ usb_modeswitch-1.2.5_p20121109.ebuild:
+ amd64/x86 stable
28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
-usb_modeswitch-1.2.3_p20120531-r1.ebuild,
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.5_p20121109.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.5_p20121109.ebuild
index 93d422b5b9f4..a475ff7d87e4 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-1.2.5_p20121109.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-1.2.5_p20121109.ebuild
@@ -1,6 +1,6 @@
# 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.5_p20121109.ebuild,v 1.1 2012/11/28 23:00:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usb_modeswitch/usb_modeswitch-1.2.5_p20121109.ebuild,v 1.2 2012/12/18 10:37:38 ssuominen Exp $
EAPI=5
inherit linux-info toolchain-funcs udev
@@ -16,11 +16,12 @@ SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="virtual/udev
- virtual/libusb:0"
+ virtual/libusb:0
+ !<sys-apps/kmod-12-r1"
RDEPEND="${COMMON_DEPEND}
dev-lang/tcl" # usb_modeswitch script is tcl
DEPEND="${COMMON_DEPEND}
@@ -31,10 +32,6 @@ S=${WORKDIR}/${MY_P}
CONFIG_CHECK="~USB_SERIAL"
src_prepare() {
- # NOTE: This one can be removed once >= kmod-11-r3 is marked stable since it
- # puts modprobe back to /sbin which is already in the search patch earlier.
- sed -i -e 's:/usr/sbin/modprobe:& /usr/bin/modprobe:' ${PN}.tcl || die #416223
-
sed -i -e '/install.*BIN/s:-s::' Makefile || die
}