From: Maciej Mrozowski <reavertm@gentoo.org>
Date: Fri, 25 Jun 2010 21:26:52 +0000 (+0000)
Subject: Try harder to use system expat
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0dfecbcdbbf3dc02437580a415d09fc0e0c3e89f;p=gentoo.git

Try harder to use system expat
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index 15d017db0aec..f07271f6a792 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/coin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.31 2010/06/25 20:26:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.32 2010/06/25 21:26:52 reavertm Exp $
+
+  25 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> coin-3.1.3.ebuild:
+  Try harder to use system expat
 
 *coin-3.1.3 (25 Jun 2010)
 
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index f8d1e4223240..357073d813c1 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -2,6 +2,6 @@ AUX coin-3.1.0-javascript.patch 1259 RMD160 b5d2b39d7f75bf975efde6e2e96f21ba9789
 DIST Coin-3.1.0.tar.gz 5632452 RMD160 0fd8125b08be4d623d2ded14feceb0c70b45eec4 SHA1 369f3b28baa7725ab2a3f0f2cf4ccaa191fcecc5 SHA256 81ec8c4bf0daca6718d6b59eca76354f5f9e1c5a19c20dd4fa173d65f04cb899
 DIST Coin-3.1.3.tar.gz 5981534 RMD160 e57fd6a4876a06874429f9ad6b96f166f5609362 SHA1 8e9f05628461963623686d3ec53102214e233dd1 SHA256 583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417
 EBUILD coin-3.1.0.ebuild 1666 RMD160 79cba148c500a2246c814dff55cf3505fc039dc9 SHA1 acb72332065b1a2a8163c5235c3289d691c0c186 SHA256 985d0c3d0de3e164994cd1006ef8b6ce0932928ed5b082acbd41b9c075a046b0
-EBUILD coin-3.1.3.ebuild 2288 RMD160 d16fc947f61024fca4cbeeb7c53cce706ff80867 SHA1 2a5c9abf3b28defdbb084f670f7808ede705291b SHA256 d2dbe01e1192934625564015327bcde054ca89528f9e746a3851776a26839260
-MISC ChangeLog 4534 RMD160 2faaff21c93bbc17d0ae28630135b6dde9d4c0a7 SHA1 a7faec0201d7c309329772403791e85210c787cb SHA256 5d1249100de45d8ef620219338718c2d399f4f968a680738cfb9c7e4d395b16f
+EBUILD coin-3.1.3.ebuild 2351 RMD160 918584e0b16f8cf96361afda9b6b35c4b6d587cc SHA1 02cd6773f5e8b63630a45d5d725451fafd467198 SHA256 f565958fa93082a8f11d01c7e616e5a7801befaa195cfd896b33d331174daa87
+MISC ChangeLog 4641 RMD160 e94847b7c2749b51f2f697b5971f0676aa8b47af SHA1 e11f39407fed17901cbca8b6c8bf93e3b3bcc258 SHA256 578c34c4bb669430b1e12122ab1cf7bb772647c1151a58b17c5d220101ffd62d
 MISC metadata.xml 224 RMD160 5b3a088ab8ba1bf9e9d131509866de4dedc1319c SHA1 a2a6bf3ce344afeae1cce509356f4a8de1bc7f9c SHA256 35675eac9b2dc95504ecab20a2641ae7eb34e111132c07de56ba90238381fa94
diff --git a/media-libs/coin/coin-3.1.3.ebuild b/media-libs/coin/coin-3.1.3.ebuild
index 3e92da186c36..9ac965f2dc64 100644
--- a/media-libs/coin/coin-3.1.3.ebuild
+++ b/media-libs/coin/coin-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3.ebuild,v 1.1 2010/06/25 20:26:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3.ebuild,v 1.2 2010/06/25 21:26:52 reavertm Exp $
 
 EAPI=2
 
@@ -50,7 +50,8 @@ PATCHES=(
 
 src_configure() {
 	MANDIR=/usr/share/Coin/man
-	append-cppflags -I/usr/include/freetype2
+	# Unforunately it links to static expat...
+	append-cppflags -I/usr/include/freetype2 -DUSE_SYSTEM_EXPAT
 	# Prefer link-time linking over dlopen
 	econf \
 		htmldir="/usr/share/doc/${PF}/html" \