Cleaned an obsolete function, added a patch for test, and avoid FORTIFY_SOURCE (but only fixes the C part, not the FORTRAN one)

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

4 files changed, 35 insertions, 12 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index 83ca0aa9b5d9..41f947c1a267 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.5 2009/07/16 18:46:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.6 2009/08/11 17:57:46 bicatali Exp $
+
+  11 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  wcslib-4.3.3-r1.ebuild, +files/wcslib-4.3.3-tests.patch:
+  Cleaned an obsolete function, added a patch for test, and avoid
+  FORTIFY_SOURCE (but only fixes the C part, not the FORTRAN one)
 
 *wcslib-4.3.3-r1 (16 Jul 2009)
 
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index be61906a762c..5d31f8740508 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX wcslib-4.3.3-flibs.patch 1534 RMD160 82098f98705eaad19d93f9e5889371e590cccbd9 SHA1 03d2e76bebb0e7aea783d5e8fbc95d58b0b2edc5 SHA256 deadaaaafdf34823253e9664a00b8079fe53a55312677d06c43d237942f8d10f
+AUX wcslib-4.3.3-tests.patch 352 RMD160 809f8882bf22d5c2cdf0324f8c9f414f9a5336ac SHA1 ffd9747dddd800807c69b88074815193d7c98eeb SHA256 4b1414c89da292403d3ffacfaba00edf9d3c3e48d2ef47d7557cee74ad65cad4
 DIST wcslib-4.3.3.tar.gz 629037 RMD160 8aaf4544ecb756b374f1823da47825da38ea1704 SHA1 d575c2441fe9ffa3fa4a5ddfedecd8b648f93fe8 SHA256 24031144861085dc1e45cf0c2f3864eb40f259a65ab80a2ce547fd1baabc02de
 DIST wcslib-4.3.tar.gz 606393 RMD160 19b2f2aded2b0ba9841de4d9d7006247fb0619b9 SHA1 4d4370484c1db2159935d599eee6c7eb6d2adf7a SHA256 c8bd43840b1a76774728f3d32d3e79f02586f3b34b0051eb5a861236b23e549f
 EBUILD wcslib-4.3-r1.ebuild 1331 RMD160 0c7e288f32e0661839802f8b0d286b4ec94c5a27 SHA1 bb18687a611e320b02d493680c15c4d43289d009 SHA256 06a95517496408edfecc13267da9812eb1156ab00212127572a4f07da05f908e
-EBUILD wcslib-4.3.3-r1.ebuild 1597 RMD160 e6f5ded9b72dc41ea7f4db02c150614918a5798e SHA1 a203e7a7118317f8526ad9b80ca6a998f959a49a SHA256 fd9ddccafee21e81decc91533026bae8093f2f22a0c0a932cbd7860038fef64c
-MISC ChangeLog 986 RMD160 46dbe47e8e9ebe046175a9f9c793a9074ce5ea92 SHA1 3cefc829a325f344be706df1d85c250f1e9266dd SHA256 4b1620a51e9a71f4ea79ee111786109b329466190115908fead59f2d55bad11a
+EBUILD wcslib-4.3.3-r1.ebuild 1774 RMD160 6613ab1e659a675b604844e774f655f839d1a56d SHA1 820758d3d3826c6cda54a0eb477deaf9396dd154 SHA256 0d895c25819d2e9f21f6ea617b4a5a1c151adb1f576f8e95fb611a35e8d19f3e
+MISC ChangeLog 1233 RMD160 916cc887512131ff57b6ff245b598a4d5fe5a76a SHA1 5f7fda67a7a3094fc7163a534476134d4b784072 SHA256 27426291a9f231ea54b16ce9b568ab4e95a1f296097c176729bf2583d22b44ae
 MISC metadata.xml 526 RMD160 b4130ef4285e199d5c07d9848f095c138b7e5d39 SHA1 17a684cec86c065cec536197709034dcc6a8ae80 SHA256 4819cc3667c7460268fe9ada14c4c69606d30335d6a249da471d5c598b5c1e9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpfdY0ACgkQ1ycZbhPLE2AHxgCfSkmIxbudMfILqgRdMW4oVCcm
-yr4AnRcntijaRwjy5v7ZlYY+NzcqkeXk
-=EZrC
+iEYEARECAAYFAkqBsSQACgkQ1ycZbhPLE2D+xQCgi2Nm07pIId3/w21CuOOK9UKy
+gSAAoLG+Uf9rFB/7wtdRbzS7ETUB25be
+=vQnj
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/wcslib/files/wcslib-4.3.3-tests.patch b/sci-astronomy/wcslib/files/wcslib-4.3.3-tests.patch
new file mode 100644
index 000000000000..02ea580c7e1a
--- /dev/null
+++ b/sci-astronomy/wcslib/files/wcslib-4.3.3-tests.patch
@@ -0,0 +1,11 @@
+--- C/GNUmakefile.orig	2009-08-11 17:13:16.000000000 +0100
++++ C/GNUmakefile	2009-08-11 17:13:43.000000000 +0100
+@@ -137,7 +137,7 @@
+ 	-@ echo ''
+ 	-@ $(TIMER)
+ 	 @ if [ '$<' = tcel2 ] ; then \
+-	     echo N | $< ; \
++	     echo N | ./$< ; \
+ 	   elif [ '$<' = tunits ] ; then \
+ 	     ./$< < test/units_test ; \
+ 	   elif [ '$<' != twcshdr ] ; then \
diff --git a/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild b/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild
index d98ca7c65c17..0705259c57c0 100644
--- a/sci-astronomy/wcslib/wcslib-4.3.3-r1.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-r1.ebuild,v 1.1 2009/07/16 18:46:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.3.3-r1.ebuild,v 1.2 2009/08/11 17:57:46 bicatali Exp $
 
 EAPI=2
-inherit eutils versionator
+inherit eutils versionator virtualx flag-o-matic
 
 DESCRIPTION="Astronomical World Coordinate System transformations library"
 HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
@@ -16,28 +16,34 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="sci-libs/pgplot
 	sci-libs/cfitsio"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
 
 src_prepare() {
 	sed -i \
 		-e 's/$(SHRLD)/$(SHRLD) $(LDFLAGS)/' \
 		C/GNUmakefile || die
-	WCSV=$(get_version_component_range 1-2)
 	epatch "${FILESDIR}"/${P}-flibs.patch
+	epatch "${FILESDIR}"/${P}-tests.patch
+	append-flags -U_FORTIFY_SOURCE
 }
 
 src_compile() {
 	# -j1 forced. build system too crappy to be worth debugging
+	# does not really fix anything
 	emake -j1 || die "emake failed"
 }
 
-rc_install() {
-   emake DESTDIR="${D}" install || die "emake install failed"
+src_test() {
+	Xemake -j1 check || die "emake test failed"
 }
 
 src_install () {
 	# make install from makefile is buggy
 	dobin utils/{HPXcvt,fitshdr,wcsgrid} || die "dobin failed"
+	WCSV=$(get_version_component_range 1-2)
 	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