Version bump. Remove old. Now does not need X display for testing anymore

(Portage version: 2.1.10.10/cvs/Linux x86_64)

5 files changed, 23 insertions, 259 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index b0f58466f3e6..4ed227fc673c 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/wcslib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.18 2011/08/04 18:33:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.19 2011/08/18 05:45:59 bicatali Exp $
+
+*wcslib-4.8 (18 Aug 2011)
+
+  18 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> -wcslib-4.6.3.ebuild,
+  -files/wcslib-4.6.3-autoconf.patch, -files/wcslib-4.6.3-destdir.patch,
+  -files/wcslib-4.6.3-ldflags.patch, +wcslib-4.8.ebuild:
+  Version bump. Remove old. Now does not need X display for testing anymore
 
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
diff --git a/sci-astronomy/wcslib/files/wcslib-4.6.3-autoconf.patch b/sci-astronomy/wcslib/files/wcslib-4.6.3-autoconf.patch
deleted file mode 100644
index f70ac002e774..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.6.3-autoconf.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nur wcslib-4.6.3.orig/configure.ac wcslib-4.6.3/configure.ac
---- wcslib-4.6.3.orig/configure.ac	2010-12-10 03:40:58.000000000 +0000
-+++ wcslib-4.6.3/configure.ac	2010-12-10 05:41:05.000000000 +0000
-@@ -15,7 +15,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], [Define wcslib version])
- 
- AC_CONFIG_SRCDIR([C/wcs.h])
- AC_CONFIG_AUX_DIR([config])
-@@ -147,11 +147,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"
-@@ -208,7 +205,11 @@
- 
-     SUBDIRS="C Fortran"
-     TSTDIRS="C Fortran"
--    INSTDIR="pgsbox"
-+    if test "x$PGPLOTINC" != x; then
-+      INSTDIR="pgsbox"
-+    else
-+      INSTDIR="Fortran"
-+    fi
-   fi
- fi
- 
-@@ -491,6 +492,6 @@
- # Do it.
- AC_MSG_NOTICE([Configuring files...])
- AC_CONFIG_FILES([makedefs wcslib.pc])
--AC_CONFIG_HEADERS([wcsconfig.h wcsconfig_f77.h wcsconfig_tests.h \
-+AC_CONFIG_HEADERS([wcsconfig.h wcsconfig_f77.h wcsconfig_tests.h
-                    wcsconfig_utils.h])
- AC_OUTPUT
diff --git a/sci-astronomy/wcslib/files/wcslib-4.6.3-destdir.patch b/sci-astronomy/wcslib/files/wcslib-4.6.3-destdir.patch
deleted file mode 100644
index 9a7f6a7d4bc7..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.6.3-destdir.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -Nur wcslib-4.6.3.orig/C/GNUmakefile wcslib-4.6.3/C/GNUmakefile
---- wcslib-4.6.3.orig/C/GNUmakefile	2010-12-10 03:40:58.000000000 +0000
-+++ wcslib-4.6.3/C/GNUmakefile	2010-12-10 04:11:54.000000000 +0000
-@@ -177,30 +177,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 [ -h "$(LIBDIR)/libwcs.a" ] ; then \
--	     $(RM) $(LIBDIR)/libwcs.a ; \
-+	   $(INSTALL) -m 644 $(LIBWCS) $(DESTDIR)$(LIBDIR)
-+	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBWCS)
-+	-  if [ -h "$(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 [ -h "$(LIBDIR)/$(SHRLN)" ] ; then \
--	         $(RM) $(LIBDIR)/$(SHRLN) ; \
-+	       if [ -h "$(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) -r *.o *.i a.out core *.dSYM $(EXTRA_CLEAN)
-diff -Nur wcslib-4.6.3.orig/Fortran/GNUmakefile wcslib-4.6.3/Fortran/GNUmakefile
---- wcslib-4.6.3.orig/Fortran/GNUmakefile	2010-12-10 03:40:58.000000000 +0000
-+++ wcslib-4.6.3/Fortran/GNUmakefile	2010-12-10 04:11:54.000000000 +0000
-@@ -180,7 +180,7 @@
- 
- install : build
- 	$(MAKE) -C ../C install
--	$(INSTALL) -m 444 *.inc $(INCDIR)
-+	$(INSTALL) -m 444 *.inc $(DESTDIR)$(INCDIR)
- 
- clean :
- 	-  $(RM) -r *.o *.i a.out core fort.* *.dSYM $(EXTRA_CLEAN)
-diff -Nur wcslib-4.6.3.orig/GNUmakefile wcslib-4.6.3/GNUmakefile
---- wcslib-4.6.3.orig/GNUmakefile	2010-12-10 03:40:58.000000000 +0000
-+++ wcslib-4.6.3/GNUmakefile	2010-12-10 05:12:54.000000000 +0000
-@@ -65,14 +65,18 @@
- 	 @ 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)
-+	-  if [ ! -d "$(DESTDIR)$(DOCDIR)" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(DOCDIR) ; \
- 	   fi
--	   $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc
-+
-+	   $(INSTALL) -m 444 CHANGES $(DESTDIR)$(DOCDIR)/CHANGES
-+	   $(INSTALL) -m 444 COPYING $(DESTDIR)$(DOCDIR)/COPYING
-+	   $(INSTALL) -m 444 README  $(DESTDIR)$(DOCDIR)/README
-+	   if [ ! -d "$(DESTDIR)$(LIBDIR)/pkgconfig" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(DESTDIR)$(LIBDIR)/pkgconfig ; \
-+	   fi
-+	   $(INSTALL) -m 444 wcslib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/wcslib.pc
- 
- clean cleaner :
- 	   for DIR in $(SUBDIRS) doxygen ; do \
-diff -Nur wcslib-4.6.3.orig/makedefs.in wcslib-4.6.3/makedefs.in
---- wcslib-4.6.3.orig/makedefs.in	2010-12-10 03:40:57.000000000 +0000
-+++ wcslib-4.6.3/makedefs.in	2010-12-10 05:03:22.000000000 +0000
-@@ -124,6 +124,7 @@
-   prefix   := @prefix@
-   exec_prefix := @exec_prefix@
- 
-+  DOCDIR   := @docdir@
-   LIBDIR   := @libdir@
-   BINDIR   := @bindir@
-   INCDIR   := @includedir@/$(WCSLIBV)
-@@ -198,6 +199,7 @@
- 	-@ echo '  SHRLN       := $(SHRLN)'
- 	-@ echo '  LN_S        := $(LN_S)'
- 	-@ echo '  INSTALL     := $(INSTALL)'
-+	-@ echo '  DOCDIR      := $(DOCDIR)'
- 	-@ echo '  LIBDIR      := $(LIBDIR)'
- 	-@ echo '  BINDIR      := $(BINDIR)'
- 	-@ echo '  INCDIR      := $(INCDIR)'
-diff -Nur wcslib-4.6.3.orig/pgsbox/GNUmakefile wcslib-4.6.3/pgsbox/GNUmakefile
---- wcslib-4.6.3.orig/pgsbox/GNUmakefile	2010-12-10 03:40:58.000000000 +0000
-+++ wcslib-4.6.3/pgsbox/GNUmakefile	2010-12-10 04:51:38.000000000 +0000
-@@ -123,20 +123,20 @@
- 
- install : build
- 	   $(MAKE) -C ../Fortran install
--	   $(INSTALL) -m 644 $(LIBPGSBOX) $(LIBDIR)
--	   $(RANLIB) $(LIBDIR)/$(LIBPGSBOX)
--	   $(RM) $(LIBDIR)/libpgsbox.a
--	   $(LN_S) $(LIBDIR)/$(LIBPGSBOX) $(LIBDIR)/libpgsbox.a
-+	   $(INSTALL) -m 644 $(LIBPGSBOX) $(DESTDIR)$(LIBDIR)
-+	   $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBPGSBOX)
-+	   $(RM) $(DESTDIR)$(LIBDIR)/libpgsbox.a
-+	   $(LN_S) $(LIBDIR)/$(LIBPGSBOX) $(DESTDIR)$(LIBDIR)/libpgsbox.a
- 	-  if [ "$(SHRLIB)" != "" ] ; then \
--	     $(INSTALL) -m 644 $(SHRLIB) $(LIBDIR) ; \
-+	     $(INSTALL) -m 644 $(SHRLIB) $(DESTDIR)$(LIBDIR) ; \
- 	     if [ "$(SHRLN)" != "" ] ; then \
--	       if [ -h "$(LIBDIR)/$(SHRLN)" ] ; then \
--	         $(RM) $(LIBDIR)/$(SHRLN) ; \
-+	       if [ -h "$(DESTDIR)$(LIBDIR)/$(SHRLN)" ] ; then \
-+	         $(RM) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \
- 	       fi ; \
--	       $(LN_S) $(SHRLIB) $(LIBDIR)/$(SHRLN) ; \
-+	       $(LN_S) $(SHRLIB) $(DESTDIR)$(LIBDIR)/$(SHRLN) ; \
- 	     fi ; \
- 	   fi
--	   $(INSTALL) -m 444 *.h $(INCDIR)
-+	   $(INSTALL) -m 444 *.h $(DESTDIR)$(INCDIR)
- 
- clean :
- 	-  $(RM) -r *.o *.i a.out core *.dSYM $(EXTRA_CLEAN)
-diff -Nur wcslib-4.6.3.orig/utils/GNUmakefile wcslib-4.6.3/utils/GNUmakefile
---- wcslib-4.6.3.orig/utils/GNUmakefile	2010-12-10 03:40:58.000000000 +0000
-+++ wcslib-4.6.3/utils/GNUmakefile	2010-12-10 04:11:54.000000000 +0000
-@@ -102,10 +102,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.6.3-ldflags.patch b/sci-astronomy/wcslib/files/wcslib-4.6.3-ldflags.patch
deleted file mode 100644
index d0fe5bb4df54..000000000000
--- a/sci-astronomy/wcslib/files/wcslib-4.6.3-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur wcslib-4.6.3.orig/C/GNUmakefile wcslib-4.6.3/C/GNUmakefile
---- wcslib-4.6.3.orig/C/GNUmakefile	2010-12-10 03:40:58.000000000 +0000
-+++ wcslib-4.6.3/C/GNUmakefile	2010-12-10 03:46:28.000000000 +0000
-@@ -171,7 +171,7 @@
- 	     cd tmp && \
- 	     trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
- 	     $(AR) x ../$(PICLIB) && \
--	     $(SHRLD) -o $@ *.o && \
-+	     $(SHRLD) $(LDFLAGS) -o $@ *.o && \
- 	     mv $@ ..
- 
- $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
-diff -Nur wcslib-4.6.3.orig/Fortran/GNUmakefile wcslib-4.6.3/Fortran/GNUmakefile
---- wcslib-4.6.3.orig/Fortran/GNUmakefile	2010-12-10 03:40:58.000000000 +0000
-+++ wcslib-4.6.3/Fortran/GNUmakefile	2010-12-10 03:45:35.000000000 +0000
-@@ -173,7 +173,7 @@
- 	     cd tmp && \
- 	     trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
- 	     $(AR) x ../$(PICLIB) && \
--	     $(SHRLD) -o $(@F) *.o && \
-+	     $(SHRLD) $(LDFLAGS) -o $(@F) *.o && \
- 	     mv $(@F) ../../C
- 
- $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
diff --git a/sci-astronomy/wcslib/wcslib-4.6.3.ebuild b/sci-astronomy/wcslib/wcslib-4.8.ebuild
index 0ce21b0932dc..1c0891251335 100644
--- a/sci-astronomy/wcslib/wcslib-4.6.3.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.8.ebuild
@@ -1,10 +1,9 @@
 # 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.6.3.ebuild,v 1.3 2011/06/21 16:08:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.8.ebuild,v 1.1 2011/08/18 05:45:59 bicatali Exp $
 
-EAPI=3
-
-inherit eutils fortran-2 virtualx flag-o-matic autotools
+EAPI=4
+inherit eutils fortran-2
 
 DESCRIPTION="Astronomical World Coordinate System transformations library"
 HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
@@ -13,51 +12,39 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 SLOT="0"
 LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc fortran fits pgplot test"
-
-RDEPEND="
-	fortran? ( virtual/fortran )
+IUSE="doc fortran fits pgplot static-libs"
 
+RDEPEND="fortran? ( virtual/fortran )
 	fits? ( sci-libs/cfitsio )
 	pgplot? ( sci-libs/pgplot )"
-DEPEND="${RDEPEND}
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	use fortran && fortran-2_pkg_setup
 }
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-destdir.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-autoconf.patch
-	eautoreconf
-}
-
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable static-libs static) \
 		$(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"
+	# nasty makefile, debugging means full rewrite
+	emake -j1
 }
 
 src_test() {
-	Xemake check || die "emake test failed"
+	emake check
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r *.pdf html || die
-	fi
+	default
+	use doc && dodoc *.pdf && dohtml html/*
+	# static libs are same as shared (compiled with PIC)
+	# so they are not compiled twice
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.a
 }