From: Christian Heim <phreak@gentoo.org>
Date: Mon, 16 Apr 2007 14:53:54 +0000 (+0000)
Subject: Calling modules-update has been deprecated w/ sys-apps/module-init-tools-3.2.2-r3... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7a6eb6eb14013f12068221edaebc1fea772c8f1;p=gentoo.git

Calling modules-update has been deprecated w/ sys-apps/module-init-tools-3.2.2-r3, thanks to Jakub for the fix (fixes #174761).
Package-Manager: portage-2.1.2.3
---

diff --git a/app-laptop/toshiba-utils/ChangeLog b/app-laptop/toshiba-utils/ChangeLog
index f6b35afa8b5e..791ca6af221f 100644
--- a/app-laptop/toshiba-utils/ChangeLog
+++ b/app-laptop/toshiba-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/toshiba-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/ChangeLog,v 1.9 2007/01/12 12:36:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/ChangeLog,v 1.10 2007/04/16 14:53:54 phreak Exp $
+
+  16 Apr 2007; Christian Heim <phreak@gentoo.org>
+  toshiba-utils-2.0.1-r1.ebuild, toshiba-utils-2.0.1-r2.ebuild:
+  Calling modules-update has been deprecated w/
+  sys-apps/module-init-tools-3.2.2-r3, thanks to Jakub for the fix (fixes
+  #174761).
 
 *toshiba-utils-2.0.1-r2 (12 Jan 2007)
 
diff --git a/app-laptop/toshiba-utils/Manifest b/app-laptop/toshiba-utils/Manifest
index 6d6587a208c1..20aa8b409170 100644
--- a/app-laptop/toshiba-utils/Manifest
+++ b/app-laptop/toshiba-utils/Manifest
@@ -14,18 +14,18 @@ MD5 eba354581685a783dfbeac94292cb28d files/toshiba-utils-2.0.1-gentoo.diff 1037
 RMD160 7462f24c930846dd95c9a024eb92d46335ca7743 files/toshiba-utils-2.0.1-gentoo.diff 1037
 SHA256 0152514170f72556b8f4f7f327c54261c1a4072184eeb9b8e1c32468910a522c files/toshiba-utils-2.0.1-gentoo.diff 1037
 DIST toshutils-2.0.1.tar.gz 385389 RMD160 2505b9635ce18e7ed0ada129baad978287053d84 SHA1 18f327e20aa478f9d36c0841ec32ac98367e67b9 SHA256 cb66e83b8d93fe5a4a9a872051a4ed96322c64d07b068e036494a355d440696c
-EBUILD toshiba-utils-2.0.1-r1.ebuild 1596 RMD160 9322c5ba76e7ad6e3633b5c4d72f7f58f10ecf23 SHA1 915efeabc5c0335cc3dd8fe79f8c983f3e7d11d4 SHA256 eecf970b10c3b9d9ad4e1880bfa54a4cad58deaadf855548de75e6b524da8276
-MD5 1bb842ec2a09bcf135d15ca7826a9324 toshiba-utils-2.0.1-r1.ebuild 1596
-RMD160 9322c5ba76e7ad6e3633b5c4d72f7f58f10ecf23 toshiba-utils-2.0.1-r1.ebuild 1596
-SHA256 eecf970b10c3b9d9ad4e1880bfa54a4cad58deaadf855548de75e6b524da8276 toshiba-utils-2.0.1-r1.ebuild 1596
-EBUILD toshiba-utils-2.0.1-r2.ebuild 1822 RMD160 b6457b64a764a7b43419fb1a1a39cce0f1711727 SHA1 afe261cb1fd0066ac5e1f4a31e9cd4f5ce051812 SHA256 34fcfed2bade57e8ab04a24f546c4efe79e47bdd4531864923fa3173867f75fb
-MD5 7e3034cb3ae144cd24bddac856a84ae3 toshiba-utils-2.0.1-r2.ebuild 1822
-RMD160 b6457b64a764a7b43419fb1a1a39cce0f1711727 toshiba-utils-2.0.1-r2.ebuild 1822
-SHA256 34fcfed2bade57e8ab04a24f546c4efe79e47bdd4531864923fa3173867f75fb toshiba-utils-2.0.1-r2.ebuild 1822
-MISC ChangeLog 1374 RMD160 24e24ab0d54f34c43e82ae2d06e89216b03525fb SHA1 86b3956d07ba205f46635f5d3bdfb61cdd9a797a SHA256 fc16319f141dd9ffaf9f25d51ffe6b4f1bd01dc1a1a328f63537b5113c018e45
-MD5 6733d538d49913f4e533a09302fb8cf3 ChangeLog 1374
-RMD160 24e24ab0d54f34c43e82ae2d06e89216b03525fb ChangeLog 1374
-SHA256 fc16319f141dd9ffaf9f25d51ffe6b4f1bd01dc1a1a328f63537b5113c018e45 ChangeLog 1374
+EBUILD toshiba-utils-2.0.1-r1.ebuild 1652 RMD160 313b56a1c4ec4fb668cbb30492d65beef98e2a17 SHA1 19e6367de71bf948922dea3390cba1a8ffcb2b8e SHA256 f700226d285afbf08678958a6711788cb201208aff7f5e8ecc4c9ea3ef1fb61e
+MD5 cac0976bfd5c4b516596781711dc3e02 toshiba-utils-2.0.1-r1.ebuild 1652
+RMD160 313b56a1c4ec4fb668cbb30492d65beef98e2a17 toshiba-utils-2.0.1-r1.ebuild 1652
+SHA256 f700226d285afbf08678958a6711788cb201208aff7f5e8ecc4c9ea3ef1fb61e toshiba-utils-2.0.1-r1.ebuild 1652
+EBUILD toshiba-utils-2.0.1-r2.ebuild 1881 RMD160 61a873af5449575697ca5b163c47d715fff421c7 SHA1 2419d8be9c0018c099768373c22b0d9cbea92856 SHA256 432cbe30ea522d6e1a44380c94f647822b38a60bb5f62d16129d3953111395cc
+MD5 e26d160782a4164fec1788b30126ebe2 toshiba-utils-2.0.1-r2.ebuild 1881
+RMD160 61a873af5449575697ca5b163c47d715fff421c7 toshiba-utils-2.0.1-r2.ebuild 1881
+SHA256 432cbe30ea522d6e1a44380c94f647822b38a60bb5f62d16129d3953111395cc toshiba-utils-2.0.1-r2.ebuild 1881
+MISC ChangeLog 1625 RMD160 b4fda6db37849a6f07e2548462b853a36066266b SHA1 a326290f30bfdc42cee4b1236e75818b3d97b2bc SHA256 497213199c0db0078496f9484b9b16e44cafdbbb7a68376deaa0872506a64206
+MD5 482e42e155eea6a40bc3c0d1ac79bd88 ChangeLog 1625
+RMD160 b4fda6db37849a6f07e2548462b853a36066266b ChangeLog 1625
+SHA256 497213199c0db0078496f9484b9b16e44cafdbbb7a68376deaa0872506a64206 ChangeLog 1625
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
@@ -37,9 +37,9 @@ MD5 21f59d06d8dd179e6335789cdae22480 files/digest-toshiba-utils-2.0.1-r2 247
 RMD160 f09fbf316fbdc1eb924ea576074beb91e028a9eb files/digest-toshiba-utils-2.0.1-r2 247
 SHA256 626c2b7fb08ebc1a9ab80b16bef03aaa7af51ae9d94020f47fdb3f0cba21afc1 files/digest-toshiba-utils-2.0.1-r2 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFp4C0NQqtfCuFneMRAqwHAKCPum8fbp2veUsmVTyeE/c/vjhW2ACaAtOW
-bYxPZ8+U7TgjklW8NfNu8z8=
-=7J0o
+iD8DBQFGI44cyuNVb5qfaOYRAsaBAJ9xT3lxGCYeqDg52XqQ056ECnpR1wCfWbPR
+ual4vCtLKE4kygnqmb6VRkY=
+=pVV2
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
index 2b7a9a5ebd6e..c08746d0a4ce 100644
--- a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
+++ b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild,v 1.7 2006/06/13 10:04:33 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild,v 1.8 2007/04/16 14:53:54 phreak Exp $
 
 inherit eutils
 
@@ -50,7 +50,9 @@ src_install() {
 pkg_postinst() {
 	ewarn "Dont forget Toshiba Laptop Support for your kernel."
 	ewarn "(under Processor Type and Features, CONFIG_TOSHIBA)"
-	[[ ${ROOT} == / ]] && /sbin/modules-update || return 0
+	if [[ ${ROOT} == / ]] ; then
+		[[ -x /sbin/update-modules ]] && /sbin/update-modules || /sbin/modules-update
+	fi
 }
 
 pkg_config() {
diff --git a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild
index bb149d44a81c..b6571f7ec1f0 100644
--- a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild
+++ b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild,v 1.1 2007/01/12 12:36:13 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild,v 1.2 2007/04/16 14:53:54 phreak Exp $
 
 inherit eutils autotools
 
@@ -54,7 +54,9 @@ src_install() {
 pkg_postinst() {
 	ewarn "Dont forget Toshiba Laptop Support for your kernel."
 	ewarn "(under Processor Type and Features, CONFIG_TOSHIBA)"
-	[[ ${ROOT} == / ]] && /sbin/modules-update || return 0
+	if [[ ${ROOT} == / ]] ; then
+		[[ -x /sbin/update-modules ]] && /sbin/update-modules || /sbin/modules-update
+	fi
 }
 
 pkg_config() {