Fixed for as-needed, and merging sed and patch

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

5 files changed, 83 insertions, 20 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/Manifest b/sci-astronomy/ast/Manifest
index c27790db1979..2ba81c41130d 100644
--- a/sci-astronomy/ast/Manifest
+++ b/sci-astronomy/ast/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ast-4.6.2-makefile.in.patch 2024 RMD160 63dd6ce1d012c55a8bf800f35d26a399e3cdce81 SHA1 cf0a5cab4a4330e9cc4dffca2046acada18f59a5 SHA256 bc6a58bff194410f2bd7db31805ac7d4e04dbbb307cd36e4d848b6d6da42244b
 DIST ast-4.6-2.tar.gz 11584346 RMD160 da6870fb2fed4b45d3e945541d5bf87dcbd4d7f6 SHA1 dcbd3a66852c9d63861f03998bada01aa7a20164 SHA256 47178d778517e65e213a49c5db59bc123507724d397593a95783cb92cbc9cd0e
-EBUILD ast-4.6.2-r1.ebuild 1207 RMD160 87b64d6aa0c177bb794e1c80c90b63b4a621f51c SHA1 a5c4c51295097c167dcc11df384d9db3750757a8 SHA256 82863b9dd50014b22a97d05a80f943df5ceb7857bc5a9a94dfc4a07fa0e8e942
-MISC ChangeLog 769 RMD160 a5e4c721ffe2871c630796e985a90c1c373d8c5e SHA1 a08244dcf3c485a737503953cc126ccc71188c43 SHA256 e470fb14ea9a87e339f8d3cf28a13e578707cbb1a99794d554decc70e7d5fd0b
+EBUILD ast-4.6.2-r1.ebuild 1074 RMD160 cac398dedf746eea5bce91512827d08db03878e2 SHA1 6fbdf8e1527712c140799d8463af495345104161 SHA256 0d4b132aa7719dba180d00e8582e86ea41079b52d39bc6fcbc5ab48804608c1b
+MISC ChangeLog 933 RMD160 44337c90d60e1a73eaac1ae39b089c30799b6512 SHA1 9328dfbcc2c8f8eae453a4a9df4864ee912e5ee7 SHA256 2b182a6bfdd35bd6f63a56d7485493033a98f097887add0a552271520002d864
 MISC metadata.xml 525 RMD160 0ae28b2258b73b243a0a15af6be1451aaeff7e36 SHA1 6f630d82b6864565d1accaa59c27ed08477e222d SHA256 89798b5d9777297df075ff76257d62740b18eed26028938fa2e13a8686068cfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkma5S8ACgkQ1ycZbhPLE2COmwCfWVD30JOgHgS1qfKU+UGe6ymn
-0U0AnROEWW8O+1oJr4OmfxcZJbI1lzU0
-=Uv8V
+iEYEARECAAYFAkmbHCgACgkQ1ycZbhPLE2D/XQCglEKWoKlyLX1XzTfoYF504YxT
+LfEAn28XYx9jpupSbkBjh1N1z/FzD58R
+=MGMJ
 -----END PGP SIGNATURE-----
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; \
diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
index 9c272763d89f..bd8876226d79 100644
--- a/sci-astronomy/ds9/Manifest
+++ b/sci-astronomy/ds9/Manifest
@@ -11,7 +11,7 @@ AUX ds9-5.4-main.patch 6580 RMD160 7d2b235ea6137a618919628214b54fdff7636d51 SHA1
 AUX ds9-5.4-makefile.patch 861 RMD160 d8bc94e012ea3ebf1a5ac8d56b255d097379f617 SHA1 c5488838e13ba59d5e4675bcf7475f97b5461f74 SHA256 bf9f2b61f9abf224600663511b873547a18fab2f2dbc59545a62737940be5676
 AUX ds9-5.4-saotk.patch 5400 RMD160 abfd44096cc329ae19350ae6bed50e05751fd7f8 SHA1 eb70b5cd98837ed21f0eeae293395c94686a0b33 SHA256 5bd91e719d5992502b65eb27309cde8c653175c3dba0c2db8e7cd674e652cbc8
 AUX ds9-5.4-src.patch 1690 RMD160 50ae454f2a640ac62b0509b019b070abbbe7e181 SHA1 5271be0ab53115d1038976eb14428a9034fc8bfc SHA256 e7f18d9b46e92f04dd33a06c8373c3d780b81a3dcce421b3b4e4c4cb873be0f5
-AUX ds9-5.5-main.patch 6798 RMD160 72bf2b805279b173a6a48330037166fc11e19ff6 SHA1 38fd595a8dec5ce0ebce60904c880bad427bec3d SHA256 1ff9bac570e9c065fc456bb68d2680a8c4e63429e296f9d9690c533fbeebdb46
+AUX ds9-5.5-main.patch 6809 RMD160 bbbf9e8a9d54fb8b802171b47b049bf8d7b61215 SHA1 1bb1dd4ebc04e082827795ef1b73ed6d203a34b1 SHA256 a58a6f2c04f578312277502059d51d9e21ca74464f9d03632fb0257c4a665de0
 AUX ds9-5.5-makefile.patch 879 RMD160 6d204ca28fd90a6dc00af5ff6436d5104b907499 SHA1 693b90b19c694e77767584e0a251b2aa7903ff66 SHA256 cf34e5117d83eb367043250d9e8aa9e9b350363a6f3194ab59077bad64e64fc7
 AUX ds9-5.5-src.patch 1678 RMD160 22e9fc46522e2acffd271006c405c9882144fe84 SHA1 e52494991bfe8d8b8462e4ffc4dea84c9e7948cb SHA256 28e355f46adc5f71356ada257bd8d91e430da8cc2369830239038f167f56e7c2
 AUX make.gentoo 237 RMD160 b0de6c53dca48199106aaec86e950d517d94bfb7 SHA1 2ccddb02a71c97acc63ec48dccf2b904b2b5cc1b SHA256 15b7b6aebaf733c4e88818119938718a3a7b89c7a255452f4b0cbfa0a1061bd6
@@ -21,12 +21,12 @@ DIST ds9.5.5.tar.gz 27278806 RMD160 abcc1c71c62ac0ab3e81727ab55f561b0e174417 SHA
 EBUILD ds9-5.2.ebuild 1967 RMD160 0f1b3f91b587ce4f6b925c5a6c126b5452a7939e SHA1 8fd2e3451161dc5622480d5c0aed07a61136ae41 SHA256 e0f7659bb31c0bed23eb1fa4e89ec75272be48f089f6fb6f92fb6fed32e76c42
 EBUILD ds9-5.4.ebuild 1802 RMD160 8c0fb6700783256df3a8e0581353fdb5dbda3af1 SHA1 8bf5aef825f0226560158ecfd36afc6193da46bb SHA256 44a565b2127717faf8cae94537caae4b319b7511f33654c808d9ec01fe198e11
 EBUILD ds9-5.5.ebuild 1857 RMD160 0f177d3a951b6ea8be88f12cf68abb1f780378b7 SHA1 c36dd28da0411d89cafb02742d01c1e03d5cef6f SHA256 ad203b9229fec5a940c21c7d48afa2091e86760c3de4cb06ccad328d7a0a5a13
-MISC ChangeLog 3317 RMD160 610e97b7de6fb269b60f292f22287d5282c5e23d SHA1 e415acd38aec8a7ac7f7d930149d3b4aad7336c4 SHA256 0958470464680239484e42fff2044d657a22596a37294491bfb6e958e343e44d
+MISC ChangeLog 3425 RMD160 bc25ce4deb398a0be20f350832452e3e41c90131 SHA1 1aa419dcc14b0bdb04aaf5afe6384e4a7e850693 SHA256 659abd8cfaf83c3a9cfe393a6dddd2c71d3ec10ffcc19a211780e1aa4dcc1138
 MISC metadata.xml 1072 RMD160 3c839d72950b8eb3ab84920e86017f97f3b14799 SHA1 1cefcee915ef90f64beb486d298972981ea3891e SHA256 42893aa6c35591819017a8708062c88df98d27ab0466ec07d7603b46d6e3719e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkma59AACgkQ1ycZbhPLE2DtMwCfZRPKblm6AWJMdB4tJZ4576Gh
-h10An35H8XmWnto1WnnTrr8OD0uSRngN
-=ihIk
+iEYEARECAAYFAkmbHRcACgkQ1ycZbhPLE2CMogCeK5UE4NDJ5Ax/aTfiRf8zNqS8
+4KEAni1rCMlKGZKEuOMReH/yXyEi2klh
+=k0Ln
 -----END PGP SIGNATURE-----