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

Package-Manager: portage-2.1.5_rc6

3 files changed, 138 insertions, 5 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/Manifest b/sci-libs/cdf/Manifest
index 53e28e116842..b3702719eb8c 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -15,6 +15,8 @@ DIST cdf31jrm.pdf 2505807 RMD160 3d881a472abdb2b0290bc2c568d94913b2d35a89 SHA1 9
 DIST cdf31ug.pdf 800633 RMD160 c29a3f85fd766d4476101178175cdbad24f967ff SHA1 bd89197d2b93b3fe57c545e52018265f949d828b SHA256 02b34ae9e001f2bf12c83912f6e803cbe6e58bcd7ec11ab3787fe89e0fc86198
 DIST cdf32-dist-cdf.tar.gz 966523 RMD160 1913835d597bae33138f31218147d3c4bc068a12 SHA1 f95a78e0fe5346fd356ba7b4a9fa6198d8d9934e SHA256 2da085abfb3380849befc42cbfa0e8b663e2395a05a423583be4b07dd2fb14c0
 DIST cdf32-dist-java.tar.gz 673976 RMD160 7781e5db7606f7cd6cadb44fa4364adac47ebf14 SHA1 76024ab8320ad812574a408d10bc2bb5255f7f50 SHA256 6a9c67b985fe34fc4be6b118c1c89417e89f38b5846656d5e64bff2cd19f375b
+DIST cdf32_1-dist-cdf.tar.gz 966632 RMD160 9684a87805b19e53e4e32be55562236a7099e134 SHA1 442ebd3654e5fdb00a83c30ed924a6350b29ec00 SHA256 3663c627cbe1059ca82df1b48454e618e51f7ac6e12c0ff3a843323d914104d6
+DIST cdf32_1-dist-java.tar.gz 674771 RMD160 9b7105eb6f18238e864c02320e87ac541d4347e1 SHA1 3ef9ff1d3e922d4a8248ea16d1fa431b58953882 SHA256 bf4c0b32f9eda1a843837e2fcd03cc94ef3643b5dd1bf3511c219e41b0a88974
 DIST cdf32crm.pdf 984808 RMD160 36a2295f76278baba6c8ba8b6881ff301b1de80a SHA1 f52de834035b510f3600e80a9a29d1d61eaa03ec SHA256 69a396a4e8969e561854945918e51bbf5df3292d4c462028df24d8b9dee24f6d
 DIST cdf32frm.pdf 1022045 RMD160 505b1edac1070a1f033ec22dedf8abd8558e9294 SHA1 5837797e55f454cd01dc081db59fc3344551b521 SHA256 83e15705cdb7e23649f81ff80d844817b73721789c11aaacc094591bff28b937
 DIST cdf32ifd.pdf 199629 RMD160 a5d7cb2459594f6c75afb092c1ebd4b7c4600fb5 SHA1 d586fc86b713daba5c4c3f4944f108de809c36b9 SHA256 308425e647124aa20fffeb4453e13d6f6d6ba7aa770771c652a21eb4a9dbaec9
@@ -22,13 +24,14 @@ DIST cdf32jrm.pdf 2700352 RMD160 a0473c0487cae7ea479a49edf215506936612cfc SHA1 8
 DIST cdf32prm.pdf 503273 RMD160 9160bcc5aff617102d6571a543b40ea647413204 SHA1 113903ce65e7a465623f5f7fa9f20a5e3ce51e4d SHA256 5eedd50135851d82146d4516a573965e44b89f9afd84dcfa197dd7599a7b37da
 DIST cdf32ug.pdf 664399 RMD160 37b7b2aced89d5aa5a4263312df93a20f7499344 SHA1 aab3e089c2da6709c5341219d3d345073dd58424 SHA256 905ed52af5adc1b0bd8949743ac2147846a543b9d489f44fa1c4c451d9e3456f
 EBUILD cdf-3.1.ebuild 3257 RMD160 beb51f9cdeb8b1f501b86310cba779d05be2163f SHA1 76f5c4f5bc0b721a6f88c6ed7cb6cb6f3f4070fd SHA256 75304f5f586b8a93f808569024e910d362950fcda8bf8a95e0504e2631c78aa4
+EBUILD cdf-3.2.1-r1.ebuild 3258 RMD160 dc1f12de04a96eb5d9c028b5baa46b66f5621a80 SHA1 88d28d351b09b047218bee8a21fb603b9e96d13d SHA256 ae25601dba9949be43174be48e9376fbc09dbc91d3717c94848136ba4a199200
 EBUILD cdf-3.2.1.ebuild 3247 RMD160 a6a45ffce7494b8523627352e66fabc88d665e39 SHA1 27ac4b31b668199b9b171e515dae42894d29ee08 SHA256 eb067694c591368fc55e341afebc3fe047b308894e75072ea8b8e6c6485b6b03
-MISC ChangeLog 2336 RMD160 4ae6cfa2f8b59e289b8509402edc11c5eef60e42 SHA1 17f552cbca05e5012fcbb734f5e1646ba995726c SHA256 5c86a706d3fb6e19aac668ecb85a7b1570b8f6257b8a85dc028a79aedf74b578
+MISC ChangeLog 2529 RMD160 45dd16449a554942e689e40e46585bb48a508fa6 SHA1 ce04cb02df1252a7823b55e387b876f73d165b82 SHA256 aeec8db7432c5e669bd3225f30b91b7a71e12594ab005ce2020a0a85bc9ce575
 MISC metadata.xml 920 RMD160 19216d66dfe3e690c26b89013e697a848ad3190d SHA1 cfbaedc3d345509812ce3339f4f06d5b31ab034c SHA256 da95dbe621a4e9b48b392bd653c1b0b25f74c5eb2cd3bb8046cf0eeb88066f5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgi1wMACgkQ1ycZbhPLE2CitgCfa+T3FDJDGE0FhJesrG7Mbl6B
-hUIAn0O8RFLtGxMvTs/UATPyG4cKcvFU
-=hkPq
+iEYEARECAAYFAkgkJRkACgkQ1ycZbhPLE2APgQCgsMSBfU+gGySLEoTz56I4Ug03
+oSYAn1MwSvVFKSnmB9cd3AHjNadL1lqI
+=ApzO
 -----END PGP SIGNATURE-----
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
+
+}