Added pgplot as a dependency, since libast_pgplot is only an option in ast_link

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

4 files changed, 74 insertions, 17 deletions

diff --git a/sci-astronomy/ast/ChangeLog b/sci-astronomy/ast/ChangeLog
index e9ff541cc2c4..04700e3910de 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.5 2009/02/17 20:20:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ChangeLog,v 1.6 2009/02/23 17:31:45 bicatali Exp $
+
+*ast-4.6.2-r2 (23 Feb 2009)
+
+  23 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  files/ast-4.6.2-makefile.in.patch, +ast-4.6.2-r2.ebuild:
+  Added pgplot as a dependency, libast_pgplot is only an option in ast_link
 
   17 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
   +files/ast-4.6.2-makefile.in.patch, ast-4.6.2-r1.ebuild:
diff --git a/sci-astronomy/ast/Manifest b/sci-astronomy/ast/Manifest
index 2ba81c41130d..f20b9dbeae28 100644
--- a/sci-astronomy/ast/Manifest
+++ b/sci-astronomy/ast/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ast-4.6.2-makefile.in.patch 2024 RMD160 63dd6ce1d012c55a8bf800f35d26a399e3cdce81 SHA1 cf0a5cab4a4330e9cc4dffca2046acada18f59a5 SHA256 bc6a58bff194410f2bd7db31805ac7d4e04dbbb307cd36e4d848b6d6da42244b
+AUX ast-4.6.2-makefile.in.patch 2510 RMD160 b206e253acb936d6b174bc3f73cd3fd6e8fab2eb SHA1 a7c32417dba717fd4a422bf95aaf8e93f177928c SHA256 cf7cbcc4e5e26edd71acbaab975d81c26b139ed88a8f1328e8bf26d5b4a394cb
 DIST ast-4.6-2.tar.gz 11584346 RMD160 da6870fb2fed4b45d3e945541d5bf87dcbd4d7f6 SHA1 dcbd3a66852c9d63861f03998bada01aa7a20164 SHA256 47178d778517e65e213a49c5db59bc123507724d397593a95783cb92cbc9cd0e
 EBUILD ast-4.6.2-r1.ebuild 1074 RMD160 cac398dedf746eea5bce91512827d08db03878e2 SHA1 6fbdf8e1527712c140799d8463af495345104161 SHA256 0d4b132aa7719dba180d00e8582e86ea41079b52d39bc6fcbc5ab48804608c1b
-MISC ChangeLog 933 RMD160 44337c90d60e1a73eaac1ae39b089c30799b6512 SHA1 9328dfbcc2c8f8eae453a4a9df4864ee912e5ee7 SHA256 2b182a6bfdd35bd6f63a56d7485493033a98f097887add0a552271520002d864
+EBUILD ast-4.6.2-r2.ebuild 1090 RMD160 0575f7ec09b058dc56c5651ef1d24c54554aec8d SHA1 d7731bff63ce555bd5954848eb49a615290b4103 SHA256 5e2ac0e5d841924e48800cc4693e8e63b9feaf97deebd0a6145e77ca466dcf1d
+MISC ChangeLog 1153 RMD160 ec20ab433c8399f38d5efe35e1a3deceeb0e6d66 SHA1 05f2d4faac5ab8373c47178853ac12a0fe534e56 SHA256 f8520e30bf12cc71b375643797ef5e7e3c7b68e78f34c6c23a9771eb8b3f453d
 MISC metadata.xml 525 RMD160 0ae28b2258b73b243a0a15af6be1451aaeff7e36 SHA1 6f630d82b6864565d1accaa59c27ed08477e222d SHA256 89798b5d9777297df075ff76257d62740b18eed26028938fa2e13a8686068cfa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmbHCgACgkQ1ycZbhPLE2D/XQCglEKWoKlyLX1XzTfoYF504YxT
-LfEAn28XYx9jpupSbkBjh1N1z/FzD58R
-=MGMJ
+iEYEARECAAYFAkmi3ZAACgkQ1ycZbhPLE2AowQCgn99NYczkE1poaaIFGhGD1voe
+ubYAmgLD60jB2WHXG+jqSUO2mujizCoy
+=MAg0
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/ast/ast-4.6.2-r2.ebuild b/sci-astronomy/ast/ast-4.6.2-r2.ebuild
new file mode 100644
index 000000000000..b9416efa7088
--- /dev/null
+++ b/sci-astronomy/ast/ast-4.6.2-r2.ebuild
@@ -0,0 +1,40 @@
+# 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.1 2009/02/23 17:31:45 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"
+	# 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/files/ast-4.6.2-makefile.in.patch b/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch
index d65dcd07eaac..2a26aa66e808 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,25 +1,35 @@
---- Makefile.in.orig	2009-02-17 17:47:41.139829207 +0000
-+++ Makefile.in	2009-02-17 20:13:20.388249934 +0000
-@@ -76,7 +76,17 @@
+--- Makefile.in.orig	2008-09-10 11:59:21.000000000 +0100
++++ Makefile.in	2009-02-23 17:01:16.196714977 +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_ems.la \
 +    libast_grf3d.la \
 +    libast_grf_2.0.la \
 +    libast_grf_3.2.la \
-+    libast_pgplot.la \
-+    libast_pgplot3d.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 \
-@@ -670,7 +680,6 @@
+@@ -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 = \
@@ -27,7 +37,7 @@
      libast_err.la \
      libast_ems.la \
      libast_grf3d.la \
-@@ -679,11 +688,12 @@
+@@ -679,11 +685,12 @@
      libast_pgplot.la \
      libast_pgplot3d.la \
      libast_pal.la \
@@ -44,7 +54,7 @@
  
  # Make all library code position independent by default. This is handy for
  # creating shareable libraries from the static ones (Java JNI libraries). 
-@@ -791,7 +801,7 @@
+@@ -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
@@ -53,7 +63,7 @@
  all: $(BUILT_SOURCES) config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-am
  
-@@ -2566,7 +2576,6 @@
+@@ -2566,7 +2573,6 @@
  	      echo "</files>"; \
  	      echo "</manifest>"; \
  	    ) >$$MF; \