Fix issue where /usr/ccs/bin/make would not find make.rules; obey CFLAGS, use tc-getCC() for compiler

(Portage version: 2.2.0_alpha178/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

3 files changed, 39 insertions, 17 deletions

diff --git a/sys-devel/heirloom-devtools/ChangeLog b/sys-devel/heirloom-devtools/ChangeLog
index f573cba6e477..28cdfbdb14c6 100644
--- a/sys-devel/heirloom-devtools/ChangeLog
+++ b/sys-devel/heirloom-devtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/heirloom-devtools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/ChangeLog,v 1.2 2013/06/10 00:14:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/ChangeLog,v 1.3 2013/06/10 05:12:17 ryao Exp $
+
+*heirloom-devtools-070527-r1 (10 Jun 2013)
+
+  10 Jun 2013; Richard Yao <ryao@gentoo.org>
+  +heirloom-devtools-070527-r1.ebuild, -heirloom-devtools-070527.ebuild,
+  heirloom-devtools-999999.ebuild:
+  Fix issue where /usr/ccs/bin/make would not find make.rules; obey CFLAGS, use
+  tc-getCC() for compiler
 
   10 Jun 2013; Richard Yao <ryao@gentoo.org> heirloom-devtools-070527.ebuild,
   heirloom-devtools-999999.ebuild:
diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-070527.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild
index 42c2b9489ac5..1ce4ed378ae3 100644
--- a/sys-devel/heirloom-devtools/heirloom-devtools-070527.ebuild
+++ b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/heirloom-devtools-070527.ebuild,v 1.2 2013/06/10 00:14:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild,v 1.1 2013/06/10 05:12:17 ryao Exp $
 
 EAPI=4
 
@@ -21,15 +21,18 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 
 	sed -i \
-		-e 's:\(SHELL =\) \(.*\):\1 /bin/jsh:' \
-		-e 's:\(POSIX_SHELL =\) \(.*\):\1 /bin/sh:' \
-		-e "s:\(PREFIX=\)/\(.*\):\1${ED}\2:" \
-		-e "s:\(SUSBIN=\)/\(.*\):\1${ED}\2:" \
-		-e "s:\(LDFLAGS=\):\1${LDFLAGS}:" \
-		-e 's:\(STRIP=\)\(.*\):\1true:' \
-		-e "s:\(CXX = \)\(.*\):\1$(tc-getCXX):" \
+		-e 's:^\(SHELL =\) \(.*\):\1 /bin/jsh:' \
+		-e 's:^\(POSIX_SHELL =\) \(.*\):\1 /bin/sh:' \
+		-e "s:^\(PREFIX=\)\(.*\):\1${EPREFIX}\2:" \
+		-e "s:^\(SUSBIN=\)\(.*\):\1${EPREFIX}\2:" \
+		-e "s:^\(LDFLAGS=\):\1${LDFLAGS}:" \
+		-e "s:^\(CFLAGS=\)\(.*\):\1${CFLAGS}:" \
+		-e 's:^\(STRIP=\)\(.*\):\1true:' \
+		-e "s:^\(CXX = \)\(.*\):\1$(tc-getCXX):" \
 		./mk.config
 
+	echo "CC=$(tc-getCC)" >> "./mk.config"
+
 	epatch "${FILESDIR}/${P}-64-bit.patch"
 
 }
@@ -38,6 +41,10 @@ src_compile() {
 	emake -j1
 }
 
+src_install() {
+	emake ROOT="${D}" install
+}
+
 pkg_postinst() {
 	elog "You may want to add /usr/5bin or /usr/ucb to \$PATH"
 	elog "to enable using the apps of heirloom toolchest by default."
diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild
index 89c7692f8852..5f61d716c1a2 100644
--- a/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild
+++ b/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild,v 1.2 2013/06/10 00:14:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild,v 1.3 2013/06/10 05:12:17 ryao Exp $
 
 EAPI=4
 
@@ -30,21 +30,28 @@ S="${WORKDIR}/${PN}"
 src_prepare() {
 
 	sed -i \
-		-e 's:\(SHELL =\) \(.*\):\1 /bin/jsh:' \
-		-e 's:\(POSIX_SHELL =\) \(.*\):\1 /bin/sh:' \
-		-e "s:\(PREFIX=\)/\(.*\):\1${ED}\2:" \
-		-e "s:\(SUSBIN=\)/\(.*\):\1${ED}\2:" \
-		-e "s:\(LDFLAGS=\):\1${LDFLAGS}:" \
-		-e 's:\(STRIP=\)\(.*\):\1true:' \
-		-e "s:\(CXX = \)\(.*\):\1$(tc-getCXX):" \
+		-e 's:^\(SHELL =\) \(.*\):\1 /bin/jsh:' \
+		-e 's:^\(POSIX_SHELL =\) \(.*\):\1 /bin/sh:' \
+		-e "s:^\(PREFIX=\)\(.*\):\1${EPREFIX}\2:" \
+		-e "s:^\(SUSBIN=\)\(.*\):\1${EPREFIX}\2:" \
+		-e "s:^\(LDFLAGS=\):\1${LDFLAGS}:" \
+		-e "s:^\(CFLAGS=\)\(.*\):\1${CFLAGS}:" \
+		-e 's:^\(STRIP=\)\(.*\):\1true:' \
+		-e "s:^\(CXX = \)\(.*\):\1$(tc-getCXX):" \
 		./mk.config
 
+	echo "CC=$(tc-getCC)" >> "./mk.config"
+
 }
 
 src_compile() {
 	emake -j1
 }
 
+src_install() {
+	emake ROOT="${D}" install
+}
+
 pkg_postinst() {
 	elog "You may want to add /usr/5bin or /usr/ucb to \$PATH"
 	elog "to enable using the apps of heirloom toolchest by default."