Respect LDFLAGS and fix src_test() logic wrt #351021 by Kevin McCarthy.

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

4 files changed, 44 insertions, 14 deletions

diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog
index a17c87aa034c..2f9bc54bc97b 100644
--- a/app-office/ical/ChangeLog
+++ b/app-office/ical/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/ical
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.31 2010/04/20 10:49:49 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.32 2011/02/05 17:46:49 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> ical-3.0-r1.ebuild,
+  +files/ical-3.0-ldflags.patch:
+  Respect LDFLAGS and fix src_test() logic wrt #351021 by Kevin McCarthy.
 
   20 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> ical-3.0-r1.ebuild:
   amd64 stable wrt #305295
diff --git a/app-office/ical/Manifest b/app-office/ical/Manifest
index d322d4ac1cd9..c1aba84bcacd 100644
--- a/app-office/ical/Manifest
+++ b/app-office/ical/Manifest
@@ -1,6 +1,7 @@
 AUX ical-3.0-gcc44.patch 329 RMD160 d04d78e4673f9d3d00694784d42e97234324f36f SHA1 6e6a29edead16866a041aaf0f08eb1cbef2c8708 SHA256 6450b45e18a63a34aaf32c28b55b8f49abed585d8ba8276f5992719b38769821
+AUX ical-3.0-ldflags.patch 681 RMD160 2575abc5288bf56a9ce989d319471dd5293e2075 SHA1 749bf68059a1073dd325985c8012c367b369cc34 SHA256 a4a7c658f8a6dc734a5ab3d60f8fce49d17c303497ff749c90aecd26b824337e
 AUX ical-3.0-newtcl.patch 12767 RMD160 bd5f7eb7b368a9b983b4e4eff05f8d90e42c267c SHA1 e7f700cdbac1ae026a6bfb56f02c154f178c9517 SHA256 75ff4f6683dc0d913f1bbe694958f1f1d108445e2a25da52eed922380dda9a28
 DIST ical-3.0.tar.gz 373891 RMD160 ff0724c1cda6de8cbde0762fb84931455abef73b SHA1 a2d2efe5bd93ea63045f3dd4a7d2e0922849c727 SHA256 d290fa484a8fe5e8f70a397e9c12b61bb82c6ca517464390171fe3b06d203bbb
-EBUILD ical-3.0-r1.ebuild 1215 RMD160 4a5f9ed2e1034d78ce4d8c9f9ba25ee57cdb560c SHA1 a71c6941baf98fc8309b0baaf16dba16209c28f4 SHA256 4c460f51ac0bc4263f348131de5fc48e3b85e1ca3b8b480307de754db0473f08
-MISC ChangeLog 3849 RMD160 9d822d48a5b549981dbe6e2d4910ae139ac1a980 SHA1 863f5962759005f21f816a1c7dd8e813acb52f4d SHA256 85a6cbbba6b94203ae6f2001e7fb685e7eb063fc497513b254010ca05f170233
+EBUILD ical-3.0-r1.ebuild 1274 RMD160 919e25ee4745dba8697520adc3973545eca1629f SHA1 b6bdd4e65b5404ff0b8a187b94ef2bee93f73530 SHA256 48cf7ccd1ee9deb88f11b36498549aeb213e8dc74575868706ad635b7a73735b
+MISC ChangeLog 4031 RMD160 a973734bb7afd3a2e7ef3b5131f10fdda5f1fea3 SHA1 f6ede3e28f21763dd182cbd445d114aa0eab1281 SHA256 7600b7c28ca6bc9af7705f347f4969b5f1187345478ce7c4b9c0b4cc52d9c050
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/app-office/ical/files/ical-3.0-ldflags.patch b/app-office/ical/files/ical-3.0-ldflags.patch
new file mode 100644
index 000000000000..36c1599f8ca7
--- /dev/null
+++ b/app-office/ical/files/ical-3.0-ldflags.patch
@@ -0,0 +1,23 @@
+Add LDFLAGS to linker calls
+
+Patch by Kevin McCarthy <signals42@gmail.com>
+
+--- Makefile.in
++++ Makefile.in
+@@ -74,13 +74,13 @@
+ all: $(CONFIGURED) ical
+ 
+ ical: $(LIB3) $(LIB2) $(LIB1) $(OBJS) main.o
+-	$(CXXLINKER) -o $@ $(OBJS) main.o $(LIBS)
++	$(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) main.o $(LIBS)
+ 
+ ical-bundle: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o
+-	$(CXXLINKER) -o $@ $(OBJS) mbundle.o $(BLIBS)
++	$(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) mbundle.o $(BLIBS)
+ 
+ ical-tiny: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o
+-	$(CXXLINKER) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS)
++	$(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS)
+ 
+ $(LIB1): FRC
+ 	@echo making in calendar
diff --git a/app-office/ical/ical-3.0-r1.ebuild b/app-office/ical/ical-3.0-r1.ebuild
index 128054f3ee12..8a51d47f3d34 100644
--- a/app-office/ical/ical-3.0-r1.ebuild
+++ b/app-office/ical/ical-3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r1.ebuild,v 1.4 2010/04/20 10:49:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r1.ebuild,v 1.5 2011/02/05 17:46:49 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit autotools eutils multilib virtualx
 
 DESCRIPTION="Tk-based Calendar program"
@@ -14,15 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="dev-lang/tcl
+RDEPEND="dev-lang/tcl
 	dev-lang/tk"
-
-# FIXME wrt bug #315949
-RESTRICT="test"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-newtcl.patch
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-newtcl.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 
 	sed -i \
 		-e 's:8.4 8.3:8.6 8.5 8.4 8.3:g' \
@@ -43,7 +43,9 @@ src_compile() {
 }
 
 src_test() {
-	Xmake check || die
+	if [[ ${EUID} != 0 ]]; then
+		Xmake -j1 check || die
+	fi
 }
 
 src_install() {