From 5168924e2a6fafd6bb2c4c8a637b207d2081d685 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 13 Dec 2004 16:19:38 +0000
Subject: [PATCH] cross-compile fixes

---
 sys-apps/procps/Manifest            | 10 +++++-----
 sys-apps/procps/procps-3.2.4.ebuild | 30 ++++++++++++++++-------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest
index e13b320af6f1..9d37d19a592d 100644
--- a/sys-apps/procps/Manifest
+++ b/sys-apps/procps/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 MD5 f80c1fd4601bc60440c1b6e485304c8c ChangeLog 15184
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 94b5d4d4dffc6100d5a77f621769ac76 procps-3.2.3-r1.ebuild 1491
-MD5 594f9bc373db21d48421dc0518de2d3d procps-3.2.4.ebuild 1549
+MD5 c02a6bcc244789278da55fe3746c5de1 procps-3.2.4.ebuild 1752
 MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3-r1 64
 MD5 a26e86ab1efcb58809f0f46aa735ef07 files/digest-procps-3.2.4 64
 MD5 7ba1d9bd2f1c46766282250643ab9ebd files/procps-mips-define-pagesize.patch 1028
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBtwxymdTrptrqvGERAqgtAJ4khefXKrEOuWu7LMRPWt2wZYLAlgCfY/f5
-D8Ncw6eXu3+VQkdYakayBRs=
-=+hi/
+iD8DBQFBvcEzroRuSHgZdywRAjG0AJ9vCxAP1yTB+YeBFb1DuIi0eThiNgCfa+eW
+mE3BPDQcYSkBsPb5YqSaRZ8=
+=EhlM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/procps/procps-3.2.4.ebuild b/sys-apps/procps/procps-3.2.4.ebuild
index d24ae6a69653..bd653df1ec89 100644
--- a/sys-apps/procps/procps-3.2.4.ebuild
+++ b/sys-apps/procps/procps-3.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.4.ebuild,v 1.5 2004/12/08 14:15:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.4.ebuild,v 1.6 2004/12/13 16:19:38 vapier Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="Standard informational utilities and process-handling tools"
 HOMEPAGE="http://procps.sourceforge.net/"
@@ -22,31 +22,35 @@ src_unpack() {
 	# Clean up the makefile
 	# firstly we want to control stripping
 	# and secondly these gcc flags have changed
-	sed -i Makefile \
-	-e '/install/s: --strip : :' \
-	-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
-	-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,'
-	use ppc && \
-	sed -i Makefile -e 's:-m64::g'
+	sed -i \
+		-e '/install/s: --strip : :' \
+		-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
+		-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \
+		Makefile || die "sed Makefile"
+	use ppc && sed -i -e 's:-m64::g' Makefile
 
 	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
 	# userspace anymore, so this patch instructs procps to get the
 	# value from sysconf().
 	use mips && epatch ${FILESDIR}/${PN}-mips-define-pagesize.patch
-
 }
 
 src_compile() {
 	replace-flags -O3 -O2
-	unset NAME
-	emake -e || die
+	emake \
+		lib64="$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die "make failed"
 }
 
 src_install() {
-	einstall -e DESTDIR="${D}"|| die
+	make install DESTDIR="${D}" || die "install failed"
 
 	insinto /usr/include/proc
-	doins proc/*.h
+	doins proc/*.h || die "doins include"
 
 	dodoc sysctl.conf BUGS NEWS TODO ps/HACKING
 }
-- 
2.26.2