Temporarily remove running of update_depmod() from linux-mod.eclass because it's introducing circulars wrt #462926

Package-Manager: portage-2.2.0_alpha168/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 36 insertions, 31 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 2f1e2725c36e..e647ba64693b 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.77 2013/03/22 08:50:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.78 2013/03/24 11:49:43 ssuominen Exp $
+
+  24 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-12-r1.ebuild,
+  kmod-9999.ebuild:
+  Temporarily remove running of update_depmod() from linux-mod.eclass because
+  it's introducing circulars wrt #462926
 
   22 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-12-r1.ebuild,
   kmod-9999.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 5fd5cacf6663..ee96bb203f27 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA256
 
 DIST kmod-12.tar.xz 1275028 SHA256 c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f SHA512 f24bb25812b1902736f875bd3d7f995fa42a50cb7208b0d79a82fb5915223cf78e41018d5bc2cd1088acad5dc8e3dd737876262f4acde6479936c4e04223b629 WHIRLPOOL cde992a543945670992813ce142aa96bd94cc719f539b4734a7c2251b2918622e60a027531d5b430c872e58f28a153d3d2b4b90babe3e4b0f3c262afb09b7116
-EBUILD kmod-12-r1.ebuild 2470 SHA256 165bf4b4bc959334ffe87df006cf42a381322c479f5c24f9be03d25559799023 SHA512 fa2a1044213b80ed9ee65ec4c7c6672bf56a276f26b5e41c828a677272e68deeed6f51b2af5f3738ffdff0c50d3a3a4cdf47218430ca82591b22e7ef840d6c2b WHIRLPOOL 64319806c19438866a74f0b71ae4087b05faf24b1806650500125f9429c1d056873637a6ac65385ed767d08816277bf01aff96c631303d75b4b83a5b478a3e06
-EBUILD kmod-9999.ebuild 2481 SHA256 ac82680208e2a23b0dfd9ee5327a64143af7ad24906ba5206162be88a5c9dbd4 SHA512 e93ee3d517dea41281a758c1e3e7634e7d659bb893c92942cedf51ef67f0ac7c7cd3cfcd16e29f536e04719733a2f9368e88b1d6e997d7ae267d10524c507043 WHIRLPOOL bfc2f42d2db6230fd8b1df8ab9c01ff031cfa32a41dc12ae77df90942f6ed3c55084e6027ab919fda724ee7255ffbb5f82f27eb9ff95d2dd141e29b323f7c191
-MISC ChangeLog 11623 SHA256 92cb39f58fb9f4236f1f0e28a2b5cc6ced24ca3c0d828f945559126279d1a723 SHA512 7be0a2e07b7a85fee384f3b85c76a4dd88dde544ad27029d13e338d650bef443e13db66dd9e6065c05e021599dd4042a5644388a6384de312d00ec55550de003 WHIRLPOOL d77241a0362e4b29633ce842e40732968732fe799f9b555b734949ab113b3f0f717714d999440068ec2c63cc34850ca13279956d3aac5dd860574884114af5b9
+EBUILD kmod-12-r1.ebuild 2491 SHA256 a90bd764e26066426e3f2b11b3a637be9ab2cabdc684d2a22966ee17048dd123 SHA512 d67859b715a1a29527906ee67754cea5208aea06ee7994dafd14999949115bc29cb5a995373fb68e7b2acc27f7a1ebe3cc174e9013581fd03d799b0014ec8330 WHIRLPOOL 30782f64ddf37f7da9784b8025f1d6c7f7b68969f1691872bd78686d57ddc7a43d100e3de46479f39b8cfdc0e84fcc8e295dfbf7b4776a93ff10739efd6a0365
+EBUILD kmod-9999.ebuild 2502 SHA256 b597acdddfd3ddcaed1687caccf1db05eacc35b283119c13d2bffc063f998449 SHA512 07aff316b9b5717bf593877a484b325331441f3d6f253f3063b5591fbb3bcb37e1b560e0e9f5c4c0dff22b6ec6ce41dec51eb881156121ee5cda3e02d40a82f0 WHIRLPOOL b68b505806a27ef1443d3db1e6acbd5b86a2477b4b0aacd9d6c0ef489a05397e146c47d45b03271cc8f3943535e8f8f2ba54db47b2be225383cab6c2532dc79f
+MISC ChangeLog 11836 SHA256 3c3640be13ea5b9bee4fa1f515f2cf122b898140d6d7a7f829295cc53184177a SHA512 b22724d9a1f5cc7d7a7e2d7fa7faaeadcc859b513db843106da5fb3ea416039878554e3466d680780bb436c9a24a9510cd7ed8bf51baf1a9fc9797474f45f44a WHIRLPOOL 550ed87256dba5e0325cf4ea567eb5f17259bb1386db133b41c84c0ff220d3cb039dbbacf1aafa1058423f62d137c559bb90c73c28c7f5cd486994452cc292ea
 MISC metadata.xml 316 SHA256 f979caea5d423e7941d00ffe03b8c5a56a3f728e36492410541224e4bf33b6b2 SHA512 fdd742292a4e051bf8f57a0a8b94880824424775611ae97c97368368d6b55b15ce96dcbae0b50d43cfe438f2d083821a102524a3ed469f3d03a4d67633e14814 WHIRLPOOL a74bc7356ba96ab765c7acb24ccb33e4d3d5f58c48db18c13f684fa29aa7e633d95e5ad2fa8b8c296229196c03fc2d8e94e83a47013d6a756b3d845d2e97a4bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRTBs2AAoJEEdUh39IaPFNH8IH/i0uQx9wPqhuAv1+lo+Fdo8K
-gZKp0KB2eHMR9a3cgmmhg64XR85eI/vPOBSaqjPA5IW7wnW/pBPfBhR4VEZDNhES
-q4U13s8UwlODAPmBAjVKdykKuyczH5dbGnXhLvqgmsYdSAXg0UHKwoGalMqang5s
-H4+7S8NiQ9re6tkRtvLlF0t1D45kU672v2wdY62Jeaamp2nT+LCWKp7ufVHQ2dm7
-vL9YjgHOIbRkjAlZc6s8ReaM96YYEK6kGuWH0HMHSPUSR4O0eC6/p/YctWEJwRzV
-ZGbiMACIRW20Av/oP4VMTqo5FfOLcPe+90NSvD1fpDSmLmLLbv8bkL072DfOnXU=
-=iPVJ
+iQEcBAEBCAAGBQJRTugfAAoJEEdUh39IaPFN8qUIAJ3S9hca2y+pgpxltDavfvjx
+Q3nJPKIknjei7QSPJ30xyU0stUlgyohulOeeRQXvoMwzgc/iTAaItO8RtJezM5rY
+OdF3/TSySWDOuIN6HIEeYBDciGayvsJPVOcEw+B67Mk2pfqlvxOso8h1pBA73Suu
+yPAVLMA0fmfdXOELEZdwra/EJg6kYKplkJLgjEqv1J3QA06yVbsHRpXUVcww7K7r
+zbO0EyrFMD6CmeBBIcM0ZXUgEsQtt8CTb3d4FfoUSCC2jFuummCyTCtxS5CgLOJs
+cVvE9F8AFohU76O+N05MAPLBfPbpwnrb0UUm/5fhEck1m21r5SFYRsgnTKxKd9g=
+=Plgt
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-12-r1.ebuild b/sys-apps/kmod/kmod-12-r1.ebuild
index 9bfb4bfa0d13..43aea9e06272 100644
--- a/sys-apps/kmod/kmod-12-r1.ebuild
+++ b/sys-apps/kmod/kmod-12-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.15 2013/03/22 08:50:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.16 2013/03/24 11:49:43 ssuominen Exp $
 
 EAPI=4
 
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib linux-info # linux-mod
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -97,11 +97,11 @@ src_install()
 	doins "${T}"/usb-load-ehci-first.conf #260139
 }
 
-pkg_postinst() {
-	# Upgrade path from sys-apps/module-init-tools
-	if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			update_depmod
-		fi
-	fi
-}
+#pkg_postinst() {
+#	# Upgrade path from sys-apps/module-init-tools
+#	if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then
+#		if [[ -z ${REPLACING_VERSIONS} ]]; then
+#			update_depmod
+#		fi
+#	fi
+#}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 06ceaec8ee1a..a9441b5c378c 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.49 2013/03/22 08:50:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.50 2013/03/24 11:49:43 ssuominen Exp $
 
 EAPI=4
 
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib linux-info # linux-mod
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -97,11 +97,11 @@ src_install()
 	doins "${T}"/usb-load-ehci-first.conf #260139
 }
 
-pkg_postinst() {
-	# Upgrade path from sys-apps/module-init-tools
-	if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			update_depmod
-		fi
-	fi
-}
+#pkg_postinst() {
+#	# Upgrade path from sys-apps/module-init-tools
+#	if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then
+#		if [[ -z ${REPLACING_VERSIONS} ]]; then
+#			update_depmod
+#		fi
+#	fi
+#}