Add note about expat unbundling being broken, remove expat workaround (as it doesn...

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

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index 88a7c0f21f8a11189a7072f5eecf1ec8c273fbba..53c44e3b31b206a8eac2a6fd3e5818de4cd1ba1b 100644 (file)
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.35 2010/06/26 14:26:12 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.36 2010/06/27 05:37:07 reavertm Exp $
+
+  27 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> coin-3.1.3-r1.ebuild:
+  Add note about expat unbundling being broken, remove expat workaround (as
+  it doesn't work in some cases, bug 325685)
 
 *coin-3.1.3-r1 (26 Jun 2010)
 

diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index f6ede57fab5f49d0d3d3c6b6448566d4ca6bee00..c2ab65c3103dbf598d98a32877f51e9dbb72781a 100644 (file)
--- 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-r1.ebuild 2342 RMD160 84f41c0eb207f79e749e3760536da810b7a1fb35 SHA1 e70ac4c757b188ab8f4a337bfd8fd962122bc909 SHA256 6274fccb23dcc4d53603a441fc78d61728dab0777d03b8351b27ebb5657894d4
-MISC ChangeLog 5081 RMD160 b03a98542a9311753d2811c3bb07e0be6d72d0de SHA1 bf3797bb7a2b156e32827243eb35eaebce13a01a SHA256 73e7dd3f73e83e7756c93b6e55adf65e46faacc3596a31b621872548dc9674dd
+EBUILD coin-3.1.3-r1.ebuild 2349 RMD160 859e033abf8fa4984848f135d6f2af88e64a0e65 SHA1 015669bed52aef3b4691fd89db240669e3cc8813 SHA256 3f84b3ee0402fb842c18eee36cf3fb8101a4574f086d6af39dd73827e3509430
+MISC ChangeLog 5279 RMD160 c23b634aa67b1d900238d18f036e1c4f4d632408 SHA1 c8fcb47714a0c278b424e5bc793a83151003f45f SHA256 fc7240fad0d0f5d9f5aa4af13cc703505e918904b837b5acc365cf98caf3afe1
 MISC metadata.xml 321 RMD160 82d4bf8ca9bbd023d90c6980429208533fc48660 SHA1 950908467325aba69bb4f18a295417a57f3af6ef SHA256 a198ab6bfdd62b7e7d7f006192ef7aed6d002174bae40e0af3b43668019fd962

diff --git a/media-libs/coin/coin-3.1.3-r1.ebuild b/media-libs/coin/coin-3.1.3-r1.ebuild
index e424fca147f15f6a0f18c4436d10f532826b9c9c..9f9c74a52ad4ec26d1e60672b5d940a15087ca70 100644 (file)
--- a/media-libs/coin/coin-3.1.3-r1.ebuild
+++ b/media-libs/coin/coin-3.1.3-r1.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-r1.ebuild,v 1.1 2010/06/26 14:26:12 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3-r1.ebuild,v 1.2 2010/06/27 05:37:07 reavertm Exp $
 
 EAPI=2
 
@@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE="bzip2 debug doc javascript openal simage static-libs threads zlib"
 
+# NOTE: expat is not really needed as --enable-system-expat is broken
 RDEPEND="
        dev-libs/expat
        media-libs/fontconfig
@@ -50,8 +51,7 @@ PATCHES=(
 )
 
 src_configure() {
-       # Unforunately it links to static expat...
-       append-cppflags -I/usr/include/freetype2 -DUSE_SYSTEM_EXPAT
+       append-cppflags -I/usr/include/freetype2
        # Prefer link-time linking over dlopen
        econf \
                htmldir="/usr/share/doc/${PF}/html" \