Replace udevcontrol with udevadm control.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 9 insertions, 66 deletions

diff --git a/net-dialup/mwavem/ChangeLog b/net-dialup/mwavem/ChangeLog
index 2ab1d5b449a0..becd7d9d8ce9 100644
--- a/net-dialup/mwavem/ChangeLog
+++ b/net-dialup/mwavem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/mwavem
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.14 2008/10/18 09:42:16 mrness Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.15 2009/03/13 20:26:59 mrness Exp $
+
+  13 Mar 2009; Alin Năstac <mrness@gentoo.org> -mwavem-2.0.ebuild,
+  mwavem-2.0-r1.ebuild:
+  Replace udevcontrol with udevadm control.
 
 *mwavem-2.0-r1 (18 Oct 2008)
 
diff --git a/net-dialup/mwavem/mwavem-2.0-r1.ebuild b/net-dialup/mwavem/mwavem-2.0-r1.ebuild
index 5910b994f41f..750154160f1c 100644
--- a/net-dialup/mwavem/mwavem-2.0-r1.ebuild
+++ b/net-dialup/mwavem/mwavem-2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/mwavem/mwavem-2.0-r1.ebuild,v 1.1 2008/10/18 09:42:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-2.0-r1.ebuild,v 1.2 2009/03/13 20:26:59 mrness Exp $
 
 inherit autotools
 
@@ -53,7 +53,7 @@ pkg_postinst() {
 	elif [ -e "${ROOT}/dev/.udev" ]; then
 		#the device should be created by udev
 		ebegin "Restarting udev to reread udev rules"
-			udevcontrol reload_rules
+			udevadm control --reload-rules
 		eend $?
 	else
 		[ ! -d "${ROOT}/dev/modem" ] && mkdir --mode=0755 "${ROOT}/dev/modems"
diff --git a/net-dialup/mwavem/mwavem-2.0.ebuild b/net-dialup/mwavem/mwavem-2.0.ebuild
deleted file mode 100644
index 9782ceba4a8d..000000000000
--- a/net-dialup/mwavem/mwavem-2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 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.9 2008/05/19 19:52:43 mrness Exp $
-
-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=""
-
-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 "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	exeinto /usr/sbin
-	doexe "${FILESDIR}/mwave-dev-handler"
-
-	insinto /etc/devfs.d
-	newins "${FILESDIR}/mwave.devfs" mwave
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/mwave.modules" mwave
-
-	dodoc AUTHORS ChangeLog FAQ 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 /sbin/update-modules ] && /sbin/update-modules || /sbin/modules-update
-	fi
-
-	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"
-			udevcontrol reload_rules
-		eend $?
-	else
-		[ ! -d "${ROOT}/dev/modem" ] && mkdir --mode=0755 "${ROOT}/dev/modems"
-		mknod --mode=0660 "${ROOT}/dev/modems/mwave" c 10 219
-	fi
-}