From: Steve Arnold <nerdboy@gentoo.org>
Date: Sat, 3 Sep 2011 00:49:45 +0000 (+0000)
Subject: More updates to force qmake to use the right config settings.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6d7258ad99d4e0e5bfff82b5f3f7f37ee65b563e;p=gentoo.git

More updates to force qmake to use the right config settings.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
---

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 74a3709427bf..b128b6013bc2 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.203 2011/04/09 18:09:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.204 2011/09/03 00:49:45 nerdboy Exp $
+
+  03 Sep 2011; Steve Arnold <nerdboy@gentoo.org> doxygen-1.7.4.ebuild:
+  More updates to force qmake to use the right config settings; should 
+  also fix bug #378963.  Qmake could really use a nice eclass...
 
 *doxygen-1.7.4 (09 Apr 2011)
 
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index b795947d8b4d..1cb86b8a7a1e 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -40,6 +40,6 @@ EBUILD doxygen-1.6.3.ebuild 5153 RMD160 96721b42675af763276f72298215d201e2daf072
 EBUILD doxygen-1.7.1.ebuild 5249 RMD160 60f6f651029c9410d4cc5019eac12c78ca3b2a2e SHA1 ac8c7ae7aeb053945fbf40b6522ab214edc35dc3 SHA256 afad9f53aca6de69123d7ab108594d39cc913a151682903850a94c8b10d9c343
 EBUILD doxygen-1.7.2.ebuild 5554 RMD160 4998e8d3fad9060e16a9562564a06c02a434e23b SHA1 138a9ad80e18255e2a49096d247a67c993eaf9b1 SHA256 d7168596217bc6f470c1d684035a352e5f33c3ae341b08f4475abd8158f79fe1
 EBUILD doxygen-1.7.3.ebuild 5790 RMD160 4665316d7adc951b444daa413830953248f8ec43 SHA1 b410891b29c652d731da48787a2fc86da57f23eb SHA256 10d6899dff5678438875ce64f82891c720e2a7f2d4e1d90208d459f6e1132655
-EBUILD doxygen-1.7.4.ebuild 5805 RMD160 174811fdc3ab82ed35269e727fa7b538a711ef2f SHA1 c5f369fdee3372a35a66817e6e81c6f1c43f7a65 SHA256 02de0454de0f687927ee4dab438e7780a7804490df2827196827f0cc247b37c3
-MISC ChangeLog 33940 RMD160 4de1a0c59373562cafab85070a23153773d9aad8 SHA1 ac03554a30ce338e743872ffa3efec99101d7f95 SHA256 76bf2225824c171efe6fa05c009806ede62cd9fd22d08651e41fa8b339ccc659
+EBUILD doxygen-1.7.4.ebuild 6030 RMD160 b85b12f8131318754e4a3dc095a8e9d148fb6567 SHA1 4b491cf5d08a8acb7d5a000c687aa0ad2ec4185e SHA256 1895c9a868768b01c3540060a113a3877bb5505d52e8947b1b387b6873a9e595
+MISC ChangeLog 34149 RMD160 ace6e213d6f95b651ddff426dc5276bad7c2f29b SHA1 a1d242a45b203e2cd32ab94ab895423e70926d07 SHA256 972a2c67a19b92fb92779f0e6e0c3dc0203421b102805ca37dd5b476572c401d
 MISC metadata.xml 831 RMD160 1a40ce1c3afecb14f2706c413b0d4a4fea3bb55f SHA1 258d06797a0b59edab6716e9ead66bb7df6b0e6e SHA256 802686f997f166ad02f46f8abc382dace5b23bac8db51c5f4a963afa3f75a6e2
diff --git a/app-doc/doxygen/doxygen-1.7.4.ebuild b/app-doc/doxygen/doxygen-1.7.4.ebuild
index f82f7c44c789..49c6d31b84c7 100644
--- a/app-doc/doxygen/doxygen-1.7.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v 1.1 2011/04/09 18:09:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v 1.2 2011/09/03 00:49:45 nerdboy Exp $
 
 EAPI=3
 
@@ -62,6 +62,10 @@ src_prepare() {
 	sed -i.orig -e "s:g_kowal:g kowal:" \
 		doc/maintainers.txt || die "sed 3 failed"
 
+	# fix qmake spec problem
+#	sed -i.orig -e "s:spec macx-g++:spec gentoo:" \
+#		addon/doxywizard/Makefile || die "sed 4 failed"
+
 	# add native TCL support
 	use tcl && epatch "${WORKDIR}"/${PN}-1.7-tcl_support.patch
 
@@ -104,16 +108,18 @@ src_configure() {
 }
 
 src_compile() {
-	CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \
-		emake all || die 'emake failed'
 
-	# force stupid qmake to use LDFLAGS - yes, it's a big kluge...
+	# force stupid qmake to behave - yes, it's a big kluge...
 	if use qt4 ; then
-		rm -f bin/doxywizard
 		sed -i -e "s|\-Wl,\-O1 |\-Wl,\-O1 ${ELDFLAGS} |" \
-			addon/doxywizard/Makefile.doxywizard
-		make -C addon/doxywizard
+			-e "s|= g++|= $(tc-getCXX)|" \
+			-e "s|usr/local/Qt4.6|usr/share/qt4|g" \
+			-e "s|macx-g++ -macx|linux-g++|" \
+			addon/doxywizard/Makefile.doxywizard \
+			|| die "qmake sed hack failed"
 	fi
+	CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \
+		emake all || die 'emake failed'
 
 	# generate html and pdf (if tetex in use) documents.
 	# errors here are not considered fatal, hence the ewarn message