Version bump

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

4 files changed, 14 insertions, 140 deletions

diff --git a/sci-astronomy/ast/ChangeLog b/sci-astronomy/ast/ChangeLog
index dfb005f0a9d6..736834ab19e1 100644
--- a/sci-astronomy/ast/ChangeLog
+++ b/sci-astronomy/ast/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/ast
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ChangeLog,v 1.10 2009/11/04 01:39:55 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ChangeLog,v 1.11 2010/01/27 07:00:53 bicatali Exp $
+
+*ast-5.3.1 (27 Jan 2010)
+
+  27 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> -ast-4.6.2-r2.ebuild,
+  -files/ast-4.6.2-makefile.in.patch, -ast-5.1.0.ebuild, +ast-5.3.1.ebuild:
+  Version bump
 
 *ast-5.2.0 (04 Nov 2009)
 
diff --git a/sci-astronomy/ast/ast-4.6.2-r2.ebuild b/sci-astronomy/ast/ast-4.6.2-r2.ebuild
deleted file mode 100644
index d64b1e2102c8..000000000000
--- a/sci-astronomy/ast/ast-4.6.2-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ast-4.6.2-r2.ebuild,v 1.2 2009/02/24 16:43:11 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils versionator
-
-MYP="${PN}-$(replace_version_separator 2 '-')"
-DESCRIPTION="Library for handling World Coordinate Systems in astronomy"
-HOMEPAGE="http://www.starlink.ac.uk/~dsb/ast/ast.html"
-SRC_URI="http://www.starlink.ac.uk/~dsb/${PN}/${MYP}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-RDEPEND="sci-libs/pgplot"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	# dont patch/sed Makefile.am because it requires special upstream automake
-	# not shipped
-	epatch "${FILESDIR}"/${P}-makefile.in.patch
-}
-
-src_configure() {
-	PATH=".:${PATH}" econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	# remove the empty starlink dirs
-	rm -rf "${D}"usr/{docs,help,manifests,news,share} || die
-	dodoc ast.news fac_1521_err
-	if use doc; then
-		dodoc *.ps || die "doc install failed"
-	fi
-}
diff --git a/sci-astronomy/ast/ast-5.1.0.ebuild b/sci-astronomy/ast/ast-5.3.1.ebuild
index 8b14b63fc44f..10aed01c8f65 100644
--- a/sci-astronomy/ast/ast-5.1.0.ebuild
+++ b/sci-astronomy/ast/ast-5.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ast-5.1.0.ebuild,v 1.1 2009/03/21 15:46:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ast-5.3.1.ebuild,v 1.1 2010/01/27 07:00:53 bicatali Exp $
 
 EAPI=2
 inherit eutils versionator
@@ -8,8 +8,9 @@ inherit eutils versionator
 MYP="${PN}-$(replace_version_separator 2 '-')"
 
 DESCRIPTION="Library for handling World Coordinate Systems in astronomy"
-HOMEPAGE="http://www.starlink.ac.uk/~dsb/ast/ast.html"
-SRC_URI="http://www.starlink.ac.uk/~dsb/${PN}/${MYP}.tar.gz"
+HOMEPAGE="http://starlink.jach.hawaii.edu/starlink/AST"
+SRC_URI="${HOMEPAGE}?action=AttachFile&do=get&target=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -22,13 +23,9 @@ S="${WORKDIR}/${MYP}"
 src_prepare() {
 	# dont patch/sed Makefile.am because it requires special upstream automake
 	# not shipped
-	epatch "${FILESDIR}"/${P}-makefile.in.patch
+	epatch "${FILESDIR}"/${PN}-5.1.0-makefile.in.patch
 }
 
-#src_configure() {
-#	PATH=".:${PATH}" econf
-#}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	rm -rf "${D}"usr/{docs,help,manifests,news,share} || die
diff --git a/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch b/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch
deleted file mode 100644
index e3291e277c6d..000000000000
--- a/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- Makefile.in.orig	2009-03-21 11:48:33.829215706 +0000
-+++ Makefile.in	2009-03-21 11:50:56.901572460 +0000
-@@ -76,7 +76,14 @@
- 	"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libast_la_LIBADD =
-+libast_la_LIBADD = \
-+    libast_err.la \
-+    libast_grf3d.la \
-+    libast_grf_2.0.la \
-+    libast_grf_3.2.la \
-+    libast_pal.la \
-+    libast_wcslib.la
-+
- am__objects_1 = libast_la-axis.lo libast_la-box.lo libast_la-c2f77.lo \
- 	libast_la-channel.lo libast_la-circle.lo libast_la-cmpframe.lo \
- 	libast_la-cmpmap.lo libast_la-cmpregion.lo \
-@@ -158,10 +165,10 @@
- libast_pal_la_LIBADD =
- am_libast_pal_la_OBJECTS = libast_pal_la-pal.lo
- libast_pal_la_OBJECTS = $(am_libast_pal_la_OBJECTS)
--libast_pgplot_la_LIBADD =
-+libast_pgplot_la_LIBADD = -lpgplot
- am_libast_pgplot_la_OBJECTS = libast_pgplot_la-grf_pgplot.lo
- libast_pgplot_la_OBJECTS = $(am_libast_pgplot_la_OBJECTS)
--libast_pgplot3d_la_LIBADD =
-+libast_pgplot3d_la_LIBADD = -lpgplot
- am_libast_pgplot3d_la_OBJECTS = libast_pgplot3d_la-grf3d_pgplot.lo
- libast_pgplot3d_la_OBJECTS = $(am_libast_pgplot3d_la_OBJECTS)
- libast_wcslib_la_LIBADD =
-@@ -670,7 +677,6 @@
- nodist_include_HEADERS = ast.h AST_PAR
- include_MESSAGES = AST_ERR ast_err.h
- lib_LTLIBRARIES = \
--    libast.la \
-     libast_err.la \
-     libast_ems.la \
-     libast_grf3d.la \
-@@ -679,11 +685,12 @@
-     libast_pgplot.la \
-     libast_pgplot3d.la \
-     libast_pal.la \
--    libast_wcslib.la
-+    libast_wcslib.la \
-+    libast.la
- 
--stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
--dist_starnews_DATA = ast.news
--dist_pkgdata_DATA = LICENCE
-+stardocs_DATA = 
-+dist_starnews_DATA = 
-+dist_pkgdata_DATA = 
- 
- # Make all library code position independent by default. This is handy for
- # creating shareable libraries from the static ones (Java JNI libraries). 
-@@ -791,7 +798,7 @@
- #ast_test_LDADD = `ast_link`
- # Expand ast_link to avoid libast_pass2, which causes problems for Solaris
- ast_test_LDADD = libast.la libast_pal.la libast_grf_3.2.la libast_wcslib.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm
--starfacs_DATA = fac_1521_err
-+starfacs_DATA = 
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-@@ -2566,7 +2573,6 @@
- 	      echo "</files>"; \
- 	      echo "</manifest>"; \
- 	    ) >$$MF; \
--	    $(INSTALL_DATA) $$MF $(DESTDIR)$(STAR_MANIFEST_DIR)/$(PACKAGE); \
- 	  else \
- 	    echo "Installation of component $(DESTDIR)$(STAR_MANIFEST_DIR)/$(PACKAGE) failed" >&2; \
- 	  fi; \
-@@ -2720,14 +2726,14 @@
- 	$(mkdir_p) $(DESTDIR)$(libdir) 
- 	cd $(DESTDIR)$(libdir); \
- 	for f in `ls libast.*`; do \
--	   ff=`echo $$f | sed -e 's/libast/libast_pass2/'`; \
-+	   ff=`echo $$f | sed -e 's/libast\./libast_pass2\./'`; \
- 	   if test -f "$$ff"; then rm "$$ff"; fi; \
- 	   $(LN_S) $$f $$ff; \
- 	   $(MANIFEST) && echo "MANIFEST:$(DESTDIR)$(libdir)/$$ff" || :; \
- 	done; \
- 	if test -f "libast.la"; then \
- 	   if test -f "libast_pass2.la"; then rm "libast_pass2.la"; fi; \
--	   sed -e 's/libast/libast_pass2/g' libast.la > libast_pass2.la; \
-+	   sed -e 's/libast\./libast_pass2\./g' libast.la > libast_pass2.la; \
- 	fi
- @PREDIST@version.h: version.h.in configure.ac
- @PREDIST@	rm -f $@; $(predist_subs) version.h.in >$@