Version bump and fixed a libtool file (bug #261077)

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

5 files changed, 164 insertions, 8 deletions

diff --git a/sci-astronomy/ast/ChangeLog b/sci-astronomy/ast/ChangeLog
index f363a54b7d48..c6cd5ccc3cfb 100644
--- a/sci-astronomy/ast/ChangeLog
+++ b/sci-astronomy/ast/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2009/02/25 17:12:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ChangeLog,v 1.8 2009/03/21 15:46:50 bicatali Exp $
+
+*ast-5.1.0 (21 Mar 2009)
+
+  21 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  files/ast-4.6.2-makefile.in.patch, +files/ast-5.1.0-makefile.in.patch,
+  +ast-5.1.0.ebuild:
+  Version bump and fixed a libtool file (bug #261077)
 
   25 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> -ast-4.6.2-r1.ebuild:
   Removed buggy version
diff --git a/sci-astronomy/ast/Manifest b/sci-astronomy/ast/Manifest
index 6f8c84d37fbc..9a4101d9ab4e 100644
--- a/sci-astronomy/ast/Manifest
+++ b/sci-astronomy/ast/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ast-4.6.2-makefile.in.patch 2510 RMD160 b206e253acb936d6b174bc3f73cd3fd6e8fab2eb SHA1 a7c32417dba717fd4a422bf95aaf8e93f177928c SHA256 cf7cbcc4e5e26edd71acbaab975d81c26b139ed88a8f1328e8bf26d5b4a394cb
+AUX ast-4.6.2-makefile.in.patch 3242 RMD160 2e429be1635f6994db6381dd8b31f99583431e40 SHA1 9f5296b547483ddb2a33f303154e06da36ca1f14 SHA256 acd3332185237cf9c7b2b382c72026280730c0959313f59c59e03fa7608d8b85
+AUX ast-5.1.0-makefile.in.patch 3242 RMD160 13d63a7331c458ff2883356cf143c6ca677f581b SHA1 d005b912e9239bdc440106b3e789308fecb4f198 SHA256 f7279ad2ae837b38f0db489ad89cfeeda7a06e4121244d128d29f476be880c95
 DIST ast-4.6-2.tar.gz 11584346 RMD160 da6870fb2fed4b45d3e945541d5bf87dcbd4d7f6 SHA1 dcbd3a66852c9d63861f03998bada01aa7a20164 SHA256 47178d778517e65e213a49c5db59bc123507724d397593a95783cb92cbc9cd0e
+DIST ast-5.1-0.tar.gz 11487521 RMD160 62b72db13014869fcf9017409e85ae089178ae9c SHA1 9cc59b39001461f137b5bce76dcfcee3826c05af SHA256 d80b801247bd1eb4431244c3bebe9d3976c3e58f44947d28d680ef06cd89492d
 EBUILD ast-4.6.2-r2.ebuild 1090 RMD160 bc4c7e256127c109f00db39bb54cab37f01bdd9e SHA1 4656151833b9dd1f16f97fc25000e50fa2d34e15 SHA256 9699a9b40d1739eeeae97c55867b9a5656067d86d66d7b769ff52a883bd69e91
-MISC ChangeLog 1255 RMD160 8b506adf1d581ed93a86c107bc3229e543911d81 SHA1 a8ab5f6eba25ecc66eb3a63855fc319eecc0fb29 SHA256 d876b89dca337c1220df4003ce4f9c4bad0334b63a8bc0e789886bf78395a5d5
+EBUILD ast-5.1.0.ebuild 1056 RMD160 eb171dffebe72571523840965a0fb93211096ead SHA1 f2522e7ff08f473d4a80704b8e797a2e00c3794e SHA256 cf5cf995b2a642bbaab0bc3e6cf92bdae2a376ba6339c61c4cf0e6615008d6b2
+MISC ChangeLog 1485 RMD160 c81db4ff46f5fe20f9e16879f77c99729cb8da32 SHA1 1d8b60e3ef6b6ad744f55e45fd205eeedd1ca959 SHA256 080b5550a029f4b85775f416d0d9f0367917576383bf6e1f0eea637342522e07
 MISC metadata.xml 525 RMD160 0ae28b2258b73b243a0a15af6be1451aaeff7e36 SHA1 6f630d82b6864565d1accaa59c27ed08477e222d SHA256 89798b5d9777297df075ff76257d62740b18eed26028938fa2e13a8686068cfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmlfAMACgkQ1ycZbhPLE2CK4QCgsrpuiE5PDtQQGs4akOxi96V5
-fLoAnjSxCzPMnxaKI5KGvoxYOiM4bBWF
-=S8+9
+iEYEARECAAYFAknFC/MACgkQ1ycZbhPLE2DWkACeIJxNxJx6TTP7asZyZMA6z9WT
+ts0AoI/4Q6NXkGeNgpIo/CW8h52yRCtm
+=avgN
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/ast/ast-5.1.0.ebuild b/sci-astronomy/ast/ast-5.1.0.ebuild
new file mode 100644
index 000000000000..8b14b63fc44f
--- /dev/null
+++ b/sci-astronomy/ast/ast-5.1.0.ebuild
@@ -0,0 +1,39 @@
+# 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-5.1.0.ebuild,v 1.1 2009/03/21 15:46:50 bicatali 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"
+	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/files/ast-4.6.2-makefile.in.patch b/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch
index 2a26aa66e808..e3291e277c6d 100644
--- a/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch
+++ b/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2008-09-10 11:59:21.000000000 +0100
-+++ Makefile.in	2009-02-23 17:01:16.196714977 +0000
+--- 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)
@@ -71,3 +71,20 @@
  	  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 >$@
diff --git a/sci-astronomy/ast/files/ast-5.1.0-makefile.in.patch b/sci-astronomy/ast/files/ast-5.1.0-makefile.in.patch
new file mode 100644
index 000000000000..99203524b5ed
--- /dev/null
+++ b/sci-astronomy/ast/files/ast-5.1.0-makefile.in.patch
@@ -0,0 +1,90 @@
+--- Makefile.in.orig	2009-03-20 20:05:18.314466717 +0000
++++ Makefile.in	2009-03-21 15:07:59.217879770 +0000
+@@ -77,7 +77,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 \
+@@ -163,10 +170,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 =
+@@ -682,7 +689,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_drama.la \
+@@ -692,11 +698,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). 
+@@ -813,7 +820,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
+ 
+@@ -2608,7 +2615,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; \
+@@ -2762,14 +2768,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 >$@