Version bump

(Portage version: 2.1.4_rc4)

7 files changed, 260 insertions, 60 deletions

diff --git a/sci-libs/cdf/ChangeLog b/sci-libs/cdf/ChangeLog
index 5571a39445fd..29753f34cb3b 100644
--- a/sci-libs/cdf/ChangeLog
+++ b/sci-libs/cdf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2007/12/01 22:19:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.10 2007/12/03 18:41:01 bicatali Exp $
+
+*cdf-3.2 (03 Dec 2007)
+
+  03 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/cdf-3.2-Makefile.patch, +files/cdf-3.2-soname.patch,
+  -cdf-2.7.ebuild, +cdf-3.2.ebuild:
+  Version bump
 
   01 Dec 2007; Christoph Mende <angelos@gentoo.org> cdf-3.1.ebuild:
   Stable on amd64 wrt bug #200951
diff --git a/sci-libs/cdf/cdf-2.7.ebuild b/sci-libs/cdf/cdf-2.7.ebuild
deleted file mode 100644
index d99f4bace7b9..000000000000
--- a/sci-libs/cdf/cdf-2.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-2.7.ebuild,v 1.2 2005/08/20 07:55:57 hansmi Exp $
-
-MY_P="${P/-}"
-MY_P="${MY_P/.}"
-
-DESCRIPTION="CDF library and toolkit for storing, manipulating, and accessing multi-dimensional data sets"
-HOMEPAGE="http://nssdc.gsfc.nasa.gov/cdf/cdf_home.html"
-SRC_URI="ftp://nssdcftp.gsfc.nasa.gov/standards/cdf/dist/${MY_P}/unix/${MY_P}-dist-cdf.tar.gz
-	java? ( ftp://nssdcftp.gsfc.nasa.gov/standards/cdf/dist/${MY_P}/unix/${MY_P}-dist-java.tar.gz )"
-LICENSE="CDF"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="ncurses java"
-
-RDEPEND="ncurses? ( sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-		java? ( virtual/jdk
-				dev-java/java-config )"
-
-S=${WORKDIR}/${MY_P}-dist
-
-src_compile() {
-	local myconf
-	if use ncurses; then
-		myconf="CURSES=yes"
-	else
-		myconf="CURSES=no"
-	fi
-	emake OS=linux ENV=gnu ${myconf} all || die "make failed"
-	make test || die "test failed"
-	if use java; then
-		export CDF_BASE="${S}"
-		export CDF_LIB="${S}/src/lib"
-		cd cdfjava/jni
-		cc -c cdfNativeLibrary.c -I${CDF_BASE}/src/include \
-			-I$(java-config -O)/include -I$(java-config -O)/include/linux \
-			-o cdfNativeLibrary.o || die "cc failed"
-		ld -shared cdfNativeLibrary.o -L${CDF_LIB} -lcdf \
-			-o ../lib/libcdfNativeLibrary.so -lc -lm || die "ld failed"
-	fi
-}
-
-src_install() {
-	make INSTALLDIR="${D}/usr" install || die "install failed"
-	if use java; then
-		cd ${S}/cdfjava
-		dolib lib/libcdfNativeLibrary.so
-		insinto /usr/share/cdf
-		doins */*.jar
-	fi
-}
diff --git a/sci-libs/cdf/cdf-3.2.ebuild b/sci-libs/cdf/cdf-3.2.ebuild
new file mode 100644
index 000000000000..9a8262d60618
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.2.ebuild
@@ -0,0 +1,122 @@
+# 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.2.ebuild,v 1.1 2007/12/03 18:41:01 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_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_P}crm.pdf
+		   ${SRC_BASE}/${MY_P}_documentation/${MY_P}frm.pdf
+		   ${SRC_BASE}/${MY_P}_documentation/${MY_P}ifd.pdf
+		   ${SRC_BASE}/${MY_P}_documentation/${MY_P}prm.pdf
+		   ${SRC_BASE}/${MY_P}_documentation/${MY_P}ug.pdf
+	java? ( ${SRC_BASE}/${MY_P}_documentation/${MY_P}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-readonly"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# respect cflags, remove useless scripts
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-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
+
+}
diff --git a/sci-libs/cdf/files/cdf-3.2-Makefile.patch b/sci-libs/cdf/files/cdf-3.2-Makefile.patch
new file mode 100644
index 000000000000..6816002dda0f
--- /dev/null
+++ b/sci-libs/cdf/files/cdf-3.2-Makefile.patch
@@ -0,0 +1,84 @@
+--- Makefile.orig	2007-12-03 17:38:59.450705131 +0000
++++ Makefile	2007-12-03 17:46:11.117238346 +0000
+@@ -661,17 +661,17 @@
+ "PIC=$(PIC_$(OS)_$(ENV))" \
+ "CCx=$(CC_$(OS)_$(ENV))" \
+ "LDx=$(LD_$(OS)_$(ENV))" \
+-"COPTIONS=$(UCOPTIONS) $(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))" \
+@@ -681,9 +681,9 @@
+ "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))" \
++"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
+ "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
+ "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
+ "SHAREDEXT=$(SHAREDEXT_$(OS))" \
+@@ -711,12 +711,17 @@
+ install.all: install.definitions install.include install.lib \
+ 	     install.tools install.help_ notify.user
+ 
+-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 \
+@@ -811,8 +816,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
+@@ -1851,15 +1856,15 @@
+ show.supported:
+ 	@echo SHARED is $(SUPPORTED.$(SHARED_$(OS)))
+ 	@echo CURSES is $(SUPPORTED.$(CURSES_$(OS)_$(ENV)))
+-	@echo FOPTIONS=$(FOPTIONS_$(OS))
++	@echo FOPTIONS=$(FFLAGS) $(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-3.2-soname.patch b/sci-libs/cdf/files/cdf-3.2-soname.patch
new file mode 100644
index 000000000000..d0357bc23f5a
--- /dev/null
+++ b/sci-libs/cdf/files/cdf-3.2-soname.patch
@@ -0,0 +1,22 @@
+--- src/lib/Makefile.orig	2007-12-03 17:47:58.476149933 +0000
++++ src/lib/Makefile	2007-12-03 17:50:34.353032850 +0000
+@@ -94,7 +94,7 @@
+ 
+ shared.yes: libcdf.$(SHAREDEXT)
+ 
+-libcdf.so \
++libcdf.$(SHAREDEXT) \
+ libcdf.dylib \
+ libcdf.sl: $(OBJs)
+ 	@if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
+@@ -102,8 +102,8 @@
+ 	  echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
+ 	       $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
+ 	else \
+-	  echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
+-	       $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
++	  echo $(LD) $(LDFLAGS) -Wl,-soname,libdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS); \
++	       $(LD) $(LDFLAGS) -Wl,-soname,libdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS); \
+ 	fi
+ 
+ libcdf.o: $(OBJs)
diff --git a/sci-libs/cdf/files/digest-cdf-2.7 b/sci-libs/cdf/files/digest-cdf-2.7
deleted file mode 100644
index e3c441f92110..000000000000
--- a/sci-libs/cdf/files/digest-cdf-2.7
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1b95b51f54a0bb787a97aa733381f7a9 cdf27-dist-cdf.tar.gz 872734
-RMD160 69a8fb9d63d1f6e635e85b15dc886b5f96c008b3 cdf27-dist-cdf.tar.gz 872734
-SHA256 eb17bb74bc3b5338d1b4f0139744257f3a5a7c0ff89f7f7015def546ef9d02fd cdf27-dist-cdf.tar.gz 872734
-MD5 c7803f13511a7c2753fdcab45a4e6bee cdf27-dist-java.tar.gz 552932
-RMD160 1f322fa313f749463eab4999f30804a2ff4ee87e cdf27-dist-java.tar.gz 552932
-SHA256 366cc03593511b35973bd44fd590f67aa22a3701b5f1c26cbed4172c666915fd cdf27-dist-java.tar.gz 552932
diff --git a/sci-libs/cdf/files/digest-cdf-3.2 b/sci-libs/cdf/files/digest-cdf-3.2
new file mode 100644
index 000000000000..aafa4db63dc0
--- /dev/null
+++ b/sci-libs/cdf/files/digest-cdf-3.2
@@ -0,0 +1,24 @@
+MD5 8c665c013f6fe1d2ad4968dfdc14431f cdf32-dist-cdf.tar.gz 966523
+RMD160 1913835d597bae33138f31218147d3c4bc068a12 cdf32-dist-cdf.tar.gz 966523
+SHA256 2da085abfb3380849befc42cbfa0e8b663e2395a05a423583be4b07dd2fb14c0 cdf32-dist-cdf.tar.gz 966523
+MD5 8aba71b8b38033a0aa591476110559bc cdf32-dist-java.tar.gz 673976
+RMD160 7781e5db7606f7cd6cadb44fa4364adac47ebf14 cdf32-dist-java.tar.gz 673976
+SHA256 6a9c67b985fe34fc4be6b118c1c89417e89f38b5846656d5e64bff2cd19f375b cdf32-dist-java.tar.gz 673976
+MD5 5b3b357353fddf42f5eff8bbf128088e cdf32crm.pdf 984808
+RMD160 36a2295f76278baba6c8ba8b6881ff301b1de80a cdf32crm.pdf 984808
+SHA256 69a396a4e8969e561854945918e51bbf5df3292d4c462028df24d8b9dee24f6d cdf32crm.pdf 984808
+MD5 0e2ecc6c94984f69c22cfaf3c7a82222 cdf32frm.pdf 1022045
+RMD160 505b1edac1070a1f033ec22dedf8abd8558e9294 cdf32frm.pdf 1022045
+SHA256 83e15705cdb7e23649f81ff80d844817b73721789c11aaacc094591bff28b937 cdf32frm.pdf 1022045
+MD5 343473403b7ce433ff774f71e5a82a51 cdf32ifd.pdf 199629
+RMD160 a5d7cb2459594f6c75afb092c1ebd4b7c4600fb5 cdf32ifd.pdf 199629
+SHA256 308425e647124aa20fffeb4453e13d6f6d6ba7aa770771c652a21eb4a9dbaec9 cdf32ifd.pdf 199629
+MD5 0e2da8df5a3d2fee881b3f7b67c43f72 cdf32jrm.pdf 2700352
+RMD160 a0473c0487cae7ea479a49edf215506936612cfc cdf32jrm.pdf 2700352
+SHA256 9e1501896fbc08c97efcd8fc6d2dd19d10c820c46c566104826d48b7eec4d642 cdf32jrm.pdf 2700352
+MD5 f52d4d12e2570188bbeb1aea3df472b2 cdf32prm.pdf 503273
+RMD160 9160bcc5aff617102d6571a543b40ea647413204 cdf32prm.pdf 503273
+SHA256 5eedd50135851d82146d4516a573965e44b89f9afd84dcfa197dd7599a7b37da cdf32prm.pdf 503273
+MD5 b4ede7e8e9f77525b56754836af25de2 cdf32ug.pdf 664399
+RMD160 37b7b2aced89d5aa5a4263312df93a20f7499344 cdf32ug.pdf 664399
+SHA256 905ed52af5adc1b0bd8949743ac2147846a543b9d489f44fa1c4c451d9e3456f cdf32ug.pdf 664399