Newer (and cleaner) version using more of the qt4-r2 functionality.

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

3 files changed, 26 insertions, 33 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index b128b6013bc2..43b971c6c017 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.204 2011/09/03 00:49:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.205 2011/09/03 02:02:28 nerdboy Exp $
+
+  03 Sep 2011; Steve Arnold <nerdboy@gentoo.org> doxygen-1.7.4.ebuild:
+  Newer (and cleaner) version using more of the qt4-r2 functionality.
+  Thanks to radhermit for bugging me about this...
 
   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 
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 1cb86b8a7a1e..8675c9ff63bf 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 6030 RMD160 b85b12f8131318754e4a3dc095a8e9d148fb6567 SHA1 4b491cf5d08a8acb7d5a000c687aa0ad2ec4185e SHA256 1895c9a868768b01c3540060a113a3877bb5505d52e8947b1b387b6873a9e595
-MISC ChangeLog 34149 RMD160 ace6e213d6f95b651ddff426dc5276bad7c2f29b SHA1 a1d242a45b203e2cd32ab94ab895423e70926d07 SHA256 972a2c67a19b92fb92779f0e6e0c3dc0203421b102805ca37dd5b476572c401d
+EBUILD doxygen-1.7.4.ebuild 5320 RMD160 91014a6c3d8a32c81528c8488b76624219d50661 SHA1 ccd95ea2fe45d63ba0878a5e6ecc7dc1b34cf115 SHA256 754d9b93cbbfea01ac492e904908c3abcd0a6d4e8d885f83512a6c436ccc52e2
+MISC ChangeLog 34342 RMD160 bda86436165afefdd2a3dfe6031ab1b06efb34ef SHA1 562ff73573df9ac4d993fee8d267a5d03a84443e SHA256 4c15c386740841bd0929c26ac862cafcd05ebe608235e9937089e603251a9f28
 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 49c6d31b84c7..08691774e54c 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.2 2011/09/03 00:49:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v 1.3 2011/09/03 02:02:28 nerdboy Exp $
 
 EAPI=3
 
@@ -49,7 +49,7 @@ src_prepare() {
 	fi
 
 	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	epatch "${FILESDIR}/${PN}-1.7.1-dot-eps.patch"
+	epatch "${FILESDIR}"/${PN}-1.7.1-dot-eps.patch
 
 	# prefix search tools patch, plus OSX fixes
 	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
@@ -62,10 +62,6 @@ 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
 
@@ -83,43 +79,36 @@ src_prepare() {
 src_configure() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 
-	local my_conf=""
-	use debug && my_conf="--debug"
+	local my_conf="--shared"
+
+	if use debug ; then
+		my_conf="${my_conf} --debug"
+	else
+		my_conf="${my_conf} --release "
+	fi
+
 	use ppc64 && my_conf="${my_conf} --english-only" #263641
 
+	use qt4 && my_conf="${my_conf} --with-doxywizard"
+
 	export CC="${QMAKE_CC}"
 	export CXX="${QMAKE_CXX}"
 	export LINK="${QMAKE_LINK}"
 	export LINK_SHLIB="${QMAKE_CXX}"
 
-	if use qt4; then
-		export QTDIR="${EPREFIX}/usr"
-		einfo "using QTDIR: '$QTDIR'."
-		export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-
-		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
-		|| die 'configure with qt4 failed'
-	else
-		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
-	fi
+	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
+			|| die 'configure failed'
 }
 
 src_compile() {
 
-	# force stupid qmake to behave - yes, it's a big kluge...
+	# force stupid qmake to behave - if it works...
 	if use qt4 ; then
-		sed -i -e "s|\-Wl,\-O1 |\-Wl,\-O1 ${ELDFLAGS} |" \
-			-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"
+		qt4-r2_src_compile
+	else
+		CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \
+			emake all || die 'emake 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