Respect LDFLAGS, #335339

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

5 files changed, 124 insertions, 9 deletions

diff --git a/sci-calculators/hcalc/ChangeLog b/sci-calculators/hcalc/ChangeLog
index fbcdceba5b16..2e3db3bf7a3d 100644
--- a/sci-calculators/hcalc/ChangeLog
+++ b/sci-calculators/hcalc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-calculators/hcalc
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/ChangeLog,v 1.8 2008/03/24 16:44:47 coldwind Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/ChangeLog,v 1.9 2011/02/23 07:32:08 jlec Exp $
+
+*hcalc-1.0-r1 (23 Feb 2011)
+
+  23 Feb 2011; Justin Lecher <jlec@gentoo.org> +files/1.0-gentoo.patch,
+  hcalc-1.0.ebuild, +hcalc-1.0-r1.ebuild:
+  Respect LDFLAGS, #335339
 
   24 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> hcalc-1.0.ebuild:
   amd64 stable
diff --git a/sci-calculators/hcalc/Manifest b/sci-calculators/hcalc/Manifest
index dc955542a918..0319bb1607b2 100644
--- a/sci-calculators/hcalc/Manifest
+++ b/sci-calculators/hcalc/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.0-gentoo.patch 1097 RMD160 78b87442c4bf361bc81bedac38b62691e16a5b9e SHA1 02e7ee78aaedfaa54e61e588f181ba469775e4c7 SHA256 463528f17ae398d6d534576394f8dc6e9e2f141f337708fa1a82a746054b1c67
 DIST hcalc.tar.gz 6014 RMD160 ed99477349f83090e4ced0254bd2041a41f370d7 SHA1 c0aa1844d6d1e98fca10f2917551ba7b26aefa2d SHA256 03f6fcdeb9cfafc54d4d9a138ae3489c90b529b3576434847bcc753359bdccf8
-EBUILD hcalc-1.0.ebuild 693 RMD160 3ec356359adede2a12d040e7ceeb6940abaf2be1 SHA1 a483c3071e0337f16bf43655374c67b4847c890b SHA256 5da2b18aa5c63780a14ec796fde530f0f62b70ed2374b54fe39026b86240b2ca
-MISC ChangeLog 1323 RMD160 a0379648f7f01be03298c024b063b76e72240793 SHA1 44b561563d01cee40b2c9bf71c36483ca05d9aac SHA256 464a5392e3cbd697609dfe259e56623b6724dd64d0118af33a80e062f5352976
+EBUILD hcalc-1.0-r1.ebuild 740 RMD160 e3a8642cfa14ea572a7d9967a2496a1e6a66b004 SHA1 9bc82ba0d309551ba79461dffcd5140b5230edf1 SHA256 b03251c14d038f6d0fdfbe90922d87763e0bbf70b444834cdc1b7defb9015c24
+EBUILD hcalc-1.0.ebuild 739 RMD160 4ef68877510e621e8774385e9bd3b80f8b161f87 SHA1 b1f2282db8279aa4acc9b48cf3e416fe8a98acf0 SHA256 487b7c103a42ef4583df3ac46ade14fb510f970d2c4e7f7273fc96c9b066d9e1
+MISC ChangeLog 1490 RMD160 0e1219a2f9964359177c5f3497f58eb48742a48b SHA1 40ab1d844815ddfe7030f1a22d5a850f103a3253 SHA256 70aafc1f911783745802fb1716174dfefe577b707d448afe497f77dcd459dd31
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1kt/0ACgkQgAnW8HDreRbn+QCguX98FyUhVGCcoGKZe2ByqovH
+9N4AnjNQV0qyB217dtqgG37r+xq+7EN/
+=z71o
+-----END PGP SIGNATURE-----
diff --git a/sci-calculators/hcalc/files/1.0-gentoo.patch b/sci-calculators/hcalc/files/1.0-gentoo.patch
new file mode 100644
index 000000000000..a2b24031fab8
--- /dev/null
+++ b/sci-calculators/hcalc/files/1.0-gentoo.patch
@@ -0,0 +1,57 @@
+diff --git a/Makefile b/Makefile
+index 5386821..eb5db3e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-CC = gcc
+-CFLAGS = -g -O2 -MMD
++CC ?= gcc
++CFLAGS += -MMD
+ 
+ OBJS = \
+ 	hcalc.o \
+@@ -10,7 +10,7 @@ OBJS = \
+ 	$E
+ 
+ hcalc : $(OBJS)
+-	gcc -o $@ $^ -L/usr/X11R6/lib -lXpm -lX11
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lXpm -lX11
+ 
+ clean :
+ 	-rm -f *.o *.d *~ \#* hcalc core
+diff --git a/draw.c b/draw.c
+index 5bde83d..c3bdeb2 100644
+--- a/draw.c
++++ b/draw.c
+@@ -3,6 +3,7 @@
+    http://www.delorie.com/store/hcalc/
+ */
+ #include "hcalc.h"
++#include <string.h>
+ 
+ static char shown_offsets[15];
+ static int shown_bitmask;
+diff --git a/input.c b/input.c
+index d7de47c..f1d45f5 100644
+--- a/input.c
++++ b/input.c
+@@ -5,6 +5,7 @@
+ #include "hcalc.h"
+ #include <ctype.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ char pending_op = 0;
+ int making_number = 0;
+diff --git a/setupx.c b/setupx.c
+index 238c1e2..74e574b 100644
+--- a/setupx.c
++++ b/setupx.c
+@@ -3,6 +3,7 @@
+    http://www.delorie.com/store/hcalc/
+ */
+ #include "hcalc.h"
++#include <stdlib.h>
+ 
+ Display *display=0;
+ int screen=0;
diff --git a/sci-calculators/hcalc/hcalc-1.0-r1.ebuild b/sci-calculators/hcalc/hcalc-1.0-r1.ebuild
new file mode 100644
index 000000000000..4905129ac8a3
--- /dev/null
+++ b/sci-calculators/hcalc/hcalc-1.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/hcalc-1.0-r1.ebuild,v 1.1 2011/02/23 07:32:08 jlec Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DJ's Hex Calculator"
+HOMEPAGE="http://www.delorie.com/store/hcalc/"
+SRC_URI="http://www.delorie.com/store/hcalc/${PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin hcalc || die
+}
+
+pkg_postinst() {
+	einfo "Enter hcalc to run and use kill or ctrl-c to exit."
+}
diff --git a/sci-calculators/hcalc/hcalc-1.0.ebuild b/sci-calculators/hcalc/hcalc-1.0.ebuild
index b0d41c3558a4..e8371e20f3e0 100644
--- a/sci-calculators/hcalc/hcalc-1.0.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.0.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/hcalc-1.0.ebuild,v 1.7 2008/03/24 16:44:47 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hcalc/hcalc-1.0.ebuild,v 1.8 2011/02/23 07:32:08 jlec Exp $
 
 DESCRIPTION="DJ's Hex Calculator"
 HOMEPAGE="http://www.delorie.com/store/hcalc/"
 SRC_URI="http://www.delorie.com/store/hcalc/${PN}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="x11-libs/libXpm"
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_compile() {
 	sed 's|'-lX11'|'"-lX11 -L/usr/X11R6/lib"'|' Makefile > Makefile_fixed
@@ -20,7 +24,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin hcalc
+	dobin hcalc || die
 }
 
 pkg_postinst() {