Version bump and major cleaning.

(Portage version: 2.1.2.2)

7 files changed, 271 insertions, 1 deletions

diff --git a/sci-libs/cdf/ChangeLog b/sci-libs/cdf/ChangeLog
index c5a4f6f93cbe..e58799612133 100644
--- a/sci-libs/cdf/ChangeLog
+++ b/sci-libs/cdf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/cdf
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.4 2007/02/09 08:26:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.5 2007/04/19 12:05:07 bicatali Exp $
+
+*cdf-3.1 (19 Apr 2007)
+
+  19 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org> +files/50cdf,
+  +files/cdf-Makefile.patch, +files/cdf-soname.patch, metadata.xml,
+  +cdf-3.1.ebuild:
+  Version bump and major ebuild cleaning. Added doc and examples flags, a
+  couple of patches to handle flags and shared libraries properly. Added longdescription in 
+  metadata.xml. Closing bug #125409, thanks carlo@gentoo.org for his initial ebuild.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/sci-libs/cdf/cdf-3.1.ebuild b/sci-libs/cdf/cdf-3.1.ebuild
new file mode 100644
index 000000000000..d1a6864b84d0
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-3.1.ebuild,v 1.1 2007/04/19 12:05:07 bicatali Exp $
+
+inherit eutils toolchain-funcs multilib
+
+MY_P="${P/-}"
+MY_P="${MY_P/.}"
+
+DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
+HOMEPAGE="http://cdf.gsfc.nasa.gov/"
+SRC_URI="ftp://rumba.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix/${MY_P}-dist-${PN}.tar.gz
+	java? ( ftp://rumba.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix/${MY_P}-dist-java.tar.gz )
+	doc? ( ftp://rumba.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix/${MY_P}_documentation/${MY_P}ug.pdf
+		ftp://rumba.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix/${MY_P}_documentation/${MY_P}crm.pdf
+		ftp://rumba.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix/${MY_P}_documentation/${MY_P}frm.pdf
+		ftp://rumba.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix/${MY_P}_documentation/${MY_P}ifd.pdf
+		java? ( ftp://rumba.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix/${MY_P}_documentation/${MY_P}jrm.pdf ) )"
+
+LICENSE="CDF"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses java doc examples"
+
+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}-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-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}
+	make \
+		OS=linux \
+		ENV=gnu \
+		SHARED=yes \
+		SHAREDEXT_linux=so.${PV_SO} \
+		${myconf} \
+		all || die "make 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() {
+	make test || die "test failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)
+	make \
+		INSTALLDIR="${D}usr" \
+		SHAREDEXT=so.${PV_SO} \
+		install || die "make install failed"
+	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
+
+	dodoc Release.notes README_CDF_tools.txt CHANGES.txt Welcome.txt
+	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
+		insinsto /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
+			insinsto /usr/share/doc/${PF}/examples/java
+			doins examples/*
+		fi
+	fi
+
+}
diff --git a/sci-libs/cdf/files/50cdf b/sci-libs/cdf/files/50cdf
new file mode 100644
index 000000000000..d967cbee6f22
--- /dev/null
+++ b/sci-libs/cdf/files/50cdf
@@ -0,0 +1,5 @@
+CDF_BASE=/usr
+CDF_INC=${CDF_BASE}/include
+CDF_LIB=${CDF_BASE}/lib
+CDF_BIN=${CDF_BASE}/bin
+CDF_HELP=${CDF_BASE}/lib/cdf/help
diff --git a/sci-libs/cdf/files/cdf-Makefile.patch b/sci-libs/cdf/files/cdf-Makefile.patch
new file mode 100644
index 000000000000..edf65506d8e9
--- /dev/null
+++ b/sci-libs/cdf/files/cdf-Makefile.patch
@@ -0,0 +1,80 @@
+--- Makefile.orig	2007-04-19 11:32:17.940863000 +0100
++++ Makefile	2007-04-19 12:00:47.449801500 +0100
+@@ -628,17 +628,17 @@
+ "PIC=$(PIC_$(OS)_$(ENV))" \
+ "CCx=$(CC_$(OS)_$(ENV))" \
+ "LDx=$(LD_$(OS)_$(ENV))" \
+-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
++"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
+ "SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
+ "SHAREDEXT=$(SHAREDEXT_$(OS))" \
+-"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
++"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
+ "AROPTIONS=$(AROPTIONS_$(OS))" \
+ "RANLIB=$(RANLIB_$(OS))" \
+ all
+ 	@cd $(TOOLSsrcDIR); $(MAKE) \
+ "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
+ "CCx=$(CC_$(OS)_$(ENV))" \
+-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
++"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
+ "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
+ "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
+ "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
+@@ -648,7 +648,7 @@
+ "FCx=$(FC_$(OS))" \
+ "CCx=$(CC_$(OS)_$(ENV))" \
+ "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
+-"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
++"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
+ "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
+ "COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
+ "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
+@@ -676,14 +676,19 @@
+ install: install.$(PART)
+ 
+ install.all: install.definitions install.include install.lib \
+-	     install.tools install.help_ notify.user
++	     install.tools install.help_
+ 
+-install.definitions: create.bin copy.definitions change.definitions
++install.definitions: create.bin
+ install.include: create.include copy.include
+ install.tools: create.bin copy.tools
+ install.help_: create.help copy.help
+ 
+ install.lib: create.lib copy.lib.a
++	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
++	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
++	 else \
++	   $(NULL) ; \
++	 fi
+ 	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
+ 	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
+ 	 else \
+@@ -778,8 +783,8 @@
+ 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
+ 
+ copy.lib.so:
+-	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
+-	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
++	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
++	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
+ 
+ copy.lib.sl:
+ 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
+@@ -1787,12 +1792,12 @@
+ 	@echo FOPTIONS=$(FOPTIONS_$(OS))
+ 	@echo FOPTIONSld=$(FOPTIONSld_$(OS))
+ 	@echo SHAREDEXT=$(SHAREDEXT_$(OS))
+-	@echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
++	@echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
+ 	@echo RANLIB=$(RANLIB_$(OS))
+ 	@echo FCx=$(FC_$(OS))
+ 	@echo CCx=$(CC_$(OS)_$(ENV))
+ 	@echo PIC=$(PIC_$(OS)_$(ENV))
+-	@echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
++	@echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
+ 	@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
+ 	@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
+ 	@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
diff --git a/sci-libs/cdf/files/cdf-soname.patch b/sci-libs/cdf/files/cdf-soname.patch
new file mode 100644
index 000000000000..00c1a6153825
--- /dev/null
+++ b/sci-libs/cdf/files/cdf-soname.patch
@@ -0,0 +1,22 @@
+--- src/lib/Makefile.orig	2007-04-19 11:37:42.148327750 +0100
++++ src/lib/Makefile	2007-04-19 12:18:40.109867500 +0100
+@@ -92,7 +92,7 @@
+ 
+ shared.yes: libcdf.$(SHAREDEXT)
+ 
+-libcdf.so \
++libcdf.$(SHAREDEXT) \
+ libcdf.dylib \
+ libcdf.sl: $(OBJs)
+ 	@if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
+@@ -100,8 +100,8 @@
+ 	  echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
+ 	       $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
+ 	else \
+-	  echo $(LD) $(LDFLAGS) -o $@ $(OBJs); \
+-	       $(LD) $(LDFLAGS) -o $@ $(OBJs); \
++	  echo $(LD) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs); \
++	       $(LD) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs); \
+ 	fi 
+ libcdf.o: $(OBJs)
+ 	@echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
diff --git a/sci-libs/cdf/files/digest-cdf-3.1 b/sci-libs/cdf/files/digest-cdf-3.1
new file mode 100644
index 000000000000..91d6a11f4f75
--- /dev/null
+++ b/sci-libs/cdf/files/digest-cdf-3.1
@@ -0,0 +1,21 @@
+MD5 7ff40108c9898ad5cd2fe432ede961cb cdf31-dist-cdf.tar.gz 934350
+RMD160 d9cbc778e8435113b58d68fbc6c4ec749941ca58 cdf31-dist-cdf.tar.gz 934350
+SHA256 62961877b2912c70e813f97f5226de808dc108e637638197ac88fc52ab5dbfec cdf31-dist-cdf.tar.gz 934350
+MD5 6166daa8753e61844c2ff6f38ca9ed4f cdf31-dist-java.tar.gz 689947
+RMD160 5f136e3dfaed34e42c823f759aa796f7ce60a166 cdf31-dist-java.tar.gz 689947
+SHA256 89222f8abe4d336055a21a645da32515ebde69eec76863f87a82cd9440cd01fd cdf31-dist-java.tar.gz 689947
+MD5 c83ee410080d9eecd6d05859eef15820 cdf31crm.pdf 809352
+RMD160 9230cdf6ff1f91b7278c9f7db738f4f2138c6bb9 cdf31crm.pdf 809352
+SHA256 d511236bb5ddc5ba19a97cded9ee4616ce055bb39efb74648acff0d50da6b667 cdf31crm.pdf 809352
+MD5 d0b14ee122f48fcf17f2f17344e302bd cdf31frm.pdf 823902
+RMD160 244531c2db48416f82fd34ac53c5c0075d3ac67d cdf31frm.pdf 823902
+SHA256 7dbcd03fb31d3727f3814828c6a8f6cd8770bae509173862341a9b6856486293 cdf31frm.pdf 823902
+MD5 11e94f9dad362f4db3698aed9d2313e4 cdf31ifd.pdf 172971
+RMD160 a00747e67b97d5d559dce8b7ccfd81f01dcf4c36 cdf31ifd.pdf 172971
+SHA256 6a1b3b85fc059889d813e5b00b6a6824ae16e173be69659461679921fbeed349 cdf31ifd.pdf 172971
+MD5 83c75bbdc9aee4f6c78b88f2d04b4b0f cdf31jrm.pdf 2505807
+RMD160 3d881a472abdb2b0290bc2c568d94913b2d35a89 cdf31jrm.pdf 2505807
+SHA256 70f0f3017430e636c1cffc0c146a0f6bc6bf0fc3ee457063ef7cdc2d2bffa011 cdf31jrm.pdf 2505807
+MD5 acdb95d098b7b83c2e6549f68e815dd5 cdf31ug.pdf 800633
+RMD160 c29a3f85fd766d4476101178175cdbad24f967ff cdf31ug.pdf 800633
+SHA256 02b34ae9e001f2bf12c83912f6e803cbe6e58bcd7ec11ab3787fe89e0fc86198 cdf31ug.pdf 800633
diff --git a/sci-libs/cdf/metadata.xml b/sci-libs/cdf/metadata.xml
index b229aec85b8f..3ff050373d4c 100644
--- a/sci-libs/cdf/metadata.xml
+++ b/sci-libs/cdf/metadata.xml
@@ -2,4 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription lang="en">
+Common Data Format (CDF) is a conceptual data abstraction for storing
+multi-dimensional data sets. The basic component of CDF is a software
+programming interface that is a device independent view of the CDF data
+model. The application developer is insulated from the actual physical
+file format for reasons of conceptual simplicity, device independence,
+and future expandability. CDF files created on any given platform can
+be transported to any other platform on to which CDF is ported and used
+with any CDF tools or layered applications. A more detailed introduction
+to CDF can be found in the CDF User's Guide.
+A comparison between CDF, netCDF, HDF and HDF5 is available at
+http://cdf.gsfc.nasa.gov/html/FAQ.html.
+</longdescription>
 </pkgmetadata>