Migrate to EAPI 2. Cleanup dependencies. Update README with changes occured in baselayout-2.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 40 insertions, 29 deletions

diff --git a/net-dialup/speedtouch-usb/ChangeLog b/net-dialup/speedtouch-usb/ChangeLog
index 7377e4027799..0de5468860b0 100644
--- a/net-dialup/speedtouch-usb/ChangeLog
+++ b/net-dialup/speedtouch-usb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/speedtouch-usb
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch-usb/ChangeLog,v 1.7 2006/09/23 16:09:15 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch-usb/ChangeLog,v 1.8 2009/08/23 06:59:41 mrness Exp $
+
+*speedtouch-usb-3.0.1.2-r3 (23 Aug 2009)
+
+  23 Aug 2009; Alin Năstac <mrness@gentoo.org> files/README,
+  -speedtouch-usb-3.0.1.2-r2.ebuild, +speedtouch-usb-3.0.1.2-r3.ebuild:
+  Migrate to EAPI 2. Cleanup dependencies. Update README with changes occured
+  in baselayout-2.
 
   23 Sep 2006; Alin Nastac <mrness@gentoo.org> files/README,
   speedtouch-usb-3.0.1.2-r2.ebuild:
diff --git a/net-dialup/speedtouch-usb/Manifest b/net-dialup/speedtouch-usb/Manifest
index 308b6cb78753..4cca102329b0 100644
--- a/net-dialup/speedtouch-usb/Manifest
+++ b/net-dialup/speedtouch-usb/Manifest
@@ -1,5 +1,15 @@
-AUX README 9566 RMD160 b910c9bc1d0ad6cf116e6bf47371ee03d2cb8213 SHA1 e9d815990ee39b0ec4fe245d60d9186ac0c7a8e3 SHA256 10293a7eff2b0b282385178f2c77b858d8060345bcd319063befe61ba6969930
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX README 9438 RMD160 ee91aa5af519fe96713829683fa4bd1656c4a36f SHA1 f720f4c077f92cbc8d41d7d566cf2efa7a3eae3b SHA256 048d487b1c76a2484104404e92f6cfb19556adfe7d3decce6dbf84b777c14e2a
 DIST SpeedTouch330_firmware_3012.zip 769125 RMD160 5d7dea06a6752f44ad2fa030943a3978f5080152 SHA1 4fd2eefda958fd34ab4df43cffdda4e7757fbd34 SHA256 1f4ef294f9ac52fc01781f0bba15ab1e686f692dac11ecdcbfedfbf580b19afc
-EBUILD speedtouch-usb-3.0.1.2-r2.ebuild 3583 RMD160 e639188d921a266f353310d8e3a50b50970b0c24 SHA1 9856a1b2ef8e21e25d3ed0f8b69b6ec1e1685a00 SHA256 b5c6b438b49cff03590768986336775213343b482bacdad7d580fc3662980279
-MISC ChangeLog 1734 RMD160 9b48449fc4c4de457ed02153f8f219bfefb9b181 SHA1 7ac81257d78dfc0b5c8ddd3bbd9580f488b1d928 SHA256 d24ea788e9a7072a2a4570b9e396f97335ec25d16a206e46592bb6dc6a9f5515
+EBUILD speedtouch-usb-3.0.1.2-r3.ebuild 3476 RMD160 8a8b2e2e3a311e0c8b5a877ee321b6691bd1978e SHA1 123c30818a71e2f3271f981bc193a62aa50f1940 SHA256 d4e47b059b6a10591b244681e1ed1573ee7fa106529d93a5060f8d4689cff4c0
+MISC ChangeLog 2008 RMD160 810dfb5687f4b938cbe75d0e1fa029987854323e SHA1 439c39140e79494b750ab7703437057e9be8982a SHA256 bf4f75a68990d7f098682caa9d85da44dcc500842005064ecc62221658e430e8
 MISC metadata.xml 301 RMD160 13b610fb2a56fb6bef5ff0fe554dea26816ce157 SHA1 cc7dcfba207028e879eb29723b28c19ccfd70149 SHA256 52673ff9f00f87d8032e30cf646f08401ecf3750c36502e9563ca862d312da0c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqQ6OgACgkQ9A5kJBGSrstw2QCeKFigt03cYVGKHgczSjSCd8Dc
+Zj8AoIP3k8wK+q4av4We3a8t0QyHU/vT
+=QjJF
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/speedtouch-usb/files/README b/net-dialup/speedtouch-usb/files/README
index 076206bc0357..23cd899397f5 100644
--- a/net-dialup/speedtouch-usb/files/README
+++ b/net-dialup/speedtouch-usb/files/README
@@ -2,10 +2,7 @@ Introduction
 ============
 
 This ebuild enables kernel-space support for Alcatel/Thomson SpeedTouch
-USB modems, which first appeared in kernel 2.6.10 as a replacement for
-the user-space driver. For earlier kernels, the "speedtouch" ebuild
-must be emerged instead.
-
+USB modems, which first appeared in kernel 2.6.10.
 
 Configuration
 =============
@@ -26,17 +23,17 @@ Add the following lines from the appropriate section below to
 
 a) PPPoATM configuration:
 
-config_ppp0=( ppp )  # Runs /lib/rcscripts/net/pppd.sh
+config_ppp0='ppp'  # Runs /lib/rcscripts/net/pppd.sh
 # The 2 numbers represent the VPI & VCI of your ISP, and they are separated
 # by a dot. Choose here, or ask your ISP:
 #   http://www.linux-usb.org/SpeedTouch/faq/index.html#q12
 link_ppp0='0.38'
-plugins_ppp0=( 'pppoa' ) 
+plugins_ppp0='pppoa' 
 # 'man pppd' shows other options. Compression is disabled because it is
 # rarely taken advantage of, and may interfere with the connection.
 # Add option 'usepeerdns' to populate /etc/resolv.conf
-pppd_ppp0=( updetach noauth debug defaultroute noaccomp nobsdcomp noccp
-	nodeflate nopcomp novj novjccomp child-timeout 60 )
+pppd_ppp0='updetach noauth debug defaultroute noaccomp nobsdcomp noccp
+	nodeflate nopcomp novj novjccomp child-timeout 60'
 username_ppp0='username@isp.com'  # ADSL login, assigned by your ISP
 password_ppp0='password'  # ADSL password, assigned by your ISP
 
@@ -53,20 +50,20 @@ function preup() {
 b) PPPoE configuration:
 
 # Configure first the RFC2684 bridge interface 
-config_nas0=( null )
+config_nas0='null'
 # Use "-e 0" for LLC mux or "-e 1" for VC mux.
 # The 2 numbers after "-a" represent the VPI & VCI of your ISP, and
 # they are separated by a dot. Ask your ISP about those numbers.
-br2684ctl_nas0="-e 0 -a 0.38"
+br2684ctl_nas0='-e 0 -a 0.38'
 
-config_ppp0=( ppp )  # Runs /lib/rcscripts/net/pppd.sh
+config_ppp0='ppp'  # Runs /lib/rcscripts/net/pppd.sh
 link_ppp0='nas0' # The name of the RFC2684 bridge interface
-plugins_ppp0=( 'pppoe' )
+plugins_ppp0='pppoe'
 # 'man pppd' shows other options. Compression is disabled because it is
 # rarely taken advantage of, and may interfere with the connection.
 # Add option 'usepeerdns' to populate /etc/resolv.conf
-pppd_ppp0=( updetach noauth debug defaultroute noaccomp nobsdcomp noccp
-	nodeflate nopcomp novj novjccomp child-timeout 60 )
+pppd_ppp0='updetach noauth debug defaultroute noaccomp nobsdcomp noccp
+	nodeflate nopcomp novj novjccomp child-timeout 60'
 username_ppp0='username@isp.com'  # ADSL login, assigned by your ISP
 password_ppp0='password'  # ADSL password, assigned by your ISP
 
@@ -219,13 +216,13 @@ pppd_ppp0. "man pppd" explains all the options in that file.
 If the ADSL connection seems to have worked, but no websites can be
 contacted, then check that /etc/resolv.conf is populated, and possibly
 add the "usepeerdns" option (to use the ISP's DNS) to pppd_ppp0 in
-/etc/conf.d/net
+/etc/conf.d/net .
 
 If the problem is still not resolved, then describe the problem in the
 "discussion and bugs" tab at:
   http://gentoo-wiki.com/HOWTO_Speedtouch_modem
 Or post to the Gentoo Forums at http://forums.gentoo.org/ - ultimately,
-if there is no answer, then file a bug at http://bugs.gentoo.org/
+if there is no answer, then file a bug at http://bugs.gentoo.org/ .
 
 
 Compression
diff --git a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r2.ebuild b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild
index a37f23893173..5e9d8fe96b84 100644
--- a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r2.ebuild
+++ b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r2.ebuild,v 1.5 2006/09/24 07:41:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild,v 1.1 2009/08/23 06:59:41 mrness Exp $
 
 inherit eutils linux-info
 
@@ -14,11 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND=">=net-dialup/ppp-2.4.3-r11
-	>=sys-fs/udev-086
-	!net-dialup/speedtouch"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+RDEPEND="net-dialup/ppp"
+DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
@@ -27,7 +24,7 @@ pkg_setup() {
 
 	if kernel_is lt 2 6 10 ; then
 		eerror "The kernel-space driver exists only in kernels >= 2.6.10."
-		eerror "Please emerge net-dialup/speedtouch instead or upgrade the kernel."
+		eerror "Please upgrade the kernel."
 		die "Unsupported kernel version"
 	fi
 }