Now use system expat library

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

3 files changed, 79 insertions, 7 deletions

diff --git a/sci-libs/udunits/ChangeLog b/sci-libs/udunits/ChangeLog
index 54fc2215dbcd..48f7e1e1b24a 100644
--- a/sci-libs/udunits/ChangeLog
+++ b/sci-libs/udunits/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2009/12/07 03:41:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/ChangeLog,v 1.8 2009/12/15 06:12:18 bicatali Exp $
+
+*udunits-2.1.11-r1 (15 Dec 2009)
+
+  15 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -udunits-2.1.11.ebuild, +udunits-2.1.11-r1.ebuild,
+  +files/udunits-2.1.11-autotools.patch:
+  Now use system expat library
 
 *udunits-2.1.11 (07 Dec 2009)
 
diff --git a/sci-libs/udunits/files/udunits-2.1.11-autotools.patch b/sci-libs/udunits/files/udunits-2.1.11-autotools.patch
new file mode 100644
index 000000000000..513b4cd061b8
--- /dev/null
+++ b/sci-libs/udunits/files/udunits-2.1.11-autotools.patch
@@ -0,0 +1,63 @@
+--- Makefile.am.orig	2009-12-15 06:15:11.000000000 +0000
++++ Makefile.am	2009-12-15 06:17:07.000000000 +0000
+@@ -5,8 +5,8 @@
+ # redistribution conditions.
+ #
+ ## Process this file with automake to produce Makefile.in
+-DIST_SUBDIRS		= expat lib prog test
+-SUBDIRS			= expat lib prog
++DIST_SUBDIRS		= lib prog test
++SUBDIRS			= lib prog
+ info_TEXINFOS		= udunits2.texi
+ udunits2_TEXINFOS	= success.texi failure.texi make.texi
+ EXTRA_DIST = \
+--- configure.ac.orig	2009-12-15 06:15:21.000000000 +0000
++++ configure.ac	2009-12-15 06:16:32.000000000 +0000
+@@ -13,7 +13,7 @@
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_SRCDIR([lib/converter.c])
+ AM_INIT_AUTOMAKE([foreign subdir-objects no-installinfo])
+-AC_CONFIG_HEADERS([config.h expat/expat_config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ CFLAGS_COVERAGE=''
+ LIBS_COVERAGE=''
+@@ -37,7 +37,7 @@
+     CFLAGS="${CFLAGS:+$CFLAGS }-g -O0"
+     debug=true ;;
+   no)
+-    CFLAGS="${CFLAGS:+$CFLAGS }-O"
++    CFLAGS="${CFLAGS:+$CFLAGS }"
+     debug=false ;;
+   *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
+ esac],
+@@ -125,18 +125,12 @@
+ 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, [Define to specify 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
+--- lib/Makefile.am.orig	2009-12-15 06:30:11.000000000 +0000
++++ lib/Makefile.am	2009-12-15 06:31:10.000000000 +0000
+@@ -38,7 +38,7 @@
+ LFLAGS = -d -P$(lex_prefix)
+ 
+ LDADD = libudunits2.la @LIBS_CUNIT@ -lm @LIBS_COVERAGE@
+-libudunits2_la_LIBADD = ../expat/libexpat.la
++libudunits2_la_LIBADD = -lexpat
+ libudunits2_la_CFLAGS = @CFLAGS_COVERAGE@
+ include_HEADERS = udunits2.h converter.h
+ EXTRA_DIST = \
diff --git a/sci-libs/udunits/udunits-2.1.11.ebuild b/sci-libs/udunits/udunits-2.1.11-r1.ebuild
index 226cf3b780a7..cc24a85ef832 100644
--- a/sci-libs/udunits/udunits-2.1.11.ebuild
+++ b/sci-libs/udunits/udunits-2.1.11-r1.ebuild
@@ -1,8 +1,9 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/udunits-2.1.11-r1.ebuild,v 1.1 2009/12/15 06:12:18 bicatali Exp $
 
 EAPI=2
+inherit eutils autotools
 
 DESCRIPTION="Library for manipulating units of physical quantities"
 HOMEPAGE="http://www.unidata.ucar.edu/packages/udunits/"
@@ -12,15 +13,16 @@ SLOT="0"
 LICENSE="UCAR-Unidata"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 
-DEPEND=""
-RDEPEND=""
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}"
 
 IUSE="doc"
 
 src_prepare() {
-	# respect user's flags
-	sed -i \
-		-e 's/-O//g' configure || die
+	# respect user's flags, compile with system libexpat
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	rm -rf expat
+	eautoreconf
 }
 
 src_install() {