taking maintainership of this one; mark 1.0.4 stable on x86; bump version

6 files changed, 82 insertions, 19 deletions

diff --git a/net-dialup/mwavem/ChangeLog b/net-dialup/mwavem/ChangeLog
index 14a310853478..9a94cc07265a 100644
--- a/net-dialup/mwavem/ChangeLog
+++ b/net-dialup/mwavem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/mwavem
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.1 2004/12/05 08:18:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.2 2004/12/05 09:34:44 mrness Exp $
+
+*mwavem-2.0 (05 Dec 2004)
+
+  05 Dec 2004; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  mwavem-1.0.4.ebuild, +mwavem-2.0.ebuild:
+  Mark 1.0.4 as stable on x86. Bump version (see #58627).
 
 *mwavem-1.0.4 (05 Dec 2004)
 
diff --git a/net-dialup/mwavem/Manifest b/net-dialup/mwavem/Manifest
index 2ec5134f58ad..26de80f67e39 100644
--- a/net-dialup/mwavem/Manifest
+++ b/net-dialup/mwavem/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7ae6cc74f695f8e3ba232e0599ac91a9 ChangeLog 777
+MD5 1ed4dccf2daec8dc336a0d514cf5b463 ChangeLog 1101
 MD5 53fb7e1e97ab6f60167cb93fd626a292 metadata.xml 394
-MD5 6af9b0ee8f09226ec39b3a0a9e604a54 mwavem-1.0.2.ebuild 1272
-MD5 c1731141ecded400521306c335a5250d mwavem-1.0.4.ebuild 1996
+MD5 9ae0fb9775da27912c535b31fcfffff8 mwavem-1.0.2.ebuild 1274
+MD5 c551974cf773b989c1d15092207067fb mwavem-1.0.4.ebuild 1997
+MD5 ed8fade81d68be02f69739b04948e127 mwavem-2.0.ebuild 2029
 MD5 ef5c0d9f57ca24c1eb1ab7b33df9d291 files/digest-mwavem-1.0.2 65
 MD5 1f1c427444c0684d7d1c8bc8146b9a3f files/digest-mwavem-1.0.4 65
 MD5 779ead17ce93702aa87513e41030ba40 files/mwave-dev-handler 210
@@ -12,10 +10,4 @@ MD5 6a2110cacb03948288203ca53d4c9535 files/mwave.devfs 150
 MD5 8ceb387439cc272ebcfbf455eef22ec1 files/mwave.modules 30
 MD5 201284b6e4d0b1db01e347aa7586bae7 files/mwavem-1.0.2-gentoo.diff 2178
 MD5 63382db599ecae3e74b11e641249c93a files/mwavem-1.0.4-gentoo.diff 2255
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBWIeqmdTrptrqvGERAivgAJ0Ya3pyTSFI8eF4vJCYPd25+ryzvgCeMpxz
-XZ7OtGCjPjjeSsEqC/2N7lU=
-=1oE5
------END PGP SIGNATURE-----
+MD5 3763c7ee83d898c35fb878ead9398918 files/digest-mwavem-2.0 63
diff --git a/net-dialup/mwavem/files/digest-mwavem-2.0 b/net-dialup/mwavem/files/digest-mwavem-2.0
new file mode 100644
index 000000000000..5fc4efe2700a
--- /dev/null
+++ b/net-dialup/mwavem/files/digest-mwavem-2.0
@@ -0,0 +1 @@
+MD5 fa27c7fc3360cefdc480bf94250dc81b mwavem-2.0.tar.gz 1443167
diff --git a/net-dialup/mwavem/metadata.xml b/net-dialup/mwavem/metadata.xml
index 96bed231fa68..9d98478bab72 100644
--- a/net-dialup/mwavem/metadata.xml
+++ b/net-dialup/mwavem/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>net-dialup</herd>
 <maintainer>
-  <email>nerdboy@gentoo.org</email>
-  <name>Steve Arnold</name>
+  <email>mrness@gentoo.org</email>
+  <name>Alin Nastac</name>
   <description>Primary Maintainer</description>
 </maintainer>
-<longdescription>User-space widget for displaying mwave modem parameters.</longdescription>
+<longdescription>User level application for IBM Mwave modem.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/mwavem/mwavem-1.0.4.ebuild b/net-dialup/mwavem/mwavem-1.0.4.ebuild
index a9e2c94967bc..1319e1d37a49 100644
--- a/net-dialup/mwavem/mwavem-1.0.4.ebuild
+++ b/net-dialup/mwavem/mwavem-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-1.0.4.ebuild,v 1.1 2004/12/05 08:18:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-1.0.4.ebuild,v 1.2 2004/12/05 09:34:44 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/1.0.4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="X"
 
 DEPEND="virtual/libc
diff --git a/net-dialup/mwavem/mwavem-2.0.ebuild b/net-dialup/mwavem/mwavem-2.0.ebuild
new file mode 100644
index 000000000000..957efe9e4059
--- /dev/null
+++ b/net-dialup/mwavem/mwavem-2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-2.0.ebuild,v 1.1 2004/12/05 09:34:44 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="User level application for IBM Mwave modem"
+HOMEPAGE="http://oss.software.ibm.com/acpmodem/"
+SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X"
+
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+
+src_compile() {
+	#Disable installing stuff outside sandbox
+	sed -i -e 's/^install-exec-local:.*$/&\n\ninstall-exec-local-invalid:/' \
+		src/mwavem/Makefile.am src/mwavem/Makefile.in
+
+	econf || die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	exeinto /usr/sbin
+	doexe ${FILESDIR}/mwave-dev-handler
+
+	insinto /etc/devfs.d
+	newins ${FILESDIR}/mwave.devfs mwave
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/mwave.modules mwave
+
+	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README README.devfs THANKS
+	docinto doc
+	dodoc doc/mwave.sgml doc/mwave.txt
+	dohtml doc/mwave.html
+}
+
+pkg_postinst() {
+	# Below is to get /etc/modules.d/mwave loaded into /etc/modules.conf
+	[ -x ${ROOT}/usr/sbin/update-modules ] && ${ROOT}/usr/sbin/update-modules
+
+	if [ -e ${ROOT}/dev/.devfsd ]; then
+		# device node is created by devfs
+		ebegin "Restarting devfsd to reread devfs rules"
+			killall -HUP devfsd
+		eend $?
+	elif [ -e ${ROOT}/dev/.udev ]; then
+		#the device should be created by udev
+		ebegin "Restarting udev to reread udev rules"
+			udevstart
+		eend $?
+	else
+		[ ! -d ${ROOT}/dev/modem ] && mkdir --mode=0755 ${ROOT}/dev/modems
+		mknod --mode=0660 ${ROOT}/dev/modems/mwave c 10 219
+	fi
+}