fix info messages for 2.4 kernels (#86658); stable on x86; remove obsolete version

Package-Manager: portage-2.0.51.19

6 files changed, 32 insertions, 140 deletions

diff --git a/net-dialup/ltmodem/ChangeLog b/net-dialup/ltmodem/ChangeLog
index 5527be7614c2..c55681a6683f 100644
--- a/net-dialup/ltmodem/ChangeLog
+++ b/net-dialup/ltmodem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/ltmodem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.19 2005/03/07 20:21:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.20 2005/03/26 14:41:39 mrness Exp $
+
+  26 Mar 2005; Alin Nastac <mrness@gentoo.org> ltmodem-8.31_alpha10-r1.ebuild,
+  -ltmodem-8.31_alpha10.ebuild, ltmodem-8.31_alpha8.ebuild:
+  Correct info messages when installed against a 2.4 kernel (#86658).
+  Mark 8.31_alpha10-r1 as stable on x86 and remove obsolete version 8.31_alpha10.
 
 *ltmodem-8.31_alpha10-r1 (07 Mar 2005)
 
diff --git a/net-dialup/ltmodem/Manifest b/net-dialup/ltmodem/Manifest
index 35fdcd789902..a66f6d85f2bc 100644
--- a/net-dialup/ltmodem/Manifest
+++ b/net-dialup/ltmodem/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 88678fca9de672cfb6c55f3e3798c5b3 ltmodem-8.31_alpha10-r1.ebuild 3091
-MD5 e7386bc7aea8e8f1e741a02d781bac3e ltmodem-8.31_alpha10.ebuild 3011
-MD5 b0a2fb11338328a0235f4277e1bfa95e ltmodem-8.31_alpha8.ebuild 3009
-MD5 b9d5cc00fa69ea700597b79f9badc69b ChangeLog 2726
+MD5 46af18c4b0cb3c10c9122633042f801c ltmodem-8.31_alpha10-r1.ebuild 3268
+MD5 aeb41a577c5cb3853ca31b1aaf47494f ltmodem-8.31_alpha8.ebuild 3187
+MD5 ca056343feee87e3de297df85a26d62a ChangeLog 3018
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 bb762fb0d5ebce81b72fa6c8eb99ca0d files/digest-ltmodem-8.31_alpha8 136
 MD5 b990e7d5303c86f37ea21cf471d22e03 files/ltmodem_devfs 198
 MD5 0093643280b04ff8473b33e908df5b67 files/digest-ltmodem-8.31_alpha10-r1 137
-MD5 0093643280b04ff8473b33e908df5b67 files/digest-ltmodem-8.31_alpha10 137
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCOndXjiC39V7gKu0RAmedAKDAAqSvM6GWcayYJ5wIes9iaUBTNgCgpWB2
-XKlwvwoQrWZgeRJ6fRQgHl0=
-=9rV2
+iD8DBQFCRXS6jiC39V7gKu0RAqZsAJ98pm7fSYMwrE0GFh5DXHjMG17QeQCePTyE
+VrinhgLWuCoq1a+BqDzixKY=
+=tIMM
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ltmodem/files/digest-ltmodem-8.31_alpha10 b/net-dialup/ltmodem/files/digest-ltmodem-8.31_alpha10
deleted file mode 100644
index fb4d7efe006c..000000000000
--- a/net-dialup/ltmodem/files/digest-ltmodem-8.31_alpha10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1ca42e1f5622fbc5664920b5dd2146b7 ltmodem-8.31a10.tar.gz 580518
-MD5 cef203ab4ad1edec006a27abb8996507 ltmodem-2.6-alk-7.tar.bz2 435466
diff --git a/net-dialup/ltmodem/ltmodem-8.31_alpha10-r1.ebuild b/net-dialup/ltmodem/ltmodem-8.31_alpha10-r1.ebuild
index 2fac63f1af22..b0ef8c933c5d 100644
--- a/net-dialup/ltmodem/ltmodem-8.31_alpha10-r1.ebuild
+++ b/net-dialup/ltmodem/ltmodem-8.31_alpha10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.31_alpha10-r1.ebuild,v 1.2 2005/03/18 06:38:05 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.31_alpha10-r1.ebuild,v 1.3 2005/03/26 14:41:39 mrness Exp $
 
 inherit linux-mod
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.physcip.uni-stuttgart.de/heby/ltmodem/${MY_P}.tar.gz
 	http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/ltmodem-2.6-alk-7.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 RESTRICT="nouserpriv"
@@ -22,18 +22,22 @@ S_2_4=${WORKDIR}/${MY_P}
 
 DEPEND="sys-apps/util-linux"
 
-MODULE_NAMES="ltmodem(ltmodem:) ltserial(ltmodem:)"
 BUILD_TARGETS="module"
 BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-MODULESD_LTMODEM_ALIASES=( "char-major-62 ltserial"
-	"/dev/tts/LT0  ltserial"
-	"/dev/modem ltserial" )
 
 pkg_setup() {
 	if kernel_is 2 4; then
+		MODULE_NAMES="lt_modem(lt_modem:) lt_serial(lt_modem:)"
+		MODULESD_LTMODEM_ALIASES=( "char-major-62 lt_serial"
+			"/dev/tts/LT0  lt_serial"
+			"/dev/modem lt_serial" )
 		CONFIG_CHECK="SERIAL"
 		SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL) support."
 	else
+		MODULE_NAMES="ltmodem(ltmodem:) ltserial(ltmodem:)"
+		MODULESD_LTMODEM_ALIASES=( "char-major-62 ltserial"
+			"/dev/tts/LT0  ltserial"
+			"/dev/modem ltserial" )
 		CONFIG_CHECK="SERIAL_8250"
 		SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL_8250) support."
 	fi
diff --git a/net-dialup/ltmodem/ltmodem-8.31_alpha10.ebuild b/net-dialup/ltmodem/ltmodem-8.31_alpha10.ebuild
deleted file mode 100644
index 85777b2cf971..000000000000
--- a/net-dialup/ltmodem/ltmodem-8.31_alpha10.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.31_alpha10.ebuild,v 1.2 2005/03/18 06:38:05 mrness Exp $
-
-inherit linux-mod
-
-MY_P="${P/_alpha/a}"
-DESCRIPTION="Winmodems with Lucent Apollo (ISA) and Mars (PCI) chipsets"
-HOMEPAGE="http://www.heby.de/ltmodem/"
-SRC_URI="http://www.physcip.uni-stuttgart.de/heby/ltmodem/${MY_P}.tar.gz
-	http://www.sfu.ca/~cth/ltmodem/${MY_P}.tar.gz
-	http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/ltmodem-2.6-alk-7.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE=""
-
-RESTRICT="nouserpriv"
-
-S=${WORKDIR}/${PN}-2.6-alk-7
-S_2_4=${WORKDIR}/${MY_P}
-
-DEPEND="sys-apps/util-linux"
-
-MODULE_NAMES="ltmodem(ltmodem:) ltserial(ltmodem:)"
-BUILD_TARGETS="module"
-BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-MODULESD_LTMODEM_ALIASES=( "char-major-62 ltserial"
-	"/dev/tts/LT0  ltserial"
-	"/dev/modem ltserial" )
-
-pkg_setup() {
-	if kernel_is 2 4; then
-		CONFIG_CHECK="SERIAL"
-		SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL) support."
-	else
-		CONFIG_CHECK="SERIAL_8250"
-		SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL_8250) support."
-	fi
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	convert_to_m ${S}/Makefile
-}
-
-src_compile() {
-	if kernel_is 2 4; then
-		cd ${S_2_4}
-		sed -i -e 's:make -e:make:' -e 's:read -p:echo:' build_module
-		FAST="1" ./build_module ${KV_FULL} || die "Compilation filed"
-	else
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# install docs
-	cd ${S_2_4}/DOCs
-	dohtml *.html
-
-	rm -rf *.html Installers build* Build* gcc3.txt Examples Suse*
-	rm -rf fixscript* slackware srcprep.man scanmodem.man conf*
-
-	rename .man .1 *.man
-	doman *.1
-	rm -rf *.1
-
-	dodoc ../1ST-READ *
-	cd ..
-
-	# install utilities
-	mv utils/unloading utils/lt_unloading
-	dosbin utils/lt_*
-
-	# install configuration
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/ltmodem_devfs ltmodem
-
-	# install kernel module
-	if kernel_is 2 4; then
-		cd source
-		make install ROOTDIR=${D} || die "Cannot install drivers"
-	else
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs
-	if [ -e ${ROOT}/dev/.devfsd ]; then
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-		einfo "modules-update to complete configuration."
-
-		einfo "Use /dev/tts/LT0 or /dev/ttyLT0 to access modem"
-	elif [ -e ${ROOT}/dev/.udev ]; then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend $?
-
-		einfo "Use /dev/ttyLTM0 to access modem"
-	fi
-
-	einfo
-	ewarn "Remember, in order to access the modem,"
-	ewarn "you have to be in the 'dialout' group."
-	ewarn "Also, if your dialing application use locking mechanism (e.g wvdial),"
-	ewarn "you should have write access to /var/lock directory."
-	einfo
-	einfo "If you have problems, read this doc:"
-	einfo "/usr/share/doc/${PF}/html/post-install.html"
-}
diff --git a/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild b/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild
index e2b65d657da8..c5a06b8778ed 100644
--- a/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild
+++ b/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild,v 1.4 2005/03/18 06:38:05 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild,v 1.5 2005/03/26 14:41:39 mrness Exp $
 
 inherit linux-mod
 
@@ -22,18 +22,22 @@ S_2_4=${WORKDIR}/${MY_P}
 
 DEPEND="sys-apps/util-linux"
 
-MODULE_NAMES="ltmodem(ltmodem:) ltserial(ltmodem:)"
 BUILD_TARGETS="module"
 BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-MODULESD_LTMODEM_ALIASES=( "char-major-62 ltserial"
-	"/dev/tts/LT0  ltserial"
-	"/dev/modem ltserial" )
 
 pkg_setup() {
 	if kernel_is 2 4; then
+		MODULE_NAMES="lt_modem(lt_modem:) lt_serial(lt_modem:)"
+		MODULESD_LTMODEM_ALIASES=( "char-major-62 lt_serial"
+			"/dev/tts/LT0  lt_serial"
+			"/dev/modem lt_serial" )
 		CONFIG_CHECK="SERIAL"
 		SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL) support."
 	else
+		MODULE_NAMES="ltmodem(ltmodem:) ltserial(ltmodem:)"
+		MODULESD_LTMODEM_ALIASES=( "char-major-62 ltserial"
+			"/dev/tts/LT0  ltserial"
+			"/dev/modem ltserial" )
 		CONFIG_CHECK="SERIAL_8250"
 		SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL_8250) support."
 	fi