Fix parallel build, respect LDFLAGS, fix build with make 3.82 wrt bug 337479. Thanks to Diego for the report. Drop old.

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

4 files changed, 74 insertions, 27 deletions

diff --git a/sci-astronomy/xfitsview/ChangeLog b/sci-astronomy/xfitsview/ChangeLog
index 804b032af727..c0772fa5be3c 100644
--- a/sci-astronomy/xfitsview/ChangeLog
+++ b/sci-astronomy/xfitsview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/xfitsview
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/ChangeLog,v 1.4 2009/08/17 17:09:00 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/ChangeLog,v 1.5 2010/09/15 13:01:59 xarthisius Exp $
+
+*xfitsview-2.2-r1 (15 Sep 2010)
+
+  15 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> -xfitsview-2.2.ebuild,
+  +xfitsview-2.2-r1.ebuild, +files/xfitsview-2.2-build_system.patch:
+  Fix parallel build, respect LDFLAGS, fix build with make 3.82 wrt bug
+  337479. Thanks to Diego for the report. Drop old.
 
   17 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
   -xfitsview-2.1.ebuild, xfitsview-2.2.ebuild, metadata.xml:
diff --git a/sci-astronomy/xfitsview/Manifest b/sci-astronomy/xfitsview/Manifest
index 22bfa2a2a236..c1841361d849 100644
--- a/sci-astronomy/xfitsview/Manifest
+++ b/sci-astronomy/xfitsview/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xfitsview-2.2-build_system.patch 1308 RMD160 5bebb092f0f83a6fd2a82a88316d7c1e75e2c895 SHA1 1032810b2400aee13a235eb33953f42b32818609 SHA256 53adac51c2741cd0ccd0676913fbffebbeddb96a094a2e64d66a83036ccf1fe2
 DIST xfitsview2.2.tgz 290959 RMD160 d6c3748d69e0538ccf388e9a7e037043ff990383 SHA1 d9357a1eeb9ba388ddfb2c9d8ec755d3650884f7 SHA256 f47649ad0091fa555aae13a0c539cd378591df28613b8572195baf77eea74fbb
-EBUILD xfitsview-2.2.ebuild 906 RMD160 0aded457142eb898d125ba07cbb6e68464062edc SHA1 3db093b0a634934bdc5a96cf07493447e2c7cbd4 SHA256 85a6198ee5e810ab91737f563412c45f595324fd4a791780df32d1c7f85b07c7
-MISC ChangeLog 909 RMD160 dfd853f8f097769534165b31e50db9433557ef67 SHA1 0d3dc879ab93e80f1a798add647b48e77b2df88f SHA256 5c8be0813d10b2f87e3e894dd9755d9c2828d85be03660be4e98cc00a9482761
+EBUILD xfitsview-2.2-r1.ebuild 801 RMD160 fd02c85909ea3fc2c92a2cf3e52e48c380ee18e7 SHA1 b95537908c9d650c847be4652f75b64464963d09 SHA256 251350752a94a83a9f00e22bb3af372be0251b928f230beac25648f3c26495c1
+MISC ChangeLog 1215 RMD160 9865a09be6d9f734b88275ec7f6bf923f7332a9c SHA1 5bd36b71bba6f32290cda9780af7f032156edc91 SHA256 7bbd6ab5116eaca20bd1054798fd1032dc457faf23db46cb6242d08677660d62
 MISC metadata.xml 394 RMD160 413c3a13cb45577b51576b12b4fd329ecbbebec2 SHA1 edcc3fcd27b9a240ac711a0d3cbf0a8a309c0a65 SHA256 407e148197dadab6bec04e70eeb1762221ae6da3a00557658f17bbce68d36f89
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqJjrYACgkQ1ycZbhPLE2AecACePjRogZBRCluVfpxfipSgLRVq
-chAAn31e4pmIyT6kF2DPq9+QE9DD21Of
-=VU63
------END PGP SIGNATURE-----
diff --git a/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch b/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch
new file mode 100644
index 000000000000..6b010a3ea721
--- /dev/null
+++ b/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch
@@ -0,0 +1,54 @@
+* Fix parallel build
+* Respect LDFLAGS
+* Fix build with gmake 3.82
+
+http://bugs.gentoo.org/show_bug.cgi?id=337479
+
+--- Makefile.in
++++ Makefile.in
+@@ -61,26 +61,26 @@
+ LIBDIR = lib/$(ARCH)/
+ CFLAGS = -Iinclude -Ifitssubs @MOTIF_CPPFLAGS@ @X_CFLAGS@ \
+ 	$(DEBUG) $(OSFLAGS) @CFLAGS@ 
+-LIBS = @MOTIF_LIBS@ -lfitsLib
+-LDFLAGS = @MOTIF_LDFLAGS@ @X_LIBS@ -L$(LIBDIR)
++LIBS = @MOTIF_LIBS@ @X_LIBS@ -L$(LIBDIR) -lfitsLib
++LDFLAGS = @LDFLAGS@ @MOTIF_LDFLAGS@
+ 
+ all:  $(TARGETS)
+ 
+ # update source/object directory
+ srcupdate: 
+-	cd src; $(MAKE)
++	$(MAKE) -C src
+ 
+ # update fitssubs source/object directory
+ fitsupdate: 
+-	cd fitssubs; $(MAKE)
++	$(MAKE) -C fitssubs
+ 
+ # update fitssubs library directory
+-libupdate: 
+-	cd lib; $(MAKE) RANLIB="$(RANLIB)"
++libupdate: fitsupdate srcupdate
++	$(MAKE) RANLIB="$(RANLIB)" -C lib
+ 
+ # Link Obitview
+-XFITSview: lib/$(ARCH)/libfitsLib.a  src/*.c XFITSview.c
+-	$(CC) XFITSview.c -o XFITSview  $(CFLAGS) src/*.o $(LDFLAGS) $(LIBS)
++XFITSview: XFITSview.c libupdate
++	$(CC) $(LDFLAGS) XFITSview.c -o XFITSview  $(CFLAGS) src/*.o $(LIBS)
+ 
+ # make gzipped tar backup of directory
+ backup:	
+--- fitssubs/Makefile.in
++++ fitssubs/Makefile.in
+@@ -69,7 +69,7 @@
+ 
+ 
+ # create library directory if needed
+-../lib/$(ARCH): ../lib
++$(LIBDIR): ../lib
+ 	mkdir ../lib/$(ARCH)
+ 
+ clean:
diff --git a/sci-astronomy/xfitsview/xfitsview-2.2.ebuild b/sci-astronomy/xfitsview/xfitsview-2.2-r1.ebuild
index 28f37797d6d4..f38f565ad376 100644
--- a/sci-astronomy/xfitsview/xfitsview-2.2.ebuild
+++ b/sci-astronomy/xfitsview/xfitsview-2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/xfitsview-2.2.ebuild,v 1.3 2009/08/17 17:09:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/xfitsview-2.2-r1.ebuild,v 1.1 2010/09/15 13:01:59 xarthisius Exp $
 
 EAPI=2
 inherit eutils
@@ -20,19 +20,14 @@ IUSE=""
 DEPEND="x11-libs/openmotif"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_PN}"
+S=${WORKDIR}/${MY_PN}
 
-src_compile() {
-	# trick to make parallel building work
-	for d in fitssubs src; do
-	   pushd ${d}
-	   emake || die "emake ${d} failed"
-	   popd
-	done
-	emake -j1 || die "emake failed"
+src_prepare() {
+	find "${S}" -name "*old.c" -delete || die
+	epatch "${FILESDIR}"/${P}-build_system.patch
 }
 
 src_install() {
-	dobin XFITSview || die "dobin failed"
-	dodoc README changes notes.text || die "dodoc failed"
+	dobin XFITSview || die
+	dodoc README changes notes.text || die
 }