Version bump, removed old version

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

7 files changed, 123 insertions, 81 deletions

diff --git a/sci-libs/udunits/ChangeLog b/sci-libs/udunits/ChangeLog
index 48f7e1e1b24a..2adf66557c48 100644
--- a/sci-libs/udunits/ChangeLog
+++ b/sci-libs/udunits/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/udunits
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/ChangeLog,v 1.8 2009/12/15 06:12:18 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/ChangeLog,v 1.9 2010/06/23 08:29:31 jlec Exp $
+
+*udunits-2.1.15 (23 Jun 2010)
+*udunits-1.12.11 (23 Jun 2010)
+
+  23 Jun 2010; Justin Lecher <jlec@gentoo.org> -udunits-1.12.0.ebuild,
+  -udunits-1.12.3.ebuild, -files/udunits-1.12.9-fixingtests.patch,
+  +udunits-1.12.11.ebuild, +files/udunits-1.12.11-fixingtests.patch,
+  +udunits-2.1.15.ebuild, +files/udunits-2.1.15-autotools.patch:
+  Version bump, removed old version
 
 *udunits-2.1.11-r1 (15 Dec 2009)
 
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index e5c4e73b9cb8..3a7f64821de5 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX udunits-1.12.9-fixingtests.patch 324 RMD160 e6a4ef762126a7ef5b9941f32000eed7daffe922 SHA1 36b27361c5c49d44dcd9fa9ada9724133c57aa88 SHA256 83a6b89c979961876987d2f8fbe9737e3533201875a0735e6d590ba173606e1b
+AUX udunits-1.12.11-fixingtests.patch 324 RMD160 e6a4ef762126a7ef5b9941f32000eed7daffe922 SHA1 36b27361c5c49d44dcd9fa9ada9724133c57aa88 SHA256 83a6b89c979961876987d2f8fbe9737e3533201875a0735e6d590ba173606e1b
 AUX udunits-2.1.11-autotools.patch 2122 RMD160 b4419d6e003b92050d5d6567e67edc7151532ddb SHA1 caf51bb2a4a1b526191c3a0b93dffb84ea3dbaca SHA256 81df413054cb7956b07a652c7e7201ed57e977afd4cc0a5c9838c23dc54a60ea
+AUX udunits-2.1.15-autotools.patch 1850 RMD160 d9816d49de6f40806c99e0825400747e5cf264ef SHA1 e6ea8e240bfaa35e650f0a0915c6815de6eff533 SHA256 c4ea7d50d51cfc19be9719cd62d153f74d29c565e17fd969dc69a64096599972
 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
 AUX udunits_master_mk.patch 1234 RMD160 9420ad8d9cbade33b1b73b8157484c20d12df0a0 SHA1 ca1a8b1c1a8767d13c08bc8819a53cc99cf73e20 SHA256 2d353ab90e4c48395e31016e4585272d0b078b5c79e21ce96acf1d5591d213ee
-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-1.12.11.tar.gz 239271 RMD160 cc1bffe18ba042cc6e19243a2efc52242649493f SHA1 da4c3c50764b03db4cc83c679670203280aac51a SHA256 846c834130ba9651b4792ab3ce10731184cf5bd90620d92ff67f22ae8ea914e1
 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
+DIST udunits-2.1.15.tar.gz 1056530 RMD160 44d7f3c51fce3a91f7dc5a3294801cb51fcd35f1 SHA1 912f45fc13e9754bb2aeedb04f693c9dc4c98724 SHA256 9f89196c3ffa5a4edebb944e17b38c7b20dc16b546311ea54272494b3c4b036d
 EBUILD udunits-1.12.1.ebuild 2009 RMD160 e37f69c4cdb36883449d3b8046a000cf96efee3c SHA1 d038c02ac30cb3b48c51e3ceb3a6de00fd5aa814 SHA256 122a7d72d7f0e5eadd8391c1b5f763d4d92ba679b222858067a0197ed082ceb2
-EBUILD udunits-1.12.3.ebuild 2685 RMD160 1025f69331bff4b7a7370da76d844730fcaea113 SHA1 67aeef1463513b3ce3973aab60480ed6d9ca1f86 SHA256 8fd10c47d467e23270eb45ec8f63bc3b002e15e5e6f2fbec307b0bc160ab5805
+EBUILD udunits-1.12.11.ebuild 2687 RMD160 5b3d99ae7e8d292129ea2789174ce63462ca7737 SHA1 c14feaaad65ddf6fce7a33c62ed72706ed0ebfdf SHA256 314d159c8ff0856c8fcefa3757a2e47767775c884f6ed7429f2ce3c416753b09
 EBUILD udunits-2.1.11-r1.ebuild 1029 RMD160 73ab699ae58f77c2389f8a05f4057030aa52060c SHA1 8730743a3da3252d3463ed464344224495e013c3 SHA256 ba121616cc819187169e5bd105706e1dca811b0d50f199130ef59cc2d0e4bf34
-MISC ChangeLog 3179 RMD160 4668e7c88afb4bf26d867222a797398c7fc9b91d SHA1 9463a95e0e0cfc2f026b267d8fd6ecdc640d1bd5 SHA256 bccbe2f0f47a6bca24500f3c4d5e14acd4ca144c07bf06f3b270ca3772c68816
+EBUILD udunits-2.1.15.ebuild 1022 RMD160 a9817fe5d8ff2f0970200774a596804fff53aa3c SHA1 343ef3da810f80ed0d4825ce77227fc7c2c88868 SHA256 8f8d80c355f5bd64c4d3200d6f76954e2be523b10b39c591b2e41219003ffbe2
+MISC ChangeLog 3546 RMD160 791d0fc1147431d8d83562b6a289eac9d4623a37 SHA1 e63c01faf86a85d49a8b40e998bae5c0b6c4c38b SHA256 2568a3de17650b4a2f5646e4ba45c4cc3688d601c584472fb6139d892a310275
 MISC metadata.xml 583 RMD160 7e78ab354043f23ecdaca5a0300aa7a01268b536 SHA1 0683289e5912587c6c95d2985c8e93292f1241e8 SHA256 b0e23466ef6dbca44936882acc679f41e998a5c7a4771fc3fc6fcaa78d2141e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAksnMfIACgkQ1ycZbhPLE2AHEgCcDdaG2Trkswbl0ELQrm+8Kvok
-5DEAn2vLxKqm50joxgSVCajEWbh4KhHf
-=BGtZ
+iEYEARECAAYFAkwhxfIACgkQgAnW8HDreRYdswCdHsSnjaTWM5PIQqotWzBEtSEd
+d1AAoI0Mf5SR8YX0DBMLtiXjcbCa8hnr
+=0hyu
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/udunits/files/udunits-1.12.9-fixingtests.patch b/sci-libs/udunits/files/udunits-1.12.11-fixingtests.patch
index 56c9f94a4755..56c9f94a4755 100644
--- a/sci-libs/udunits/files/udunits-1.12.9-fixingtests.patch
+++ b/sci-libs/udunits/files/udunits-1.12.11-fixingtests.patch
diff --git a/sci-libs/udunits/files/udunits-2.1.15-autotools.patch b/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
new file mode 100644
index 000000000000..31c67656a815
--- /dev/null
+++ b/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
@@ -0,0 +1,61 @@
+diff --git a/Makefile.am b/Makefile.am
+index 728e587..3c84c1b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,11 +6,11 @@
+ #
+ ## Process this file with automake to produce Makefile.in
+ if COND_EXPAT
+-    SUBDIRS		= expat lib prog
++    SUBDIRS		= lib prog
+ else
+     SUBDIRS		= lib prog
+ endif
+-DIST_SUBDIRS		= expat lib prog test
++DIST_SUBDIRS		= lib prog test
+ info_TEXINFOS		= udunits2.texi
+ udunits2_TEXINFOS	= success.texi failure.texi make.texi
+ EXTRA_DIST = \
+diff --git a/configure.ac b/configure.ac
+index 097f6eb..091e673 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@ AC_INIT(UDUNITS, 2.1.15, support-udunits@unidata.ucar.edu)
+ AC_CONFIG_SRCDIR([lib/converter.c])
+ AC_CONFIG_AUX_DIR([.])
+ AM_INIT_AUTOMAKE([foreign subdir-objects])
+-AC_CONFIG_HEADERS([config.h expat/expat_config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ CFLAGS_COVERAGE=''
+ LIBS_COVERAGE=''
+@@ -37,7 +37,7 @@ AC_ARG_ENABLE([debug],
+     CFLAGS="-g${CFLAGS:+ $CFLAGS}"
+     debug=true ;;
+   no)
+-    CFLAGS="-O${CFLAGS:+ $CFLAGS}"
++    CFLAGS="${CFLAGS:+ $CFLAGS}"
+     debug=false ;;
+   *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
+ esac],
+@@ -110,20 +110,12 @@ AM_CONDITIONAL([HAVE_CUNIT], [test "$LD_CUNIT"])
+ AC_C_CONST
+ AC_TYPE_SIZE_T
+ 
+-# Needed for the Expat subpackage:
+-AC_C_BIGENDIAN([byteorder=4321], [byteorder=1234])
+-AC_DEFINE_UNQUOTED([BYTEORDER], [$byteorder],
+-    [Define to 4321 for big-endian and 1234 for little-endian])
+-AC_DEFINE([XML_CONTEXT_BYTES], 1024,
+-    [How much context to retain around the current parse point.])
+-
+ # Checks for library functions.
+ AC_CHECK_FUNCS([floor memmove memset modf pow strcasecmp strdup strpbrk])
+ 
+ AC_PROG_LIBTOOL
+ 
+ AC_CONFIG_FILES([Makefile
+-		 expat/Makefile
+                  lib/Makefile
+                  lib/xmlFailures/Makefile
+                  lib/xmlSuccesses/Makefile
diff --git a/sci-libs/udunits/udunits-1.12.0.ebuild b/sci-libs/udunits/udunits-1.12.0.ebuild
deleted file mode 100644
index b4fce0955f66..000000000000
--- a/sci-libs/udunits/udunits-1.12.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/udunits-1.12.0.ebuild,v 1.4 2007/07/13 06:57:51 mr_bones_ Exp $
-
-inherit eutils
-
-# This is the Unidata Units library, which supports conversion of unit
-# specifications between formatted and binary forms, arithmetic
-# manipulation of unit specifications, and conversion of values between
-# compatible scales of measurement.
-
-#inherit perl-app
-
-IUSE=""
-S=${WORKDIR}/${P}/src
-SP=${WORKDIR}/${P}/src/perl
-DESCRIPTION="The UCAR/Unidata Units library"
-HOMEPAGE="http://www.unidata.ucar.edu/packages/udunits/"
-SRC_URI="ftp://unidata.ucar.edu/pub/udunits/udunits-${PV}.tar.Z"
-
-SLOT="0"
-LICENSE="UCAR-Unidata"
-KEYWORDS="x86 ~ppc ~sparc alpha ~mips ~hppa"
-
-DEPEND="dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/udunits_configure_in.patch
-	epatch ${FILESDIR}/udunits_lib_make.patch
-	epatch ${FILESDIR}/udunits_master_mk.patch
-}
-
-src_compile() {
-	export CPPFLAGS=-Df2cFortran
-	econf || die "econf failed"
-	cd perl
-	perl Makefile.PL PREFIX=${D}/usr
-	cd ..
-	make ld_math=-lm || die
-#	make test || die
-}
-
-src_install() {
-	sed "s?/usr?${D}/usr?" Makefile > Makefile.install
-	emake -f Makefile.install install
-	dodir /etc /usr/share/man/man3 /usr/share/man/man3f
-	insinto /etc
-	insopts -m 644
-	doins lib/udunits.dat
-	insinto /usr/share/man/man3
-	doins lib/udunits.3
-	insinto /usr/share/man/man3f
-	doins lib/udunits.3f
-
-	cd perl
-	make PREFIX=${D}/usr install INSTALLSITEMAN1DIR=${D}/usr/share/man/man1
-	cd ..
-	find ${D} -type f -a \( -name perllocal.pod -o -name .packlist \
-	    -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-	find ${D} -type d -depth -exec rmdir {} 2>/dev/null ';'
-	chmod -R u+w ${D}/*
-
-	dodoc COPYRIGHT README RELEASE_NOTES VERSION CUSTOMIZE INSTALL
-}
diff --git a/sci-libs/udunits/udunits-1.12.3.ebuild b/sci-libs/udunits/udunits-1.12.11.ebuild
index cdf3167015f1..fb0458edd302 100644
--- a/sci-libs/udunits/udunits-1.12.3.ebuild
+++ b/sci-libs/udunits/udunits-1.12.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.4 2009/12/07 03:41:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/udunits-1.12.11.ebuild,v 1.1 2010/06/23 08:29:31 jlec Exp $
 
 inherit eutils flag-o-matic fortran perl-module toolchain-funcs
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/${P}/src
 SP=${WORKDIR}/${P}/src/perl
 DESCRIPTION="The UCAR/Unidata Units library"
 HOMEPAGE="http://www.unidata.ucar.edu/packages/udunits/"
-SRC_URI="ftp://unidata.ucar.edu/pub/udunits/udunits-${PV}.tar.Z"
+SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="UCAR-Unidata"
diff --git a/sci-libs/udunits/udunits-2.1.15.ebuild b/sci-libs/udunits/udunits-2.1.15.ebuild
new file mode 100644
index 000000000000..b36e4374170b
--- /dev/null
+++ b/sci-libs/udunits/udunits-2.1.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/udunits-2.1.15.ebuild,v 1.1 2010/06/23 08:29:31 jlec Exp $
+
+EAPI=2
+inherit eutils autotools
+
+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"
+
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}"
+
+IUSE="doc"
+
+src_prepare() {
+	# respect user's flags, compile with system libexpat
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	rm -rf expat
+	eautoreconf
+}
+
+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
+}