Fixed for as-needed, and merging sed and patch

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

3 files changed, 72 insertions, 10 deletions

diff --git a/sci-astronomy/ast/ChangeLog b/sci-astronomy/ast/ChangeLog
index 6ae512666348..e9ff541cc2c4 100644
--- a/sci-astronomy/ast/ChangeLog
+++ b/sci-astronomy/ast/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2009/02/17 16:26:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ChangeLog,v 1.5 2009/02/17 20:20:47 bicatali Exp $
+
+  17 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/ast-4.6.2-makefile.in.patch, ast-4.6.2-r1.ebuild:
+  Fixed for as-needed, and merging sed and patch
 
 *ast-4.6.2-r1 (17 Feb 2009)
 
diff --git a/sci-astronomy/ast/ast-4.6.2-r1.ebuild b/sci-astronomy/ast/ast-4.6.2-r1.ebuild
index 649ef5cd6ed0..e6298c0049f4 100644
--- a/sci-astronomy/ast/ast-4.6.2-r1.ebuild
+++ b/sci-astronomy/ast/ast-4.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2009/02/17 16:26:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ast-4.6.2-r1.ebuild,v 1.2 2009/02/17 20:20:47 bicatali Exp $
 
 EAPI=2
 inherit eutils versionator
@@ -19,14 +19,9 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	# dont do sed in Makefile.am because it requires special starlink automake
-	sed -i \
-		-e 's/@STAR_LATEX_DOCUMENTATION@//' \
-		-e 's/ast.news//' \
-		-e 's/LICENCE//' \
-		-e 's/starfacs_DATA =.*/starfacs_DATA =/' \
-		-e '/$(INSTALL_DATA) $$MF/d' \
-		Makefile.in || die
+	# dont patch/sed Makefile.am because it requires special upstream automake
+	# not shipped
+	epatch "${FILESDIR}"/${P}-makefile.in.patch
 }
 
 src_configure() {
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
new file mode 100644
index 000000000000..d65dcd07eaac
--- /dev/null
+++ b/sci-astronomy/ast/files/ast-4.6.2-makefile.in.patch
@@ -0,0 +1,63 @@
+--- 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 @@
+ 	"$(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 @@
+ 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 +688,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 +801,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 +2576,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; \