Fixed for as-needed, cl closing bug #201493

Package-Manager: portage-2.1.4_rc7

4 files changed, 70 insertions, 11 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index bf0729f7a394..bbc2ec09caba 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.40 2007/10/15 14:48:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.41 2007/12/06 17:20:09 bicatali Exp $
+
+  06 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/netcdf-3.6.2-as-needed.patch, netcdf-3.6.2.ebuild:
+  Fixed for as-needed, cl closing bug #201493
 
   15 Oct 2007; Markus Rothe <corsair@gentoo.org> netcdf-3.6.1-r1.ebuild:
   Stable on ppc64
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 30aaefc05deb..eed5d4c8cf56 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fPIC.1.patch 816 RMD160 4640831dac116428fc1b7bb80a27a0c3ad59cc15 SHA1 3ed50725c51c66cdbf769b2214d0e2be9d4aa850 SHA256 d5f9431b102815c5000fb2a97536d5a74aa1c83acbc1df11e5ad9716f9623501
 MD5 da36efc15fffb2c79992752200446dce files/fPIC.1.patch 816
 RMD160 4640831dac116428fc1b7bb80a27a0c3ad59cc15 files/fPIC.1.patch 816
@@ -6,6 +9,10 @@ AUX fPIC.patch 209 RMD160 f7336b30c070a75335bed8280e5f1505a03ce464 SHA1 c5e87289
 MD5 46a9de0130f415c3cff34812e9ce6724 files/fPIC.patch 209
 RMD160 f7336b30c070a75335bed8280e5f1505a03ce464 files/fPIC.patch 209
 SHA256 7c24234fdc8b9f4031989949398aa203aafd492d367d71c02e1ce41b5b39d68c files/fPIC.patch 209
+AUX netcdf-3.6.2-as-needed.patch 1535 RMD160 394331f42b20e6fdc510b669390bc697b60cd07d SHA1 8970375441ba026995e1d517c643117919038486 SHA256 23a18d65be6cdc7521e75db8cca3c09e83854343e33f60d214addff836df3b88
+MD5 0467794b7811cf8e8f17b6d89e0f1a89 files/netcdf-3.6.2-as-needed.patch 1535
+RMD160 394331f42b20e6fdc510b669390bc697b60cd07d files/netcdf-3.6.2-as-needed.patch 1535
+SHA256 23a18d65be6cdc7521e75db8cca3c09e83854343e33f60d214addff836df3b88 files/netcdf-3.6.2-as-needed.patch 1535
 AUX netcdf-3.6.2-parallel-make.patch 1159 RMD160 bdc0ab52031c4822aeeb1a4ca93da027920c06f9 SHA1 38776793ab83f39762f1556e4932a0580153dcb7 SHA256 44fc5f7fcad525e53f1405e55b9924126f7214931cbd6f545ab9b8c30e2e8a74
 MD5 71f7683db17f266950388f52b4fdacfe files/netcdf-3.6.2-parallel-make.patch 1159
 RMD160 bdc0ab52031c4822aeeb1a4ca93da027920c06f9 files/netcdf-3.6.2-parallel-make.patch 1159
@@ -20,14 +27,14 @@ EBUILD netcdf-3.6.1.ebuild 1932 RMD160 281ab589d135ac62c4881c4f4ea7f39c39828a47
 MD5 4d5d4637ad171403872323fe26ab0197 netcdf-3.6.1.ebuild 1932
 RMD160 281ab589d135ac62c4881c4f4ea7f39c39828a47 netcdf-3.6.1.ebuild 1932
 SHA256 22d73c9434ed09b0a060767bcd42097cc568fbcb4809d57defc37d98711a84a8 netcdf-3.6.1.ebuild 1932
-EBUILD netcdf-3.6.2.ebuild 2345 RMD160 ae0aede8d40ce9c5fdd68850791c9936940470f1 SHA1 26e194b5f39ee499b519656ccc863e9651327441 SHA256 d21ec0be1e73685c872abdafd03c4b36816dc3daf64e617f8940e061c778d179
-MD5 a07a47361d7dbc9f80206aa688cb243e netcdf-3.6.2.ebuild 2345
-RMD160 ae0aede8d40ce9c5fdd68850791c9936940470f1 netcdf-3.6.2.ebuild 2345
-SHA256 d21ec0be1e73685c872abdafd03c4b36816dc3daf64e617f8940e061c778d179 netcdf-3.6.2.ebuild 2345
-MISC ChangeLog 9136 RMD160 632cb248a72de29bc3d3e80684001724344d2bac SHA1 b4b03b74c24922ef17b510571b7edbc3b483868c SHA256 4a2aeb7cba9c097ac65fe3f7fd419d31d5d1aaf0a6dad120006bb9063ea33304
-MD5 bd9a7253ceffb90c3042d9f2f037d9df ChangeLog 9136
-RMD160 632cb248a72de29bc3d3e80684001724344d2bac ChangeLog 9136
-SHA256 4a2aeb7cba9c097ac65fe3f7fd419d31d5d1aaf0a6dad120006bb9063ea33304 ChangeLog 9136
+EBUILD netcdf-3.6.2.ebuild 2393 RMD160 7ffc86e1bb122f92e2b4f4fbeeed73909897b978 SHA1 45710d637f467f3487458e2afdf6276dc36b450d SHA256 69a49899714929102ce4532f546967a3ab206d032571185da1ada64559bb5b84
+MD5 94f9aaab066553c751b3fcfc06c9236a netcdf-3.6.2.ebuild 2393
+RMD160 7ffc86e1bb122f92e2b4f4fbeeed73909897b978 netcdf-3.6.2.ebuild 2393
+SHA256 69a49899714929102ce4532f546967a3ab206d032571185da1ada64559bb5b84 netcdf-3.6.2.ebuild 2393
+MISC ChangeLog 9299 RMD160 daa7e886920830ee49594b8aa917ef2b4eab2dbf SHA1 061a28ebb0c9f1b69efdea223260490011778216 SHA256 4cf0789a3e149fcc68cb2352008f58e8818366911299069cf6c8361d59ec7d2c
+MD5 a4fc85a98e8b1e759ded92d0a3d33a79 ChangeLog 9299
+RMD160 daa7e886920830ee49594b8aa917ef2b4eab2dbf ChangeLog 9299
+SHA256 4cf0789a3e149fcc68cb2352008f58e8818366911299069cf6c8361d59ec7d2c ChangeLog 9299
 MISC metadata.xml 575 RMD160 638c53aa85064f37973c46069075a55d1cc02c9b SHA1 1b31b9514dc8f1d56c4c9e0bfe58e0d4f6ce2e9e SHA256 4fc8a40dde64837250400a3468add946b4cc8b29b74b9fc2b7b416534dab04f6
 MD5 6e13f312bd19633ba0c7be0f125451f0 metadata.xml 575
 RMD160 638c53aa85064f37973c46069075a55d1cc02c9b metadata.xml 575
@@ -41,3 +48,10 @@ SHA256 9494146ba09f3753dad7e578aff473f639fa38c84759738e00abc13782047bc3 files/di
 MD5 76269455a88702493b70db92a1cc360b files/digest-netcdf-3.6.2 241
 RMD160 9f29e9ea8efe759f6a14c35952034b45ea7e612c files/digest-netcdf-3.6.2 241
 SHA256 7d58e86cb28eae8a59453893dafaaf601d78ab9c2a343b742239cf35916ba816 files/digest-netcdf-3.6.2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHWC9Q1ycZbhPLE2ARAofRAJ9ZGKxwA1zTSQJ76JHaTS6R8GJ66wCgqoSu
+/CBw8BfCslkf1LbQP+o2o30=
+=VdXZ
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch b/sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch
new file mode 100644
index 000000000000..8f2bef7d9ff4
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch
@@ -0,0 +1,40 @@
+--- ./cxx/Makefile.am.orig	2007-12-06 17:12:03.352615935 +0000
++++ ./cxx/Makefile.am	2007-12-06 17:12:41.830808682 +0000
+@@ -88,6 +88,7 @@
+ 
+ # Library source.
+ libnetcdf_c___la_SOURCES = netcdf.cpp ncvalues.cpp
++libnetcdf_c___la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la
+ 
+ test: check
+ 
+--- ./fortran/Makefile.am.orig	2007-12-06 17:11:59.140375893 +0000
++++ ./fortran/Makefile.am	2007-12-06 17:13:18.480897252 +0000
+@@ -35,6 +35,7 @@
+ # (it's generated by the configure script from nfconfig.in), or if
+ # netcdf.inc has changed.
+ libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc 
++libnetcdff_la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la
+ 
+ # Is the user building netCDF-4?
+ if USE_NETCDF4
+@@ -71,7 +72,7 @@
+ 
+ # If F90 is built, include it's convenience library.
+ if BUILD_F90
+-libnetcdff_la_LIBADD = ../f90/libnetcdff90.la
++libnetcdff_la_LIBADD += ../f90/libnetcdff90.la
+ endif
+ 
+ # If we are building the dll (under MinGW) then set the correct flags.
+--- ./Makefile.am.orig	2007-12-06 17:11:55.140147933 +0000
++++ ./Makefile.am	2007-12-06 17:12:41.830808682 +0000
+@@ -57,7 +57,7 @@
+ # This is the list of subdirs for which Makefiles will be constructed
+ # and run. ncgen must come before ncdump and cxx, because their tests
+ # depend on it. nf_test depends upon ncgen as well.
+-SUBDIRS = $(F90_DIR) $(F77_DIR) libsrc $(V2_TEST) $(NCGEN) $(NCDUMP)	\
++SUBDIRS = libsrc $(F90_DIR) $(F77_DIR) $(V2_TEST) $(NCGEN) $(NCDUMP)	\
+ $(F77_TEST) ${CXX_DIR} nc_test $(MAN) $(EXAMPLES)
+ 
+ # make test should do the same as make check.
diff --git a/sci-libs/netcdf/netcdf-3.6.2.ebuild b/sci-libs/netcdf/netcdf-3.6.2.ebuild
index d35367185a6e..705bfdeba72d 100644
--- a/sci-libs/netcdf/netcdf-3.6.2.ebuild
+++ b/sci-libs/netcdf/netcdf-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.2.ebuild,v 1.5 2007/09/28 11:25:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.2.ebuild,v 1.6 2007/12/06 17:20:09 bicatali Exp $
 
 inherit fortran eutils toolchain-funcs flag-o-matic autotools
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	doc? ( virtual/tetex )"
+	doc? ( virtual/latex-base )"
 
 pkg_setup() {
 	if use fortran ; then
@@ -28,6 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-parallel-make.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 	eautoreconf
 }