ppc64 stable wrt #325069. Drop old.

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

5 files changed, 21 insertions, 176 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index db1d5031736f..9435fa65bdd2 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.88 2011/03/20 11:29:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.89 2011/03/20 18:19:30 xarthisius Exp $
+
+  20 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> -netcdf-4.1.1.ebuild,
+  -netcdf-4.1.1-r3.ebuild, netcdf-4.1.1-r4.ebuild:
+  ppc64 stable wrt #325069. Drop old.
 
   20 Mar 2011; Raúl Porcel <armin76@gentoo.org> netcdf-4.1.1-r4.ebuild:
   ia64 stable wrt #325069
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index b0ba445daa4f..c41dd6bd3658 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX netcdf-4.1.1-fortran.patch 533 RMD160 5237f450bddab15286f4ec4a9abb95953dce437a SHA1 9f5450708b9d7a165d92c3a3545303f2ab797253 SHA256 0b7ed3bc01dfe23fe8eeace124efb3d49e793361a2626e3aeef5bf62c842e5df
@@ -7,8 +10,15 @@ AUX netcdf-4.1.1-parallel-build.patch 1311 RMD160 ea8237befdf90fb373a561531decee
 DIST netcdf-3.6.3.tar.gz 11572512 RMD160 6917caa05adc2fb9dbf2d43354f6dd00914486a2 SHA1 711e5f2a24e1679b17715398ba58127e50cd7fb3 SHA256 afa1a0fa82b9ea33b035257b6e9662b22e135f98b2fd93d5cf030320dfc3ffa1
 DIST netcdf-4.1.1.tar.gz 11201096 RMD160 89b6e1a2115ef348ac83166aa7a50e045fbd98e2 SHA1 6fece208825b978fc2240732f6f57927d71a0552 SHA256 7933d69d378c57f038375bae4dd78c52442a06e2647fce4b75c13a225e342fb0
 EBUILD netcdf-3.6.3.ebuild 2415 RMD160 f5af681e5bf3b635a5a537385d213b97017edaf8 SHA1 125ad71d02a32dcfd014a2dbc2f88c5dccea0b44 SHA256 7e4f33e1a5682a7176f8f08f0cb81e9fe345d0610f3836e99b765d574f074a4f
-EBUILD netcdf-4.1.1-r3.ebuild 2172 RMD160 5c7fb3fa65a42dfc7a357149addfd9e42a919cde SHA1 b0b1b918bec9bf0f70ba157c58612040de3b2834 SHA256 593b0685ef728fa3bc934693d1ad5672a51744ef3a5a409c7d1f4197334ae662
-EBUILD netcdf-4.1.1-r4.ebuild 2250 RMD160 1cbec505bc4f62573689e39e3217b086f3d2e074 SHA1 c3f200d7eecf6355c50e8dc6775dec3471d0bd8b SHA256 85b44142bedf70ead5867479f9e4170d3400b142f5ed7adfdd30d737ab2b9805
-EBUILD netcdf-4.1.1.ebuild 1963 RMD160 3e39844a9b490185dca99f309bee84463b4310a6 SHA1 87a21817a8c0ba7d353a8b8dd39bf454bcb8caaf SHA256 2dfedef4cd594e8e9ef2147a3108ff81f841887de0c4caf9bab813dc4dcfca62
-MISC ChangeLog 16256 RMD160 04fde91ed39bdaef3a6ccb757b4f93a7d1a065d5 SHA1 49d5e2e8e133d547309c63a22552cf2288432bec SHA256 05d2d143f336846978289d349123ae1c9ee28c53e64c658fc9946e4959e3254f
+EBUILD netcdf-4.1.1-r4.ebuild 2252 RMD160 231b9c5bf657563b6096c97144f9b7ef004c5bbe SHA1 333fee71a6b8368d9d3c58e2fd963f594a91e7bb SHA256 b4ec7f0625f940d15be7b6da31df0dc6e4d40921b57591ba2033fb1d7c84f00f
+MISC ChangeLog 16425 RMD160 b0ef0810c02b08a748abf60bd5c7e954d0f6e7fe SHA1 464111199627064d3d8d6186dae0883bd209ee68 SHA256 2ca3ec3ea239acb1248f9db14186f631ec5fe6547940620b9dbaa67fbbfcc393
 MISC metadata.xml 689 RMD160 ea3463e14f45ed00c810c1ba8b452eb22ed68bc8 SHA1 78128a34222208d7accfdec9e92c75f0ec67ed6a SHA256 31c1ec42edfa2928152c62863bec9f485cf378552ddc9366578aa883dd309f2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQECAAYFAk2GRTsACgkQIiMqcbOVdxR/1wP/ZRgayS74ERw6CoIy2caIDYos
+DjY+L0uC5LlP5H/Io/b0bcbM0NCZjAL5oJa4Yl5vs75IzlezvoU3jJVxeNJFH/63
+2ilMFNm94clGXB4/512HTQ3rIdsKhA2IomDVpTy5zon/Wba+nm4UG5FbFtaNphyH
+3CTwyCCHXRfBbnezb14=
+=Ay9m
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild b/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild
deleted file mode 100644
index 105457c697e5..000000000000
--- a/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild,v 1.1 2010/12/06 12:47:00 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools autotools-utils
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cxx dap doc fortran hdf5 static-libs szip"
-
-RDEPEND="dap? ( net-misc/curl )
-	hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	doc? ( virtual/latex-base )
-	fortran? ( dev-lang/cfortran )"
-
-DOCS=(README RELEASE_NOTES)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallel-build.patch
-	"${FILESDIR}"/${P}-implicits.patch
-	"${FILESDIR}"/${P}-mpi-fix.patch
-)
-
-pkg_setup() {
-	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
-		export CC=mpicc
-		if use cxx; then
-			export CXX=mpicxx
-		fi
-		if use fortran; then
-			export FC=mpif90
-			export F77=mpif77
-		fi
-	fi
-}
-
-src_prepare() {
-	# use system cfortran
-	rm -f fortran/cfortran.h || die
-	# we don't build udunits and libcf
-	sed -i -e '/udunits libcf/d' configure.ac || die
-	if ! use doc; then
-		sed -i -e "/\$(NC_TEST4)/ s/man4//" Makefile.am || die
-	fi
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use hdf5; then
-		myconf="--with-hdf5=${EPREFIX}/usr --with-zlib=${EPREFIX}/usr"
-		use szip && myconf="${myconf} --with-szlib=${EPREFIX}/usr"
-	fi
-
-	myeconfargs=(
-		--enable-shared
-		--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)
-		$(use_enable fortran separate-fortran)
-		$(use_enable hdf5 netcdf-4)
-		${myconf}
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# hack to allow parallel build
-	if use doc; then
-		autotools-utils_src_compile pdf
-		autotools-utils_src_compile -j1 -C man4
-	fi
-	autotools-utils_src_compile
-}
diff --git a/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild b/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild
index 4ca15298e0e2..bb5b3f474d25 100644
--- a/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild
+++ b/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild,v 1.8 2011/03/20 11:29:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r4.ebuild,v 1.9 2011/03/20 18:19:30 xarthisius Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="cxx dap doc fortran hdf5 static-libs szip"
 
 RDEPEND="dap? ( net-misc/curl )
diff --git a/sci-libs/netcdf/netcdf-4.1.1.ebuild b/sci-libs/netcdf/netcdf-4.1.1.ebuild
deleted file mode 100644
index 11ebd7923615..000000000000
--- a/sci-libs/netcdf/netcdf-4.1.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1.ebuild,v 1.8 2010/10/22 10:31:42 grobian Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
-HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
-
-LICENSE="UCAR-Unidata"
-SLOT="0"
-IUSE="dap doc fortran hdf5 static-libs szip cxx"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] )
-	dap? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	doc? ( virtual/latex-base )
-	fortran? ( dev-lang/cfortran )"
-
-pkg_setup() {
-	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
-		export CC=mpicc
-		if use cxx; then
-			export CXX=mpicxx
-		fi
-		if use fortran; then
-			export FC=mpif90
-			export F77=mpif77
-		fi
-	fi
-}
-
-src_prepare() {
-	# use system cfortran
-	rm -f fortran/cfortran.h || die
-}
-
-src_configure() {
-	local myconf
-	if use hdf5; then
-		myconf="--with-hdf5=${EPREFIX}/usr --with-zlib=${EPREFIX}/usr"
-		use szip && myconf="${myconf} --with-szlib=${EPREFIX}/usr"
-	fi
-
-	econf \
-		--enable-shared \
-		--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) \
-		$(use_enable fortran separate-fortran) \
-		$(use_enable hdf5 netcdf-4) \
-		$(use_enable hdf5 ncgen4) \
-		$(use_enable doc docs-install) \
-		${myconf}
-}
-
-src_compile() {
-	# hack to allow parallel build
-	if use doc; then
-		emake pdf || die "emake pdf failed"
-		cd man4
-		emake -j1 || die "emake doc failed"
-		cd ..
-	fi
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README RELEASE_NOTES VERSION || die
-}