Fixed minimum libtool dependency (bug #409219, thanks dima), fixes a sed for man page, remove redundant lines with autotools-utils eclass

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 20 insertions, 15 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index d9688555291c..582b3d1da28b 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.94 2012/03/25 10:35:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.95 2012/03/29 19:01:45 bicatali Exp $
+
+  29 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> netcdf-4.1.3.ebuild:
+  Fixed minimum libtool dependency (bug #409219, thanks dima), fixes a sed for
+  man page, remove redundant lines with autotools-utils eclass
 
   25 Mar 2012; Justin Lecher <jlec@gentoo.org> netcdf-4.1.1-r4.ebuild,
   netcdf-4.1.3.ebuild, metadata.xml:
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 9aff71f9979f..a42fadd81762 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX netcdf-3.6.3-as-needed.patch 1794 RMD160 4b81004e09b1d620ad6fe3450ed3906f214cfa32 SHA1 f3c3809227674cdcdd0ec0ea3236c68cda8e9bf7 SHA256 4bd124aac6f9b3aeedf91b89e713cb1dd035423361ef609e784b17b4b08be645
 AUX netcdf-3.6.3-parallel.patch 518 RMD160 840c57498d0dd75f33f1653be0a811248b2c1d18 SHA1 f8a14e3d069c9983bbb9fd3b3ebdd9f480617e2a SHA256 ff26354df395398b70ebb28c26a0478e6a0bff18fdf6b46cece9a619d3df1b97
@@ -12,13 +12,13 @@ DIST netcdf-4.1.1.tar.gz 11201096 RMD160 89b6e1a2115ef348ac83166aa7a50e045fbd98e
 DIST netcdf-4.1.3.tar.gz 11097157 RMD160 ac07f570873bba89a49cb2eb2275a40cbc8e502b SHA1 e600322478276f51612e17cca3cda38489003f81 SHA256 315bc385b0750dd85b9a122194382db52f432dea1390de9f7afa11cf91869213
 EBUILD netcdf-3.6.3.ebuild 2448 RMD160 0281d6e6e190812e45b9aaff82154be61500d26d SHA1 0c39bf834706e584efef325e796326ff8cb0421c SHA256 567bffa7a41fe0f63ecca2d9243fc4d03d75d67f07934a3cdea4182f41049954
 EBUILD netcdf-4.1.1-r4.ebuild 2307 RMD160 dd4818609384a28e7f3f55271e3dc4506fae442c SHA1 ad86af12a4a3de996f2b5eedab0ef7375fdfcfeb SHA256 ee05f06b5380eb9c37c7cb039c973380723a1da5ba71ba6bcedd876fe46a1df3
-EBUILD netcdf-4.1.3.ebuild 2123 RMD160 9e2a54d7a5096a3dcb4e4bbe3f05919fd2447a02 SHA1 172c1be30f678b13b9a9ec000a2f183518d8f3b5 SHA256 9b191191f0515c12287c0c89688a42586e0a0e7565d055f1ec2a2706e7f41478
-MISC ChangeLog 17120 RMD160 588981059da67b3beb313d62bdbb3ace4ce65b66 SHA1 d0cf81607f1848bc11a9dfdc0a1019d3d2633c38 SHA256 0d43aa78ac673e99bf316eff8bdf5e58bfef959beffd972aeb00d6ab31524a05
+EBUILD netcdf-4.1.3.ebuild 2121 RMD160 975497fa91c32ea1b7f42a4d5f1b342217bff479 SHA1 9dbb7e95498d6005683d7008b28a5650fac72c71 SHA256 36b3eac5531dcc804d18335edfb60ca7e26300670b95c137049f63fc75258afd
+MISC ChangeLog 17343 RMD160 77842255423aa16b3fd7a37a8db27d3a79087511 SHA1 557f056ef4ddbeac45a8b91b2ade7d3f5f05005d SHA256 2db80a4f02ed236958c3b89ffd34d8e06d633029dd2bc5a0dab28d0204445893
 MISC metadata.xml 694 RMD160 a9753b2677a6b99c8bb24277c240419c5c2c6a27 SHA1 88ad0c99b930f80ddb799157117fe44a7c2f9361 SHA256 ecfdc3bfa2846cb731e4aa422fdf5730e1008782dbbf51735c3aae6567d169fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk9u9O8ACgkQgAnW8HDreRb7lACeIGGrDY23qtr9vn2BPbOl2OSA
-k9cAoNCo0oZr7qbOAgyAF7+DF1BzLoTY
-=k9Xy
+iEYEARECAAYFAk90saEACgkQ1ycZbhPLE2D6PACgpfKCm7a5Ok6FZQC8RAJECxG2
+o/8An02cdjjlQ1JjCbsOOU+BGPiCgqLt
+=qKet
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/netcdf-4.1.3.ebuild b/sci-libs/netcdf/netcdf-4.1.3.ebuild
index 17e19e8fef4f..ee14517939e3 100644
--- a/sci-libs/netcdf/netcdf-4.1.3.ebuild
+++ b/sci-libs/netcdf/netcdf-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.3.ebuild,v 1.2 2012/03/25 10:35:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.3.ebuild,v 1.3 2012/03/29 19:01:45 bicatali Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ RDEPEND="
 	hdf5? ( >=sci-libs/hdf5-1.8.6[zlib,szip,fortran?] )"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
+	>=sys-devel/libtool-2.4
 	doc? ( virtual/latex-base )
 	fortran? ( dev-lang/cfortran )"
 
@@ -48,13 +48,15 @@ pkg_setup() {
 
 src_prepare() {
 	# use system cfortran
-	rm -f fortran/cfortran.h || die
+	rm -f "${S}"/fortran/cfortran.h || die
 	# check for szip is libsz, not libszip
-	sed -i -e 's/\[szip\]/\[sz\]/' configure.ac || die
-	# we don't build udunits and libcf
-	sed -i -e '/udunits libcf/d' configure.ac || die
+	# we don't build udunits and libcf we take them from system
+	sed -i \
+		-e 's/\[szip\]/\[sz\]/' \
+		-e '/udunits libcf/d' \
+		"${S}"/configure.ac || die
 	if ! use doc; then
-		sed -i -e "/\$(NC_TEST4)/ s/man4//" Makefile.am || die
+		sed -i -e '/$(NC_TEST4) /s/man4//' "${S}"/Makefile.am || die
 	fi
 	autotools-utils_src_prepare
 }
@@ -63,7 +65,6 @@ src_configure() {
 	myeconfargs=(
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable dap)
-		$(use_enable static-libs static)
 		$(use_enable fortran f77)
 		$(use_enable fortran f90)
 		$(use_enable cxx)