From beee8327085d5995562bb4d163ee94c954a04f6a Mon Sep 17 00:00:00 2001
From: Sebastien Fabbro <bicatali@gentoo.org>
Date: Tue, 6 May 2008 12:56:09 +0000
Subject: Version bump with important security fix (bug #220391). Also fixed
 patch for testing. Restricting mirroring for now. (Portage version:
 2.1.5_rc6)

---
 sci-libs/cdf/ChangeLog                  |  12 ++-
 sci-libs/cdf/cdf-3.2.1.ebuild           | 126 ++++++++++++++++++++++++++++++++
 sci-libs/cdf/cdf-3.2.ebuild             | 122 -------------------------------
 sci-libs/cdf/files/cdf-3.2-soname.patch |   4 +-
 4 files changed, 138 insertions(+), 126 deletions(-)
 create mode 100644 sci-libs/cdf/cdf-3.2.1.ebuild
 delete mode 100644 sci-libs/cdf/cdf-3.2.ebuild

(limited to 'sci-libs/cdf')

diff --git a/sci-libs/cdf/ChangeLog b/sci-libs/cdf/ChangeLog
index 29753f34cb3b..ef7f650f1a76 100644
--- a/sci-libs/cdf/ChangeLog
+++ b/sci-libs/cdf/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2007/12/03 18:41:01 bicatali Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.11 2008/05/06 12:56:08 bicatali Exp $
+
+*cdf-3.2.1 (06 May 2008)
+
+  06 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/cdf-3.2-soname.patch, -cdf-3.2.ebuild, +cdf-3.2.1.ebuild:
+  Version bump with important security fix (bug #220391). Also fixed patch
+  for testing. Since upstream did not change names, restricting mirroring
+  for now.
 
 *cdf-3.2 (03 Dec 2007)
 
diff --git a/sci-libs/cdf/cdf-3.2.1.ebuild b/sci-libs/cdf/cdf-3.2.1.ebuild
new file mode 100644
index 000000000000..6c926ef21211
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.2.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2008 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.1 2008/05/06 12:56:08 bicatali Exp $
+
+inherit eutils toolchain-funcs multilib versionator
+
+MY_P="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
+MY_HP="${MY_P}$(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_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 )"
+
+RESTRICT="mirror"
+
+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-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/cdf-3.2.ebuild b/sci-libs/cdf/cdf-3.2.ebuild
deleted file mode 100644
index 9a8262d60618..000000000000
--- a/sci-libs/cdf/cdf-3.2.ebuild
+++ /dev/null
@@ -1,122 +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.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-soname.patch b/sci-libs/cdf/files/cdf-3.2-soname.patch
index d0357bc23f5a..e4f28617faca 100644
--- a/sci-libs/cdf/files/cdf-3.2-soname.patch
+++ b/sci-libs/cdf/files/cdf-3.2-soname.patch
@@ -15,8 +15,8 @@
  	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); \
++	  echo $(LD) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS); \
++	       $(LD) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS); \
  	fi
  
  libcdf.o: $(OBJs)
-- 
cgit v1.2.3-65-gdbad