respecting LDFLAGS, fixing pre-stripped files bug 240001, respecting CC variable bug 243554, fixing repoman warnings

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 40 insertions, 10 deletions

diff --git a/app-doc/psmark/ChangeLog b/app-doc/psmark/ChangeLog
index c3f71a3b162a..c622c2b819b8 100644
--- a/app-doc/psmark/ChangeLog
+++ b/app-doc/psmark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-doc/psmark
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/psmark/ChangeLog,v 1.2 2009/09/23 15:19:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/psmark/ChangeLog,v 1.3 2009/10/04 19:14:37 vostorga Exp $
+
+  04 Oct 2009; Víctor Ostorga <vostorga@gentoo.org> psmark-2.1.ebuild,
+  +files/psmark-2.1-Makefile-QA.patch:
+  respecting LDFLAGS, fixing pre-stripped files bug 240001, respecting CC
+  variable bug 243554, fixing repoman warnings
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> psmark-2.1.ebuild:
   Remove virtual/libc
diff --git a/app-doc/psmark/Manifest b/app-doc/psmark/Manifest
index c5e4e121b0d4..ef99d9165b1d 100644
--- a/app-doc/psmark/Manifest
+++ b/app-doc/psmark/Manifest
@@ -1,5 +1,6 @@
+AUX psmark-2.1-Makefile-QA.patch 399 RMD160 06c063f0c961137beafb23549f14dc3ee6ceb587 SHA1 b4cd0ccde13962c054bac66ec7d70246531a9ffa SHA256 99aa55fcd984b08ed79cc7dbcb31590d90c8e5317e2608752732b466b020a5b4
 AUX psmark-2.1-string.patch 741 RMD160 31bef17fb6730235683895ba971786ad4a2b5f37 SHA1 436f423c1cb54efb3fac63ee7e5a9fa8f3030c09 SHA256 d52b195ee4a565cbe04cdd730b3b6d8ec2838f42e6c5b913852ae1d053118446
 DIST psmark-v2.1.tar.gz 16296 RMD160 0e7365af60c47c2cadecff5b5f25bf073169a048 SHA1 827ab631e27b57658cbe4f8c6b5aa6ee0dff0651 SHA256 de7df2cb5fbad408406c96a3eccd14f219424a2d42394e64b4c73027f26dd8b4
-EBUILD psmark-2.1.ebuild 807 RMD160 71de15430f3392a5ff24c7b47269f4249e636044 SHA1 514121297220cb78b9aba0a328f569bee14798ba SHA256 f5998d60aa1a0c2a6b36b3d979657f0fdbd40efdc791ca76954c49869e2d307a
-MISC ChangeLog 598 RMD160 e6cd6751dfc37f160a37335eb2e407b98380d606 SHA1 92fb7b94997bf846e3c875155e374d4c0bffc14e SHA256 d96c56af66a9e3eb7358ce10719716e5a77b3b35485712ec1807d23e21cca3c5
+EBUILD psmark-2.1.ebuild 941 RMD160 b055b6ceca5bd09701ae626418f44a8dc961ccf5 SHA1 a68cbe9b61bdaa2fead1091b32f729cb23d8afda SHA256 8ffccf0cc1f3d48140dec23b1f10dc256fc16eb43fb4206ccf24a16659d7db7f
+MISC ChangeLog 832 RMD160 e345f9bdab3b7370cf749c3969c088e1f2163c69 SHA1 d31b5f03bb7ed259ff353ad238490e4f999bfc31 SHA256 a5edfc2a5825e412a0ae0a98e7473c5e4109e53de121edc1ca4e914acc3cb567
 MISC metadata.xml 519 RMD160 b720e95a7929502509b36eafb77adcd8491421c2 SHA1 ec879f55eb80c0d7a9d30d0477e44f64977b4a73 SHA256 6e8479c5f0f10243d34fb465a40355142186ed5e4549550b040684f71ab5cd3e
diff --git a/app-doc/psmark/files/psmark-2.1-Makefile-QA.patch b/app-doc/psmark/files/psmark-2.1-Makefile-QA.patch
new file mode 100644
index 000000000000..30a81498bf6d
--- /dev/null
+++ b/app-doc/psmark/files/psmark-2.1-Makefile-QA.patch
@@ -0,0 +1,19 @@
+--- Makefile.original	2009-10-04 19:06:09.000000000 -0600
++++ Makefile	2009-10-04 19:08:25.000000000 -0600
+@@ -3,14 +3,13 @@
+ all:
+ 	make clean
+ 	make psmark
+ 
+ psmark:
+-	gcc $(CFLAGS) -o psmark psmark.c
+-	strip psmark
++	$(CC) $(CFLAGS) $(LDFLAGS) -o psmark psmark.c
+ 
+ clean:
+ 	rm -f *.o psmark
+ 
+ install:
+-	install -s psmark /usr/bin/
++	install psmark /usr/bin/
+ 	install psmark.1 /usr/man/man1/
diff --git a/app-doc/psmark/psmark-2.1.ebuild b/app-doc/psmark/psmark-2.1.ebuild
index efce294482ef..c41db755a659 100644
--- a/app-doc/psmark/psmark-2.1.ebuild
+++ b/app-doc/psmark/psmark-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/psmark/psmark-2.1.ebuild,v 1.2 2009/09/23 15:19:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/psmark/psmark-2.1.ebuild,v 1.3 2009/10/04 19:14:37 vostorga Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,14 +20,19 @@ KEYWORDS="~x86"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-string.patch
+	epatch "${FILESDIR}"/${P}-Makefile-QA.patch
+}
+
 src_compile() {
-	cd ${S}
-	epatch ${FILESDIR}/${P}-string.patch || die "epatch failed"
-	make CFLAGS="${CFLAGS}" || die "make failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
-	dobin psmark
-	doman psmark.1
-	dodoc README CHANGELOG COPYING
+	dobin psmark || die "dobin failed"
+	doman psmark.1 || die "doman failed"
+	dodoc README CHANGELOG || die "dodoc failed"
 }