Use ${EROOT} instead of / or ${ROOT}. This lets things build on Gentoo Prefix and should allow cross compilation with Catalyst. WilliamH gave his okay in IRC for the non-maintainer commit.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

6 files changed, 62 insertions, 56 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 1caefb81aa83..c4451cdb01ae 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.165 2014/07/22 09:24:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.166 2014/08/29 18:35:57 ryao Exp $
+
+  29 Aug 2014; Richard Yao <ryao@gentoo.org> kmod-16.ebuild, kmod-17.ebuild,
+  kmod-18-r1.ebuild, kmod-18.ebuild, kmod-9999.ebuild:
+  Use ${EROOT} instead of / or ${ROOT}. This lets things build on Gentoo Prefix
+  and should allow cross compilation with Catalyst. WilliamH gave his okay in
+  IRC for the non-maintainer commit.
 
   22 Jul 2014; Tobias Klausmann <klausman@gentoo.org> kmod-18-r1.ebuild:
   Stable on alpha, bug #517106
diff --git a/sys-apps/kmod/kmod-16.ebuild b/sys-apps/kmod/kmod-16.ebuild
index fd8f9ca28ddd..f6497f0e15e9 100644
--- a/sys-apps/kmod/kmod-16.ebuild
+++ b/sys-apps/kmod/kmod-16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.15 2014/05/14 21:30:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.16 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 inherit bash-completion-r1 eutils multilib
@@ -59,8 +59,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--bindir=/bin \
-		--with-rootlibdir="/$(get_libdir)" \
+		--bindir="${EROOT}bin" \
+		--with-rootlibdir="${EROOT}$(get_libdir)" \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \
@@ -109,23 +109,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/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 [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/kmod/kmod-17.ebuild b/sys-apps/kmod/kmod-17.ebuild
index 6d4e5b03df0a..82ee5ef792ec 100644
--- a/sys-apps/kmod/kmod-17.ebuild
+++ b/sys-apps/kmod/kmod-17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.11 2014/06/06 16:11:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.12 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bindir=/bin
-		--with-rootlibdir="/$(get_libdir)"
+		--bindir="${EROOT}bin"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
@@ -168,23 +168,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/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 [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/kmod/kmod-18-r1.ebuild b/sys-apps/kmod/kmod-18-r1.ebuild
index 3b52cd19c38a..c18072622520 100644
--- a/sys-apps/kmod/kmod-18-r1.ebuild
+++ b/sys-apps/kmod/kmod-18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild,v 1.7 2014/07/22 09:24:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild,v 1.8 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bindir=/bin
-		--with-rootlibdir="/$(get_libdir)"
+		--bindir="${EROOT}bin"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
@@ -168,23 +168,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/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 [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/kmod/kmod-18.ebuild b/sys-apps/kmod/kmod-18.ebuild
index 86ce8f0800ad..29c80864bad2 100644
--- a/sys-apps/kmod/kmod-18.ebuild
+++ b/sys-apps/kmod/kmod-18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18.ebuild,v 1.1 2014/06/22 08:01:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18.ebuild,v 1.2 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bindir=/bin
-		--with-rootlibdir="/$(get_libdir)"
+		--bindir="${EROOT}bin"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
@@ -168,23 +168,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/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 [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 5d2d7138b097..7cbbc5a7e5af 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.79 2014/07/11 12:28:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.80 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bindir=/bin
-		--with-rootlibdir="/$(get_libdir)"
+		--bindir="${EROOT}bin"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
@@ -168,23 +168,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/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 [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"