diff options
author | 2011-09-23 19:17:31 +0000 | |
---|---|---|
committer | 2011-09-23 19:17:31 +0000 | |
commit | 55bd062663a4a4533f827dda9eb2b9958c11284f (patch) | |
tree | 54ccf4ded3a2df235326b4993330b9d24d97bbc1 /sci-astronomy | |
parent | Drop USE=doc since opengl-manpages no longer seem to exist, bug #384197 (diff) | |
download | historical-55bd062663a4a4533f827dda9eb2b9958c11284f.tar.gz historical-55bd062663a4a4533f827dda9eb2b9958c11284f.tar.bz2 historical-55bd062663a4a4533f827dda9eb2b9958c11284f.zip |
Version bump, drop old
Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
Diffstat (limited to 'sci-astronomy')
-rw-r--r-- | sci-astronomy/wcstools/ChangeLog | 13 | ||||
-rw-r--r-- | sci-astronomy/wcstools/Manifest | 23 | ||||
-rw-r--r-- | sci-astronomy/wcstools/files/wcstools-3.8.1-autotools.patch | 141 | ||||
-rw-r--r-- | sci-astronomy/wcstools/files/wcstools-3.8.1-format.patch | 24 | ||||
-rw-r--r-- | sci-astronomy/wcstools/files/wcstools-3.8.1-implicits.patch | 35 | ||||
-rw-r--r-- | sci-astronomy/wcstools/files/wcstools-3.8.1-invalid_free.patch | 12 | ||||
-rw-r--r-- | sci-astronomy/wcstools/files/wcstools-3.8.1-overflows.patch | 116 | ||||
-rw-r--r-- | sci-astronomy/wcstools/files/wcstools-3.8.4-implicits.patch | 21 | ||||
-rw-r--r-- | sci-astronomy/wcstools/files/wcstools-3.8.4-overflows.patch | 11 | ||||
-rw-r--r-- | sci-astronomy/wcstools/wcstools-3.8.4.ebuild (renamed from sci-astronomy/wcstools/wcstools-3.8.3.ebuild) | 19 |
10 files changed, 65 insertions, 350 deletions
diff --git a/sci-astronomy/wcstools/ChangeLog b/sci-astronomy/wcstools/ChangeLog index 466e94ddc091..b61512d145b4 100644 --- a/sci-astronomy/wcstools/ChangeLog +++ b/sci-astronomy/wcstools/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sci-astronomy/wcstools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.21 2011/08/04 18:34:15 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.22 2011/09/23 19:17:31 xarthisius Exp $ + +*wcstools-3.8.4 (23 Sep 2011) + + 23 Sep 2011; Kacper Kowalik <xarthisius@gentoo.org> + -files/wcstools-3.8.1-autotools.patch, -files/wcstools-3.8.1-format.patch, + -files/wcstools-3.8.1-implicits.patch, + -files/wcstools-3.8.1-invalid_free.patch, + -files/wcstools-3.8.1-overflows.patch, -wcstools-3.8.3.ebuild, + +wcstools-3.8.4.ebuild, +files/wcstools-3.8.4-implicits.patch, + +files/wcstools-3.8.4-overflows.patch: + Version bump, drop old 04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml: Switched herd to sci-astronomy diff --git a/sci-astronomy/wcstools/Manifest b/sci-astronomy/wcstools/Manifest index 9a497f9a0e6c..237ec5c2c662 100644 --- a/sci-astronomy/wcstools/Manifest +++ b/sci-astronomy/wcstools/Manifest @@ -1,20 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX wcstools-3.8.1-autotools.patch 4434 RMD160 c7b3a3d5f523f5cead93f8f07f0823cca9ed7ad8 SHA1 d9d8b205fd6cb60ec6940b577f31187f0a342772 SHA256 809dc3ac06aa1e4dbd6720b3f3afa4fef74c13e608bac97fdc4152f6c2003171 -AUX wcstools-3.8.1-format.patch 807 RMD160 04f6173b08dbb63ffc99d95ac35c6da7b95eab13 SHA1 73dadfb6a9a7f7129ff78b1102c37829379a15a0 SHA256 e37fd71d079fd55b344f9207f58a46348bbb632e2df04e5898eaf7c44f53d40a -AUX wcstools-3.8.1-implicits.patch 1073 RMD160 05583b5fb1c13f70f8463fdb7e188371f3ee12be SHA1 2b84f4dccc056284619576237c7d330b15b68ede SHA256 7bea6da1cf9d074d1aa41d3660da0a1a4d4b42996bdf7225e8f44792adc5ada9 -AUX wcstools-3.8.1-invalid_free.patch 276 RMD160 ae6955b05d1813cb7958847de4ce62da7142e224 SHA1 34e87c5d3b708961809e8c0073591f7736d2caef SHA256 b3618ec29f38652f4b2bb00465e6228adf9326abe3bb9789e9c0b569ac7e3ba0 -AUX wcstools-3.8.1-overflows.patch 3632 RMD160 d7ca89f76f515db49f960e4c6b4dd233634d7897 SHA1 4e649a26756be754860fe57a51988d1fbd214732 SHA256 7445d7dacb7d2ac3d2143188568e42da3dcf48c416acc3b83af73dca27e3f47a AUX wcstools-3.8.3-autotools.patch 4454 RMD160 e994101268e5ad16d8d6d72f89710c8dd20ecfc2 SHA1 b740a3007284c86e5fd3eefeb4c63f0abb8d1600 SHA256 595679ba27848244b376a162b10aa3160a95afc97a76c97b7caa639c54b10459 -DIST wcstools-3.8.3.tar.gz 969489 RMD160 cda1f403a0b04103e4cb6e95a7a117d8666d1cb1 SHA1 af344d30d004cfd168bcf2ec271e1b15bcae3da3 SHA256 577c0da37b89ef4ee11685c3772c2c49a024ee128a0ce632fe8d9d5a9d465ee0 -EBUILD wcstools-3.8.3.ebuild 1654 RMD160 181f1ca06938eb6c18f58a381513cc7c8c6162fd SHA1 349343c06f094677c3922a876c27387c9817df5d SHA256 af08da8aa744d4d59f7ac43e88470ae48b96466598bc6f3238ddebd5de714b78 -MISC ChangeLog 5373 RMD160 c9e24bb807385570b58e6c808e1811236db471e4 SHA1 1afbb78b132afa399405e555de2ebfa359ef4a16 SHA256 40925644a782756a06f92e422f866470eec2e4d416bfd1d81b70b5d23e8429bc +AUX wcstools-3.8.4-implicits.patch 409 RMD160 bbeea17f9e3ca05676a9abe81b49e830a336beaf SHA1 aa4f2cdb0ab6be37944ce356d3cc00cf78d23bb6 SHA256 76d235588d570fd4a9f99cc338038dcfa60b20731bebbd8b22e04c29f2c24b1d +AUX wcstools-3.8.4-overflows.patch 225 RMD160 d234305388b7a6f33eec9bdd5e43d106e43da54a SHA1 55c869c2e7132ba44ad2fb798276e48c2aeee6c6 SHA256 7f975926b60b6d458e0121c02686e8ce1637e0b857c18eee712cad9519ad7c2e +DIST wcstools-3.8.4.tar.gz 954899 RMD160 4bc9f03fcfaad3d35a334d676fd7db88275a4506 SHA1 3e23da2638fbd219c47599cc21ad7f768d2f6f2c SHA256 a3b3475527b107c940f18a55cbf50e558e425bd2277a5f7dc57c0f2daca64c8a +EBUILD wcstools-3.8.4.ebuild 1550 RMD160 5ef4e66d28b39afb9d8f86358282d0b4cfecc73a SHA1 1973989594875cf3da6cd2f2b664febae26c9d68 SHA256 39e4023974c3bf91f36dd18f450686d7cf9f46be8548a0adbb643eee56c8d5ab +MISC ChangeLog 5819 RMD160 59a50d37b44865902ff6932738303f3453e3e55d SHA1 2e2d95dbe85659f5dfb2775175bfd2514e2240f6 SHA256 478a47010e6b93525d35173f03178d8ac0c169d83afe19fe12f0a4af3a5e6e14 MISC metadata.xml 844 RMD160 ec4785d001f529e00347bb1cd9c29add69196d04 SHA1 7961558f9441d906f4fcc1616dae591f894cacef SHA256 5ec9687eb03fffc9b6a50631582908ab233adbc81a1aff9e1fd7101eeb06272c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk465i8ACgkQ1ycZbhPLE2ByVwCgnomCCGaEVJ5rEnruYkIRT1z0 -t5YAnjJDQckVbHR63FnKNfZAkS7Vp0Up -=pVnb +iJwEAQECAAYFAk5821QACgkQIiMqcbOVdxShrAP+LVS9sbslMNM6v6At0SbO+zGX +thS4FG/mnbrniuw5JxNfJLZqRhSeabDQ3UG27RbdcDUrnMGMzJYPDpz6MEYlFFns +HvcgkonBeiw9krSDsmPVmTPqAsIG3/FzVmj2+Zw6w9wbnArnMYBOj9eJkWA4JbN7 +pcclib6LyVTF1DE88NA= +=yucA -----END PGP SIGNATURE----- diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.1-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.8.1-autotools.patch deleted file mode 100644 index f41d00add07c..000000000000 --- a/sci-astronomy/wcstools/files/wcstools-3.8.1-autotools.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- configure.ac.orig 1970-01-01 01:00:00.000000000 +0100 -+++ configure.ac 2008-11-03 09:59:35.000000000 +0000 -@@ -0,0 +1,11 @@ -+AC_PREREQ([2.59]) -+AC_INIT(wcstools, 3.8.1 , [http://tdc-www.harvard.edu/wcstools/]) -+AM_INIT_AUTOMAKE([foreign]) -+AM_CONFIG_HEADER(config.h) -+ -+AC_PROG_CC -+AC_PROG_LIBTOOL -+AC_C_CONST -+AC_CHECK_LIB(m, sin) -+AC_CONFIG_FILES([libwcs/Makefile libned/Makefile Makefile wcstools.pc]) -+AC_OUTPUT ---- libned/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 -+++ libned/Makefile.am 2008-11-03 09:34:57.000000000 +0000 -@@ -0,0 +1,5 @@ -+lib_LTLIBRARIES = libned.la -+noinst_HEADERS = nedc.h ned_client.h -+libned_la_SOURCES = \ -+ ned_cli.c ned_cif.c ned_err.c ned_sk.c -+EXTRA_DIST = README ---- libwcs/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 -+++ libwcs/Makefile.am 2008-11-03 09:34:57.000000000 +0000 -@@ -0,0 +1,17 @@ -+lib_LTLIBRARIES = libwcstools.la -+libwcstools_la_SOURCES = \ -+ imsetwcs.c imgetwcs.c matchstar.c findstar.c daoread.c wcscon.c \ -+ fitswcs.c wcsinit.c wcs.c ty2read.c webread.c tmcread.c \ -+ gscread.c gsc2read.c ujcread.c uacread.c ubcread.c ucacread.c \ -+ sdssread.c tabread.c binread.c ctgread.c actread.c catutil.c \ -+ skybotread.c imrotate.c fitsfile.c imhfile.c \ -+ hget.c hput.c imio.c dateutil.c imutil.c \ -+ worldpos.c tnxpos.c dsspos.c platepos.c \ -+ sortstar.c platefit.c iget.c fileutil.c \ -+ wcslib.c lin.c cel.c proj.c sph.c wcstrig.c distort.c -+ -+wcsdir = $(includedir)/wcs -+wcs_HEADERS = \ -+ wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h -+ -+noinst_HEADERS = fitsfile1.h wcscat1.h ---- Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 -+++ Makefile.am 2008-11-03 10:09:43.000000000 +0000 -@@ -0,0 +1,80 @@ -+SUBDIRS = libwcs libned -+INCLUDES = -I$(top_srcdir)/libwcs -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = wcstools.pc -+ -+bin_SCRIPTS = wcstools -+ -+EXTRA_DIST = wcstools COPYING Readme NEWS Programs -+ -+bin_PROGRAMS = \ -+ cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \ -+ imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \ -+ keyhead skycoor subpix xy2sky wcshead conpix gettab newfits getfits \ -+ imstack imextract sumpix wcsremap getcol wcsgetdate imfill imsmooth imresize \ -+ fileroot filename filext char2sp sp2char wcscrlf isnum isrange isfits \ -+ simpos nedpos bincat nedname -+ -+# these ones don't need libwcs -+wcscrlf_SOURCES = crlf.c -+filename_SOURCES = filename.c -+fileroot_SOURCES = fileroot.c -+filext_SOURCES = filext.c -+isrange_SOURCES = isrange.c -+ -+LDADD = $(top_builddir)/libwcs/libwcstools.la -+ -+bincat_SOURCES = bincat.c -+getcol_SOURCES = getcol.c -+wcsgetdate_SOURCES = getdate.c -+gethead_SOURCES = gethead.c -+getfits_SOURCES = getfits.c -+getpix_SOURCES = getpix.c -+gettab_SOURCES = gettab.c -+imcat_SOURCES = imcat.c -+imsize_SOURCES = imsize.c -+imstar_SOURCES = imstar.c -+imwcs_SOURCES = imwcs.c -+immatch_SOURCES = immatch.c -+scat_SOURCES = scat.c -+setpix_SOURCES = setpix.c -+skycoor_SOURCES = skycoor.c -+sumpix_SOURCES = sumpix.c -+xy2sky_SOURCES = xy2sky.c -+simpos_SOURCES = simpos.c -+ -+addpix_SOURCES = addpix.c -+char2sp_SOURCES = char2sp.c -+conpix_SOURCES = conpix.c -+cphead_SOURCES = cphead.c -+delwcs_SOURCES = delwcs.c -+delhead_SOURCES = delhead.c -+edhead_SOURCES = edhead.c -+fixpix_SOURCES = fixpix.c -+i2f_SOURCES = i2f.c -+imfill_SOURCES = imfill.c -+imresize_SOURCES = imresize.c -+imsmooth_SOURCES = imsmooth.c -+imhead_SOURCES = imhead.c -+imrot_SOURCES = imrot.c -+imstack_SOURCES = imstack.c -+imextract_SOURCES = imextract.c -+isnum_SOURCES = isnum.c -+keyhead_SOURCES = keyhead.c -+newfits_SOURCES = newfits.c -+wcsremap_SOURCES = remap.c -+sethead_SOURCES = sethead.c -+sky2xy_SOURCES = sky2xy.c -+sp2char_SOURCES = sp2char.c -+subpix_SOURCES = subpix.c -+wcshead_SOURCES = wcshead.c -+ -+nedname_SOURCES = nedname.c -+nedname_LDADD = \ -+ $(top_builddir)/libned/libned.la \ -+ $(top_builddir)/libwcs/libwcstools.la -+nedpos_SOURCES = nedpos.c -+nedpos_LDADD = \ -+ $(top_builddir)/libned/libned.la \ -+ $(top_builddir)/libwcs/libwcstools.la ---- wcstools.pc.in.orig 1970-01-01 01:00:00.000000000 +0100 -+++ wcstools.pc.in 2008-11-03 10:30:59.000000000 +0000 -@@ -0,0 +1,13 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: World Coordinate System Library and Tools -+Version: @PACKAGE_VERSION@ -+URL: http://tdc-www.harvard.edu/wcstools/ -+Libs: -L${libdir} -lwcstools -+Libs.private: -lm -+Cflags: -I${includedir}/wcs -+ diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.1-format.patch b/sci-astronomy/wcstools/files/wcstools-3.8.1-format.patch deleted file mode 100644 index 32bc9c350dc6..000000000000 --- a/sci-astronomy/wcstools/files/wcstools-3.8.1-format.patch +++ /dev/null @@ -1,24 +0,0 @@ -warning: too few arguments for format - ---- libwcs/ucacread.c -+++ libwcs/ucacread.c -@@ -734,7 +734,7 @@ - else if (ucat == UCAC2) { - fprintf (stderr,"UCACRNUM: %11.6f: %9.5f %9.5f %5.2f", - num, ra, dec, star->xmag[0]); -- fprintf (stderr," %5.2f %5.2f %5.2f %d %d", -+ fprintf (stderr," %5.2f %5.2f %5.2f", - star->xmag[1],star->xmag[2],star->xmag[3]); - fprintf (stderr," %d %d\n",star->nimage,star->ncat); - } ---- imcat.c -+++ imcat.c -@@ -1923,7 +1923,7 @@ - if (tabout && (refcat == UCAC2 || refcat == UCAC3)) { - era = gm[nmag][i] * cosdeg (gdec[i]) * 3600.0; - edec = gm[nmag+1][i] * 3600.0; -- sprintf (temp, " %5.3f %5.3f"); -+ sprintf (temp, " %5.3f %5.3f", era, edec); - strcat (headline, temp); - } - for (imag = 0; imag < nmag; imag++) { diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.1-implicits.patch b/sci-astronomy/wcstools/files/wcstools-3.8.1-implicits.patch deleted file mode 100644 index df857e7bce37..000000000000 --- a/sci-astronomy/wcstools/files/wcstools-3.8.1-implicits.patch +++ /dev/null @@ -1,35 +0,0 @@ -* ned_sk.c:152:4: warning: implicit declaration of function ‘inet_addr’ -* isfits.c:54:2: warning: implicit declaration of function ‘isfits’ -* nedpos.c:130:6: warning: implicit declaration of function ‘isfile’ -* nedpos.c:131:3: warning: implicit declaration of function ‘getfilelines’ - ---- wcstools-3.8.1/libned/ned_sk.c -+++ wcstools-3.8.1/libned/ned_sk.c -@@ -57,6 +57,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> -+#include <arpa/inet.h> - #include <netdb.h> - - #include <sys/resource.h> ---- wcstools-3.8.1/nedpos.c -+++ wcstools-3.8.1/nedpos.c -@@ -8,6 +8,7 @@ - #include <string.h> - #include "libned/ned_client.h" - #include "libwcs/wcs.h" -+#include "libwcs/fitsfile.h" - - static char *RevMsg = "NEDPOS 3.8.1, 14 December 2009, Doug Mink SAO"; - ---- wcstools-3.8.1/isfits.c -+++ wcstools-3.8.1/isfits.c -@@ -27,6 +27,7 @@ - #include <stdlib.h> - #include <string.h> - #include "libwcs/fitshead.h" -+#include "libwcs/fitsfile.h" - - static char *RevMsg = "ISFITS WCSTools 3.8.1, 14 December 2009, Doug Mink (dmink@cfa.harvard.edu)"; - diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.1-invalid_free.patch b/sci-astronomy/wcstools/files/wcstools-3.8.1-invalid_free.patch deleted file mode 100644 index 40a5649997a7..000000000000 --- a/sci-astronomy/wcstools/files/wcstools-3.8.1-invalid_free.patch +++ /dev/null @@ -1,12 +0,0 @@ -* imhfile.c:1022:10: warning: attempt to free a non-heap object ‘pixname’ - ---- wcstools-3.8.1/libwcs/imhfile.c -+++ wcstools-3.8.1/libwcs/imhfile.c -@@ -1019,7 +1019,6 @@ - nbw = write (fd, image, nbimage); - close (fd); - -- free (pixname); - return (nbw); - } - diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.1-overflows.patch b/sci-astronomy/wcstools/files/wcstools-3.8.1-overflows.patch deleted file mode 100644 index 863fb6731d68..000000000000 --- a/sci-astronomy/wcstools/files/wcstools-3.8.1-overflows.patch +++ /dev/null @@ -1,116 +0,0 @@ - call to {} will always overflow destination buffer -* In function ‘strcpy’, inlined from ‘CopyValues’ at cphead.c:579:9 -* In function ‘strcpy’, inlined from ‘CopyValues’ at cphead.c:602:14 -* In function ‘strcpy’, inlined from ‘SetValues’ at sethead.c:1134:9 -* In function ‘strcpy’, inlined from ‘SetValues’ at sethead.c:1177:14 -* In function ‘strcpy’, inlined from ‘ChangeKeyNames’ at keyhead.c:469:9 -* In function ‘strcpy’, inlined from ‘ChangeKeyNames’ at keyhead.c:487:14 -* In function ‘strcpy’, inlined from ‘ConvertDate’ at getdate.c:452:12 - ---- wcstools-3.8.1/cphead.c -+++ wcstools-3.8.1/cphead.c -@@ -372,7 +372,7 @@ - char *ltime; - int naxis, ipos, nbhead, nbr, nbw; - int fdr, fdw; -- char history[72]; -+ char history[75]; - char echar; - char *endchar; - int imageread = 0; -@@ -574,7 +574,7 @@ - - /* Add history to header */ - if (keyset || histset) { -- if (hgets (headout, "CPHEAD", 72, history)) -+ if (hgets (headout, "CPHEAD", 75, history)) - hputc (headout, "HISTORY", history); - strcpy (history, RevMsg); - endchar = strchr (history, ','); -@@ -593,7 +593,7 @@ - lkwd = strlen (kwd[ikwd]); - - /* If too may keywords, start a second history line */ -- if (lhist + lkwd + 10 > 71) { -+ if (lhist + lkwd + 10 > 74) { - if (histset) { - if (history[lhist-2] == ',') - history[lhist-2] = (char) 0; ---- wcstools-3.8.1/sethead.c -+++ wcstools-3.8.1/sethead.c -@@ -616,7 +616,7 @@ - int nbold, nbnew; - int imageread = 0; - char cval[24]; -- char history[72]; -+ char history[76]; - char *endchar; - char *ltime; - char newkey[10]; -@@ -891,7 +891,7 @@ - - /* Add, subtract, multiply, or divide keyword value by constant */ - if (keyop) { -- if (!hgets (header, opkey, 72,string)) { -+ if (!hgets (header, opkey, 76,string)) { - if (verbose) - printf ("* %s %c %s keyword not in header.\n", - opkey, ops[keyop], kwv); -@@ -1129,7 +1129,7 @@ - - /* Add history to header */ - if (keyset || histset) { -- if (hgets (header, "SETHEAD", 72, history)) -+ if (hgets (header, "SETHEAD", 76, history)) - hputc (header, "HISTORY", history); - strcpy (history, RevMsg); - endchar = strchr (history, ','); -@@ -1170,7 +1170,7 @@ - lkwd = strlen (kwd[ikwd]); - - /* If too may keywords, start a second history line */ -- if (lhist + lkwd + 10 > 71) { -+ if (lhist + lkwd + 10 > 75) { - if (histset) { - strcat (history, " updated"); - hputc (header, "HISTORY", history); ---- wcstools-3.8.1/keyhead.c -+++ wcstools-3.8.1/keyhead.c -@@ -283,7 +283,7 @@ - int imageread = 0; - char cval[24]; - int fdr, fdw, ipos, nbr, nbw, nchange; -- char history[72]; -+ char history[76]; - char comment[72]; - char *endchar; - char *ltime; -@@ -464,7 +464,7 @@ - - /* Add history to header */ - if (keyset || histset) { -- if (hgets (header, "KEYHEAD", 72, history)) -+ if (hgets (header, "KEYHEAD", 76, history)) - hputc (header, "HISTORY", history); - strcpy (history, RevMsg); - endchar = strchr (history, ','); -@@ -480,7 +480,7 @@ - lkwd = strlen (kwd[ikwd]); - - /* If too may keywords, start a second history line */ -- if (lhist + lkwd > 71) { -+ if (lhist + lkwd > 75) { - if (histset) { - strcat (history, " updated"); - hputc (header, "HISTORY", history); ---- wcstools-3.8.1/getdate.c -+++ wcstools-3.8.1/getdate.c -@@ -444,7 +444,7 @@ - char *fitsdate, *newfdate, *stdate; - char temp[64]; - char fyear[16]; -- char ts0[8]; -+ char ts0[9]; - char *tchar; - int its, its1; - time_t lts; diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.4-implicits.patch b/sci-astronomy/wcstools/files/wcstools-3.8.4-implicits.patch new file mode 100644 index 000000000000..a1329cfe355c --- /dev/null +++ b/sci-astronomy/wcstools/files/wcstools-3.8.4-implicits.patch @@ -0,0 +1,21 @@ +--- a/libned/ned_sk.c ++++ b/libned/ned_sk.c +@@ -57,6 +57,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <netdb.h> + + #include <sys/resource.h> +--- a/gethead.c ++++ b/gethead.c +@@ -32,6 +32,8 @@ + #include "libwcs/fitsfile.h" + #include "libwcs/wcscat.h" + ++void fk425(); ++ + #define MAXKWD 100 + #define MAXFILES 2000 + static int maxnkwd = MAXKWD; diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.4-overflows.patch b/sci-astronomy/wcstools/files/wcstools-3.8.4-overflows.patch new file mode 100644 index 000000000000..c53fe782ca6a --- /dev/null +++ b/sci-astronomy/wcstools/files/wcstools-3.8.4-overflows.patch @@ -0,0 +1,11 @@ +--- a/getdate.c ++++ b/getdate.c +@@ -444,7 +444,7 @@ + char *fitsdate, *newfdate, *stdate; + char temp[64]; + char fyear[16]; +- char ts0[8]; ++ char ts0[9]; + char *tchar; + int its, its1; + time_t lts; diff --git a/sci-astronomy/wcstools/wcstools-3.8.3.ebuild b/sci-astronomy/wcstools/wcstools-3.8.4.ebuild index 594859c95ac2..62ae3c2c0ce1 100644 --- a/sci-astronomy/wcstools/wcstools-3.8.3.ebuild +++ b/sci-astronomy/wcstools/wcstools-3.8.4.ebuild @@ -1,25 +1,27 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.3.ebuild,v 1.1 2011/05/03 22:37:08 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.8.4.ebuild,v 1.1 2011/09/23 19:17:31 xarthisius Exp $ EAPI=4 -inherit eutils autotools + +inherit autotools eutils DESCRIPTION="World Coordinate System library for astronomical FITS images" HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools" -SRC_URI="http://tdc-www.harvard.edu/software/${PN}/${P}.tar.gz" +SRC_URI="${HOMEPAGE}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" +DOCS=( Readme Programs NEWS libned/NED_client ) + src_prepare() { epatch \ "${FILESDIR}"/${PN}-3.8.3-autotools.patch \ - "${FILESDIR}"/${PN}-3.8.1-format.patch \ - "${FILESDIR}"/${PN}-3.8.1-invalid_free.patch \ - "${FILESDIR}"/${PN}-3.8.1-overflows.patch + "${FILESDIR}"/${P}-overflows.patch \ + "${FILESDIR}"/${P}-implicits.patch # avoid colliding with fixdos, getdate and remap from other packages sed -i \ @@ -35,15 +37,14 @@ src_test() { einfo "Testing various wcstools programs" ./newfits -a 10 -j 248 41 -p 0.15 test.fits || die "test newfits failed" ./sethead test.fits A=1 B=1 || die "test sethead failed" - [[ "$(./gethead test.fits RA)" == "16:32:00.000" ]] \ + [[ "$(./gethead test.fits RA)" == "16:32:00.0000" ]] \ || die "test gethead failed" rm -f test.fits } src_install() { - emake DESTDIR="${D}" install + default doman Man/man1/* - dodoc Readme Programs NEWS libned/NED_client newdoc libwcs/Readme Readme.libwcs newdoc libwcs/NEWS NEWS.libwcs } |