QT environment fixes for bug 127596, plus updates for bugs 126374 and 127823

Package-Manager: portage-2.1_pre7-r4

8 files changed, 61 insertions, 70 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index ef3db8abf77a..9fdc6ee82a2c 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.96 2006/04/05 12:09:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.97 2006/04/09 00:33:58 nerdboy Exp $
+
+  08 Apr 2006; Steve Arnold <nerdboy@gentoo.org> doxygen-1.4.2.ebuild,
+  doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild,
+  doxygen-1.4.6.ebuild:
+  Updated QT environment stuff to address bug 127596, as well as updates
+  for bugs 126374 and 127823 (1.4.6 only).
 
   05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Recommit manifest, connection lost during commit.
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index efd1b051e7db..5599492820a3 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,24 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7fe9d590cf039748eeaa579604cf1cad ChangeLog 15666
-RMD160 b3b5c9999df6dfca70ff187573e0ce2f88d52eb6 ChangeLog 15666
-SHA256 aae6426a599e1e914d6f559bf4e4a66ec47ae1fb59d5dc0f772ebf4b661bd032 ChangeLog 15666
-MD5 ff66cbbbe3c270460abc3d27b6fae963 doxygen-1.4.2.ebuild 3518
-RMD160 4d83c959f5bc8e51aa292d090eeeb8dc76b42dfc doxygen-1.4.2.ebuild 3518
-SHA256 86cadf22d8baff04135204427304526336b0dbdc4c47abf5ef7941d44c5b66f0 doxygen-1.4.2.ebuild 3518
-MD5 10b7e11c8a6d2f356f28ea1623bb7fc7 doxygen-1.4.3-r1.ebuild 3607
-RMD160 65e25f4b1807633c254df88d8bdc96cd7f308587 doxygen-1.4.3-r1.ebuild 3607
-SHA256 9e9695178d178123dabb5400e3220b56e978a9d254520d5e62dc926ce274b0cc doxygen-1.4.3-r1.ebuild 3607
-MD5 967627665a58b2e6e5644c36081cb943 doxygen-1.4.4.ebuild 3444
-RMD160 87749d9635e973644a5cbd22135d8cea9096345f doxygen-1.4.4.ebuild 3444
-SHA256 480fd453e2f44140eda21c206df1ad5b6b03f9c3366862453b19cc6aafc006ea doxygen-1.4.4.ebuild 3444
-MD5 265fdf678920545d5c19ab68c38e1e13 doxygen-1.4.5.ebuild 3469
-RMD160 ccc72b764ac916c707a4f28ffa3fc84aa30bf1b8 doxygen-1.4.5.ebuild 3469
-SHA256 099fdde4a9df1df7bd5ebc11c49b72e775c190189e28e667442b9f93576a3a41 doxygen-1.4.5.ebuild 3469
-MD5 02cf32ab536f9edabb71f7208ad8f30d doxygen-1.4.6.ebuild 3571
-RMD160 dc0c4900b3b235afb233fdf25c6a9af4814ec34f doxygen-1.4.6.ebuild 3571
-SHA256 e81106b4c016c3277eb9619108f70f8315b199239271673b54e4b4256e12fefd doxygen-1.4.6.ebuild 3571
+MD5 fe2ab71cb8ebd9c00c5e5f356f02546a ChangeLog 15947
+RMD160 0fd18f1ffd8c7c583d1913ac141ec516af1a50ee ChangeLog 15947
+SHA256 3670d7d6c7cb62a270914abe79463d6850790584d21af7ac9a8de127f2637378 ChangeLog 15947
+MD5 9e4f09c75bce2e0c15ac325f29868585 doxygen-1.4.2.ebuild 3442
+RMD160 513999de90f09e383fd27cacbd03da3261fc86ab doxygen-1.4.2.ebuild 3442
+SHA256 a0d636e2df12ef41b98137ff61d0b34505b31ea5c3b233c6671836016ccbe44f doxygen-1.4.2.ebuild 3442
+MD5 85da3650b541d64e985cdeeaa2fb20f0 doxygen-1.4.3-r1.ebuild 3531
+RMD160 e5d01ebcc84cd6a4c1f4e05640f64bff6d8e3eb3 doxygen-1.4.3-r1.ebuild 3531
+SHA256 75465ccb66f218bedba25e86dea8025dd865ae7222f608672dcfff0557ff6148 doxygen-1.4.3-r1.ebuild 3531
+MD5 c2de8c267dcef04b44f4dd072f76efdb doxygen-1.4.4.ebuild 3368
+RMD160 f185f1bd290bddae73bab43e9f660045f5eb07cd doxygen-1.4.4.ebuild 3368
+SHA256 943bd5f561ad7f48e62000e88c9d014707f6e8306b7c9245f0c7722e28e93ee8 doxygen-1.4.4.ebuild 3368
+MD5 c7de7b65f2c8fcd7c565d6d2ed240773 doxygen-1.4.5.ebuild 3393
+RMD160 f73e981d965ba429e06edc818b245358050086b7 doxygen-1.4.5.ebuild 3393
+SHA256 6d1600fc068af517a0820ad99ecf04235ead00a2aa6f115411334255744fcbfc doxygen-1.4.5.ebuild 3393
+MD5 94b6e650a3725fb838eae6e6a519b6ec doxygen-1.4.6.ebuild 3810
+RMD160 81767fa393d79d119574909525f487349f74b194 doxygen-1.4.6.ebuild 3810
+SHA256 ed786af538dc037d80d5049c8e84ad444e430003b89b26fb4b17191d32e78f99 doxygen-1.4.6.ebuild 3810
 MD5 0c3111e09b7ea538f06a0655e7898e38 files/bsd-configure.patch 504
 RMD160 4d3321c677bbfcae2c25c7937ef015ff41812594 files/bsd-configure.patch 504
 SHA256 8aa47622750701cd492b35e8037b3b8a5ed1c13e564d0a0081a09877717b9cf1 files/bsd-configure.patch 504
@@ -52,13 +49,6 @@ SHA256 893e64e08358865d0da55a6b3a3678d38e1dffc8fb0a3498d206488d2e490b18 files/do
 MD5 e143e9d3e25a559233f4f2d77a58290d files/doxygen-gcc4.patch 478
 RMD160 822611c007e0c51b751d25c0f9aa423a5ac85253 files/doxygen-gcc4.patch 478
 SHA256 b8edbeb3fe97523d4b84c1df17dfd162bdd0e2f82cd2a58fbd6b9b5b16f9ef66 files/doxygen-gcc4.patch 478
-MD5 cf200318691ccdabdcdf603792fc907d metadata.xml 447
-RMD160 36a99bfdbd4d84fad2476f4bf8e8ec92941a0631 metadata.xml 447
-SHA256 9b272dfefb24f058ac98121a8d78316a0789acca0cc105f36570f29ad81861e5 metadata.xml 447
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEM7MQAiZjviIA2XgRAkKRAKDInv+o/bL6R4+3HnXLvoE3o4GrAgCfTGJa
-4CuVtKZYCy8Kw+mDZN6u/yY=
-=5xnD
------END PGP SIGNATURE-----
+MD5 b8f1156ac2d88a9982011ecd8ff2275b metadata.xml 649
+RMD160 2c8cc604548cc64104c075ff64d33190efdce45d metadata.xml 649
+SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b metadata.xml 649
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
index 588ae9be6264..da32cca38dcc 100644
--- a/app-doc/doxygen/doxygen-1.4.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.16 2006/02/08 08:47:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.17 2006/04/09 00:33:58 nerdboy Exp $
 
-inherit eutils toolchain-funcs kde-functions
+inherit eutils toolchain-funcs qt3
 
 DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
 HOMEPAGE="http://www.doxygen.org/"
@@ -15,13 +15,11 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86"
 IUSE="doc qt tetex unicode"
 
 DEPEND="media-gfx/graphviz
-	qt? ( =x11-libs/qt-3* )
+	qt? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript
 	>=sys-apps/sed-4"
 
-if use qt; then need-qt 3; fi
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -49,7 +47,6 @@ src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
 	if use qt; then
-	    einfo "using QT version: '$QTVER'."
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
diff --git a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
index 26ed024f7c9c..5074295a081f 100644
--- a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.11 2006/02/08 08:47:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.12 2006/04/09 00:33:58 nerdboy Exp $
 
-inherit eutils toolchain-funcs kde-functions
+inherit eutils toolchain-funcs qt3
 
 DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
 HOMEPAGE="http://www.doxygen.org/"
@@ -15,14 +15,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-
 IUSE="doc qt tetex unicode"
 
 RDEPEND="media-gfx/graphviz
-	qt? ( =x11-libs/qt-3* )
+	qt? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
 
-if use qt; then need-qt 3; fi
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -53,7 +51,6 @@ src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
 	if use qt; then
-	    einfo "using QT version: '$QTVER'."
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
diff --git a/app-doc/doxygen/doxygen-1.4.4.ebuild b/app-doc/doxygen/doxygen-1.4.4.ebuild
index d18ed47d9a97..63669704b271 100644
--- a/app-doc/doxygen/doxygen-1.4.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.17 2006/02/08 08:47:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.18 2006/04/09 00:33:58 nerdboy Exp $
 
-inherit eutils toolchain-funcs kde-functions
+inherit eutils toolchain-funcs qt3
 
 DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
 HOMEPAGE="http://www.doxygen.org/"
@@ -15,14 +15,12 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="doc qt tetex unicode"
 
 RDEPEND="media-gfx/graphviz
-	qt? ( =x11-libs/qt-3* )
+	qt? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
 
-if use qt; then need-qt 3; fi
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -47,7 +45,6 @@ src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
 	if use qt; then
-	    einfo "using QT version: '$QTVER'."
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
index 76447af80cbd..4726b0ea15e5 100644
--- a/app-doc/doxygen/doxygen-1.4.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.6 2006/02/08 08:47:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.7 2006/04/09 00:33:58 nerdboy Exp $
 
-inherit eutils toolchain-funcs kde-functions
+inherit eutils toolchain-funcs qt3
 
 DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
 HOMEPAGE="http://www.doxygen.org/"
@@ -15,14 +15,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc
 IUSE="doc qt tetex unicode"
 
 RDEPEND=">=media-gfx/graphviz-2.6
-	qt? ( =x11-libs/qt-3* )
+	qt? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
 
-if use qt; then need-qt 3; fi
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -47,7 +45,6 @@ src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
 	if use qt; then
-	    einfo "using QT version: '$QTVER'."
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
index 36da4b4bdf7c..1b556b6538fa 100644
--- a/app-doc/doxygen/doxygen-1.4.6.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.6.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.4 2006/04/05 11:29:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.5 2006/04/09 00:33:58 nerdboy Exp $
 
-inherit eutils toolchain-funcs kde-functions
+inherit eutils toolchain-funcs qt3
 
-DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
+DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C,
+	Python, IDL , and other C-like languages."
 HOMEPAGE="http://www.doxygen.org/"
 SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
@@ -15,24 +16,22 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc
 IUSE="doc qt tetex unicode"
 
 RDEPEND=">=media-gfx/graphviz-2.6
-	qt? ( =x11-libs/qt-3* )
+	qt? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
 
-if use qt; then need-qt 3; fi
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	# use CFLAGS and CXXFLAGS (on linux and ppc-macos)
-	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
-		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
-		tmake/lib/{linux-g++,macosx-c++}/tmake.conf
+	# 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
 
 	epatch ${FILESDIR}/doxygen-1.4.3-cp1251.patch
-#	epatch ${FILESDIR}/doxygen-1.4.4-darwin.patch
 
 	if use unicode; then
 		epatch ${WORKDIR}/${PN}-utf8-ru.patch || die "utf8-ru patch failed"
@@ -47,10 +46,10 @@ src_unpack() {
 }
 
 src_compile() {
+	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
 	if use qt; then
-	    einfo "using QT version: '$QTVER'."
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
@@ -62,7 +61,8 @@ src_compile() {
 	fi
 
 	# and compile
-	emake all || die 'emake failed'
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
+	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
 
 	# generate html and pdf (if tetex in use) documents.
 	# errors here are not considered fatal, hence the ewarn message
@@ -110,5 +110,7 @@ pkg_postinst() {
 	einfo "and other goodies, see the source tarball.  For some example"
 	einfo "output, run doxygen on the doxygen source using the Doxyfile"
 	einfo "provided in the top-level source dir."
+	einfo ""
+	einfo "See the Doxygen homepage for additional language support tools."
 	ewarn
 }
diff --git a/app-doc/doxygen/metadata.xml b/app-doc/doxygen/metadata.xml
index be7ddc695383..bcfecf8998f9 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/metadata.xml
@@ -6,5 +6,10 @@
     <email>nerdboy@gentoo.org</email>
     <name>Steve Arnold</name>
 </maintainer>
-<longdescription>Doxygen is a tool for analyzing, documenting, and reverse-engineering source code of various languages using a variety of output formats (try it and see).</longdescription>
+<longdescription>Doxygen is a tool for analyzing, documenting, and reverse-engineering 
+    source code of various languages using a variety of output formats 
+    (try it and see).  Doxygen supports C++, C, Java, Objective-C, Python, 
+    IDL (Corba and Microsoft flavors) and to some extent PHP, C#, and D,
+    as well as other languages (using additional helper tools).
+</longdescription>
 </pkgmetadata>