Fixed linking problem (bug #275804) and added a patch for tests

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 59 insertions, 10 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index b33a328cc5b6..83ca0aa9b5d9 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/wcslib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.4 2009/06/26 21:49:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.5 2009/07/16 18:46:27 bicatali Exp $
+
+*wcslib-4.3.3-r1 (16 Jul 2009)
+
+  16 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> -wcslib-4.3.3.ebuild,
+  +wcslib-4.3.3-r1.ebuild, +files/wcslib-4.3.3-flibs.patch:
+  Fixed linking problem (bug #275804) and added a patch for tests
 
 *wcslib-4.3.3 (26 Jun 2009)
 
diff --git a/sci-astronomy/wcslib/files/wcslib-4.3.3-flibs.patch b/sci-astronomy/wcslib/files/wcslib-4.3.3-flibs.patch
new file mode 100644
index 000000000000..1f8590d49a94
--- /dev/null
+++ b/sci-astronomy/wcslib/files/wcslib-4.3.3-flibs.patch
@@ -0,0 +1,43 @@
+--- pgsbox/GNUmakefile.orig	2009-07-16 18:25:15.000000000 +0100
++++ pgsbox/GNUmakefile	2009-07-16 18:26:19.000000000 +0100
+@@ -118,7 +118,7 @@
+ 
+ pgtest : pgtest.o lngvel.o fscan.o $(PGSBOXLIB) $(LIBWCS)
+ 	-@ rm -f $@
+-	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^ $(PGPLOTLIB) $(LIBS)
++	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^ $(PGPLOTLIB) $(LIBS) $(FLIBS)
+ 
+ cpgtest : cpgtest.c lngvel.o fscan.o $(PGSBOXLIB) $(LIBWCS)
+ 	-@ rm -f $@
+--- Fortran/GNUmakefile.orig	2009-07-16 19:21:50.000000000 +0100
++++ Fortran/GNUmakefile	2009-07-16 19:23:04.000000000 +0100
+@@ -181,25 +181,25 @@
+ 
+ $(TEST_N) : % : test/%.f $(LIBWCS)
+ 	-@ echo ''
+-	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(LIBWCS) $(LIBS)
++	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(LIBWCS) $(LIBS) $(FLIBS)
+ 	-@ $(RM) $@.o
+ 
+ $(TEST_P) : % : test/%.f $(LIBWCS)
+ 	-@ echo ''
+-	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(LIBWCS) $(PGPLOTLIB) $(LIBS)
++	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(LIBWCS) $(PGPLOTLIB) $(LIBS) $(FLIBS)
+ 	-@ $(RM) $@.o
+ 
+ tpih2 : % : test/%.f $(PGSBOXLIB) $(LIBWCS)
+ 	-@ echo ''
+ 	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< $(PGSBOXLIB) $(LIBWCS) \
+-	     $(PGPLOTLIB) $(LIBS)
++	     $(PGPLOTLIB) $(LIBS) $(FLIBS)
+ 	-@ $(RM) $@.o
+ 
+ twcstab : test/twcstab.f ../C/wcstab.fits getwcstab_f.o getwcstab.inc \
+           ../C/getwcstab.o $(LIBWCS)
+ 	-@ echo ''
+ 	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< getwcstab_f.o \
+-	     ../C/getwcstab.o $(LIBWCS) $(CFITSIOLIB) $(LIBS)
++	     ../C/getwcstab.o $(LIBWCS) $(CFITSIOLIB) $(LIBS) $(FLIBS)
+ 	-@ $(RM) $@.o
+ 
+ $(PGSBOXLIB) :
diff --git a/sci-astronomy/wcslib/wcslib-4.3.3.ebuild b/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild
index 1770231eacd5..d98ca7c65c17 100644
--- a/sci-astronomy/wcslib/wcslib-4.3.3.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.3.3.ebuild,v 1.1 2009/06/26 21:49:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild,v 1.1 2009/07/16 18:46:27 bicatali Exp $
 
 EAPI=2
-inherit eutils
+inherit eutils versionator
 
 DESCRIPTION="Astronomical World Coordinate System transformations library"
 HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
@@ -22,6 +22,8 @@ src_prepare() {
 	sed -i \
 		-e 's/$(SHRLD)/$(SHRLD) $(LDFLAGS)/' \
 		C/GNUmakefile || die
+	WCSV=$(get_version_component_range 1-2)
+	epatch "${FILESDIR}"/${P}-flibs.patch
 }
 
 src_compile() {
@@ -35,14 +37,12 @@ rc_install() {
 
 src_install () {
 	# make install from makefile is buggy
-
 	dobin utils/{HPXcvt,fitshdr,wcsgrid} || die "dobin failed"
-
-	dolib.a C/libwcs-${PV}.a pgsbox/libpgsbox-${PV}.a || die
-	dolib.so C/libwcs.so.${PV} || die
-	dosym libwcs.so.${PV} /usr/$(get_libdir)/libwcs.so
-	dosym libwcs-${PV}.a /usr/$(get_libdir)/libwcs.a
-	dosym libpgsbox-${PV}.a /usr/$(get_libdir)/libpgsbox.a
+	dolib.a C/libwcs-${WCSV}.a pgsbox/libpgsbox-${WCSV}.a || die
+	dolib.so C/libwcs.so.${WCSV} || die
+	dosym libwcs.so.${WCSV} /usr/$(get_libdir)/libwcs.so
+	dosym libwcs-${WCSV}.a /usr/$(get_libdir)/libwcs.a
+	dosym libpgsbox-${WCSV}.a /usr/$(get_libdir)/libpgsbox.a
 
 	insinto /usr/include/${P}
 	doins wcsconfig.h wcsconfig_f77.h || die