Needed additional updates to pick up the qt4 qmake config correctly.

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

3 files changed, 19 insertions, 12 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 69e251ce8216..f8ff9a957548 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.180 2010/10/02 18:21:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.181 2010/10/04 06:10:38 nerdboy Exp $
+
+  04 Oct 2010; Steve Arnold <nerdboy@gentoo.org> doxygen-1.5.8-r1.ebuild:
+  Needed additional updates to pick up the qt4 qmake config correctly.
 
   02 Oct 2010; Steve Arnold <nerdboy@gentoo.org> doxygen-1.5.8-r1.ebuild:
   Updated LDFLAGS and EAPI; closes QA bug #336736.
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 85c5ad166362..39902ceca6d8 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -33,11 +33,11 @@ EBUILD doxygen-1.5.4.ebuild 4529 RMD160 31458ab58660ca639375d1976eafa3fde39db6b6
 EBUILD doxygen-1.5.5.ebuild 4499 RMD160 ee0464c5b924f1895bde7b956526d78dd50e86dc SHA1 8e6f528aed0369a6214689916f1497ed01b40456 SHA256 fe0b01e91433a9cc4afb45aad725fbd9a9f4ffaaa3a422b9571409407f43e088
 EBUILD doxygen-1.5.6.ebuild 4499 RMD160 470b6034a63d4bdebd48443b063e6565ba926b01 SHA1 943482558e93d3dd6de145532c95f2e203eca6e3 SHA256 01028754cf1a7be1e012e3df8ba3d433e48d63aa7e54b5323764fd0aa090ec21
 EBUILD doxygen-1.5.7.1.ebuild 4726 RMD160 bdd542705abb6c260fd29f6c02f0664979d1c8af SHA1 97513e9b35b7fd410754b587c418a1b5102cf86e SHA256 d8f68d435453a9a34cdfd29044ba999cfdd2f09dee293d9d05f7676a56506850
-EBUILD doxygen-1.5.8-r1.ebuild 5389 RMD160 ee43622b9e6bae352063475eecde33ebaf13ea2a SHA1 b97090128bd98fe1c7278bfec2199ca0dd33da79 SHA256 edafc69e111fe225506b1d444d6c4e2419598e29b6a78c005951f8b137b3dfe2
+EBUILD doxygen-1.5.8-r1.ebuild 5427 RMD160 8e00f51035bc64146849cc453c9700c3fa64dbfa SHA1 efb0de47e4658b13d639c00fbd06bf92a2436ad4 SHA256 39d509b3a80ba3f63c47c916d5d539680acc548a81d653431ad57f6f06dffb1c
 EBUILD doxygen-1.5.9.ebuild 5144 RMD160 d244e60be9c36417a3e769c67b194176b5dee9dd SHA1 4e12937fd29dda8d660cf9bef4dd3791828f77bd SHA256 bdfe3f87de8d0024022fe0d89384bd3eee1f7aea3a53d384e7c439c6a535f883
 EBUILD doxygen-1.6.1.ebuild 5327 RMD160 5cae97bf462e0ca2bb58ad9cabf6893a688be2c0 SHA1 71d307fce65e0d39ac8d728513ab3e60944b4c8d SHA256 bfc366a15795bafbf70b25385eeb8fa96039bfcbe4adf6f8716b0ce04961bcc0
 EBUILD doxygen-1.6.2.ebuild 5146 RMD160 30e58447ad9b12b69893eec1c2a31e6cafb01719 SHA1 57f17659d5d902a005f647d991206084ebcd4c1f SHA256 af0c0b5216a59ce9aaa0978bfc11a900e84b401839c619f3222c81397978f610
 EBUILD doxygen-1.6.3.ebuild 5153 RMD160 96721b42675af763276f72298215d201e2daf072 SHA1 635cb35dfd0c4211d7ae9baab8ccba6247915535 SHA256 c4371ceabf44d69fccb34066f662a5e6a3723d3e4efbf25820709d7ffbd577ec
 EBUILD doxygen-1.7.1.ebuild 5249 RMD160 60f6f651029c9410d4cc5019eac12c78ca3b2a2e SHA1 ac8c7ae7aeb053945fbf40b6522ab214edc35dc3 SHA256 afad9f53aca6de69123d7ab108594d39cc913a151682903850a94c8b10d9c343
-MISC ChangeLog 30669 RMD160 73f2f223fc79e0332e6991d5b2f5efc5f096465b SHA1 433c66cfb677701111682939a2c8cba953e8391a SHA256 0ad70a61fdf2f30a377c502f1f7093f9fffa5b4c7c0ff00d9e9f95b3e41b2d19
+MISC ChangeLog 30815 RMD160 dbccd24eb841a1fc2c3f26ab56afa8683d3d87fb SHA1 0bf295dd05d2862afe820ad338aa0a6be4dfb53a SHA256 a9eb0540626febc1c639d26a785c29ec0cceb82649e699cc3a929d9c5105db45
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
diff --git a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild
index 3e4c1f663157..fa53f8a892fd 100644
--- a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.8-r1.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/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.8 2010/10/02 18:21:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.9 2010/10/04 06:10:38 nerdboy Exp $
 
 EAPI=2
 
@@ -35,12 +35,14 @@ DEPEND=">=sys-apps/sed-4
 EPATCH_SUFFIX="patch"
 
 src_prepare() {
+	qt4-r2_src_prepare
+
 	# use CFLAGS, CXXFLAGS, LDFLAGS
 	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
 		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
 		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
 		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-		|| die "sed failed"
+		|| die "sed 1 failed"
 
 	# Ensure we link to -liconv
 	if use elibc_FreeBSD; then
@@ -60,7 +62,7 @@ src_prepare() {
 
 	# fix final DESTDIR issue
 	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		addon/doxywizard/Makefile.in || die "sed failed"
+		addon/doxywizard/Makefile.in || die "sed 2 failed"
 
 	if is-flagq "-O3" ; then
 		echo
@@ -76,8 +78,8 @@ src_prepare() {
 
 src_configure() {
 	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
 
+	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf=""
 	if use debug; then
 		my_conf="--prefix /usr --debug"
@@ -92,21 +94,23 @@ src_configure() {
 
 	if use qt4; then
 		export QTDIR="/usr"
-		einfo "using QTDIR: '$QTDIR'."
 		export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
 		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
-		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
 		./configure ${my_conf} $(use_with qt4 doxywizard) \
 		|| die 'configure with qt4 failed'
 	else
 		./configure ${my_conf} || die 'configure failed'
 	fi
+
+	# this appears to work as a fix for the final ignoring LDFLAGS issue...
+	pushd "${S}"/addon/doxywizard
+		eqmake4 "CONFIG+=nostrip" doxywizard.pro -o Makefile.doxywizard
+	popd
 }
 
 src_compile() {
 	# and compile
-	emake LDFLAGS="${LDFLAGS}" all || die 'emake failed'
+	emake all || die 'emake failed'
 
 	# generate html and pdf (if tetex in use) documents.
 	# errors here are not considered fatal, hence the ewarn message
@@ -144,7 +148,7 @@ src_install() {
 	if use qt4; then
 		doicon "${FILESDIR}/doxywizard.png"
 		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
-			"doxywizard.png" "Application;Development"
+			"doxywizard" "Application;Development"
 	fi
 
 	dodoc INSTALL LANGUAGE.HOWTO README