Version bump and fixed failing tests (bug #295722, thanks Kacper Kowalik)

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

4 files changed, 66 insertions, 12 deletions

diff --git a/sci-libs/udunits/ChangeLog b/sci-libs/udunits/ChangeLog
index 68a7e355f448..54fc2215dbcd 100644
--- a/sci-libs/udunits/ChangeLog
+++ b/sci-libs/udunits/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/udunits
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/ChangeLog,v 1.6 2008/11/25 07:35:36 nerdboy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/ChangeLog,v 1.7 2009/12/07 03:41:00 bicatali Exp $
+
+*udunits-2.1.11 (07 Dec 2009)
+
+  07 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  udunits-1.12.3.ebuild, +files/udunits-1.12.9-fixingtests.patch,
+  +udunits-2.1.11.ebuild:
+  Version bump and fixed failing tests (bug #295722, thanks Kacper Kowalik)
 
   25 Nov 2008; Steve Arnold <nerdboy@gentoo.org> udunits-1.12.3.ebuild:
   Fixed configure and build issues, added manual install commands (closes 
diff --git a/sci-libs/udunits/files/udunits-1.12.9-fixingtests.patch b/sci-libs/udunits/files/udunits-1.12.9-fixingtests.patch
new file mode 100644
index 000000000000..56c9f94a4755
--- /dev/null
+++ b/sci-libs/udunits/files/udunits-1.12.9-fixingtests.patch
@@ -0,0 +1,11 @@
+--- udunits-1.12.3.orig/src/Makefile.in	2003-08-29 20:27:07.000000000 +0200
++++ udunits-1.12.3/src/Makefile.in	2009-12-05 12:02:30.223865360 +0100
+@@ -30,6 +30,8 @@
+ 
+ all:		port/all lib/all udunits/all @PERL_ALL@
+ 
++check:		test
++
+ test:		FORCE udunits/test perl_test
+ 
+ install:	port/install lib/install udunits/install \
diff --git a/sci-libs/udunits/udunits-1.12.3.ebuild b/sci-libs/udunits/udunits-1.12.3.ebuild
index 1f65775dfa10..cdf3167015f1 100644
--- a/sci-libs/udunits/udunits-1.12.3.ebuild
+++ b/sci-libs/udunits/udunits-1.12.3.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/udunits/udunits-1.12.3.ebuild,v 1.3 2008/11/25 07:35:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/udunits-1.12.3.ebuild,v 1.4 2009/12/07 03:41:00 bicatali Exp $
 
 inherit eutils flag-o-matic fortran perl-module toolchain-funcs
 
@@ -25,9 +25,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i -e "s:\${prefix}/etc:/etc:g" \
-	    -i -e "s:\${prefix}/man:\${prefix}/share/man:g" \
-	    -i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):g" \
-	    configure || die "sed 1 failed"
+		-i -e "s:\${prefix}/man:\${prefix}/share/man:g" \
+		-i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):g" \
+		configure || die "sed 1 failed"
+	epatch "${FILESDIR}/${P}-fixingtests.patch"
 }
 
 src_compile() {
@@ -43,12 +44,12 @@ src_compile() {
 	econf || die "econf failed"
 
 	cd "${S}"/lib
-	    emake || die "emake lib failed"
+		emake || die "emake lib failed"
 	cd "${S}"
 
 	cd "${S}"/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
+		perl-module_src_prep
+		perl-module_src_compile
 	cd "${S}"
 
 	# random compile failures with -jN (when N > 1)
@@ -77,12 +78,12 @@ src_install() {
 
 	fixlocalpod
 	cd "${S}"/perl
-	    perl-module_src_install
+		perl-module_src_install
 	cd "${S}"
 
 	# Clean up left-over cruft...  (yes, this is still needed)
 	find "${D}" -type f -a \( -name perllocal.pod -o -name .packlist \
-	    -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+		-o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 	find "${D}" -type d -depth -exec rmdir {} 2>/dev/null ';'
 	chmod -R u+w "${D}"/*
 }
diff --git a/sci-libs/udunits/udunits-2.1.11.ebuild b/sci-libs/udunits/udunits-2.1.11.ebuild
new file mode 100644
index 000000000000..226cf3b780a7
--- /dev/null
+++ b/sci-libs/udunits/udunits-2.1.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/udunits-2.1.11.ebuild,v 1.1 2009/12/07 03:41:00 bicatali Exp $
+
+EAPI=2
+
+DESCRIPTION="Library for manipulating units of physical quantities"
+HOMEPAGE="http://www.unidata.ucar.edu/packages/udunits/"
+SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="UCAR-Unidata"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+
+DEPEND=""
+RDEPEND=""
+
+IUSE="doc"
+
+src_prepare() {
+	# respect user's flags
+	sed -i \
+		-e 's/-O//g' configure || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc CHANGE_LOG ANNOUNCEMENT
+	doinfo udunits2.info prog/udunits2prog.info
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins udunits2.html udunits2.pdf
+		doins prog/udunits2prog.html prog/udunits2prog.pdf
+	fi
+}