Version bump. Added LDFLAGS propagation, and link tools dynamically, closing bug #253251

(Portage version: 2.2_rc23/cvs/Linux x86_64)

7 files changed, 56 insertions, 251 deletions

diff --git a/sci-libs/cdf/ChangeLog b/sci-libs/cdf/ChangeLog
index 51dbebb52ecd..3db77e98356b 100644
--- a/sci-libs/cdf/ChangeLog
+++ b/sci-libs/cdf/ChangeLog
@@ -1,6 +1,15 @@
 # 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.16 2008/05/11 12:20:32 dertobi123 Exp $
+# 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 $
+
+*cdf-3.2.4 (02 Feb 2009)
+
+  02 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  files/cdf-3.2-Makefile.patch, -files/cdf-Makefile.patch,
+  -files/cdf-soname.patch, -cdf-3.1.ebuild, -cdf-3.2.1.ebuild,
+  cdf-3.2.1-r1.ebuild, +cdf-3.2.4.ebuild:
+  Version bump. Added LDFLAGS propagation, and link tools dynamically,
+  closing bug #253251
 
   11 May 2008; Tobias Scherbaum <dertobi123@gentoo.org> cdf-3.2.1-r1.ebuild:
   ppc stable, bug #220391
diff --git a/sci-libs/cdf/cdf-3.1.ebuild b/sci-libs/cdf/cdf-3.1.ebuild
deleted file mode 100644
index 2d7f03a1f4b4..000000000000
--- a/sci-libs/cdf/cdf-3.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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.5 2007/12/01 22:19:47 angelos 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
-		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/cdf-3.2.1-r1.ebuild b/sci-libs/cdf/cdf-3.2.1-r1.ebuild
index 28b9432bc3bc..93a83c3e49ad 100644
--- a/sci-libs/cdf/cdf-3.2.1-r1.ebuild
+++ b/sci-libs/cdf/cdf-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2.1-r1.ebuild,v 1.3 2008/05/11 12:20:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-3.2.1-r1.ebuild,v 1.4 2009/02/02 18:34:08 bicatali Exp $
 
 inherit eutils toolchain-funcs multilib versionator
 
@@ -71,10 +71,11 @@ src_compile() {
 			-c cdfNativeLibrary.c \
 			-o cdfNativeLibrary.o \
 			|| die "compiling java lib failed"
-		$(tc-getLD) \
+		$(tc-getCC) \
+			${LDFLAGS} \
 			-L${CDF_LIB} -lcdf -lm \
 			-shared cdfNativeLibrary.o \
-			-soname=libcdfNativeLibrary.so.${PV_SO} \
+			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
 			-o libcdfNativeLibrary.so.${PV_SO} \
 			|| die "linking java lib failed"
 	fi
@@ -99,7 +100,7 @@ src_install() {
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${MY_P}*.pdf
+		doins "${DISTDIR}"/${MY_DP}*.pdf
 		use java || rm "${D}"/usr/share/doc/${PF}/${MY_P}jrm.pdf
 	fi
 
diff --git a/sci-libs/cdf/cdf-3.2.1.ebuild b/sci-libs/cdf/cdf-3.2.4.ebuild
index 4a5f94c8b8f8..06830ec912e9 100644
--- a/sci-libs/cdf/cdf-3.2.1.ebuild
+++ b/sci-libs/cdf/cdf-3.2.4.ebuild
@@ -1,33 +1,34 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2.1.ebuild,v 1.3 2008/05/08 10:22:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-3.2.4.ebuild,v 1.1 2009/02/02 18:34:08 bicatali Exp $
 
-inherit eutils toolchain-funcs multilib versionator
+inherit eutils toolchain-funcs multilib versionator java-pkg-opt-2
 
-MY_P="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
-MY_HP="${MY_P}$(get_version_component_range 3)"
+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_HP}/unix"
+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 ) )"
+	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"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples java ncurses"
 
-RDEPEND="ncurses? ( sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-		java? ( virtual/jdk	dev-java/java-config )"
+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"
 
@@ -71,17 +72,18 @@ src_compile() {
 			-c cdfNativeLibrary.c \
 			-o cdfNativeLibrary.o \
 			|| die "compiling java lib failed"
-		$(tc-getLD) \
+		$(tc-getCC) \
+			${LDFLAGS} \
 			-L${CDF_LIB} -lcdf -lm \
 			-shared cdfNativeLibrary.o \
-			-soname=libcdfNativeLibrary.so.${PV_SO} \
+			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
 			-o libcdfNativeLibrary.so.${PV_SO} \
 			|| die "linking java lib failed"
 	fi
 }
 
 src_test() {
-	emake test || die "test failed"
+	emake -j1 test || die "test failed"
 }
 
 src_install() {
@@ -99,7 +101,7 @@ src_install() {
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${MY_P}*.pdf
+		doins "${DISTDIR}"/${MY_DP}*.pdf
 		use java || rm "${D}"/usr/share/doc/${PF}/${MY_P}jrm.pdf
 	fi
 
@@ -113,8 +115,7 @@ src_install() {
 		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
 		dosym libcdfNativeLibrary.so.${PV_SO} \
 			/usr/$(get_libdir)/libcdfNativeLibrary.so
-		insinto /usr/share/cdf
-		doins */*.jar
+		java-pkg_dojar */*.jar
 		if use examples; then
 			insinto /usr/share/doc/${PF}/examples/java
 			doins examples/*
diff --git a/sci-libs/cdf/files/cdf-3.2-Makefile.patch b/sci-libs/cdf/files/cdf-3.2-Makefile.patch
index 6816002dda0f..6333632abb28 100644
--- a/sci-libs/cdf/files/cdf-3.2-Makefile.patch
+++ b/sci-libs/cdf/files/cdf-3.2-Makefile.patch
@@ -82,3 +82,19 @@
  	@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
  	@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
  	@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
+--- src/tools/Makefile.orig	2009-02-02 18:02:55.000000000 +0000
++++ src/tools/Makefile	2009-02-02 18:07:31.000000000 +0000
+@@ -35,10 +35,10 @@
+ INCLUDEcdf= ../include
+ 
+ CC=$(CCx)
+-CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
+-CFLAGSld=$(COPTIONSld)
++CFLAGS:= $(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf)
++CFLAGSld=$(LDFLAGS) $(COPTIONSld)
+ 
+-LIBCDFa=../lib/libcdf.a 
++LIBCDFa=../lib/libcdf.so.3
+ 
+ LIBs1=$(LIBCDFa) $(SYSLIBS)
+ LIBs2=$(LIBCDFa) $(CURSESLIB) $(SYSLIBS)
diff --git a/sci-libs/cdf/files/cdf-Makefile.patch b/sci-libs/cdf/files/cdf-Makefile.patch
deleted file mode 100644
index edf65506d8e9..000000000000
--- a/sci-libs/cdf/files/cdf-Makefile.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- 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
deleted file mode 100644
index 00c1a6153825..000000000000
--- a/sci-libs/cdf/files/cdf-soname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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)