fixing patch and ebuild, use qt3 eclass, use always our CFLAGS.

(Portage version: 2.1_pre4-r1)

4 files changed, 37 insertions, 37 deletions

diff --git a/media-libs/exscalibar/ChangeLog b/media-libs/exscalibar/ChangeLog
index acaeb8b33210..2365618affac 100644
--- a/media-libs/exscalibar/ChangeLog
+++ b/media-libs/exscalibar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/exscalibar
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/ChangeLog,v 1.1 2006/02/13 19:42:47 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/ChangeLog,v 1.2 2006/02/14 01:04:38 sbriesen Exp $
+
+  14 Feb 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  files/exscalibar-configure-disable-features.diff, exscalibar-1.0.4.ebuild:
+  fixing patch and ebuild, use qt3 eclass, use always our CFLAGS.
 
 *exscalibar-1.0.4 (13 Feb 2006)
 
diff --git a/media-libs/exscalibar/Manifest b/media-libs/exscalibar/Manifest
index 5df7cf71a894..8170594e089f 100644
--- a/media-libs/exscalibar/Manifest
+++ b/media-libs/exscalibar/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6017e081473df88e1637db77db0b5016 ChangeLog 393
 RMD160 e278715f6e2f440887aa600e62c94fe2fce83875 ChangeLog 393
 SHA256 a87baecdf2e6a0dd65125e3c92a9a36d9a5dbd67488b3058a3079ee9a29c7abd ChangeLog 393
-MD5 c9425c6a3324eb6dab7c4fe957432646 exscalibar-1.0.4.ebuild 1467
-RMD160 a45a947b9d87b342163c1cd31990250adba20bdc exscalibar-1.0.4.ebuild 1467
-SHA256 064eed8e416197645f7e23ecbbb528f7f121909989d9cf41fc3d1562231f052e exscalibar-1.0.4.ebuild 1467
+MD5 e892129585ffb0720002876fe2d09a80 exscalibar-1.0.4.ebuild 1659
+RMD160 edb226353c0ba76c68967834b102a33f2921df5f exscalibar-1.0.4.ebuild 1659
+SHA256 a62138c4eef1a5e4555275c4cdc58dc199a506dfa899d03a6d079807897db6af exscalibar-1.0.4.ebuild 1659
 MD5 101fa04dd319f3cf78f79dbe528ee52c files/digest-exscalibar-1.0.4 253
 RMD160 4d5ff8c620369fffe46b5a6456449d291d2ba06c files/digest-exscalibar-1.0.4 253
 SHA256 43c3bdf8cc0737373dd2fd2d7581f0601bd52209c621f248385a742080604259 files/digest-exscalibar-1.0.4 253
-MD5 89dd19eccf4e638d4dd4dd88addcbe9f files/exscalibar-configure-disable-features.diff 1976
-RMD160 bb994d0922faaf23077eeebeb9437c9be4b99373 files/exscalibar-configure-disable-features.diff 1976
-SHA256 e81973aa973ee65c47cad31a7b4c7d331b2078dfdf0df8cdd06feb3d26dd3b0f files/exscalibar-configure-disable-features.diff 1976
+MD5 25502ff1fad3f11b96935ae9abaaf0d8 files/exscalibar-configure-disable-features.diff 2003
+RMD160 385279c665a3081c8c7cd4d1fd727bdec915609e files/exscalibar-configure-disable-features.diff 2003
+SHA256 c970304c250a2cfa92496b5c1ea604e6f8252d98d5b69baad734c83d5460a1b6 files/exscalibar-configure-disable-features.diff 2003
 MD5 2b0e9087ef8939ab0578160c97b115e0 metadata.xml 215
 RMD160 3c90f64bec54294d08fbffbc172ebc321c5245f1 metadata.xml 215
 SHA256 258b7218817d5b106d0de87dff165d12f747ce78b9333ca5ab0b07129823849c metadata.xml 215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD8OGvr2QksT29OyARAphgAKCHTMON90O+HhunqQfOWCWyMoGlMACfR4Wc
-mXNyyLImquBL0G0D9Kkh97g=
-=5sWU
------END PGP SIGNATURE-----
diff --git a/media-libs/exscalibar/exscalibar-1.0.4.ebuild b/media-libs/exscalibar/exscalibar-1.0.4.ebuild
index af548df00910..3783e589c2ee 100644
--- a/media-libs/exscalibar/exscalibar-1.0.4.ebuild
+++ b/media-libs/exscalibar/exscalibar-1.0.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/exscalibar-1.0.4.ebuild,v 1.2 2006/02/13 19:44:19 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/exscalibar-1.0.4.ebuild,v 1.3 2006/02/14 01:04:38 sbriesen Exp $
+
+inherit eutils qt3
 
 DESCRIPTION="EXtendable, SCalable Architecture for Live, Interactive or Batch-orientated Audio-signal Refinement"
 HOMEPAGE="http://exscalibar.sourceforge.net/"
@@ -10,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="sndfile mp3 vorbis fftw jack alsa doc"
-DEPEND="=x11-libs/qt-3*
+DEPEND="$(qt_min_version 3.2)
 	sndfile? ( >=media-libs/libsndfile-1.0.0 )
 	mp3? ( >=media-libs/libmad-0.15 )
 	vorbis? ( >=media-libs/libvorbis-1.0.0 )
@@ -18,22 +20,26 @@ DEPEND="=x11-libs/qt-3*
 	jack? (	>=media-sound/jack-audio-connection-kit-0.90.0 )
 	alsa? (	>=media-libs/alsa-lib-0.9 )"
 
+# FIXME: add GAT support
+
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/exscalibar-configure-disable-features.diff
+	epatch "${FILESDIR}/exscalibar-configure-disable-features.diff"
 }
 
 src_compile () {
-	export PATH="/usr/qt/3/bin:${PATH}"
+	export PATH="${QTDIR}/bin:${PATH}"
 
 	use sndfile || export DISABLE_SNDFILE=1
-	use mp3 || export DISABLE_MAD=1
-	use vorbis || export DISABLE_OGGFILE=1
-	use fftw || export DISABLE_FFTW3=1
-	use jack || export DISABLE_JACK=1
-	use alsa || export DISABLE_ALSA=1
-
-	econf || die "configure failed"
+	use mp3     || export DISABLE_MAD=1
+	use vorbis  || export DISABLE_VORBISFILE=1
+	use fftw    || export DISABLE_FFTW3=1
+	use jack    || export DISABLE_JACK=1
+	use alsa    || export DISABLE_ALSA=1
+
+	./configure || die "configure failed"
+	echo "QMAKE_CFLAGS_RELEASE = ${CFLAGS}" >> global.pro
+	echo "QMAKE_CXXFLAGS_RELEASE = ${CXXFLAGS}" >> global.pro
 	emake -j1 || die "emake failed"
 }
 
@@ -42,8 +48,8 @@ src_install() {
 
 	dodoc CHANGELOG INSTALL NOTES README
 
-	if use doc ; then
-		dodir /usr/share/doc/${PF}/tex/
-		cp -R doc/* ${D}/usr/share/doc/${PF}/tex/ || die
+	if use doc; then
+		dodir "/usr/share/doc/${PF}/tex"
+		cp -R doc/* "${D}/usr/share/doc/${PF}/tex/" || die
 	fi
 }
diff --git a/media-libs/exscalibar/files/exscalibar-configure-disable-features.diff b/media-libs/exscalibar/files/exscalibar-configure-disable-features.diff
index 8927107d57f7..e95f38ceb536 100644
--- a/media-libs/exscalibar/files/exscalibar-configure-disable-features.diff
+++ b/media-libs/exscalibar/files/exscalibar-configure-disable-features.diff
@@ -5,7 +5,7 @@
  
  pkg-config --atleast-version 0.90.0 jack
 -if (( $? && ! "0$HAVE_JACK" )) ; then
-+if ((( $? && ! "0$HAVE_JACK" ) || $DISABLE_JACK )) ; then
++if (( ( $? && ! "0$HAVE_JACK" ) || "0$DISABLE_JACK" )) ; then
  	echo "Jack not detected."
  	echo "If installed, please set \$HAVE_JACK to 1 and rerun."
  	echo CONFIG -= jack >> global.pro
@@ -14,7 +14,7 @@
  
  pkg-config --atleast-version 1.0.0 sndfile
 -if (( $? && ! "0$HAVE_SNDFILE" )) ; then
-+if ((( $? && ! "0$HAVE_SNDFILE" ) || $DISABLE_JACK )) ; then
++if (( ( $? && ! "0$HAVE_SNDFILE" ) || "0$DISABLE_SNDFILE" )) ; then
  	echo "sndfile not detected."
  	echo "If installed, please set \$HAVE_SNDFILE to 1 and rerun."
  	echo CONFIG -= sndfile >> global.pro
@@ -23,7 +23,7 @@
  
  pkg-config --atleast-version 0.9 alsa
 -if (( $? && ! "0$HAVE_ALSA" )) ; then
-+if ((( $? && ! "0$HAVE_ALSA" ) || $DISABLE_ALSA )) ; then
++if (( ( $? && ! "0$HAVE_ALSA" ) || "0$DISABLE_ALSA" )) ; then
  	echo "Alsa not detected."
  	echo "If installed, please set \$HAVE_ALSA to 1 and rerun."
  	echo CONFIG -= alsa >> global.pro
@@ -32,7 +32,7 @@
  
  pkg-config --atleast-version 1.0.0 vorbisfile
 -if (( $? && ! "0$HAVE_VORBSIFILE" )) ; then
-+if ((( $? && ! "0$HAVE_VORBSIFILE" ) || $DISABLE_VORBISFILE )) ; then
++if (( ( $? && ! "0$HAVE_VORBSIFILE" ) || "0$DISABLE_VORBISFILE" )) ; then
  	echo "libvorbisfile not detected."
  	echo "If installed, please set \$HAVE_VORBISFILE to 1 and rerun."
  	echo CONFIG -= vorbisfile >> global.pro
@@ -41,7 +41,7 @@
  
  pkg-config --atleast-version 0.15 mad
 -if (( $? && ! "0$HAVE_MAD" )) ; then
-+if ((( $? && ! "0$HAVE_MAD" ) || $DISABLE_MAD )) ; then
++if (( ( $? && ! "0$HAVE_MAD" ) || "0$DISABLE_MAD" )) ; then
  	echo "libmad not detected."
  	echo "If installed, please set \$HAVE_MAD to 1 and rerun."
  	echo CONFIG -= mad >> global.pro
@@ -50,7 +50,7 @@
  
  pkg-config --atleast-version 3.0.0 fftw3f
 -if (( $? && ! "0$HAVE_FFTW3" )) ; then
-+if ((( $? && ! "0$HAVE_FFTW3" ) || $DISABLE_FFTW3 )) ; then
++if (( ( $? && ! "0$HAVE_FFTW3" ) || "0$DISABLE_FFTW3" )) ; then
  	echo "FFTW not detected."
  	echo "If installed, please set \$HAVE_FFTW3 to 1 and rerun."
  	echo CONFIG -= fftw >> global.pro