kernel-mod -> linux-mod and remove oldies (#74417)

9 files changed, 52 insertions, 165 deletions

diff --git a/net-dialup/ltmodem/ChangeLog b/net-dialup/ltmodem/ChangeLog
index cf91b2291a31..dcc555b7821f 100644
--- a/net-dialup/ltmodem/ChangeLog
+++ b/net-dialup/ltmodem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/ltmodem
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.16 2004/11/19 22:31:03 mrness Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.17 2005/01/06 22:21:28 mrness Exp $
+
+  07 Jan 2005; Alin Nastac <mrness@gentoo.org> -files/ltmodem_modules,
+  -ltmodem-8.26_alpha9-r1.ebuild, -ltmodem-8.26_alpha9-r2.ebuild,
+  ltmodem-8.31_alpha8.ebuild:
+  Converted to linux-mod eclass and removed old ebuilds (#74417).
 
   20 Nov 2004; Alin Nastac <mrness@gentoo.org> ltmodem-8.26_alpha9-r3.ebuild:
   Stable on x86.
diff --git a/net-dialup/ltmodem/Manifest b/net-dialup/ltmodem/Manifest
index 8edb83936043..b869b21dc722 100644
--- a/net-dialup/ltmodem/Manifest
+++ b/net-dialup/ltmodem/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 00f133bec7290711cd596f14d5791064 ChangeLog 2083
 MD5 fb2e60717b5ce262efea991b5cbbc03b ltmodem-8.26_alpha9-r1.ebuild 1555
-MD5 c6876f0de8131cd0721cce58f339fd92 ltmodem-8.26_alpha9-r2.ebuild 1574
 MD5 c0fb9f85975675bd9660e334b2109f1b ltmodem-8.26_alpha9-r3.ebuild 2281
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 7330c8b98e09368468c234ba4cee303a ltmodem-8.31_alpha8.ebuild 2445
+MD5 c6876f0de8131cd0721cce58f339fd92 ltmodem-8.26_alpha9-r2.ebuild 1574
+MD5 00f133bec7290711cd596f14d5791064 ChangeLog 2083
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 b3a6b31f3472518801911732918b0fc6 ltmodem-8.31_alpha8-r1.ebuild 2487
+MD5 bb762fb0d5ebce81b72fa6c8eb99ca0d files/digest-ltmodem-8.31_alpha8 136
 MD5 f5ab4274b107a9ac1e7d521c5dbb594a files/digest-ltmodem-8.26_alpha9-r1 66
 MD5 f5ab4274b107a9ac1e7d521c5dbb594a files/digest-ltmodem-8.26_alpha9-r2 66
 MD5 c7770cf081fb61801ccdcf7eb67175dc files/digest-ltmodem-8.26_alpha9-r3 137
 MD5 b990e7d5303c86f37ea21cf471d22e03 files/ltmodem_devfs 198
 MD5 1a8e6ce7bc277552331003f54cf26c78 files/ltmodem_modules 244
-MD5 bb762fb0d5ebce81b72fa6c8eb99ca0d files/digest-ltmodem-8.31_alpha8 136
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBnnQxjtv59x0+BrURAtaLAJwIUFC2Yfo35rg8mTVOtY4Ags1jqwCgqAnQ
-WU+mssSTlLoyUih2mFpucLY=
-=47cF
------END PGP SIGNATURE-----
+MD5 bb762fb0d5ebce81b72fa6c8eb99ca0d files/digest-ltmodem-8.31_alpha8-r1 136
diff --git a/net-dialup/ltmodem/files/digest-ltmodem-8.26_alpha9-r1 b/net-dialup/ltmodem/files/digest-ltmodem-8.26_alpha9-r1
deleted file mode 100644
index 7529e4c0c947..000000000000
--- a/net-dialup/ltmodem/files/digest-ltmodem-8.26_alpha9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a75ae27d40ade3aa698c0b0b290724f4 ltmodem-8.26a9.tar.gz 679998
diff --git a/net-dialup/ltmodem/files/digest-ltmodem-8.26_alpha9-r2 b/net-dialup/ltmodem/files/digest-ltmodem-8.26_alpha9-r2
deleted file mode 100644
index 7529e4c0c947..000000000000
--- a/net-dialup/ltmodem/files/digest-ltmodem-8.26_alpha9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a75ae27d40ade3aa698c0b0b290724f4 ltmodem-8.26a9.tar.gz 679998
diff --git a/net-dialup/ltmodem/files/ltmodem_modules b/net-dialup/ltmodem/files/ltmodem_modules
deleted file mode 100644
index 1cfb57733c63..000000000000
--- a/net-dialup/ltmodem/files/ltmodem_modules
+++ /dev/null
@@ -1,6 +0,0 @@
-# lt_drivers: autoloading and insertion parameter usage
-alias char-major-62 ltserial
-alias /dev/tts/LT0  ltserial
-alias /dev/modem ltserial
-# options lt_modem vendor_id=0x115d device_id=0x0420 Forced=3,0x130,0x2f8
-# section for lt_drivers ends
diff --git a/net-dialup/ltmodem/ltmodem-8.26_alpha9-r1.ebuild b/net-dialup/ltmodem/ltmodem-8.26_alpha9-r1.ebuild
deleted file mode 100644
index 079b8f9d965c..000000000000
--- a/net-dialup/ltmodem/ltmodem-8.26_alpha9-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.26_alpha9-r1.ebuild,v 1.10 2004/07/14 22:56:16 agriffis Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	cp build_module{,.orig}
-	sed -e 's:make -e:make:' \
-	 -e 's:read -p:echo:' \
-		build_module.orig > build_module
-	FAST="1" ./build_module || die
-}
-
-src_install() {
-	dohtml DOCs/*.html
-	rm -rf DOCs/*.html DOCs/Installers
-
-	dodoc 1ST-READ BLDrecord.txt Utility_version_tests.txt DOCs/*
-
-	mv utils/fixscript utils/ltfixscript
-	mv utils/noisefix utils/ltnoisefix
-	mv utils/unloading utils/ltunloading
-	dobin utils/lt*
-
-	cd source
-	make install ROOTDIR=${D} || die
-
-	insinto /etc/devfs.d
-	newins debian/etc_devfs_conf.d_ltmodem ltmodem
-	insinto /etc/modules.d
-	newins debian/modules ltmodem
-}
-
-pkg_postinst() {
-	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-	einfo "Use /dev/modem to access modem"
-	einfo "If you have problems, read this doc:"
-	einfo "/usr/share/doc/${PF}/html/post-install.html"
-	echo
-	einfo "Also, if you wish to access the modem through"
-	einfo "/dev/modem without rebooting, run this:"
-	einfo "killall -HUP devfsd"
-}
diff --git a/net-dialup/ltmodem/ltmodem-8.26_alpha9-r2.ebuild b/net-dialup/ltmodem/ltmodem-8.26_alpha9-r2.ebuild
deleted file mode 100644
index 37a4743b31b4..000000000000
--- a/net-dialup/ltmodem/ltmodem-8.26_alpha9-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.26_alpha9-r2.ebuild,v 1.3 2004/07/14 22:56:16 agriffis Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	cp build_module{,.orig}
-	sed -e 's:make -e:make:' \
-	 -e 's:read -p:echo:' \
-		build_module.orig > build_module
-	FAST="1" ./build_module ${KV} --with-force || die
-}
-
-src_install() {
-	dohtml DOCs/*.html
-	rm -rf DOCs/*.html DOCs/Installers
-
-	dodoc 1ST-READ BLDrecord.txt Utility_version_tests.txt DOCs/*
-
-	mv utils/fixscript utils/ltfixscript
-	mv utils/noisefix utils/ltnoisefix
-	mv utils/unloading utils/ltunloading
-	dobin utils/lt*
-
-	cd source
-	make install ROOTDIR=${D} || die
-
-	insinto /etc/devfs.d
-	newins debian/etc_devfs_conf.d_ltmodem ltmodem
-	insinto /etc/modules.d
-	newins debian/modules ltmodem
-}
-
-pkg_postinst() {
-	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-	einfo "Use /dev/modem to access modem"
-	einfo "If you have problems, read this doc:"
-	einfo "/usr/share/doc/${PF}/html/post-install.html"
-	echo
-	einfo "Also, if you wish to access the modem through"
-	einfo "/dev/modem without rebooting, run this:"
-	einfo "killall -HUP devfsd"
-}
diff --git a/net-dialup/ltmodem/ltmodem-8.26_alpha9-r3.ebuild b/net-dialup/ltmodem/ltmodem-8.26_alpha9-r3.ebuild
index 33103e34493c..790a93bb11eb 100644
--- a/net-dialup/ltmodem/ltmodem-8.26_alpha9-r3.ebuild
+++ b/net-dialup/ltmodem/ltmodem-8.26_alpha9-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.26_alpha9-r3.ebuild,v 1.5 2004/11/19 22:31:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.26_alpha9-r3.ebuild,v 1.6 2005/01/06 22:21:28 mrness Exp $
 
 inherit kernel-mod
 
diff --git a/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild b/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild
index 637ee9e5b95d..7ff18b137e19 100644
--- a/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild
+++ b/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.1 2004/11/06 14:41:32 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.31_alpha8.ebuild,v 1.2 2005/01/06 22:21:28 mrness Exp $
 
-inherit kernel-mod
+inherit linux-mod
 
 MY_P="${P/_alpha/a}"
 DESCRIPTION="Winmodems with Lucent Apollo (ISA) and Mars (PCI) chipsets"
@@ -12,35 +12,52 @@ 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-6.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
 RESTRICT="nouserpriv"
 
-DEPEND="virtual/linux-sources
-		sys-apps/util-linux"
+S=${WORKDIR}/${PN}-2.6-alk-6
+S_2_4=${WORKDIR}/${MY_P}
 
-S=${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-mod_is_2_4_kernel; then
+	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} || die "Compilation filed"
+		FAST="1" ./build_module ${KV_FULL} || die "Compilation filed"
 	else
-		cd ../ltmodem-2.6-alk-6/
-		(
-			unset ARCH
-			addwrite /usr/src/linux-${KV}
-			sed -i -e "s:linux-2.6:linux:" Makefile
-			make || die "Compilation failed"
-		)
+		linux-mod_src_compile
 	fi
 }
 
 src_install() {
 	# install docs
-	cd DOCs
+	cd ${S_2_4}/DOCs
 	dohtml *.html
 
 	rm -rf *.html Installers build* Build* gcc3.txt Examples Suse*
@@ -60,23 +77,18 @@ src_install() {
 	# install configuration
 	insinto /etc/devfs.d
 	newins ${FILESDIR}/ltmodem_devfs ltmodem
-	insinto /etc/modules.d
-	newins ${FILESDIR}/ltmodem_modules ltmodem
 
 	# install kernel module
-	if kernel-mod_is_2_4_kernel; then
+	if kernel_is 2 4; then
 		cd source
 		make install ROOTDIR=${D} || die "Cannot install drivers"
 	else
-		cd ${WORKDIR}/ltmodem-2.6-alk-6/
-		insinto /lib/modules/${KV}/ltmodem
-		doins ltmodem.ko &&	doins ltserial.ko || die "Cannot install drivers"
+		linux-mod_src_install
 	fi
 }
 
 pkg_postinst() {
-	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-	depmod -ae ${KV}
+	linux-mod_pkg_postinst
 
 	# Make some devices if we aren't using devfs
 	if [ -e ${ROOT}/dev/.devfsd ]; then