[gentoo-commits] gentoo-x86 commit in sci-libs/cdf: ChangeLog cdf-3.2.1-r1.ebuild cdf-3.2.4.ebuild cdf-3.1.ebuild cdf-3.2.1.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    09/02/02 18:34:08

  Modified:             ChangeLog cdf-3.2.1-r1.ebuild
  Added:                cdf-3.2.4.ebuild
  Removed:              cdf-3.1.ebuild cdf-3.2.1.ebuild
  Log:
  Version bump. Added LDFLAGS propagation, and link tools dynamically, closing bug #253251
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.17                 sci-libs/cdf/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	11 May 2008 12:20:32 -0000	1.16
+++ ChangeLog	2 Feb 2009 18:34:08 -0000	1.17
@@ -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@g.o>
+  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@g.o> cdf-3.2.1-r1.ebuild:
   ppc stable, bug #220391



1.4                  sci-libs/cdf/cdf-3.2.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/cdf-3.2.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/cdf-3.2.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/cdf-3.2.1-r1.ebuild?r1=1.3&r2=1.4

Index: cdf-3.2.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-3.2.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cdf-3.2.1-r1.ebuild	11 May 2008 12:20:32 -0000	1.3
+++ cdf-3.2.1-r1.ebuild	2 Feb 2009 18:34:08 -0000	1.4
@@ -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 @@
 			-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 @@
 
 	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
 



1.1                  sci-libs/cdf/cdf-3.2.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/cdf-3.2.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/cdf-3.2.4.ebuild?rev=1.1&content-type=text/plain

Index: cdf-3.2.4.ebuild
===================================================================
# 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.4.ebuild,v 1.1 2009/02/02 18:34:08 bicatali Exp $

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_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 )
	java? ( >=virtual/jre-1.5 )"
DEPEND="ncurses? ( sys-libs/ncurses )
	java? ( >=virtual/jdk-1.5 )"

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-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/*
	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/*
		fi
	fi

}