From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 25 Nov 2006 19:36:01 +0000 (+0000)
Subject: Fix compile issues with qt-4.1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8edea89c802a619acf5f40b586a474c7ba22ea71;p=gentoo.git

Fix compile issues with qt-4.1
Package-Manager: portage-2.1.2_rc2-r2
---

diff --git a/media-sound/traverso/ChangeLog b/media-sound/traverso/ChangeLog
index 774e5a2d5dfd..8774496bd8f3 100644
--- a/media-sound/traverso/ChangeLog
+++ b/media-sound/traverso/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/traverso
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.1 2006/11/25 00:29:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.2 2006/11/25 19:36:01 aballier Exp $
+
+  25 Nov 2006; Alexis Ballier <aballier@gentoo.org> traverso-0.30.1.ebuild:
+  Fix compile issues with qt-4.1
 
 *traverso-0.30.1 (24 Nov 2006)
 
diff --git a/media-sound/traverso/Manifest b/media-sound/traverso/Manifest
index 6d71fe4d27a1..2d4b2a0a2d21 100644
--- a/media-sound/traverso/Manifest
+++ b/media-sound/traverso/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST traverso-0.30.1.tar.gz 269678 RMD160 e699e94b05011d3d51ce39117db1c5f7925eebfc SHA1 32e69f8ff1138e10b8cd29292a4f8cb346646049 SHA256 35740c58d9cecde6de2a1251ecc30ba211a379dc2ff8a269463c8514735d5d88
-EBUILD traverso-0.30.1.ebuild 1671 RMD160 f6ec73b0576e48a86eb6ce5989943bf258d10c34 SHA1 6c4a7e608a915b78be3bba4a2466ace19e8645bb SHA256 9b65c805217296bd80943572797732b05e44e1a567729ed7122101a612a0e8c9
-MD5 1941c213fc052ccad070fe93e00cdd0d traverso-0.30.1.ebuild 1671
-RMD160 f6ec73b0576e48a86eb6ce5989943bf258d10c34 traverso-0.30.1.ebuild 1671
-SHA256 9b65c805217296bd80943572797732b05e44e1a567729ed7122101a612a0e8c9 traverso-0.30.1.ebuild 1671
-MISC ChangeLog 406 RMD160 17286d774d5729d0d6c067766c6fc256f8b8cf2f SHA1 b5faedd8425fac78972c5f16e7d4bbc3d9f2da81 SHA256 d5efcd3902274a012920c939e5284f328c53d36d719a93efc26c3d0aa6384f59
-MD5 a1611429892c565ea012d9e94701c17f ChangeLog 406
-RMD160 17286d774d5729d0d6c067766c6fc256f8b8cf2f ChangeLog 406
-SHA256 d5efcd3902274a012920c939e5284f328c53d36d719a93efc26c3d0aa6384f59 ChangeLog 406
+EBUILD traverso-0.30.1.ebuild 1836 RMD160 f6a11637a91ffb286a04564f16a1472517f092f2 SHA1 2ef66250daedf928f3394fdc9b06d0e5b9d79555 SHA256 d31b130ccc5fe3a9762bb84589641559871f7de2df27c7a17c0f88fe30c441e9
+MD5 8f2276f2476166d4f736a5ecfd3822ad traverso-0.30.1.ebuild 1836
+RMD160 f6a11637a91ffb286a04564f16a1472517f092f2 traverso-0.30.1.ebuild 1836
+SHA256 d31b130ccc5fe3a9762bb84589641559871f7de2df27c7a17c0f88fe30c441e9 traverso-0.30.1.ebuild 1836
+MISC ChangeLog 516 RMD160 a6abe4d5afbac2981b54be724dc6824fd8b5e1c7 SHA1 47c4b345a455d68e03efdec17a042802566f9f77 SHA256 89f6411bdd445af9c9d3ab8dc57604203714ac23f35f35e14b2e500c35a74c13
+MD5 2d22947bde6bf8929a1c6f8fb821e3fb ChangeLog 516
+RMD160 a6abe4d5afbac2981b54be724dc6824fd8b5e1c7 ChangeLog 516
+SHA256 89f6411bdd445af9c9d3ab8dc57604203714ac23f35f35e14b2e500c35a74c13 ChangeLog 516
 MISC metadata.xml 542 RMD160 06fea9e680981b10df19c5c4b73708c5f3924e29 SHA1 48d17ed55cc5a499e40a222f014e89491e746727 SHA256 e4ce5974d4238e3c15c445918d8adedeaf97be27aecbab3a9b4f3ab981476225
 MD5 1e89095fbb38226ad56d18054de0a4d8 metadata.xml 542
 RMD160 06fea9e680981b10df19c5c4b73708c5f3924e29 metadata.xml 542
@@ -20,7 +20,7 @@ SHA256 0696cdb294fd792562cef692d9bad7c3ec904f49ab9a03e304466f06b3097c0c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZ45wvFcC4BYPU0oRAmvqAJ9X7FaVlAUotLILv03DTfuAVRC18wCeJF1m
-ezNBMtzlnnlegoRqIeuGhzE=
-=bQiW
+iD8DBQFFaJshvFcC4BYPU0oRAlOxAJ9ECBNkJBLDeFt42Ogo7Cn8L7fSiwCgzIQE
+KgEQR9tz4NHbS7Ts5f33ILU=
+=K0/O
 -----END PGP SIGNATURE-----
diff --git a/media-sound/traverso/traverso-0.30.1.ebuild b/media-sound/traverso/traverso-0.30.1.ebuild
index b81537f66b08..ca7f606db685 100644
--- a/media-sound/traverso/traverso-0.30.1.ebuild
+++ b/media-sound/traverso/traverso-0.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.30.1.ebuild,v 1.1 2006/11/25 00:29:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.30.1.ebuild,v 1.2 2006/11/25 19:36:01 aballier Exp $
 
 inherit eutils qt4 toolchain-funcs
 
@@ -31,12 +31,15 @@ src_unpack() {
 	sed -ie "s:^\(\#define\ RESOURCES_DIR\) \(.*\):\1 \"/usr/share/traverso\":" src/config.h
 	sed -ie "s:^\(target.path\ =\) \(.*\):\1 /usr/bin:" src/traverso/traverso.pro
 	sed -ie "s:^\(DESTDIR_TARGET\ =\) \(.*\):\1 /usr/bin:" src/traverso/traverso.pro
+	#  Removing forced cxxflags
+	sed -ie "s:^\(.*QMAKE_CXXFLAGS_RELEASE.*\):#\1:" src/base.pri
+	# adding our cxxflags
+	sed -ie "s:^\(.*release\ {.*\):\1\n QMAKE_CXXFLAGS_RELEASE\ =\ ${CXXFLAGS}:" src/base.pri
 }
 
 src_compile() {
 	QMAKE="/usr/bin/qmake"
-	$QMAKE traverso.pro -after\
-	"QMAKE_CXXFLAGS_RELEASE=\"${CXXFLAGS}\" QMAKE_STRIP=\"/usr/bin/true\"" || die "qmake failed"
+	$QMAKE traverso.pro -after "QMAKE_STRIP=\"/usr/bin/true\"" || die "qmake failed"
 	# No no, this is not a typo, LFLAGS is what they use as LDFLAGS...
 	emake CC=$(tc-getCC) CXX=$(tc-getCXX) LINK=$(tc-getCXX) LFLAGS="${LDFLAGS}" || die "emake failed"
 }