ppc64 stable wrt #325069. Drop old.

(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

4 files changed, 7 insertions, 172 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/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
-}