USE flag qt->qt3/qt4 change bug #137785

(Portage version: 2.1.1_pre1-r1)

6 files changed, 36 insertions, 31 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index f107a6a5af18..8f32949ce0e0 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,11 @@
 # 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.99 2006/05/27 19:04:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.100 2006/06/24 01:44:20 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@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:
+  USE flag qt->qt3/qt4 change bug #137785
 
   27 May 2006; Steve Arnold <nerdboy@gentoo.org>
   -files/1.4.6/04_amd64_qtools.patch, files/doxygen-gcc4.patch:
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
index da32cca38dcc..507b95c7687a 100644
--- a/app-doc/doxygen/doxygen-1.4.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.2.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/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.17 2006/04/09 00:33:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.18 2006/06/24 01:44:20 cardoe Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -12,10 +12,10 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86"
-IUSE="doc qt tetex unicode"
+IUSE="doc qt3 tetex unicode"
 
 DEPEND="media-gfx/graphviz
-	qt? ( $(qt_min_version 3.3) )
+	qt3? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript
 	>=sys-apps/sed-4"
@@ -46,13 +46,13 @@ src_unpack() {
 src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
-	if use qt; then
+	if use qt3; then
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
 	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt doxywizard) || die 'configure failed'
+	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
 	else
 	    ./configure ${my_conf} || die 'configure failed'
 	fi
@@ -101,7 +101,7 @@ src_install() {
 pkg_postinst() {
 
 	ewarn
-	einfo "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	einfo "The USE flags qt3, doc, and tetex will enable doxywizard, or"
 	einfo "the html and pdf documentation, respectively.  For examples"
 	einfo "and other goodies, see the source tarball.  For some example"
 	einfo "output, run doxygen on the doxygen source using the Doxyfile"
diff --git a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
index 5074295a081f..0d7ad90699a5 100644
--- a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.3-r1.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/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.12 2006/04/09 00:33:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.13 2006/06/24 01:44:20 cardoe Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -12,10 +12,10 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-macos"
-IUSE="doc qt tetex unicode"
+IUSE="doc qt3 tetex unicode"
 
 RDEPEND="media-gfx/graphviz
-	qt? ( $(qt_min_version 3.3) )
+	qt3? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
@@ -50,13 +50,13 @@ src_unpack() {
 src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
-	if use qt; then
+	if use qt3; then
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
 	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt doxywizard) || die 'configure failed'
+	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
 	else
 	    ./configure ${my_conf} || die 'configure failed'
 	fi
@@ -105,7 +105,7 @@ src_install() {
 pkg_postinst() {
 
 	ewarn
-	einfo "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	einfo "The USE flags qt3, doc, and tetex will enable doxywizard, or"
 	einfo "the html and pdf documentation, respectively.  For examples"
 	einfo "and other goodies, see the source tarball.  For some example"
 	einfo "output, run doxygen on the doxygen source using the Doxyfile"
diff --git a/app-doc/doxygen/doxygen-1.4.4.ebuild b/app-doc/doxygen/doxygen-1.4.4.ebuild
index 63669704b271..1fb4804a020b 100644
--- a/app-doc/doxygen/doxygen-1.4.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.4.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/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.18 2006/04/09 00:33:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.19 2006/06/24 01:44:20 cardoe Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -12,10 +12,10 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
-IUSE="doc qt tetex unicode"
+IUSE="doc qt3 tetex unicode"
 
 RDEPEND="media-gfx/graphviz
-	qt? ( $(qt_min_version 3.3) )
+	qt3? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
@@ -44,13 +44,13 @@ src_unpack() {
 src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
-	if use qt; then
+	if use qt3; then
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
 	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt doxywizard) || die 'configure failed'
+	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
 	else
 	    ./configure ${my_conf} || die 'configure failed'
 	fi
@@ -99,7 +99,7 @@ src_install() {
 pkg_postinst() {
 
 	ewarn
-	einfo "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	einfo "The USE flags qt3, doc, and tetex will enable doxywizard, or"
 	einfo "the html and pdf documentation, respectively.  For examples"
 	einfo "and other goodies, see the source tarball.  For some example"
 	einfo "output, run doxygen on the doxygen source using the Doxyfile"
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
index 4726b0ea15e5..44b934205d20 100644
--- a/app-doc/doxygen/doxygen-1.4.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.5.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/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.7 2006/04/09 00:33:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.8 2006/06/24 01:44:20 cardoe Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -12,10 +12,10 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc qt tetex unicode"
+IUSE="doc qt3 tetex unicode"
 
 RDEPEND=">=media-gfx/graphviz-2.6
-	qt? ( $(qt_min_version 3.3) )
+	qt3? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
@@ -44,13 +44,13 @@ src_unpack() {
 src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 	local my_conf="--prefix ${D}usr"
-	if use qt; then
+	if use qt3; then
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
 	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt doxywizard) || die 'configure failed'
+	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
 	else
 	    ./configure ${my_conf} || die 'configure failed'
 	fi
@@ -99,7 +99,7 @@ src_install() {
 pkg_postinst() {
 
 	ewarn
-	einfo "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	einfo "The USE flags qt3, doc, and tetex will enable doxywizard, or"
 	einfo "the html and pdf documentation, respectively.  For examples"
 	einfo "and other goodies, see the source tarball.  For some example"
 	einfo "output, run doxygen on the doxygen source using the Doxyfile"
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
index 13635b6fcc2c..ab6cc8d77a76 100644
--- a/app-doc/doxygen/doxygen-1.4.6.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.6.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/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.6 2006/05/08 00:17:47 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.7 2006/06/24 01:44:20 cardoe Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -13,10 +13,10 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc qt tetex unicode"
+IUSE="doc qt3 tetex unicode"
 
 RDEPEND=">=media-gfx/graphviz-2.6
-	qt? ( $(qt_min_version 3.3) )
+	qt3? ( $(qt_min_version 3.3) )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
@@ -50,13 +50,13 @@ 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
+	if use qt3; then
 	    einfo "using QTDIR: '$QTDIR'."
 	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
 	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
 	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt doxywizard) || die 'configure failed'
+	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
 	else
 	    ./configure ${my_conf} || die 'configure failed'
 	fi
@@ -106,7 +106,7 @@ src_install() {
 pkg_postinst() {
 
 	ewarn
-	einfo "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	einfo "The USE flags qt3, doc, and tetex will enable doxywizard, or"
 	einfo "the html and pdf documentation, respectively.  For examples"
 	einfo "and other goodies, see the source tarball.  For some example"
 	einfo "output, run doxygen on the doxygen source using the Doxyfile"