Remove checks for CONFIG_MODULES and CONFIG_MODULE_UNLOAD and upgrade path from sys-apps/module-init-tools wrt #462926 by Mike Frysinger. Bail out early if the used compiler is too old wrt #481020.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 29 insertions, 74 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 87dce265976f..08a241334f0d 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2013/08/16 14:25:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.110 2013/08/24 10:59:48 ssuominen Exp $
+
+  24 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-13-r1.ebuild,
+  kmod-14-r1.ebuild, kmod-14-r2.ebuild, kmod-9999.ebuild:
+  Remove checks for CONFIG_MODULES and CONFIG_MODULE_UNLOAD and upgrade path
+  from sys-apps/module-init-tools wrt #462926 by Mike Frysinger. Bail out early
+  if the used compiler is too old wrt #481020.
 
 *kmod-14-r1 (16 Aug 2013)
 
diff --git a/sys-apps/kmod/kmod-13-r1.ebuild b/sys-apps/kmod/kmod-13-r1.ebuild
index f1d250c3d2ad..a9456c793f7c 100644
--- a/sys-apps/kmod/kmod-13-r1.ebuild
+++ b/sys-apps/kmod/kmod-13-r1.ebuild
@@ -1,12 +1,9 @@
 # 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-13-r1.ebuild,v 1.14 2013/07/26 14:52:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-13-r1.ebuild,v 1.15 2013/08/24 10:59:48 ssuominen Exp $
 
 EAPI=5
-
-VIRTUAL_MODUTILS=1
-
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -39,11 +36,6 @@ DEPEND="${RDEPEND}
 	lzma? ( virtual/pkgconfig )
 	zlib? ( virtual/pkgconfig )"
 
-pkg_setup() {
-	CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
-	linux-info_pkg_setup
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-errno_syscall.patch
 
@@ -95,12 +87,3 @@ src_install() {
 	insinto /lib/modprobe.d
 	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
-}
diff --git a/sys-apps/kmod/kmod-14-r1.ebuild b/sys-apps/kmod/kmod-14-r1.ebuild
index c6ae33144447..2d32b6f14079 100644
--- a/sys-apps/kmod/kmod-14-r1.ebuild
+++ b/sys-apps/kmod/kmod-14-r1.ebuild
@@ -1,12 +1,9 @@
 # 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-14-r1.ebuild,v 1.7 2013/08/16 14:25:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r1.ebuild,v 1.8 2013/08/24 10:59:48 ssuominen Exp $
 
 EAPI=5
-
-VIRTUAL_MODUTILS=1
-
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib toolchain-funcs versionator
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -40,8 +37,8 @@ DEPEND="${RDEPEND}
 	zlib? ( virtual/pkgconfig )"
 
 pkg_setup() {
-	CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
-	linux-info_pkg_setup
+	version_is_at_least 4.6 $(gcc-version) || \
+		die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020
 }
 
 src_prepare() {
@@ -99,12 +96,3 @@ src_install() {
 	insinto /lib/modprobe.d
 	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
-}
diff --git a/sys-apps/kmod/kmod-14-r2.ebuild b/sys-apps/kmod/kmod-14-r2.ebuild
index 06ee94cf1bbc..b92811866709 100644
--- a/sys-apps/kmod/kmod-14-r2.ebuild
+++ b/sys-apps/kmod/kmod-14-r2.ebuild
@@ -1,12 +1,9 @@
 # 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-14-r2.ebuild,v 1.2 2013/08/16 14:07:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild,v 1.3 2013/08/24 10:59:48 ssuominen Exp $
 
 EAPI=5
-
-VIRTUAL_MODUTILS=1
-
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib toolchain-funcs versionator
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -41,8 +38,8 @@ DEPEND="${RDEPEND}
 	zlib? ( virtual/pkgconfig )"
 
 pkg_setup() {
-	CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
-	linux-info_pkg_setup
+	version_is_at_least 4.6 $(gcc-version) || \
+		die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020
 }
 
 src_prepare() {
@@ -104,20 +101,13 @@ src_install() {
 }
 
 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
-
 	if use openrc; then
-		# Add kmod to the runlevel automatically if this is the first install of this package.
 		if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then
-			ewarn "Removing deprecated static-nodes init script from the boot runlevel"
+			ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
 			rm -f "${ROOT}"etc/runlevels/boot/static-nodes
 		fi
 
+		# Add kmod to the runlevel automatically if this is the first install of this package.
 		if [[ -z ${REPLACING_VERSIONS} ]]; then
 			if [[ -x ${ROOT}etc/init.d/kmod-static-nodes && -d ${ROOT}etc/runlevels/sysinit ]]; then
 				ln -s /etc/init.d/kmod-static-nodes "${ROOT}"/etc/runlevels/sysinit/kmod-static-nodes
@@ -127,9 +117,8 @@ pkg_postinst() {
 		if [[ -e ${ROOT}etc/runlevels/sysinit ]]; then
 			if [[ ! -e ${ROOT}etc/runlevels/sysinit/kmod-static-nodes ]]; then
 				ewarn
-				ewarn "You need to add kmod-static-nodes to the sysinit runlevel."
-				ewarn "If you do not do this,"
-				ewarn "your system will not necessarily have the required static nodes!"
+				ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+				ewarn "kernel modules to have required static nodes!"
 				ewarn "Run this command:"
 				ewarn "\trc-update add kmod-static-nodes sysinit"
 			fi
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 7f11b0d0901a..a2ed8f8b6333 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,12 +1,9 @@
 # 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.63 2013/08/16 14:07:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.64 2013/08/24 10:59:48 ssuominen Exp $
 
 EAPI=5
-
-VIRTUAL_MODUTILS=1
-
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib toolchain-funcs versionator
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -41,8 +38,8 @@ DEPEND="${RDEPEND}
 	zlib? ( virtual/pkgconfig )"
 
 pkg_setup() {
-	CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
-	linux-info_pkg_setup
+	version_is_at_least 4.6 $(gcc-version) || \
+		die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020
 }
 
 src_prepare() {
@@ -104,20 +101,13 @@ src_install() {
 }
 
 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
-
 	if use openrc; then
-		# Add kmod to the runlevel automatically if this is the first install of this package.
 		if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then
-			ewarn "Removing deprecated static-nodes init script from the boot runlevel"
+			ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
 			rm -f "${ROOT}"etc/runlevels/boot/static-nodes
 		fi
 
+		# Add kmod to the runlevel automatically if this is the first install of this package.
 		if [[ -z ${REPLACING_VERSIONS} ]]; then
 			if [[ -x ${ROOT}etc/init.d/kmod-static-nodes && -d ${ROOT}etc/runlevels/sysinit ]]; then
 				ln -s /etc/init.d/kmod-static-nodes "${ROOT}"/etc/runlevels/sysinit/kmod-static-nodes
@@ -127,9 +117,8 @@ pkg_postinst() {
 		if [[ -e ${ROOT}etc/runlevels/sysinit ]]; then
 			if [[ ! -e ${ROOT}etc/runlevels/sysinit/kmod-static-nodes ]]; then
 				ewarn
-				ewarn "You need to add kmod-static-nodes to the sysinit runlevel."
-				ewarn "If you do not do this,"
-				ewarn "your system will not necessarily have the required static nodes!"
+				ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+				ewarn "kernel modules to have required static nodes!"
 				ewarn "Run this command:"
 				ewarn "\trc-update add kmod-static-nodes sysinit"
 			fi