added 1.0.4 ebuild and unmasked 1.0.2

8 files changed, 136 insertions, 6 deletions

diff --git a/app-misc/mwavem/Manifest b/app-misc/mwavem/Manifest
index a87ac0e4cab4..0779b06000e2 100644
--- a/app-misc/mwavem/Manifest
+++ b/app-misc/mwavem/Manifest
@@ -1,11 +1,11 @@
-MD5 76f2353296a39601cecb1f1b88542cc4 ChangeLog 702
-MD5 335c0ab02301753bd1ceee5e42b33bd4 mwavem-1.0.2.ebuild 1306
-MD5 7bd50a03e00caa64602bb8ccdc32f7d9 mwavem-1.0.4.ebuild 1923
+MD5 553da16ba6766ba54896d3b7d1aa3efb ChangeLog 703
+MD5 542ac5d8659f56ae25b316e3f61d24d9 mwavem-1.0.2.ebuild 1307
+MD5 2e1fa63c23b76ca09e16e54e328178a6 mwavem-1.0.4.ebuild 2022
+MD5 b4e2d070e1db0ae6c3181321a1315205 metadata.xml 394
 MD5 6a2110cacb03948288203ca53d4c9535 files/mwave.devfs 150
 MD5 ef5c0d9f57ca24c1eb1ab7b33df9d291 files/digest-mwavem-1.0.2 65
 MD5 779ead17ce93702aa87513e41030ba40 files/mwave-dev-handler 210
 MD5 201284b6e4d0b1db01e347aa7586bae7 files/mwavem-1.0.2-gentoo.diff 2178
 MD5 8ceb387439cc272ebcfbf455eef22ec1 files/mwave.modules 30
 MD5 63382db599ecae3e74b11e641249c93a files/mwavem-1.0.4-gentoo.diff 2255
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-1.0.4 0
 MD5 1f1c427444c0684d7d1c8bc8146b9a3f files/digest-mwavem-1.0.4 65
diff --git a/app-misc/mwavem/files/digest-mwavem-1.0.4 b/app-misc/mwavem/files/digest-mwavem-1.0.4
new file mode 100644
index 000000000000..68d834b71e31
--- /dev/null
+++ b/app-misc/mwavem/files/digest-mwavem-1.0.4
@@ -0,0 +1 @@
+MD5 22cd78ade480db8ab5f0d1ca4dee07ec mwavem-1.0.4.tar.gz 1376416
diff --git a/app-misc/mwavem/files/mwave.devfs b/app-misc/mwavem/files/mwave.devfs
new file mode 100644
index 000000000000..67ba1e527ab9
--- /dev/null
+++ b/app-misc/mwavem/files/mwave.devfs
@@ -0,0 +1,2 @@
+REGISTER     ^misc/mwave$    EXECUTE /usr/sbin/mwave-dev-handler register
+UNREGISTER   ^misc/mwave$    EXECUTE /usr/sbin/mwave-dev-handler unregister
diff --git a/app-misc/mwavem/files/mwave.modules b/app-misc/mwavem/files/mwave.modules
new file mode 100644
index 000000000000..613eef5c77a1
--- /dev/null
+++ b/app-misc/mwavem/files/mwave.modules
@@ -0,0 +1 @@
+alias char-major-10-219 mwave
diff --git a/app-misc/mwavem/files/mwavem-1.0.4-gentoo.diff b/app-misc/mwavem/files/mwavem-1.0.4-gentoo.diff
new file mode 100644
index 000000000000..3122f88f5374
--- /dev/null
+++ b/app-misc/mwavem/files/mwavem-1.0.4-gentoo.diff
@@ -0,0 +1,46 @@
+diff -u -r mwavem-1.0.4.orig/src/mwavem/Makefile.am mwavem-1.0.4/src/mwavem/Makefile.am
+--- mwavem-1.0.4.orig/src/mwavem/Makefile.am	2001-07-18 19:23:14.000000000 -0400
++++ mwavem-1.0.4/src/mwavem/Makefile.am	2003-09-08 15:47:29.000000000 -0400
+@@ -6,12 +6,12 @@
+ 
+ install-exec-local:
+ 	-chmod 755 mwaved
+-	-mkdir -p /dev/modems
+-	-mknod --mode=660 /dev/modems/mwave c 10 219
+-	-cp -f /etc/modules.conf /etc/modules.conf~
+-	-grep 'alias char-major-10-219 mwave' /etc/modules.conf || echo "alias char-major-10-219 mwave" >>/etc/modules.conf
++#	-mkdir -p /dev/modems
++#	-mknod --mode=660 /dev/modems/mwave c 10 219
++#	-cp -f /etc/modules.conf /etc/modules.conf~
++#	-grep 'alias char-major-10-219 mwave' /etc/modules.conf || echo "alias char-major-10-219 mwave" >>/etc/modules.conf
+ 
+ uninstall-local:
+-	-cp -f /etc/modules.conf /etc/modules.conf~
+-	-grep -v 'alias char-major-10-219 mwave' /etc/modules.conf~ >/etc/modules.conf
++#	-cp -f /etc/modules.conf /etc/modules.conf~
++#	-grep -v 'alias char-major-10-219 mwave' /etc/modules.conf~ >/etc/modules.conf
+ 
+diff -u -r mwavem-1.0.4.orig/src/mwavem/Makefile.in mwavem-1.0.4/src/mwavem/Makefile.in
+--- mwavem-1.0.4.orig/src/mwavem/Makefile.in	2002-10-15 18:22:49.000000000 -0400
++++ mwavem-1.0.4/src/mwavem/Makefile.in	2003-09-08 15:48:36.000000000 -0400
+@@ -321,14 +321,14 @@
+ 
+ install-exec-local:
+ 	-chmod 755 mwaved
+-	-mkdir -p /dev/modems
+-	-mknod --mode=660 /dev/modems/mwave c 10 219
+-	-cp -f /etc/modules.conf /etc/modules.conf~
+-	-grep 'alias char-major-10-219 mwave' /etc/modules.conf || echo "alias char-major-10-219 mwave" >>/etc/modules.conf
++#	-mkdir -p /dev/modems
++#	-mknod --mode=660 /dev/modems/mwave c 10 219
++#	-cp -f /etc/modules.conf /etc/modules.conf~
++#	-grep 'alias char-major-10-219 mwave' /etc/modules.conf || echo "alias char-major-10-219 mwave" >>/etc/modules.conf
+ 
+ uninstall-local:
+-	-cp -f /etc/modules.conf /etc/modules.conf~
+-	-grep -v 'alias char-major-10-219 mwave' /etc/modules.conf~ >/etc/modules.conf
++#	-cp -f /etc/modules.conf /etc/modules.conf~
++#	-grep -v 'alias char-major-10-219 mwave' /etc/modules.conf~ >/etc/modules.conf
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/app-misc/mwavem/metadata.xml b/app-misc/mwavem/metadata.xml
new file mode 100644
index 000000000000..1c106473552f
--- /dev/null
+++ b/app-misc/mwavem/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-dialip</herd>
+<maintainer>
+  <email>nerdboy@gentoo.org</email>
+  <name>Steve Arnold</name>
+  <description>Primary Maintainer</description>
+</maintainer>
+<longdescription>User-space widget for displaying mwave modem parameters.</longdescription>
+</pkgmetadata>
diff --git a/app-misc/mwavem/mwavem-1.0.2.ebuild b/app-misc/mwavem/mwavem-1.0.2.ebuild
index d57079a66cc3..38d867cb361a 100644
--- a/app-misc/mwavem/mwavem-1.0.2.ebuild
+++ b/app-misc/mwavem/mwavem-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mwavem/mwavem-1.0.2.ebuild,v 1.6 2003/02/13 09:07:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mwavem/mwavem-1.0.2.ebuild,v 1.7 2004/01/12 23:04:47 nerdboy Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="User level application for IBM Mwave modem"
diff --git a/app-misc/mwavem/mwavem-1.0.4.ebuild b/app-misc/mwavem/mwavem-1.0.4.ebuild
new file mode 100644
index 000000000000..450a31eef868
--- /dev/null
+++ b/app-misc/mwavem/mwavem-1.0.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mwavem/mwavem-1.0.4.ebuild,v 1.1 2004/01/12 23:04:47 nerdboy Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="User level application for IBM Mwave modem"
+HOMEPAGE="http://oss.software.ibm.com/acpmodem/"
+SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/1.0.4/${P}.tar.gz"
+IUSE="X"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="virtual/glibc
+	X? ( virtual/x11 )"
+
+src_compile() {
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	# The driver is no longer built by default.
+	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 COPYING 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
+	if [ "${ROOT}" = "/" ]
+	then
+		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+	fi
+	ewarn "If updating from mwavem-1.0.2, you should remove the line:"
+	ewarn "'alias char-major-10-219 mwave' from the file"
+	ewarn "/etc/modules.d/aliases.  The line is now contained in the file"
+	ewarn "/etc/modules.d/mwave"
+	einfo
+	einfo "The MWave Modem device requires the proper entries in /dev."
+	einfo
+	einfo "If you are using devfs, the following entries are in the file"
+	einfo "/etc/devfs.d/mwave, so you just need to restart devfsd."
+	einfo
+	einfo "REGISTER	^misc/mwave$	EXECUTE /usr/sbin/mwave-dev-handler register"
+	einfo "UNREGISTER	^misc/mwave$	EXECUTE /usr/sbin/mwave-dev-handler unregister"
+	einfo
+	einfo "If you are not using devfs, execute the following commands:"
+	einfo
+	einfo "# mkdir -p /dev/modems"
+	einfo "# mknod --mode=660 /dev/modems/mwave c 10 219"
+	einfo
+}