Version bump, removed old version

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

6 files changed, 112 insertions, 71 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/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
+}