Version bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 144 insertions, 7 deletions

diff --git a/sci-libs/cdf/ChangeLog b/sci-libs/cdf/ChangeLog
index 3db77e98356b..4fa153826f79 100644
--- a/sci-libs/cdf/ChangeLog
+++ b/sci-libs/cdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/cdf
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.17 2009/02/02 18:34:08 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.18 2009/07/22 22:46:52 bicatali Exp $
+
+*cdf-3.3.0 (22 Jul 2009)
+
+  22 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> +cdf-3.3.0.ebuild:
+  Version bump
 
 *cdf-3.2.4 (02 Feb 2009)
 
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index e32fb94289ec..c4e4306d85c3 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -14,14 +14,23 @@ DIST cdf32ifd.pdf 199629 RMD160 a5d7cb2459594f6c75afb092c1ebd4b7c4600fb5 SHA1 d5
 DIST cdf32jrm.pdf 2700352 RMD160 a0473c0487cae7ea479a49edf215506936612cfc SHA1 8ad727d55ac3c118ac37cbe3679a8de2863a57fa SHA256 9e1501896fbc08c97efcd8fc6d2dd19d10c820c46c566104826d48b7eec4d642
 DIST cdf32prm.pdf 503273 RMD160 9160bcc5aff617102d6571a543b40ea647413204 SHA1 113903ce65e7a465623f5f7fa9f20a5e3ce51e4d SHA256 5eedd50135851d82146d4516a573965e44b89f9afd84dcfa197dd7599a7b37da
 DIST cdf32ug.pdf 664399 RMD160 37b7b2aced89d5aa5a4263312df93a20f7499344 SHA1 aab3e089c2da6709c5341219d3d345073dd58424 SHA256 905ed52af5adc1b0bd8949743ac2147846a543b9d489f44fa1c4c451d9e3456f
+DIST cdf33_0-dist-cdf.tar.gz 985719 RMD160 c60330c656890841e8304420c960da157a0b04f6 SHA1 1579243652dd2f0f8efc05c307469c02a39a2acb SHA256 2cb49e9c0d282cdd3737c55df3df0f4b62bb701a07ecfa11c5372a0416bfa81f
+DIST cdf33_0-dist-java.tar.gz 685584 RMD160 9bdead010c33595cd0d2fdb66c79e3191e1d88a2 SHA1 775134893851cec27a1a8ff7534a78e6b20f29e1 SHA256 1a02bcd2d62dcdaf86a53e2d4817a79a68e04da3afd723eb32f298b6ba4a1c54
+DIST cdf33crm.pdf 1454306 RMD160 ea6ae1b3dff7d99c8aeffe75af21572567746116 SHA1 83c34bb15725e663060299d20f143e826b2f3036 SHA256 bc0a86330d90340fb58732dbbe5bdd41fdee3670084678deb89b7be5e80ea7df
+DIST cdf33frm.pdf 1737939 RMD160 3f4ae21637b5423819d6ef00e3ca271d27cd9e8e SHA1 32fff4729aebf0ad97fbe2ce21eab3fa972c13c8 SHA256 b43caf6134e9c2de6c2add800e8545c5699eb48d5adeab860ee0c701d184079e
+DIST cdf33ifd.pdf 369110 RMD160 a4c86af47f72a662179cf38877faf7f7db2227c3 SHA1 2c75be0b069b49122e82e15a5d19d8c004f2fce0 SHA256 eb0181573a6e2bffcc675d72844fd0f27a3e81d755e99f1516a5f4727cbbe19c
+DIST cdf33jrm.pdf 2707863 RMD160 3af11e459cecaef21a17f574bddc2a0984d45bd7 SHA1 0c291c2ba89d2d08dc9a4190ebf706666e03581a SHA256 e9fd33fd5afdb9a3b882a5e14c28d69b2ff4ba91e9f0aa2e0254ea84bd78f32f
+DIST cdf33prm.pdf 961286 RMD160 be7abb47bda9dad0c8a95920647c4d014581984c SHA1 697be389d3056643df059ca096472a0a7277e0e4 SHA256 73a8f878891a5d80233238a6210b962eb4327c11205596da7a6cd7a73417a837
+DIST cdf33ug.pdf 1372504 RMD160 25fe71578c3d4bee62ca612f77dc8b4ba99fa0ef SHA1 e04e180e6217be970cc6ce31efc106acd58ad2bc SHA256 85631b4a96043c8c4ceb368836a43199d06a5e7726732df29c6f4ae164062756
 EBUILD cdf-3.2.1-r1.ebuild 3276 RMD160 5840a739d0a493b6372a9e1cc2098f0de4e5bd74 SHA1 8596d79d1dd7fdb40d3ad1a34f72d538fa8fb7d9 SHA256 819f9acc8ec1bc9ad93671f24247d1c818324491d41038515309a350ae389717
 EBUILD cdf-3.2.4.ebuild 3311 RMD160 b22bbda2369f5afdd7a4ca55d3804664570231f6 SHA1 4af1cd24050c29d078d0387a37f7ed61ce537c42 SHA256 6364ffcabc2aeafc8a5b95cbe696ce725b6f4d4fec620c977e1fa29f40bffa90
-MISC ChangeLog 3083 RMD160 d445c5c997e596fabd3ce55f606bd3ab5ae4747d SHA1 8f38dea881b3a0545366ce7924c75f491cf6cf8a SHA256 158b1d3280483d96bcaa0e8ef44ff09d767835ae4a921e41a0d99fb1ece22d81
+EBUILD cdf-3.3.0.ebuild 3314 RMD160 543e9bac165c9fe06ba23517f3d33de9cf5d15ab SHA1 0e193117cdd0bfc2b1cc9118b049d440b8a0507f SHA256 ec427e9468c5f24937e60dba3dbc48c3d09216e392bb491fc0d00076a744028c
+MISC ChangeLog 3199 RMD160 75e1e23e101825ffda578df666581e26885be48e SHA1 3857042011da78d25482c11f4aac1a3573370ce7 SHA256 bb1516ef106f0dfa271bb9d5bbc3c7547a44187526311e1d053b95cbb0c1d4be
 MISC metadata.xml 920 RMD160 19216d66dfe3e690c26b89013e697a848ad3190d SHA1 cfbaedc3d345509812ce3339f4f06d5b31ab034c SHA256 da95dbe621a4e9b48b392bd653c1b0b25f74c5eb2cd3bb8046cf0eeb88066f5f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmHPKoACgkQ1ycZbhPLE2A3MgCfT9o+G410fOKrjTlNg1MVbMU9
-l3AAn19TFUUuJyj4YEwjVU2pxnHlICHX
-=SwXv
+iEYEARECAAYFAkpnlucACgkQ1ycZbhPLE2AWeQCfSKc5s4Fd06j1AqxvZWOBLSOf
++qwAnjZaUMmkeAouBmluAXiOm9UOf65Z
+=WP7E
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cdf/cdf-3.3.0.ebuild b/sci-libs/cdf/cdf-3.3.0.ebuild
new file mode 100644
index 000000000000..fed8f5a6f6a7
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.3.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-3.3.0.ebuild,v 1.1 2009/07/22 22:46:52 bicatali Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs multilib versionator java-pkg-opt-2
+
+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_DP}_documentation/${MY_DP}crm.pdf
+		   ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}frm.pdf
+		   ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
+		   ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}prm.pdf
+		   ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ug.pdf
+	java? ( ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}jrm.pdf ) )"
+
+LICENSE="CDF"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples java ncurses"
+
+RDEPEND="ncurses? ( sys-libs/ncurses )
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="ncurses? ( sys-libs/ncurses )
+	java? ( >=virtual/jdk-1.5 )"
+
+S="${WORKDIR}/${MY_P}-dist"
+
+src_prepare() {
+	# 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-getCC) \
+			${LDFLAGS} \
+			-L${CDF_LIB} -lcdf -lm \
+			-shared cdfNativeLibrary.o \
+			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
+			-o libcdfNativeLibrary.so.${PV_SO} \
+			|| die "linking java lib failed"
+	fi
+}
+
+src_test() {
+	emake -j1 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_DP}*.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/* || die
+	fi
+
+	if use java; then
+		cd cdfjava
+		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
+		dosym libcdfNativeLibrary.so.${PV_SO} \
+			/usr/$(get_libdir)/libcdfNativeLibrary.so
+		java-pkg_dojar */*.jar
+		if use examples; then
+			insinto /usr/share/doc/${PF}/examples/java
+			doins examples/* || die
+		fi
+	fi
+}