Bump for new upstream tar balls, now with proper versions. Also fix bad patching.

(Portage version: 2.1.5_rc6)

2 files changed, 131 insertions, 1 deletions

diff --git a/sci-libs/cdf/ChangeLog b/sci-libs/cdf/ChangeLog
index aa3d7f8297d7..cca98ad6a59e 100644
--- a/sci-libs/cdf/ChangeLog
+++ b/sci-libs/cdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cdf
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.13 2008/05/08 10:22:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.14 2008/05/09 10:18:52 bicatali Exp $
+
+*cdf-3.2.1-r1 (09 May 2008)
+
+  09 May 2008; Sébastien Fabbro <bicatali@gentoo.org> +cdf-3.2.1-r1.ebuild:
+  Bump for new upstream tar balls, now with proper versions. Also fix bad
+  patching.
 
   08 May 2008; Sébastien Fabbro <bicatali@gentoo.org> cdf-3.2.1.ebuild:
   Upstream changed tar balls again, removing mirror restriction
diff --git a/sci-libs/cdf/cdf-3.2.1-r1.ebuild b/sci-libs/cdf/cdf-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..bccad00fd81e
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.2.1-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-3.2.1-r1.ebuild,v 1.1 2008/05/09 10:18:52 bicatali Exp $
+
+inherit eutils toolchain-funcs multilib versionator
+
+MY_DP="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
+MY_P="${MY_DP}_$(get_version_component_range 3)"
+
+DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
+HOMEPAGE="http://cdf.gsfc.nasa.gov/"
+SRC_BASE="ftp://cdaweb.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix"
+
+SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
+	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
+	doc? ( ${SRC_BASE}/${MY_P}_documentation/${MY_DP}crm.pdf
+		   ${SRC_BASE}/${MY_P}_documentation/${MY_DP}frm.pdf
+		   ${SRC_BASE}/${MY_P}_documentation/${MY_DP}ifd.pdf
+		   ${SRC_BASE}/${MY_P}_documentation/${MY_DP}prm.pdf
+		   ${SRC_BASE}/${MY_P}_documentation/${MY_DP}ug.pdf
+	java? ( ${SRC_BASE}/${MY_P}_documentation/${MY_DP}jrm.pdf ) )"
+
+LICENSE="CDF"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples java ncurses"
+
+RDEPEND="ncurses? ( sys-libs/ncurses )"
+DEPEND="${RDEPEND}
+		java? ( virtual/jdk	dev-java/java-config )"
+
+S="${WORKDIR}/${MY_P}-dist"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# respect cflags, remove useless scripts
+	epatch "${FILESDIR}"/${PN}-3.2-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-3.2-soname.patch
+	# use proper lib dir
+	sed -i \
+		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+	if use ncurses; then
+		myconf="${myconf} CURSES=yes"
+	else
+		myconf="${myconf} CURSES=no"
+	fi
+	PV_SO=${PV:0:1}
+	emake \
+		OS=linux \
+		ENV=gnu \
+		SHARED=yes \
+		SHAREDEXT_linux=so.${PV_SO} \
+		${myconf} \
+		all || die "emake failed"
+
+	if use java; then
+		export CDF_BASE="${S}"
+		export CDF_LIB="${S}/src/lib"
+		cd cdfjava/jni
+		$(tc-getCC) \
+			${CFLAGS} -fPIC \
+			-I${CDF_BASE}/src/include \
+			-I$(java-config -O)/include \
+			-I$(java-config -O)/include/linux \
+			-c cdfNativeLibrary.c \
+			-o cdfNativeLibrary.o \
+			|| die "compiling java lib failed"
+		$(tc-getLD) \
+			-L${CDF_LIB} -lcdf -lm \
+			-shared cdfNativeLibrary.o \
+			-soname=libcdfNativeLibrary.so.${PV_SO} \
+			-o libcdfNativeLibrary.so.${PV_SO} \
+			|| die "linking java lib failed"
+	fi
+}
+
+src_test() {
+	emake test || die "test failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)
+	# -j1 (fragile non-autotooled make)
+	emake -j1 \
+		INSTALLDIR="${D}usr" \
+		SHAREDEXT=so.${PV_SO} \
+		install || die "emake install failed"
+	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
+
+	dodoc Release.notes CHANGES.txt Welcome.txt || die
+	doenvd "${FILESDIR}"/50cdf
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${MY_P}*.pdf
+		use java || rm "${D}"/usr/share/doc/${PF}/${MY_P}jrm.pdf
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins samples/*
+	fi
+
+	if use java; then
+		cd cdfjava
+		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
+		dosym libcdfNativeLibrary.so.${PV_SO} \
+			/usr/$(get_libdir)/libcdfNativeLibrary.so
+		insinto /usr/share/cdf
+		doins */*.jar
+		if use examples; then
+			insinto /usr/share/doc/${PF}/examples/java
+			doins examples/*
+		fi
+	fi
+
+}