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

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

5 files changed, 81 insertions, 14 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/Manifest b/sci-libs/udunits/Manifest
index 74ac02d59dc5..ed55367af0b1 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX udunits-1.12.9-fixingtests.patch 324 RMD160 e6a4ef762126a7ef5b9941f32000eed7daffe922 SHA1 36b27361c5c49d44dcd9fa9ada9724133c57aa88 SHA256 83a6b89c979961876987d2f8fbe9737e3533201875a0735e6d590ba173606e1b
 AUX udunits_configure_in.patch 241 RMD160 c77ccf67ffa6c1e5327e886a7cf156e8523bbf29 SHA1 56082a6fdc245778bde4fd77bbbd66a7b9c0a43a SHA256 374feb8aff3d872d90f21f48ca4bcd3bcc6336e43bf7b4083373c1c76c60ab8e
 AUX udunits_customize.patch 375 RMD160 8ce239ec0b949251b524ba46e7a7b8e12089210b SHA1 158c780200644752025f3a363a693f2a3a090c0b SHA256 3eaf1e897e11bcd3ba52d16e9d3ae9fcad2a8bc0b19807dc7ca7c0bd3724bdc3
 AUX udunits_lib_make.patch 895 RMD160 bfacf396499ee0c760622cf50643832d76e1b5ef SHA1 669355374a318d782f488b23ed19a37e53258055 SHA256 69f402f8f526983a1b344a042782b81339f9b17ae662ac25c0838d2a561d44c5
@@ -5,8 +9,17 @@ AUX udunits_master_mk.patch 1234 RMD160 9420ad8d9cbade33b1b73b8157484c20d12df0a0
 DIST udunits-1.12.0.tar.Z 364397 RMD160 4f14901674833da05301b3aa2c3d492c24df8e62 SHA1 e48ef4511b79f5e5fed7dc3f1b3ea3441ff318ad SHA256 e9ffbef762bc02bf67d68a632a86cb437543bf50c039976c7042b0e49b953e70
 DIST udunits-1.12.1.tar.Z 365873 RMD160 fb2f0442673ca47d302782c84ce37b8da1e16535 SHA1 ee37ca61eb1dcf34165b7573cc1645824bd6968d SHA256 eea071b4518a2d929d0ae59a249a9c622ed0d011e0c2cbe39ddb021a7fc05e00
 DIST udunits-1.12.3.tar.Z 422795 RMD160 49043f1b51b16987e7929da46f474807155d611a SHA1 ebff0ae6b753a3e51e13a679f72624d3ce60175c SHA256 3e4d310c059838ab37f44c6361f90c8213777468bf3f1dc9ae9c7692d2586bf9
+DIST udunits-2.1.11.tar.gz 1034069 RMD160 b444824e2dc32672748f8b3b5aa45fbc80018467 SHA1 dba20024b2c091b857de74768c0afbe0971aa641 SHA256 e4ab7b4039d583d902ed7e6b1e67bf79b57299e3a59364f9ee20fcde1054231b
 EBUILD udunits-1.12.0.ebuild 1848 RMD160 e65ac4434f42a198b8b36b50a8028c9c0d0ae6cc SHA1 b90b13b58699a1cab31358cc4b8eb5b461261f49 SHA256 3842039d7fa26490ca7a03254daffe11ed1f1dd599e4fdf9215dc26a045eed0a
 EBUILD udunits-1.12.1.ebuild 2009 RMD160 e37f69c4cdb36883449d3b8046a000cf96efee3c SHA1 d038c02ac30cb3b48c51e3ceb3a6de00fd5aa814 SHA256 122a7d72d7f0e5eadd8391c1b5f763d4d92ba679b222858067a0197ed082ceb2
-EBUILD udunits-1.12.3.ebuild 2663 RMD160 abd10f4abac33ff11bf8a1783667534e7d5cb87b SHA1 d56c71fe954dc07dacd56975f25a583e140a14d2 SHA256 cbff3968a86ef716afdd1150cb7e388c6872aedc97c0aa4e39203fd9b8489d2a
-MISC ChangeLog 2708 RMD160 5aaaee16e8fb5736b7ba222547c4bdf7bb7e0ee7 SHA1 876a90222d43a4bc4a99132e98ba44635aaf2c09 SHA256 5e25dc88e52c419ff8c414da9ecc2aa3f424abc6e6d6c16c5efe26664c2d68ca
+EBUILD udunits-1.12.3.ebuild 2685 RMD160 1025f69331bff4b7a7370da76d844730fcaea113 SHA1 67aeef1463513b3ce3973aab60480ed6d9ca1f86 SHA256 8fd10c47d467e23270eb45ec8f63bc3b002e15e5e6f2fbec307b0bc160ab5805
+EBUILD udunits-2.1.11.ebuild 919 RMD160 cba61c1d23e3619d98e7d3cc73e6cf4c0a410f47 SHA1 4dc4c17e72a72e68c7fbbff95b090259a642602c SHA256 06e3e4f880e0b6c4535c494d57f3b23b367fc394f65314d0845ce4aaf1ee7b23
+MISC ChangeLog 2964 RMD160 36575c239f1213dac38b51fdbc0feb49c7b9ffa6 SHA1 1677f51ee606dc9dc3bca915cc2390d4eb17952a SHA256 0215f01447fba7fdb12c3bd849e2324d10dcda60ef5d46fdf2d2653125d969fe
 MISC metadata.xml 583 RMD160 7e78ab354043f23ecdaca5a0300aa7a01268b536 SHA1 0683289e5912587c6c95d2985c8e93292f1241e8 SHA256 b0e23466ef6dbca44936882acc679f41e998a5c7a4771fc3fc6fcaa78d2141e3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkscgqgACgkQ1ycZbhPLE2BLuACeOh41MN8ZKMN15WdhzlGs1+W6
+0J4AoJOMrQ6dkT5FQ4h1VcG7ssYE9VuF
+=uhLk
+-----END PGP SIGNATURE-----
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
+}