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.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

7 files changed, 82 insertions, 68 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/Manifest b/sys-apps/kmod/Manifest
index 55006a5bbd9d..9d6e9031fd51 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -7,19 +7,27 @@ AUX kmod-static-nodes-r1 601 SHA256 21995879ee2ac6727ca5784a309eff5dd41b93030efc
 DIST kmod-16.tar.xz 1440880 SHA256 63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5 SHA512 326921bb184d53840837cc600f6301b948031ef7c2048e46ef16bc26ef7b967fa3c20cb133b1ebbddcf8a8537e9af8166fbca6a28d94f694f12ce1d89361a1bc WHIRLPOOL 625c277d7733a344040eaaeca26ce103d79c96ca1ba7759302e5fd573bba86285420c6f599a70411e7732e22145108afadbc29606d9f8fc62fe94479480f3a3f
 DIST kmod-17.tar.xz 1484336 SHA256 3ba7470041de04ca88308f501901b574169cb517d3192397074611b3921a2dfa SHA512 2b237a96b8bcfe03bde30d4f8b6886f8ec33817cc6f0fe810f6f382310bd71814236b299b9051304ca5a9b29c205d8e1ba5a15bf6ee98648644ac268dc368294 WHIRLPOOL 421f95e48da7baf40617c9222d4cc26868d26dbf51f77aa2613cfe5cf7a84b5489eca4611fe86108135c164890eeab32916836776561ab8f2541aa10456d1095
 DIST kmod-18.tar.xz 1473904 SHA256 e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e SHA512 6704f52f1b69837f06516237fb61d3f29551b06e59f270561993e0318c104bdc0140a32d3fc9bda859d0918412ea2c40effa0ceeccbda5e1cb79a204d7219847 WHIRLPOOL d8e022cdbf19cef8dac46f70d49dcb0b9812e6b263bf40628a082de3696793fe591cc402b12773b43a86b3514910c292aebb7b8fc8954c796ac9679e65f43b98
-EBUILD kmod-16.ebuild 3710 SHA256 54a9acb449fa1a3e1c6205c86c25b5ca731d6f60831f57f6cddb9f9f50183ae4 SHA512 af07adaafe88489047b296cd97c345260f5776f34742c89bfef9f372d62ae1a87973a5fcc3237577a9b70265249020b2b6be5a5c308a7c158576402fb4ad228f WHIRLPOOL b93f5d9bbd94013ed7db8cae2b514c573aea7e29110184e6ea57c5f1ac177bee10b95c55615c312ca7e455c93f1c552757ace616f5ec33280b33a3b38101319e
-EBUILD kmod-17.ebuild 5081 SHA256 0e3a66e7aab7a8f34e5264d811670c5dfb6b7d9b87cbba7900b274f094889b06 SHA512 d6f55abecca775bc8c634a1d6acc5ea5d29eb926c2f3d7c99b73890c83ab84fba3dbe071e3170201e3a38480d058cdd91d5745f4f7f9a349754842db27a788ab WHIRLPOOL 378c12213080f916b61af6bba70bdf0897bce9cb38ca7a76773d9e9acac1f9407b330d8b066efad98b7cdd210bdb8b1d9c0f7b5306b3a9c490bd4bb5fb31edd0
-EBUILD kmod-18-r1.ebuild 5108 SHA256 5e7a940a0064f3bc2661b8031970d5268dcd99d0bccb4c1e911b9075f590adbe SHA512 eb7db265031be7f6e52cc94ae33b4f1e3de9cedd8469d0a13f3fe1a774743bc1a5ceb43ff828817bd2e5da99f29f03a956ba38487b275414901e786e7bec68db WHIRLPOOL 9cf2e2e914f1a9d93b719eb819a2192ee99e988342e75b0e9915a8615bd2c2f08f1a75d0f7408f2eabfd04bd3a74f015ef7cf584af94767ef723e6f65973c747
-EBUILD kmod-18.ebuild 5092 SHA256 309445ef64199998eecc220f305c20bca5f86f65959fe456c5e19b77fb970a09 SHA512 1b6912c36c8264ad8b4b20de23b0925a72da807c308921451d1724dad9aa4c25028ded986cb3b81d8f37a63701ed6d41aa58d3b3959c324b2b8c613e37910052 WHIRLPOOL cacef26447716d24a1049cfc9db93bf35e812bde2f1bb4927b64211cb4fdef3cc12d2e24c1ae17af3ce9df82cc2f3ea9a92f8544725c1d0a0269771defd1a9d6
-EBUILD kmod-9999.ebuild 5117 SHA256 97e5a38fe649a07983bd27caa2b1fb42ab6b9703ff0c82b82d0d8b26d3e2c34e SHA512 88f6a0c748441bdb9c0ee6d0d21c2ecc923957cc6aecccd35bf86f3709a567947fde179ae35a68044840d4058e62bc0f5fc6a09ebe91a3500cac97778e639d69 WHIRLPOOL 1bc8e4363e81f56ae7b1444b3f9ef142dd84e19f39cec5de07b9e9607718e485e0f24df868108c617d455de52f6256e716dab0659222fd40e00f181b1fd838dc
-MISC ChangeLog 23281 SHA256 879974762ba2ea55593eeda918cdd64d781af74cc947d1af4c2abe1427d728f3 SHA512 6c060a405efe8f7df6f486071b4ea4d1d483252a3ffb65bc0c349fdf1e9b1843d34c9641471106098d0498aa2fd95baff1db141d07383c40dd7a4f8ee2503c13 WHIRLPOOL b0bf664a7ac1e7001d8da9847e6dfd8378856a3d244d72ac15c7b0f1046cb04fe825328de5fc01760e40bc2e82c4d68230decb6d49c220fb9a32ffd036139c86
+EBUILD kmod-16.ebuild 3729 SHA256 9519dc6737ab8042e2e3c514e833df3c7d61f46e809ebbfb2d9af6b5b2989751 SHA512 a0d55e5d2a8bb943407ee4279381a4acb55daf0cc65412ae90184c30fc14fecb75addfd464e15ecb843f562ac7c424b63ab7cecb2f92a68fe4ff8b197e6c8fa4 WHIRLPOOL bf1568be7fb194669da24df8a9902cf711ce58bf1751fae9f00881fd17798dfb9a0f9bff799bd6c0c04f5fe9b262b82621654c350d9317a4885979dd94a9b1a3
+EBUILD kmod-17.ebuild 5103 SHA256 69bff34e13d879ecfb131689fe74fb7344a9268d491d385011cf60e5f2abce53 SHA512 6202c13d60887d873dcd277a6fee4a4d94a049c79e72abed0a9ff059039b68704ea0803c53009a01cc86a57f2a4e88672482bb74648c2bc2cce76b22f0bca92a WHIRLPOOL 6f5fd7180a489139e40f9619abd4b1cefa99007d48c33f23dfe936361a30cc5d38c5502bf5ab1a1af92fc88977557ad85eee21a16900fb109451ffcad81e6985
+EBUILD kmod-18-r1.ebuild 5128 SHA256 6379748aaafb991a96dd01861c04ff55925ea2cf3c48fad782a882634b4a027e SHA512 8aa1f3848aa41fa92c5691eb096fd69bddb23864879600eb8865704382b196ef4b55c8453ded1b1a41717d1427df51757b1cc38f5179b9d2640da165b4c1723f WHIRLPOOL 0424f577df7408fb6daa16c4a9283156a04dcd71b624d7556486b2af71d6b231f08a683c1f7f5f54c863f88b9d176119155db23439357ec3298ad7845dbe08a4
+EBUILD kmod-18.ebuild 5111 SHA256 054a21e36e456e666dc8c63444c7401af1101a878700a8c7388b64ed8903972c SHA512 eddac7e131fff4e1e008f51026ce85bf3b4acd748a89ec6dabfd025b2cbd991f84d65d81e622d3d6872f4ef62288d179089f31b5aa0259e06e57d72b32a48f26 WHIRLPOOL 8622aaf271baacf2d55259fa2a2ba51ec07822a4ae73afe311f2969c782d64bbcde16a65783f03510f32ff3d8adce37cb424e8cb68bb660649ad63e33a6707b2
+EBUILD kmod-9999.ebuild 5136 SHA256 0d49784d3efc83f698bf73d6a5624105cb14308b05c567d63b056e2e32b57632 SHA512 deef418bd71d2294291a54ab36fdfb7e4b256e2611c87a8f3596d8270822d4181ccb1871eead4930b639a304697fdea52359b9bc392faad1b07b5a702c780266 WHIRLPOOL 0e751c8e3f866aedb758cd62e50a5f282d1abbf431c05830dedff044f961a343c3c2f212c96677363a348cc62547f32491a85a66d47196e5eaf65aa357c8778a
+MISC ChangeLog 23605 SHA256 daa68797080b9b1d901a64330b1964da89c32c2d17e274e32554d02c8a58929c SHA512 59e2edf8bbb1e60d248208537a8372a40e3e894cf423d7b1453588d4b6c20479cf0c60f99822fc4db6d3dbce6cec6242351f8dd6430614be06bbb4450f105ee0 WHIRLPOOL 31a47f8db32d9bb0664d3b03cce368203e685767293b69f9f937605a016666a118d4a54ea412a6a9ef528894fa4020a84bea514eaff89ee50b446cb184008e38
 MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlPOLeJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOhbBACgh2rVRvYKBmxp/gSHafC17ioB
-LT8AnRmwCuvqk8HTjjpU7+1PxOxiBZhy
-=pxeX
+iQIcBAEBCAAGBQJUAMgRAAoJECDuEZm+6ExkTDkQAIXZXy5y5UfLpm03lz8SyRud
+kgi1gsy/ZIclJF/YR6eEuBNZhjRaDOwof0wiHtXtT7YQmGXZXzxsBUvm9XNc9CfS
+n3xzlAA8hWqzQox3+xrEld4W2a6MUV2/Xc6ghySYzj02xa9MXEHzEXYd6lIXlu/B
+Wkjw6ublWVa7fbBWY1s1hZnGfgOgyAhpVSjFYnfR4hg3hMEhum9oKHR1j8V4G3qm
+QsovG4Ts2d7PNagSi8GfSoKIqQJyTHuIjMGJqYaZRGt0b4b8HGCINn9GYAejw1P8
+tI7UnOFoZdh3WwpLTWBOvsQCueLHkDik+UlqWb65YNIceik/qkYhFX+dgENkXGgZ
+bEMhp+xwa+nBy66sdVxj1CML2wDyEL+wJIPKpftk4N5BUwYKpQ96CyIbgzFaFvoJ
+URG5u5vQb4UvYZxzUa1PT6W3ny1gZIFx+XvcG1qr+l3BGYvaDo8h1M77Une0Z7rw
+jLkR9RV0XfRyJLLL4ntNQtRVykp9cM2zX7oH91r7udmNJfrF3S2qRUe2ia1AAUoe
+sMrbeCFuDc+5b6fGBbJGvXt9SQe+vmtj5QMP4G4VCfGb/qvYw9u1eqxWmwxAQo1c
+Y4qS4hKEzDkvUg0NvhWKOBTeZ+/Ehf7FyFFvj9X/pHCOaS4yetZzD/Q/6vD/ilUJ
+/53PRLqkVluvPs5+2YQX
+=PJG3
 -----END PGP SIGNATURE-----
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!"