Respect LDFLAGS, do not strip by intall -s, fixes bug 335333

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 24 insertions, 10 deletions

diff --git a/dev-util/shc/ChangeLog b/dev-util/shc/ChangeLog
index e65c6e39e724..3ced4740461e 100644
--- a/dev-util/shc/ChangeLog
+++ b/dev-util/shc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/shc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shc/ChangeLog,v 1.15 2009/09/23 17:48:34 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shc/ChangeLog,v 1.16 2010/08/30 22:22:02 xmw Exp $
+
+  30 Aug 2010; Michael Weber (xmw) <xmw@gentoo.org> shc-3.8.3.ebuild:
+  Respect LDFLAGS, do not strip by intall -s, fixes bug 335333
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> shc-3.6.ebuild,
   shc-3.7.ebuild:
diff --git a/dev-util/shc/Manifest b/dev-util/shc/Manifest
index 3e9b432e73d2..2ab75093fecf 100644
--- a/dev-util/shc/Manifest
+++ b/dev-util/shc/Manifest
@@ -3,6 +3,6 @@ DIST shc-3.7.tgz 18942 RMD160 c9a5c0c9364103cd3c8ed76d03e778b65a61c30d SHA1 ad05
 DIST shc-3.8.3.tgz 19874 RMD160 278f0e0946c95f7e74b98c5c76076f76e9088a9f SHA1 b5a6de5128e7fe8c485e71ec6cf5abbc3d1f7055 SHA256 c5ad576bc9d772f93a97032440f7e084c45730ccc0f093dee8fe46dd84ed08cf
 EBUILD shc-3.6.ebuild 673 RMD160 e1e48278c3775e47aa2654dc8bd20c8ef078238a SHA1 1fdcee322f3208f1d29e0a0dab353e05fd3c43c4 SHA256 3523354dfc119d6438dc6a36d0b9cbae4a8ad7a0252183517d6644d41a610a67
 EBUILD shc-3.7.ebuild 673 RMD160 51ec53a84337218a70e1e0b47fb8451e3fd681d2 SHA1 4c66f80b2df6616c289f1b5355332a2e6a43d22f SHA256 352d2ddeabc053cbab7e110c2d75e22e3c7845ce22730526857a6124b89abd6c
-EBUILD shc-3.8.3.ebuild 720 RMD160 e2b909bb8b6bc5ab46d55aeb4308806abd8d2d4d SHA1 d8951dd173156cb27c778a4c18fe92ebc8644d8e SHA256 789ae58975bbf4ec54e004e67905b139b42563ed6c9ef3f68bcfdd0fb0a181c7
-MISC ChangeLog 2094 RMD160 c23a22bebfa03faff99b4130552de036cd888cc2 SHA1 2530b3324a62b4eb8e51e582e394cecf015a3dfb SHA256 62f6ebdc884e73d8583649ac42a7d60899d0c6899245e92e8ca641163fae06fe
+EBUILD shc-3.8.3.ebuild 957 RMD160 59103ff78117ff2e831b605eaf7bb06ed195e8f0 SHA1 e6471f2ab1941505f9023e573eb5a97ae262d8d2 SHA256 dd936217df70a171fcbf52d3b7b394dc25d73c22c556d3d6606c9688e5da34b0
+MISC ChangeLog 2224 RMD160 0416af1e865bd9e7d3a2ba546d98b306245455a7 SHA1 8c223163e9322e832cd9d17c5b183eb1f6055c66 SHA256 a779045f6b7382266255863e4399c9f22aa04a6392a4abf1f15b4e51650d491e
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/dev-util/shc/shc-3.8.3.ebuild b/dev-util/shc/shc-3.8.3.ebuild
index 0ea4cf1e9353..35044700ed04 100644
--- a/dev-util/shc/shc-3.8.3.ebuild
+++ b/dev-util/shc/shc-3.8.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shc/shc-3.8.3.ebuild,v 1.1 2006/02/19 03:35:02 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shc/shc-3.8.3.ebuild,v 1.2 2010/08/30 22:22:02 xmw Exp $
+
+EAPI=2
 
 inherit toolchain-funcs
 
@@ -13,16 +15,25 @@ SLOT="0"
 KEYWORDS="~alpha ~ppc ~sparc ~x86"
 IUSE=""
 
+RESTRICT="test"
+
+src_prepare() {
+	# respect LDFLAGS
+	sed -i -e 's:$(CC) $(CFLAGS):\0 $(LDFLAGS):' Makefile || die
+	# do not strip by install -s
+	sed -i -e '/install/s: -s : :' Makefile || die
+}
+
 src_compile() {
 	export CC="$(tc-getCC)"
 
 	## the "test"-target leads to an access-violation -> so we skip it
 	## as it's only for demonstration purposes anyway.
-	make shc || die
+	emake shc CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
-	dobin shc
-	doman shc.1
-	dodoc shc.README CHANGES
+	dobin shc || die
+	doman shc.1 || die
+	dodoc shc.README CHANGES || die
 }