Version bump. Patches applied upstream.

(Portage version: 2.1.9.40/cvs/Linux x86_64)

8 files changed, 16 insertions, 395 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index 0cb8654b5893..492c93676e20 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-astronomy/wcslib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.14 2010/12/10 05:58:08 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.15 2011/02/17 06:38:50 bicatali Exp $
+
+*wcslib-4.7 (17 Feb 2011)
+
+  17 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/wcslib-4.4.2-destdir.patch, -files/wcslib-4.4.2-flibs.patch,
+  -wcslib-4.4.4-r1.ebuild, -files/wcslib-4.4.4-destdir.patch,
+  -files/wcslib-4.4.4-ldflags.patch, -files/wcslib-4.5.3-fortran.patch,
+  -wcslib-4.5.4.ebuild, +wcslib-4.7.ebuild:
+  Version bump. Patches applied upstream.
 
 *wcslib-4.6.3 (10 Dec 2010)
 
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch
deleted file mode 100644
index 54a24d6e5db5..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.4.2-destdir.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- ./C/GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
-+++ ./C/GNUmakefile	2009-08-17 20:40:01.000000000 +0100
-@@ -186,30 +186,30 @@
- $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
- 
- install : build
--	-  if [ ! -d "$(LIBDIR)" ] ; then \
--	     $(INSTALL) -d -m 2775 $(LIBDIR) ; \
-+	-  if [ ! -d "$(DESTDIR)$(LIBDIR)" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR) ; \
- 	   fi
--	   $(INSTALL) -m 644 $(LIBWCS) $(LIBDIR)
--	   $(RANLIB) $(LIBDIR)/$(LIBWCS)
--	-  if [ -L "$(LIBDIR)/libwcs.a" ] ; then \
--	     $(RM) $(LIBDIR)/libwcs.a ; \
-+	   $(INSTALL) -m 644 $(LIBWCS) $(DESTDIR)$(LIBDIR)
-+	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBWCS)
-+	-  if [ -L "$(DESTDIR)$(LIBDIR)/libwcs.a" ] ; then \
-+	     $(RM) $(DESTDIR)$(LIBDIR)/libwcs.a ; \
- 	   fi
--	   $(LN_S) $(LIBWCS) $(LIBDIR)/libwcs.a
-+	   $(LN_S) $(LIBWCS) $(DESTDIR)$(LIBDIR)/libwcs.a
- 	-  if [ "$(SHRLIB)" != "" ] ; then \
--	     $(INSTALL) -m 644 $(SHRLIB) $(LIBDIR) ; \
-+	     $(INSTALL) -m 644 $(SHRLIB) $(DESTDIR)$(LIBDIR) ; \
- 	     if [ "$(SHRLN)" != "" ] ; then \
--	       if [ -L "$(LIBDIR)/$(SHRLN)" ] ; then \
--	         $(RM) $(LIBDIR)/$(SHRLN) ; \
-+	       if [ -L "$(DESTDIR)$(LIBDIR)/$(SHRLN)" ] ; then \
-+	         $(RM) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \
- 	       fi ; \
--	       $(LN_S) $(SHRLIB) $(LIBDIR)/$(SHRLN) ; \
-+	       $(LN_S) $(SHRLIB) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \
- 	     fi ; \
- 	   fi
--	-  if [ ! -d "$(INCDIR)" ] ; then \
--	     $(INSTALL) -d -m 2775 $(INCDIR) ; \
-+	-  if [ ! -d "$(DESTDIR)$(INCDIR)" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(INCDIR) ; \
- 	   fi
--	   $(INSTALL) -m 444 *.h $(INCDIR)
--	   $(RM) $(INCLINK)
--	   $(LN_S) $(WCSLIBV) $(INCLINK)
-+	   $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR)
-+	   $(RM) $(DESTDIR)$(INCLINK)
-+	   $(LN_S) $(WCSLIBV) $(DESTDIR)$(INCLINK)
- 
- clean :
- 	- $(RM) *.o *.i a.out core $(EXTRA_CLEAN)
---- ./utils/GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
-+++ ./utils/GNUmakefile	2009-08-17 19:45:16.000000000 +0100
-@@ -101,10 +101,10 @@
- 	   $(MAKE) -C ../C lib
- 
- install : build
--	-  if [ ! -d "$(BINDIR)" ] ; then \
--	     $(INSTALL) -d -m 2775 $(BINDIR) ; \
-+	-  if [ ! -d "$(DESTDIR)$(BINDIR)" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(BINDIR) ; \
- 	   fi
--	   $(INSTALL) -m 755 $(UTILS) $(BINDIR)
-+	   $(INSTALL) -m 755 $(UTILS) $(DESTDIR)$(BINDIR)
- 
- GNUmakefile : ../makedefs ;
- 
---- ./Fortran/GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
-+++ ./Fortran/GNUmakefile	2009-08-17 19:45:16.000000000 +0100
-@@ -177,7 +177,7 @@
- 
- install : build
- 	$(MAKE) -C ../C install
--	$(INSTALL) -m 444 *.inc $(INCDIR)
-+	$(INSTALL) -m 444 *.inc $(DESTDIR)$(INCDIR)
- 
- clean :
- 	- $(RM) *.o *.i a.out core fort.* $(EXTRA_CLEAN)
---- ./pgsbox/GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
-+++ ./pgsbox/GNUmakefile	2009-08-17 19:45:16.000000000 +0100
-@@ -128,11 +128,11 @@
- 
- install : build
- 	   $(MAKE) -C ../Fortran install
--	   $(INSTALL) -m 644 $(PGSBOXLIB) $(LIBDIR)
--	   $(RANLIB) $(LIBDIR)/$(PGSBOXLIB)
--	   $(RM) $(LIBDIR)/libpgsbox.a
--	   $(LN_S) $(LIBDIR)/$(PGSBOXLIB) $(LIBDIR)/libpgsbox.a
--	   $(INSTALL) -m 444 *.h $(INCDIR)
-+	   $(INSTALL) -m 644 $(PGSBOXLIB) $(DESTDIR)$(LIBDIR)
-+	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB)
-+	   $(RM) $(DESTDIR)$(LIBDIR)/libpgsbox.a
-+	   $(LN_S) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB) $(DESTDIR)$(LIBDIR)/libpgsbox.a
-+	   $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR)
- 
- pgtest : pgtest.o lngvel.o fscan.o $(PGSBOXLIB) $(LIBWCS)
- 	-@ rm -f $@
---- ./GNUmakefile.orig	2009-08-17 19:41:53.000000000 +0100
-+++ ./GNUmakefile	2009-08-17 20:38:45.000000000 +0100
-@@ -76,14 +76,13 @@
- install :
- 	$(MAKE) -k -C $(INSTDIR) $@
- 	$(MAKE) -k -C utils $@
--	$(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(INCDIR)
--	$(INSTALL) -m 444 CHANGES $(INCDIR)/CHANGES
--	$(INSTALL) -m 444 COPYING $(INCDIR)/COPYING
--	$(INSTALL) -m 444 README  $(INCDIR)/README
--	if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \
--	  $(INSTALL) -d -m 2775 $(LIBDIR)/pkgconfig ; \
-+	$(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(DESTDIR)$(INCDIR)
-+	$(INSTALL) -m 444 CHANGES $(DESTDIR)$(INCDIR)/CHANGES
-+	$(INSTALL) -m 444 README  $(DESTDIR)$(INCDIR)/README
-+	if [ ! -d "$(DESTDIR)$(LIBDIR)/pkgconfig" ] ; then \
-+	  $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR)/pkgconfig ; \
- 	fi
--	$(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc
-+	$(INSTALL) -m 444 wcslib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/wcslib.pc
- 
- realclean cleanest :
- 	for DIR in $(SUBDIRS) doxygen ; do \
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.2-flibs.patch b/sci-astronomy/wcslib/files/wcslib-4.4.2-flibs.patch
deleted file mode 100644
index 791a8f0e62d8..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.4.2-flibs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- pgsbox/GNUmakefile.orig	2009-08-11 00:57:05.000000000 +0100
-+++ pgsbox/GNUmakefile	2009-08-17 19:00:42.000000000 +0100
-@@ -136,7 +136,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-08-11 00:56:25.000000000 +0100
-+++ Fortran/GNUmakefile	2009-08-17 19:03:25.000000000 +0100
-@@ -196,25 +196,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 getwcstab_f.o getwcstab.inc $(FGETWCSTAB) \
-     $(LIBWCS)
- 	-@ echo ''
- 	   $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $< getwcstab_f.o \
--	     $(FGETWCSTAB) $(CFITSIOLIB) $(LIBWCS) $(LIBS)
-+	     $(FGETWCSTAB) $(CFITSIOLIB) $(LIBWCS) $(LIBS) $(FLIBS)
- 	-@ $(RM) $@.o
- 
- getwcstab_f.o : getwcstab_f.c getwcstab.h
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
deleted file mode 100644
index 96374e992341..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.4.4-destdir.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Nur wcslib-4.4.4.orig/C/GNUmakefile wcslib-4.4.4/C/GNUmakefile
---- wcslib-4.4.4.orig/C/GNUmakefile	2009-08-13 00:55:50.000000000 +0100
-+++ wcslib-4.4.4/C/GNUmakefile	2010-01-29 02:48:25.000000000 +0000
-@@ -180,36 +180,36 @@
- 	-@ echo ''
- 	-@ $(RM) -r tmp
- 	   mkdir tmp
--	   cd tmp && $(AR) x ../$(PICLIB) && $(SHRLD) -o $@ *.o && mv $@ ..
-+	   cd tmp && $(AR) x ../$(PICLIB) && $(SHRLD) $(LDFLAGS) -o $@ *.o && mv $@ ..
- 	-  $(RM) -r tmp
- 
- $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
- 
- install : build
--	-  if [ ! -d "$(LIBDIR)" ] ; then \
--	     $(INSTALL) -d -m 2775 $(LIBDIR) ; \
-+	-  if [ ! -d "$(DESTDIR)$(LIBDIR)" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR) ; \
- 	   fi
--	   $(INSTALL) -m 644 $(LIBWCS) $(LIBDIR)
--	   $(RANLIB) $(LIBDIR)/$(LIBWCS)
--	-  if [ -L "$(LIBDIR)/libwcs.a" ] ; then \
--	     $(RM) $(LIBDIR)/libwcs.a ; \
-+	   $(INSTALL) -m 644 $(LIBWCS) $(DESTDIR)$(LIBDIR)
-+	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBWCS)
-+	-  if [ -L "$(DESTDIR)$(LIBDIR)/libwcs.a" ] ; then \
-+	     $(RM) $(DESTDIR)$(LIBDIR)/libwcs.a ; \
- 	   fi
--	   $(LN_S) $(LIBWCS) $(LIBDIR)/libwcs.a
-+	   $(LN_S) $(LIBWCS) $(DESTDIR)$(LIBDIR)/libwcs.a
- 	-  if [ "$(SHRLIB)" != "" ] ; then \
--	     $(INSTALL) -m 644 $(SHRLIB) $(LIBDIR) ; \
-+	     $(INSTALL) -m 644 $(SHRLIB) $(DESTDIR)$(LIBDIR) ; \
- 	     if [ "$(SHRLN)" != "" ] ; then \
--	       if [ -L "$(LIBDIR)/$(SHRLN)" ] ; then \
--	         $(RM) $(LIBDIR)/$(SHRLN) ; \
-+	       if [ -L "$(DESTDIR)$(LIBDIR)/$(SHRLN)" ] ; then \
-+	         $(RM) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \
- 	       fi ; \
--	       $(LN_S) $(SHRLIB) $(LIBDIR)/$(SHRLN) ; \
-+	       $(LN_S) $(SHRLIB) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \
- 	     fi ; \
- 	   fi
--	-  if [ ! -d "$(INCDIR)" ] ; then \
--	     $(INSTALL) -d -m 2775 $(INCDIR) ; \
-+	-  if [ ! -d "$(DESTDIR)$(INCDIR)" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(INCDIR) ; \
- 	   fi
--	   $(INSTALL) -m 444 *.h $(INCDIR)
--	   $(RM) $(INCLINK)
--	   $(LN_S) $(WCSLIBV) $(INCLINK)
-+	   $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR)
-+	   $(RM) $(DESTDIR)$(INCLINK)
-+	   $(LN_S) $(WCSLIBV) $(DESTDIR)$(INCLINK)
- 
- clean :
- 	- $(RM) *.o *.i a.out core $(EXTRA_CLEAN)
-diff -Nur wcslib-4.4.4.orig/Fortran/GNUmakefile wcslib-4.4.4/Fortran/GNUmakefile
---- wcslib-4.4.4.orig/Fortran/GNUmakefile	2009-08-11 00:56:25.000000000 +0100
-+++ wcslib-4.4.4/Fortran/GNUmakefile	2010-01-29 02:19:49.000000000 +0000
-@@ -177,7 +177,7 @@
- 
- install : build
- 	$(MAKE) -C ../C install
--	$(INSTALL) -m 444 *.inc $(INCDIR)
-+	$(INSTALL) -m 444 *.inc $(DESTDIR)$(INCDIR)
- 
- clean :
- 	- $(RM) *.o *.i a.out core fort.* $(EXTRA_CLEAN)
-diff -Nur wcslib-4.4.4.orig/GNUmakefile wcslib-4.4.4/GNUmakefile
---- wcslib-4.4.4.orig/GNUmakefile	2009-09-14 07:49:58.000000000 +0100
-+++ wcslib-4.4.4/GNUmakefile	2010-01-29 02:32:59.000000000 +0000
-@@ -51,14 +51,13 @@
- 	 @ for DIR in $(INSTDIR) ; do \
- 	     $(MAKE) -k -C $$DIR $@ ; \
- 	   done
--	   $(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(INCDIR)
--	   $(INSTALL) -m 444 CHANGES $(INCDIR)/CHANGES
--	   $(INSTALL) -m 444 COPYING $(INCDIR)/COPYING
--	   $(INSTALL) -m 444 README  $(INCDIR)/README
--	   if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \
--	     $(INSTALL) -d -m 2775 $(LIBDIR)/pkgconfig ; \
-+	   $(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(DESTDIR)$(INCDIR)
-+	   $(INSTALL) -m 444 CHANGES $(DESTDIR)$(INCDIR)/CHANGES
-+	   $(INSTALL) -m 444 README  $(DESTDIR)$(INCDIR)/README
-+	   if [ ! -d "$(DESTDIR)$(LIBDIR)/pkgconfig" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR)/pkgconfig ; \
- 	   fi
--	   $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc
-+	   $(INSTALL) -m 444 wcslib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/wcslib.pc
- 
- realclean cleanest :
- 	for DIR in $(SUBDIRS) doxygen ; do \
-diff -Nur wcslib-4.4.4.orig/pgsbox/GNUmakefile wcslib-4.4.4/pgsbox/GNUmakefile
---- wcslib-4.4.4.orig/pgsbox/GNUmakefile	2009-08-11 00:57:05.000000000 +0100
-+++ wcslib-4.4.4/pgsbox/GNUmakefile	2010-01-29 02:19:49.000000000 +0000
-@@ -128,11 +128,11 @@
- 
- install : build
- 	   $(MAKE) -C ../Fortran install
--	   $(INSTALL) -m 644 $(PGSBOXLIB) $(LIBDIR)
--	   $(RANLIB) $(LIBDIR)/$(PGSBOXLIB)
--	   $(RM) $(LIBDIR)/libpgsbox.a
--	   $(LN_S) $(LIBDIR)/$(PGSBOXLIB) $(LIBDIR)/libpgsbox.a
--	   $(INSTALL) -m 444 *.h $(INCDIR)
-+	   $(INSTALL) -m 644 $(PGSBOXLIB) $(DESTDIR)$(LIBDIR)
-+	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(PGSBOXLIB)
-+	   $(RM) $(DESTDIR)$(LIBDIR)/libpgsbox.a
-+	   $(LN_S) $(PGSBOXLIB) $(DESTDIR)$(LIBDIR)/libpgsbox.a
-+	   $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR)
- 
- pgtest : pgtest.o lngvel.o fscan.o $(PGSBOXLIB) $(LIBWCS)
- 	-@ rm -f $@
-diff -Nur wcslib-4.4.4.orig/utils/GNUmakefile wcslib-4.4.4/utils/GNUmakefile
---- wcslib-4.4.4.orig/utils/GNUmakefile	2009-08-10 09:56:04.000000000 +0100
-+++ wcslib-4.4.4/utils/GNUmakefile	2010-01-29 02:19:49.000000000 +0000
-@@ -101,10 +101,10 @@
- 	   $(MAKE) -C ../C lib
- 
- install : build
--	-  if [ ! -d "$(BINDIR)" ] ; then \
--	     $(INSTALL) -d -m 2775 $(BINDIR) ; \
-+	-  if [ ! -d "$(DESTDIR)$(BINDIR)" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(BINDIR) ; \
- 	   fi
--	   $(INSTALL) -m 755 $(UTILS) $(BINDIR)
-+	   $(INSTALL) -m 755 $(UTILS) $(DESTDIR)$(BINDIR)
- 
- GNUmakefile : ../makedefs ;
- 
diff --git a/sci-astronomy/wcslib/files/wcslib-4.4.4-ldflags.patch b/sci-astronomy/wcslib/files/wcslib-4.4.4-ldflags.patch
deleted file mode 100644
index f227bb8b8841..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.4.4-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Fortran/GNUmakefile b/Fortran/GNUmakefile
-index 6a9600d..94c33a3 100644
---- a/Fortran/GNUmakefile
-+++ b/Fortran/GNUmakefile
-@@ -169,7 +169,7 @@ $(SHRLIB) : $(PICLIB)
- 	   mkdir tmp
- 	   cd tmp && \
- 	     $(AR) x ../$(PICLIB) && \
--	     $(SHRLD) -o $(@F) *.o && \
-+	     $(SHRLD) $(LDFLAGS) -o $(@F) *.o && \
- 	     mv $(@F) ../../C
- 	-  $(RM) -r tmp
- 
diff --git a/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch b/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch
deleted file mode 100644
index 2121bd2945ae..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.5.3-fortran.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.ac.orig	2010-09-23 21:30:25.000000000 +0000
-+++ configure.ac	2010-09-23 21:31:40.000000000 +0000
-@@ -145,11 +145,8 @@
- #   F77=no configure            ...bash
- AC_ARG_ENABLE([fortran], [AS_HELP_STRING([--disable-fortran],
-             [don't build the Fortran wrappers or PGSBOX])], [])
--if test "x$enable_fortran" != x ; then
--  F77="$enable_fortran"
--fi
- 
--if test "x$F77" = xno ; then
-+if test "x$enable_fortran" = xno ; then
-   F77=
- 
-   SUBDIRS="C"
---- configure.ac.orig	2010-09-23 23:23:47.000000000 +0100
-+++ configure.ac	2010-09-23 23:26:41.000000000 +0100
-@@ -13,7 +13,7 @@
- AC_PREREQ([2.53])
- AC_REVISION([$Revision: 1.1 $])
- AC_SUBST([PACKAGE_VERSION])
--AC_DEFINE_UNQUOTED([WCSLIB_VERSION], [$PACKAGE_VERSION])
-+AC_DEFINE_UNQUOTED([WCSLIB_VERSION], [PACKAGE_VERSION], [Description])
- 
- AC_CONFIG_SRCDIR([C/wcs.h])
- AC_CONFIG_AUX_DIR([config])
diff --git a/sci-astronomy/wcslib/wcslib-4.4.4-r1.ebuild b/sci-astronomy/wcslib/wcslib-4.4.4-r1.ebuild
deleted file mode 100644
index f2a4110b3cd3..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.4.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.4.4-r1.ebuild,v 1.1 2010/05/22 07:30:37 jlec Exp $
-
-EAPI=2
-inherit eutils virtualx flag-o-matic
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	sci-libs/cfitsio
-	sci-libs/pgplot"
-DEPEND="${RDEPEND}
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc
-		)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.4.2-flibs.patch
-	epatch "${FILESDIR}"/${PN}-4.4.4-destdir.patch
-	epatch "${FILESDIR}"/${PN}-4.4.4-ldflags.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"
-}
-
-src_test() {
-	Xemake check || die "emake test failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r *.pdf html || die
-	fi
-}
diff --git a/sci-astronomy/wcslib/wcslib-4.5.4.ebuild b/sci-astronomy/wcslib/wcslib-4.7.ebuild
index 9505f1673a5c..695f6f35b33f 100644
--- a/sci-astronomy/wcslib/wcslib-4.5.4.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.7.ebuild
@@ -1,9 +1,9 @@
-# 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/sci-astronomy/wcslib/wcslib-4.5.4.ebuild,v 1.1 2010/10/10 01:27:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.7.ebuild,v 1.1 2011/02/17 06:38:50 bicatali Exp $
 
-EAPI=2
-inherit eutils virtualx flag-o-matic autotools
+EAPI=3
+inherit eutils virtualx
 
 DESCRIPTION="Astronomical World Coordinate System transformations library"
 HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
@@ -20,22 +20,15 @@ DEPEND="${RDEPEND}
 	test? ( media-fonts/font-misc-misc
 			media-fonts/font-cursor-misc )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.4.4-destdir.patch
-	epatch "${FILESDIR}"/${PN}-4.4.4-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-4.5.3-fortran.patch
-	eautoreconf
-}
-
 src_configure() {
 	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable fortran) \
 		$(use_with fits cfitsio) \
 		$(use_with pgplot)
 }
 
 src_compile() {
-	# -j1 forced. build system too crappy to be worth debugging
 	emake -j1 || die "emake failed"
 }
 
@@ -45,7 +38,6 @@ src_test() {
 
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README || die
 	if use doc; then
 		insinto /usr/share/doc/${PF}
 		doins -r *.pdf html || die