Revert part of last commit

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

diff --git a/media-libs/libfishsound/Manifest b/media-libs/libfishsound/Manifest
index 0033f7fa86d24518d104e75ce85f17c778770008..ffadb9eadfacb6f6e8c1af77a92a13ce02faeb9b 100644 (file)
--- a/media-libs/libfishsound/Manifest
+++ b/media-libs/libfishsound/Manifest
@@ -3,6 +3,6 @@ DIST libfishsound-0.9.2.tar.gz 436119 RMD160 07972b131ee1bb681217b591697cf1bff27
 DIST libfishsound-1.0.0.tar.gz 444980 RMD160 49919da94696932ca88cc81bcc317a434ce67bc9 SHA1 5263dfaa12dce71e30c5d80f871d92869c6b5ce2 SHA256 2e0b57ce2fecc9375eef72938ed08ac8c8f6c5238e1cae24458f0b0e8dade7c7
 EBUILD libfishsound-0.9.1.ebuild 1161 RMD160 a09e9c96f6bd7440eb501963e879256ce943a2cf SHA1 92f405ad12cd315de93ccdb5d59e16d83b45c840 SHA256 c224dc37209aa86f3cc3d7476b576c2488b3b5c551eff7061b9a0a03ba4d154a
 EBUILD libfishsound-0.9.2.ebuild 1399 RMD160 6421a0b5d1bfa754b0cb71cc1d1c77f456fee0d2 SHA1 32ac87f6b0c757e0f6b4b843bee01839e7d4d606 SHA256 9538f82b61171326baedde7e3e2152dc4e8a769e1edd6c2c0bfd3eef6a81eb98
-EBUILD libfishsound-1.0.0.ebuild 1067 RMD160 4059c3723c674e1a7bf379d5b385df358149278b SHA1 df8f4c0ad64328dc538732e0d5405fb06090ebeb SHA256 f7d472dce898841947f2b988adffb373e32db3f7fc09465cceab2b56333e1ea9
+EBUILD libfishsound-1.0.0.ebuild 1176 RMD160 4e537db10834882b2e86136ff1f48241ebcca29d SHA1 2a6acb18fd095f0527a627248e2e34707dda1ca4 SHA256 fa01dd1bad6db0676e682f2a8d9ea45f997a9fa7c6347e0e3e271f6698c83b5d
 MISC ChangeLog 1583 RMD160 164e551f887eedf6fe025f6a7ff049ecd7599483 SHA1 018754252a4d4f945bd9b4ed4ab6b69928080964 SHA256 49d8ceee62504d691318475414edd27d3a8fd946e319f1dc47213a43d9c0d972
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b

diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
index d697cf11e1c7530c0aa2950680cc935c4c6a344e..223fad5a196c749390635b9f18217d65ecd442c0 100644 (file)
--- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0.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/libfishsound/libfishsound-1.0.0.ebuild,v 1.1 2010/03/11 10:56:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfishsound/libfishsound-1.0.0.ebuild,v 1.2 2010/03/11 11:18:37 ssuominen Exp $
 
 EAPI=2
 
@@ -11,12 +11,13 @@ SRC_URI="http://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="flac speex"
+IUSE="speex"
+# flac
 
 RDEPEND="media-libs/libvorbis
        media-libs/libogg
-       flac? ( media-libs/flac )
        speex? ( media-libs/speex )"
+# flac? ( media-libs/flac )
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
@@ -28,7 +29,10 @@ src_prepare() {
 
 src_configure() {
        local myconf=""
-       use flac || myconf="${myconf} --disable-flac"
+       # FLAC pkg-config file is broken and shouldn't append -I/usr/include/FLAC
+       # because of e.g. assert.h
+       # use flac ||
+       myconf="${myconf} --disable-flac"
        use speex || myconf="${myconf} --disable-speex"
 
        econf \