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.

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

6 files changed, 22 insertions, 16 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/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)