Change update-modules to modules-update

Package-Manager: portage-2.1

13 files changed, 49 insertions, 31 deletions

diff --git a/media-video/dxr2-driver/ChangeLog b/media-video/dxr2-driver/ChangeLog
index 047a769e822e..5c0a1371c7a5 100644
--- a/media-video/dxr2-driver/ChangeLog
+++ b/media-video/dxr2-driver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/dxr2-driver
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dxr2-driver/ChangeLog,v 1.6 2004/06/25 00:39:40 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dxr2-driver/ChangeLog,v 1.7 2006/06/13 10:37:02 uberlord Exp $
+
+  13 Jun 2006; Roy Marples <uberlord@gentoo.org> dxr2-driver-1.0.4.ebuild:
+  Change update-modules to modules-update and respect ${ROOT}
 
   21 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
   chouser is gone at the moment
diff --git a/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild b/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild
index e69d16f11569..4cdf919e5eb7 100644
--- a/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild
+++ b/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild,v 1.9 2004/06/25 00:39:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild,v 1.10 2006/06/13 10:37:02 uberlord Exp $
 
 DESCRIPTION="Driver and minimal DVD player(s) for the Creative Labs Dxr2 Card"
 HOMEPAGE="http://dxr2.sourceforge.net/"
@@ -62,9 +62,11 @@ src_install () {
 }
 
 pkg_postinst() {
-	depmod -a
-	ldconfig >/dev/null 2>&1
-	/usr/sbin/update-modules || return 0
+	if [[ ${ROOT} == / ]] ; then
+		/sbin/modules-update
+		depmod -a
+		ldconfig >/dev/null 2>&1
+	fi
 	einfo
 	einfo "To load the dxr2 device automaticallly at boot time:"
 	einfo "	echo dxr2 >> /etc/modules.autoload"
diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index e437d9af9511..9bfdebc2ff6b 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/em8300-modules
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.25 2006/06/03 23:20:38 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.26 2006/06/13 10:34:05 uberlord Exp $
+
+  13 Jun 2006; Roy Marples <uberlord@gentoo.org>
+  em8300-modules-0.13.0.ebuild, em8300-modules-0.15.2.ebuild,
+  em8300-modules-0.15.3.ebuild:
+  Change update-modules to modules-update
 
   03 Jun 2006; Mark Loeser <halcy0n@gentoo.org>
   em8300-modules-0.15.3.ebuild:
diff --git a/media-video/em8300-modules/em8300-modules-0.13.0.ebuild b/media-video/em8300-modules/em8300-modules-0.13.0.ebuild
index dfb82e46f3a8..91ba9b082898 100644
--- a/media-video/em8300-modules/em8300-modules-0.13.0.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.13.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.13.0.ebuild,v 1.5 2004/07/14 21:34:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.13.0.ebuild,v 1.6 2006/06/13 10:34:05 uberlord Exp $
 
 S="${WORKDIR}/${P}/modules"
 DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules"
@@ -67,7 +67,7 @@ pkg_postinst () {
 
 	if [ "${ROOT}" = "/" ]
 	then
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		/sbin/modules-update
 	fi
 
 	einfo
diff --git a/media-video/em8300-modules/em8300-modules-0.15.2.ebuild b/media-video/em8300-modules/em8300-modules-0.15.2.ebuild
index e7fded279435..e267f8463e5b 100644
--- a/media-video/em8300-modules/em8300-modules-0.15.2.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.15.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.2.ebuild,v 1.1 2006/01/14 15:39:27 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.2.ebuild,v 1.2 2006/06/13 10:34:05 uberlord Exp $
 
 inherit eutils linux-info
 
@@ -69,7 +69,7 @@ pkg_postinst () {
 
 	if [ "${ROOT}" = "/" ]
 	then
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		/sbin/modules-update
 	fi
 
 	einfo
diff --git a/media-video/em8300-modules/em8300-modules-0.15.3.ebuild b/media-video/em8300-modules/em8300-modules-0.15.3.ebuild
index 47ade236c6b2..8514beaaebe2 100644
--- a/media-video/em8300-modules/em8300-modules-0.15.3.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.15.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.3.ebuild,v 1.3 2006/06/03 23:20:38 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.3.ebuild,v 1.4 2006/06/13 10:34:05 uberlord Exp $
 
 inherit eutils linux-info
 
@@ -69,7 +69,7 @@ pkg_postinst () {
 
 	if [ "${ROOT}" = "/" ]
 	then
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		/sbin/modules-update
 	fi
 
 	einfo
diff --git a/media-video/usb-pwc-re/ChangeLog b/media-video/usb-pwc-re/ChangeLog
index 3a03bd8f0e77..4d8d1418b9bf 100644
--- a/media-video/usb-pwc-re/ChangeLog
+++ b/media-video/usb-pwc-re/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/usb-pwc-re
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.23 2006/06/09 03:46:30 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.24 2006/06/13 10:29:20 uberlord Exp $
+
+  13 Jun 2006; Roy Marples <uberlord@gentoo.org> usb-pwc-re-10.0.7.ebuild,
+  usb-pwc-re-10.0.11.ebuild, usb-pwc-re-10.0.12_rc1.ebuild:
+  Change update-modules to modules-update
 
   09 Jun 2006; Joshua Jackson <tsunam@gentoo.org>
   usb-pwc-re-10.0.12_rc1.ebuild:
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.11.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.11.ebuild
index 9ef813560e6b..246f1923085f 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.11.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.11.ebuild,v 1.1 2006/02/13 07:50:05 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.11.ebuild,v 1.2 2006/06/13 10:29:20 uberlord Exp $
 
 
 inherit linux-info toolchain-funcs eutils
@@ -45,7 +45,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		/sbin/modules-update
 		depmod -a
 	fi
 	einfo "If you have problems loading the module, please check the \"dmesg\" output."
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild
index 44ebcd5f623b..74e246b6eefa 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild,v 1.4 2006/06/09 03:46:30 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.12_rc1.ebuild,v 1.5 2006/06/13 10:29:20 uberlord Exp $
 
 
 inherit linux-info toolchain-funcs eutils
@@ -45,7 +45,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		/sbin/modules-update
 		depmod -a
 	fi
 	einfo "If you have problems loading the module, please check the \"dmesg\" output."
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild
index 5cf8e6222cf7..056a384ab468 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild,v 1.8 2005/08/10 11:50:07 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild,v 1.9 2006/06/13 10:29:20 uberlord Exp $
 
 
 inherit linux-info toolchain-funcs eutils
@@ -43,7 +43,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		/sbin/modules-update
 		depmod -a
 	fi
 	einfo "If you have problems loading the module, please check the \"dmesg\" output."
diff --git a/media-video/usb-pwcx/ChangeLog b/media-video/usb-pwcx/ChangeLog
index 35e2bbdf876f..d2dfab0f984a 100644
--- a/media-video/usb-pwcx/ChangeLog
+++ b/media-video/usb-pwcx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/usb-pwcx
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/ChangeLog,v 1.14 2005/03/09 07:27:20 phosphan Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/ChangeLog,v 1.15 2006/06/13 10:31:53 uberlord Exp $
+
+  13 Jun 2006; Roy Marples <uberlord@gentoo.org> usb-pwcx-8.2.2.ebuild,
+  usb-pwcx-8.4.ebuild:
+  Change update-modules to modules-update
 
   09 Mar 2005; Patrick Kursawe <phosphan@gentoo.org> usb-pwcx-8.2.2.ebuild,
   usb-pwcx-8.4.ebuild:
diff --git a/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild b/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild
index c787106d55c4..d1f9adc4daf9 100644
--- a/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild
+++ b/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild,v 1.13 2005/03/09 07:27:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild,v 1.14 2006/06/13 10:31:53 uberlord Exp $
 
 inherit linux-info
 
@@ -36,6 +36,6 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		# Update module dependancy
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		/sbin/modules-update
 	fi
 }
diff --git a/media-video/usb-pwcx/usb-pwcx-8.4.ebuild b/media-video/usb-pwcx/usb-pwcx-8.4.ebuild
index bc674e2e252f..a163c9f1ee8b 100644
--- a/media-video/usb-pwcx/usb-pwcx-8.4.ebuild
+++ b/media-video/usb-pwcx/usb-pwcx-8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/usb-pwcx-8.4.ebuild,v 1.8 2005/03/09 07:27:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/usb-pwcx-8.4.ebuild,v 1.9 2006/06/13 10:31:53 uberlord Exp $
 
 
 inherit linux-info
@@ -42,7 +42,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		# Update module dependancy
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		/sbin/modules-update
 		depmod -a
 	fi
 }