src_configure() should use EPREFIX, not EROOT. The previous commit was not correct from the perspective of Catalyst. Thanks goes to Arfever for pointing it out.

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

7 files changed, 41 insertions, 35 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index c4451cdb01ae..fe522edee425 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.166 2014/08/29 18:35:57 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.167 2014/09/02 03:24:55 ryao Exp $
+
+  02 Sep 2014; Richard Yao <ryao@gentoo.org> kmod-16.ebuild, kmod-17.ebuild,
+  kmod-18-r1.ebuild, kmod-18.ebuild, kmod-9999.ebuild:
+  src_configure() should use EPREFIX, not EROOT. The previous commit was not
+  correct from the perspective of Catalyst. Thanks goes to Arfever for pointing
+  it out.
 
   29 Aug 2014; Richard Yao <ryao@gentoo.org> kmod-16.ebuild, kmod-17.ebuild,
   kmod-18-r1.ebuild, kmod-18.ebuild, kmod-9999.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 9d6e9031fd51..a835f11024b4 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -7,27 +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 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
+EBUILD kmod-16.ebuild 3735 SHA256 5325d9ba4144421271f908974a3b50fe74763b1c77a5e6dd4181d0b84592325c SHA512 f1ce4bfddd2ca97d3049909ec27cea3285b911a31aa848bff3af2673ff4bbce2e0f5ba1b039402d1d622e1b1055e5443cad9d2278ffd10dfb852880df6a3eedc WHIRLPOOL 8a506524926f894a7558c49318f252ba39beaa5d6265b006a1c2e37cfaf24ffc2899f4772f4f4aee209c75b64f233905a35e7e1992e7236a0d0f1d40ced97aba
+EBUILD kmod-17.ebuild 5109 SHA256 c3aa8b863fb346699d905ac810b627ae36a4732cfd343e705eea334e22fa924e SHA512 59debd9744beba70841ee697cf1e1e5fecfdddc5f3f7fa7bf5a2883710b3db35b0bea34484c18254a42b76fba6f8febfb4631fca5b65878164e03f1f91f03c89 WHIRLPOOL c1df809d63d98d50e626adcc8bf8caaffe29d124c2afed10c5d20dc279bcb39f5ebcab2476f426a7aea07d9fe5e461418edb14208febc41c9f5123455cb16735
+EBUILD kmod-18-r1.ebuild 5134 SHA256 cbcc2e40815aa9e99342e434ae0a26713c74d3da69573a041970577872212777 SHA512 7153a808a7ae01239e92830ac22abd70c5aaf2e9018ecdb6796962336f2582f5d47119b97f5bcb6b723c08635d2b1dcb4fd2f3aaa7fc1516d6941c26759bc5b3 WHIRLPOOL 08c32c195ae6b95fadd43df1651a4f19dc37455944bb1234822d75fcb9d7ab7e08d298c3ff093540726f61c59698d4f2b3a8f3db68ecd04982d55d9a916a4b1a
+EBUILD kmod-18.ebuild 5117 SHA256 66b0a1d588d157a2ffaabc536949fdc1be4da6e7aeb5b252fcf1e90210a2ad1d SHA512 bbd400ab3541c39076d7b73f24f8e53cf7478f2e00eb923a85789fdd3f4082c226f20e8383749b718bc24468f627fb26c8f92b4c727a40f4be4110c79bb6f08a WHIRLPOOL 611021d8fde81651af28e3d01419b68ae2587b613f9b3b7db73c73cf1933d29385421ff4bf547254fcb20bf86e51d7f0fd1ab655fd64e708e6e5cfa91e0b4aa1
+EBUILD kmod-9999.ebuild 5142 SHA256 2972d595df05e2f4c8389a8b40f1444442bcbda244a3895f120dd2bee0d8ad07 SHA512 5039cdfd61ee9a70108ef03bb9ab732a88573ac34551ffd8df5dab913684fd13037a40b8109d79ef4958912569d62a047080bf104d4e7cb9b2abc3dee839fe05 WHIRLPOOL 606fb19a19dfe88b4cc8154ef64ee14ee2a957a351c2feab5e1915f3b35317479a80adde5e059acb3b238d1cd57352775cf7f77c32720477c794b5bcd6eb0ead
+MISC ChangeLog 23905 SHA256 76acbd6b72a8e8489eaa0fe274885c141b7cd908cb46612deffdfc55178949f8 SHA512 c7bcf97f85b7111a71d8db5da852d3c5c13e615cef2a1c10c8d29756a8400ab10ac42191c8da09c5af74b4dcd90b5003d06a045d1a10137e9e5e965aa2c63ee2 WHIRLPOOL 87638268ab88a57c402148728d3c080df0e7e6b5b493ee7403840335562e37f2778380437bd9776fea5559ee209f63d4afb2c6169c8c7be15c48c274d9d6f5b9
 MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJUBTiLAAoJECDuEZm+6ExkWCwP/1LNFiw7k7+tX5agQZLQKfLO
+TYGctwZIf2hTcg5ipKzm16cvbQr/QSJfm1lAVdfx/7C8+AXa5V1mrM50yjf/CuV3
+4TyDC5qyGiEuaHnJpVoWf7dbfY2byTsou9veb2B5N/D50JqtIzCITS9CzNRGzWod
+GlI7fIIHBg0MjtND+krgAE910j91DiMIYbVnaeI2FAItzzzb7yozLq8zbwin/xFR
+uiotpz17i2RY3xQ90rJQLaaUhPPbNNfXnY9c9mjfy1fWHHbawON1C0ULDJ05yiJw
+shDkxV+xoH8+3WxnasTI3gmz48vjfBsTYDntcr6rFEwhYc0KaD4wFx+Z+VFFmZID
+XAgYrxprp38IXT7IMYmGBKZCu9FvbZIQnD0EBn0rAqnkUrqvTnoQgydqu7fsRl7Y
+rRnacaVcUc5tBYO59lPzczz9kjb2qFkSLQifPAth9Wis7VwzaQq59B1rtdsgRPiP
+P0Ha7Ade7uD9PcbMvc1q5pt68KB6yjRDHM8lp43WKBBxquC4H1aEg+TZukneIqCx
+WWaLG/07SeMkY5ARToDHQxTAnuC4GSYoSYSr1VmrmS+dcDh0yMH6atULmLDxNjTe
+YoH+DCBQnRy4jGxp3jRtEit9CypeFK5pz7+YrbX2J1jE5/Z5397CKjQwCUHP43A+
+v5NjWkS9/4EdAWamheu9
+=PVo3
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-16.ebuild b/sys-apps/kmod/kmod-16.ebuild
index f6497f0e15e9..448ab377fc0b 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.16 2014/08/29 18:35:57 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.17 2014/09/02 03:24:55 ryao Exp $
 
 EAPI=5
 inherit bash-completion-r1 eutils multilib
@@ -59,8 +59,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--bindir="${EROOT}bin" \
-		--with-rootlibdir="${EROOT}$(get_libdir)" \
+		--bindir="${EPREFIX}/bin" \
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)" \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \
diff --git a/sys-apps/kmod/kmod-17.ebuild b/sys-apps/kmod/kmod-17.ebuild
index 82ee5ef792ec..a8b2debf78d8 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.12 2014/08/29 18:35:57 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.13 2014/09/02 03:24:55 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bindir="${EROOT}bin"
-		--with-rootlibdir="${EROOT}$(get_libdir)"
+		--bindir="${EPREFIX}/bin"
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
diff --git a/sys-apps/kmod/kmod-18-r1.ebuild b/sys-apps/kmod/kmod-18-r1.ebuild
index c18072622520..da6b70f945ba 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.8 2014/08/29 18:35:57 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild,v 1.9 2014/09/02 03:24:55 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bindir="${EROOT}bin"
-		--with-rootlibdir="${EROOT}$(get_libdir)"
+		--bindir="${EPREFIX}/bin"
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
diff --git a/sys-apps/kmod/kmod-18.ebuild b/sys-apps/kmod/kmod-18.ebuild
index 29c80864bad2..f698d6ec3030 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.2 2014/08/29 18:35:57 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18.ebuild,v 1.3 2014/09/02 03:24:55 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bindir="${EROOT}bin"
-		--with-rootlibdir="${EROOT}$(get_libdir)"
+		--bindir="${EPREFIX}/bin"
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 7cbbc5a7e5af..0f051ead4192 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.80 2014/08/29 18:35:57 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.81 2014/09/02 03:24:55 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bindir="${EROOT}bin"
-		--with-rootlibdir="${EROOT}$(get_libdir)"
+		--bindir="${EPREFIX}/bin"
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)