Respecting LDFLAGS, 337632

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

5 files changed, 112 insertions, 15 deletions

diff --git a/app-misc/boxes/ChangeLog b/app-misc/boxes/ChangeLog
index 2ea08197f20e..cf5594ae0627 100644
--- a/app-misc/boxes/ChangeLog
+++ b/app-misc/boxes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/boxes
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/ChangeLog,v 1.22 2009/08/20 03:39:08 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/ChangeLog,v 1.23 2010/09/18 16:49:44 jlec Exp $
+
+*boxes-1.1-r1 (18 Sep 2010)
+
+  18 Sep 2010; Justin Lecher <jlec@gentoo.org> +files/1.1-Makefile.patch,
+  +boxes-1.1-r1.ebuild:
+  Respecting LDFLAGS, 337632
 
   20 Aug 2009; Jeremy Olexa <darkside@gentoo.org>
   -files/boxes-1.0.1-Makefile.patch, -files/boxes-1.0.1-flex.patch:
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index 106a0e8dd45c..9827fa6729cf 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.1-Makefile.patch 1542 RMD160 16704a13c9cb8282d9a771fd6e83abf92e3b3657 SHA1 f362eab460d5b8d8f2dbc7256cab375919bcb20d SHA256 aba911fdc720aba1196b527f77dcd3c7c63a530bba79ed6e997ef44dd92fc58e
 AUX boxes-1.1-Makefile.patch 1455 RMD160 19bd08d2f0ceeb97fc7ce046f76cd4d6f75d6388 SHA1 7a60d9d80baba5ff588dbf414d44b605b01269ca SHA256 9671c3408375b70aee1eb0f3adac2ed549c1f33b61a42373759d4646857c62bf
 DIST boxes-1.1.src.tar.gz 138279 RMD160 40fb3eb5123fc60ec3e270f1dd1d2d9f31f7f900 SHA1 1fd6e875e9b3c84f2a71f6df73d9eddb37d11c93 SHA256 c9f931fc9f8e0aeadb370518e3e66f1cbfa956ba7817bcb8f701630f70b711e3
+EBUILD boxes-1.1-r1.ebuild 768 RMD160 86386e6171b91817be6fdba82f40d452026f23e6 SHA1 18ffecca531db81e4e57052b3df7d3bec5017d69 SHA256 fdb4a3acf85bbdd35eea9abfd3aadd065f0f61b3864034aa96885ef83b177f20
 EBUILD boxes-1.1.ebuild 766 RMD160 2a21d6de6eb32d719fcb734e5f3c13caa9c1c0c2 SHA1 f2489eaad0462d6581363feb3a0a589d4f0b8e40 SHA256 36f642cbe42ea6aa24022f668f8d95fa173796ab18b694ac39afb32bab1dfa5c
-MISC ChangeLog 2777 RMD160 9052d3a3fc9bb9f0939e52ceef96301ee809739a SHA1 8c522a527cd9561c1cd51884be58562246d91eab SHA256 0d1a2216cdad1b52a2dfcb542500d02064364d5dbb9a9a1e198377d5f7fa274b
+MISC ChangeLog 2930 RMD160 6c6f63e1bf18cd9a38fdef0709f50b556b389a47 SHA1 66c4bd65ec56b910489d5bed375e0fc6827ebcfd SHA256 a6ea684c269168f1807436eb14aada33d739448af76d951647863d62e37182dc
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyU7a0ACgkQgAnW8HDreRZaogCdFMCYX5EkANjRwUB+9Ag0uuk+
+4oUAn098O+ImB2QRQ52eZ7bicjibAtQK
+=CzGn
+-----END PGP SIGNATURE-----
diff --git a/app-misc/boxes/boxes-1.1-r1.ebuild b/app-misc/boxes/boxes-1.1-r1.ebuild
new file mode 100644
index 000000000000..4ffc058ab998
--- /dev/null
+++ b/app-misc/boxes/boxes-1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1-r1.ebuild,v 1.1 2010/09/18 16:49:44 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Draw any kind of boxes around your text"
+HOMEPAGE="http://boxes.thomasjensen.com/"
+SRC_URI="http://boxes.thomasjensen.com/download/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-Makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin src/boxes || die
+	doman doc/boxes.1 || die
+	dodoc README || die
+	insinto /usr/share/boxes
+	doins boxes-config || die
+}
diff --git a/app-misc/boxes/files/1.1-Makefile.patch b/app-misc/boxes/files/1.1-Makefile.patch
new file mode 100644
index 000000000000..4f4ddac58b3b
--- /dev/null
+++ b/app-misc/boxes/files/1.1-Makefile.patch
@@ -0,0 +1,57 @@
+diff --git a/Makefile b/Makefile
+index 79dda53..71f8d54 100644
+--- a/Makefile
++++ b/Makefile
+@@ -73,7 +73,7 @@
+ 
+ 
+ # The following line (GLOBALCONF) is the only line you should need to edit!
+-GLOBALCONF = /usr/share/boxes
++GLOBALCONF = /usr/share/boxes/boxes-config
+ BVERSION   = 1.1
+ 
+ SNAPFILE   = boxes-SNAP-$(shell date +%Y%m%d)
+diff --git a/src/Makefile b/src/Makefile
+index 7cfab9f..9ed467b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -86,8 +86,7 @@
+ LEX        = flex
+ YACC       = bison
+ CC         = gcc
+-CFLAGS     = -ansi -I. -Iregexp -Wall -W $(CFLAGS_ADDTL)
+-LDFLAGS    = -Lregexp
++CFLAGS     += -ansi -I. -Iregexp $(CFLAGS_ADDTL)
+ 
+ GEN_HDR    = parser.h
+ GEN_SRC    = parser.c lex.yy.c
+@@ -106,14 +105,13 @@ ALL_OBJ    = $(GEN_SRC:.c=.o) $(ORIG_NORM:.c=.o)
+ 
+ 
+ build:
+-	$(MAKE) CFLAGS_ADDTL=-O boxes
+-	strip boxes
++	$(MAKE) boxes
+ debug:
+ 	$(MAKE) CFLAGS_ADDTL=-g boxes
+ 
+ boxes: $(ALL_OBJ)
+ 	$(MAKE) -C regexp CC=$(CC) libregexp.a
+-	$(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -lregexp
++	$(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -Lregexp -lregexp
+ 
+ boxes.h:
+ 	@echo File boxes.h not found or not current. Please run make in the parent directory.
+diff --git a/src/regexp/Makefile b/src/regexp/Makefile
+index 0bd0ace..53966c9 100644
+--- a/src/regexp/Makefile
++++ b/src/regexp/Makefile
+@@ -42,7 +42,7 @@
+ #============================================================================
+ 
+ 
+-CFLAGS   = -O -I. $(CFLAGS_ADDTL)
++CFLAGS   += -I. $(CFLAGS_ADDTL)
+ 
+ ALL_CL   = regexp/regexp.c regexp/regsub.c
+ C_SRC    = $(notdir $(ALL_CL))
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 025ba6cc5c6b..46021c82e31a 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gramps-3.1.2-use_bsddb3.patch 2042 RMD160 28b4068768b3837b276457acd5fde417edcef76b SHA1 f329982e9b286e053130715d4f384a6b0b4a6772 SHA256 f70d07ac75b2807032221d86f1f1ca592e90eb6f0968289ecf3a996ef6b85b98
 AUX gramps-3.1.3-fix_mo_install.patch 1089 RMD160 064c23f70302269f5a8923fec61e6cfa52fb576f SHA1 6b4c76d2519dd75eac5433fea2d992512d76ce4f SHA256 6229731ed220a2a0cbdcc6dd03e55e9404b2505f0a31d4d7fdcb94cc7d93e018
 AUX gramps-3.2.3-use_bsddb3.patch 8351 RMD160 9ef4a25b361e2210909b6aa20b1f4c936dffe22d SHA1 84120e9c77d87b6d37845f43c57d79e7b27686d6 SHA256 af1a6388a731788ae06195039464b9a9966bd30ec5dc33916a5dad6f3fe9aff7
@@ -11,14 +8,7 @@ DIST gramps-3.2.3.tar.gz 7234196 RMD160 b0a9c7a3065c6ed24a2f5b7e548fe5bcf2c1927c
 EBUILD gramps-3.1.3-r1.ebuild 2306 RMD160 aca184dc993d5babcf20bae3c015c03d6430e3d6 SHA1 d09bcf6e0c9cda75d3a0f11ba86770033373871c SHA256 ad7213be59de267ceb730cc9cf8d42b798a1d2ba65b0e0eb4d1d80fe83156257
 EBUILD gramps-3.2.0.ebuild 2223 RMD160 bfdbf25e3ea4443630933d8bc35db40793209a3d SHA1 acbb2a08cf79d68a8dadc86d72363e080cb50246 SHA256 6cad8942a8795509fcc5d09a979d238de83d2d878e2ba0297306bed0bbf6992e
 EBUILD gramps-3.2.2.ebuild 2120 RMD160 29f9e8e099ff824a267737e10ce1a4e48f0c4fbc SHA1 336d8db8ae6e55413f28ba918b3c8a3a3e900c62 SHA256 44c036ff9edd21c26ffa24472f9286412b87e5ca5062a169858001b07ead53d8
-EBUILD gramps-3.2.3-r2.ebuild 2192 RMD160 c26fc83879e53d7442046acba139a0854b9a0cfb SHA1 4898fd51c02afdee18cbdb6d478661e55fc1770b SHA256 9373b9aa9edd7efe75c9c46f35a149640f6f00a54437273cefa0136857e4f101
+EBUILD gramps-3.2.3-r2.ebuild 2193 RMD160 e2b7ae7ebdec2dbe6bb70ec13832ff3f54954086 SHA1 3e77500434e771d7cc9badfd6b647a0fe461e18a SHA256 cae50ace78b71cb57c6f03db449b7a1d0f8d91df66e899a62f42b9854d33e403
 EBUILD gramps-3.2.3.ebuild 2137 RMD160 a1f50529e831e8a1580b344e620b66438efe7a8e SHA1 73c9e8ce3b5774b3a1cce02f425ff3ae873a3648 SHA256 0cf028520296f06ccd84653d1ef2d0c646ae5f96648098f018dafd64984e1c8c
-MISC ChangeLog 18908 RMD160 975ecc9bcd428bfc14061fffe03f1648f7439171 SHA1 0bbd3ade6592c392aea27fbb3b6625e4a56d0dcf SHA256 b5183f38ff8f97b7f5b9a4ac098bbf080009c9c39bf43e5365c7fdeeff129f61
+MISC ChangeLog 19011 RMD160 3194c0b8d5c197bac8e7afed78450183fa3435a9 SHA1 92c2baa74074e53f2931118574ba5a245c43b8d7 SHA256 ef58490612a94bedea7d6093530a528642612ab93d4083400cf40bf34a677fff
 MISC metadata.xml 5391 RMD160 6b000acb76bc6562c214c0078c58874f72cf839a SHA1 4a32ff9f7ca6549f951445dfa6309aea5b5d031c SHA256 bf3d518f68f9f0c58915b821f767d9d407390f0f971a8d0dfdd6f64cad5c74c5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw9qLsACgkQNQqtfCuFneNfKACdFXvMqyQx2AoDcF60I7NGwq3t
-glEAn0d1G8E3e6l5M5tYJfAk3PpWTsAE
-=02Gk
------END PGP SIGNATURE-----