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

Package-Manager: portage-2.1.1_pre1-r1

7 files changed, 85 insertions, 80 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 6c62ecb108f9..bc97cf36e2f0 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.84 2006/05/23 06:16:58 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.85 2006/06/24 01:17:29 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> lyx-1.3.4.ebuild,
+  lyx-1.3.5-r1.ebuild, lyx-1.3.5-r2.ebuild, lyx-1.3.6.ebuild,
+  lyx-1.4.1-r1.ebuild:
+  USE flag qt->qt3/qt4 change
 
   23 May 2006; Joshua Jackson <tsunam@gentoo.org> lyx-1.4.1-r1.ebuild:
   stable on x86 bug #133942
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index cd550342b015..2f6c671b4452 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -49,30 +49,30 @@ DIST lyx-1.3.5.tar.bz2 5459049 RMD160 8e35ea173b5184bd0abaac2857fd12e45d41e2ac S
 DIST lyx-1.3.6.tar.bz2 5745377 RMD160 56ca421121121962990a8d569acc6988b913207b SHA256 c0ef3227287459729a6db3fc39b38f891f63430d5404fd0782b1ec4bd1e6959b
 DIST lyx-1.4.1.tar.bz2 6637018 RMD160 8569859a1badb3f5f1869b61210bd743bd274c5c SHA256 290b55df4d2726581b9451289b4d73e53aab733fbd0f09e22385022e84424854
 DIST preferences 1669 RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43
-EBUILD lyx-1.3.4.ebuild 3274 RMD160 8161778d8491f3126ac1053e5005fed091da8245 SHA1 17fd2ad9038263bd758b0e9d683b70d5d5f1647d SHA256 affe395c59e1f56ec4c530819751d1c7ab1b491eced896d5820d6fdadc2e28ac
-MD5 f2097f1de18186295deccf7d655cdf6d lyx-1.3.4.ebuild 3274
-RMD160 8161778d8491f3126ac1053e5005fed091da8245 lyx-1.3.4.ebuild 3274
-SHA256 affe395c59e1f56ec4c530819751d1c7ab1b491eced896d5820d6fdadc2e28ac lyx-1.3.4.ebuild 3274
-EBUILD lyx-1.3.5-r1.ebuild 4387 RMD160 2d57578cb6ef8072c2d098a0d686adc21e7fe122 SHA1 979dd58c932f594a0fd068fbf8ae8abe77192c07 SHA256 6294ff764e8db255daf3c00235851ea44d7c98d00a4bfbaab9952062b0106aeb
-MD5 8610f7c3cd81302e38c43ec4b8040445 lyx-1.3.5-r1.ebuild 4387
-RMD160 2d57578cb6ef8072c2d098a0d686adc21e7fe122 lyx-1.3.5-r1.ebuild 4387
-SHA256 6294ff764e8db255daf3c00235851ea44d7c98d00a4bfbaab9952062b0106aeb lyx-1.3.5-r1.ebuild 4387
-EBUILD lyx-1.3.5-r2.ebuild 4536 RMD160 864062187cccd67e70b69dd09eeacf957b566249 SHA1 ee4d314f9fa6bd5ffa10c0edb86d9f50c9b01828 SHA256 3735806f428344e2ac9a67d5167f2b5ef7f69c9d93bba46f2b3a2e426710b04b
-MD5 112fa20b3374810920dbc65e02f86384 lyx-1.3.5-r2.ebuild 4536
-RMD160 864062187cccd67e70b69dd09eeacf957b566249 lyx-1.3.5-r2.ebuild 4536
-SHA256 3735806f428344e2ac9a67d5167f2b5ef7f69c9d93bba46f2b3a2e426710b04b lyx-1.3.5-r2.ebuild 4536
-EBUILD lyx-1.3.6.ebuild 4425 RMD160 222d8753ed8525cabf843d3b6fabf334476e0d93 SHA1 f27086ec68aab17ef3e6395d04f8fbbca25555e0 SHA256 4272f5b36b8c469a7bdacfff3ec9f2257620a056c13914261e098b563359138c
-MD5 9acaaa20c1f4c3725b97774e84d5da23 lyx-1.3.6.ebuild 4425
-RMD160 222d8753ed8525cabf843d3b6fabf334476e0d93 lyx-1.3.6.ebuild 4425
-SHA256 4272f5b36b8c469a7bdacfff3ec9f2257620a056c13914261e098b563359138c lyx-1.3.6.ebuild 4425
-EBUILD lyx-1.4.1-r1.ebuild 4732 RMD160 aaeeb2f04b6e266b89ef1143f111e3803ec53688 SHA1 2246421587c883ebe728314fdf33f499e15965c2 SHA256 c46f28e2a96712afe2a54a0146baa4c8130a2215ad77b0eeeaf9d253e19c21c3
-MD5 61208b1642068f3a3af8546cc8806c1b lyx-1.4.1-r1.ebuild 4732
-RMD160 aaeeb2f04b6e266b89ef1143f111e3803ec53688 lyx-1.4.1-r1.ebuild 4732
-SHA256 c46f28e2a96712afe2a54a0146baa4c8130a2215ad77b0eeeaf9d253e19c21c3 lyx-1.4.1-r1.ebuild 4732
-MISC ChangeLog 13624 RMD160 3edc630916e8b1b721bbea2b5f8c207d4fe02209 SHA1 2027553c4e9020c62241b5165a7eb91f26307820 SHA256 90e02ee02fc1c2a0d2e1e9121e7e4088cde3e7cbe4cd33a7ed2ef87a484d7afc
-MD5 a75af207d45eea26bcf91cd33c9811fd ChangeLog 13624
-RMD160 3edc630916e8b1b721bbea2b5f8c207d4fe02209 ChangeLog 13624
-SHA256 90e02ee02fc1c2a0d2e1e9121e7e4088cde3e7cbe4cd33a7ed2ef87a484d7afc ChangeLog 13624
+EBUILD lyx-1.3.4.ebuild 3279 RMD160 3de4448aa779301cfe223667bb9007c2e3ee068a SHA1 965aadfb657e1385afc8fcd16f63cb9888b44532 SHA256 ca45bbad936b1630333f3fc859a12c5a70d117a830be07bf88c547fdea16396a
+MD5 0b66f1758245416c0e90f7d995056f7a lyx-1.3.4.ebuild 3279
+RMD160 3de4448aa779301cfe223667bb9007c2e3ee068a lyx-1.3.4.ebuild 3279
+SHA256 ca45bbad936b1630333f3fc859a12c5a70d117a830be07bf88c547fdea16396a lyx-1.3.4.ebuild 3279
+EBUILD lyx-1.3.5-r1.ebuild 4399 RMD160 fb88b067ec67bb01ab94939a71ace2dd702f6beb SHA1 2be4c650cd8db6134ed97a2d0a61d1938801fe65 SHA256 38d11642fe51215873fd889ed6b5557dbf47e27bdd13e3240a753d503e285ebb
+MD5 b9b82eee11e03ac06ba5d2aeda2d4c0b lyx-1.3.5-r1.ebuild 4399
+RMD160 fb88b067ec67bb01ab94939a71ace2dd702f6beb lyx-1.3.5-r1.ebuild 4399
+SHA256 38d11642fe51215873fd889ed6b5557dbf47e27bdd13e3240a753d503e285ebb lyx-1.3.5-r1.ebuild 4399
+EBUILD lyx-1.3.5-r2.ebuild 4549 RMD160 61923f2443ee838a6708f75a36fca2c11e4a0207 SHA1 fa993ea6721f8c0891787e4ec6214b79e51b6022 SHA256 361647d403ae04b9068300ec4997e666799fbbd0d26292d686d673c5025c1bc8
+MD5 c46936ae61642f80988532b4f0a15aeb lyx-1.3.5-r2.ebuild 4549
+RMD160 61923f2443ee838a6708f75a36fca2c11e4a0207 lyx-1.3.5-r2.ebuild 4549
+SHA256 361647d403ae04b9068300ec4997e666799fbbd0d26292d686d673c5025c1bc8 lyx-1.3.5-r2.ebuild 4549
+EBUILD lyx-1.3.6.ebuild 4437 RMD160 605b467f0efab006d916b8d2a57b222fa0632d53 SHA1 c0e754c3b0d6f068df46f2b47ba3d26f7dfe078b SHA256 08895da9a9739d4541c3a1eb6cdc7f017eee2f312a656d1f1104a29957dbe8e5
+MD5 63192510328eb3de10062f30c941ff03 lyx-1.3.6.ebuild 4437
+RMD160 605b467f0efab006d916b8d2a57b222fa0632d53 lyx-1.3.6.ebuild 4437
+SHA256 08895da9a9739d4541c3a1eb6cdc7f017eee2f312a656d1f1104a29957dbe8e5 lyx-1.3.6.ebuild 4437
+EBUILD lyx-1.4.1-r1.ebuild 4738 RMD160 62824e130258575089bd3bc7e3d4eea2df2c623c SHA1 303f90aef0f8c46dd486d524cd2f9b9eb9197347 SHA256 f968377bb238c6e3ac864d289408261916bb3c30c97f5587367759139cd7526b
+MD5 31cd8758611dc3f951fd3f55d23faa73 lyx-1.4.1-r1.ebuild 4738
+RMD160 62824e130258575089bd3bc7e3d4eea2df2c623c lyx-1.4.1-r1.ebuild 4738
+SHA256 f968377bb238c6e3ac864d289408261916bb3c30c97f5587367759139cd7526b lyx-1.4.1-r1.ebuild 4738
+MISC ChangeLog 13808 RMD160 0d1311c02a9f7bc739eb303adf4a3e91570dbacd SHA1 39b56c444ff9665cbeeea2173837686e1d9d3d74 SHA256 056ab80c5d44236326112054c8c5db603190f0287138ec456e2c24e6cc67ff5a
+MD5 88a26d7573948762ab54795ee9d7fd44 ChangeLog 13808
+RMD160 0d1311c02a9f7bc739eb303adf4a3e91570dbacd ChangeLog 13808
+SHA256 056ab80c5d44236326112054c8c5db603190f0287138ec456e2c24e6cc67ff5a ChangeLog 13808
 MISC metadata.xml 181 RMD160 076b1da29f7ec9ff8c71af3d300db7934a6c16c5 SHA1 5effb8ab828993de4d80369d8148ec8505a723a0 SHA256 fee59649574618944ad5be45972b6d1a8e09b75e64d07a75fbdef4c335a88fca
 MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
 RMD160 076b1da29f7ec9ff8c71af3d300db7934a6c16c5 metadata.xml 181
@@ -95,7 +95,7 @@ SHA256 a2db0f2c700e4b223f6834a61521ebf10f71c03cde53b2fdc68f0029d5818a2d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEcqjoSENan+PfizARApFmAJ4jOQZKE/31aLnt+8iBkDKzjZwxsACfQZoS
-YQ3KSBebZ20wiTvsAedSxyk=
-=YdQs
+iD8DBQFEnJK+oeSe8B0zEfwRAvaLAJ0UTCuI4VkpJer7R4BLIhQLQD+1WgCfd2GC
+NbWhsj4e3lViejD/ds4J/go=
+=7lgW
 -----END PGP SIGNATURE-----
diff --git a/app-office/lyx/lyx-1.3.4.ebuild b/app-office/lyx/lyx-1.3.4.ebuild
index 4795b68b5666..d0461e9b1bdf 100644
--- a/app-office/lyx/lyx-1.3.4.ebuild
+++ b/app-office/lyx/lyx-1.3.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-office/lyx/lyx-1.3.4.ebuild,v 1.16 2006/04/05 07:32:03 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.4.ebuild,v 1.17 2006/06/24 01:17:29 cardoe Exp $
 
 inherit kde-functions eutils libtool
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
-IUSE="nls cups qt debug gnome"
+IUSE="nls cups qt3 debug gnome"
 
 # these dependencies need looking at.
 # does lyx only need qt to compile but not run ?
@@ -32,7 +32,7 @@ DEPEND="|| (
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
-	qt? ( =x11-libs/qt-3* ) !qt? ( =x11-libs/xforms-1* )"
+	qt3? ( =x11-libs/qt-3* ) !qt3? ( =x11-libs/xforms-1* )"
 
 RDEPEND="${DEPEND}
 	|| (
@@ -69,7 +69,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	if use qt ; then
+	if use qt3 ; then
 		set-qtdir 3
 		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
 	else
@@ -125,10 +125,10 @@ pkg_postinst() {
 	einfo "2. unzip /usr/share/doc/${P}/preferences.gz into ~/.lyx/preferences"
 	einfo "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
 	einfo "for instructions on using lyx's own preferences dialog to equal effect."
-	einfo "3. use lyx's qt interface (compile with USE=qt) for maximum effect."
+	einfo "3. use lyx's qt interface (compile with USE=qt3) for maximum effect."
 	einfo ""
 
-	if ! useq qt ; then
+	if ! useq qt3; then
 	draw_line
 	einfo ""
 	einfo "If you have a multi-head setup not using xinerama you can only use lyx"
diff --git a/app-office/lyx/lyx-1.3.5-r1.ebuild b/app-office/lyx/lyx-1.3.5-r1.ebuild
index 8327b95838fa..bf2b5942f1f8 100644
--- a/app-office/lyx/lyx-1.3.5-r1.ebuild
+++ b/app-office/lyx/lyx-1.3.5-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-office/lyx/lyx-1.3.5-r1.ebuild,v 1.12 2006/04/05 07:32:03 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r1.ebuild,v 1.13 2006/06/24 01:17:29 cardoe Exp $
 
 inherit kde-functions eutils libtool flag-o-matic
 
@@ -10,13 +10,13 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 	http://movementarian.org/latex-xft-fonts-0.1.tar.gz
 	http://www.math.tau.ac.il/~dekelts/lyx/files/hebrew.bind
 	http://www.math.tau.ac.il/~dekelts/lyx/files/preferences
-	cjk? ( qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-1.patch )
-		!qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/CJK-LyX-xforms-${PV}-1.patch ) )"
+	cjk? ( qt3? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-1.patch )
+		!qt3? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/CJK-LyX-xforms-${PV}-1.patch ) )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="cjk cups debug nls qt"
+IUSE="cjk cups debug nls qt3"
 
 # these dependencies need looking at.
 # does lyx only need qt to compile but not run ?
@@ -34,8 +34,8 @@ DEPEND="|| (
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
-	qt? ( =x11-libs/qt-3* )
-	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
+	qt3? ( =x11-libs/qt-3* )
+	!qt3? ( cjk? ( =x11-libs/xforms-1.0-r1 )
 		!cjk? ( =x11-libs/xforms-1* ) )"
 
 RDEPEND="${DEPEND}
@@ -66,17 +66,17 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-1.3.2-nomktex.patch
 	epatch ${FILESDIR}/${PN}-1.3.3-configure-diff
 	epatch ${FILESDIR}/${P}-boost.patch
-	if use cjk && use qt ; then
+	if use cjk && use qt3 ; then
 		epatch ${DISTDIR}/CJK-LyX-qt-${PV}-1.patch
 	elif use cjk && built_with_use '=x11-libs/xforms-1.0-r1' cjk ; then
 		epatch ${DISTDIR}/CJK-LyX-xforms-${PV}-1.patch
 	elif use cjk ; then
 		eerror
-		eerror 'CJK-LyX requires qt USE flag enabled or x11-libs/xforms-1.0-r1'
+		eerror 'CJK-LyX requires qt3 USE flag enabled or x11-libs/xforms-1.0-r1'
 		eerror 'built with cjk USE flag. You should either'
-		eerror '1) USE="cjk qt" emerge lyx'
+		eerror '1) USE="cjk qt3" emerge lyx'
 		eerror 'or'
-		eerror '2) USE="cjk" emerge xforms-1.0-r1; USE="cjk -qt" emerge lyx'
+		eerror '2) USE="cjk" emerge xforms-1.0-r1; USE="cjk -qt3" emerge lyx'
 		eerror 'or'
 		eerror '3) USE="-cjk" emerge lyx (normal LyX will be built)'
 		eerror
@@ -87,7 +87,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	if use qt ; then
+	if use qt3 ; then
 		set-qtdir 3
 		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
 	else
@@ -143,10 +143,10 @@ pkg_postinst() {
 	einfo "2. unzip /usr/share/doc/${P}/preferences.gz into ~/.lyx/preferences"
 	einfo "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
 	einfo "for instructions on using lyx's own preferences dialog to equal effect."
-	einfo "3. use lyx's qt interface (compile with USE=qt) for maximum effect."
+	einfo "3. use lyx's qt interface (compile with USE=qt3) for maximum effect."
 	einfo ""
 
-	if ! useq qt ; then
+	if ! useq qt3 ; then
 	draw_line
 	einfo ""
 	einfo "If you have a multi-head setup not using xinerama you can only use lyx"
diff --git a/app-office/lyx/lyx-1.3.5-r2.ebuild b/app-office/lyx/lyx-1.3.5-r2.ebuild
index 8191f23a8012..c9a27817ae16 100644
--- a/app-office/lyx/lyx-1.3.5-r2.ebuild
+++ b/app-office/lyx/lyx-1.3.5-r2.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-office/lyx/lyx-1.3.5-r2.ebuild,v 1.9 2006/04/05 07:32:03 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r2.ebuild,v 1.10 2006/06/24 01:17:29 cardoe Exp $
 
 inherit kde-functions eutils libtool flag-o-matic
 
@@ -10,13 +10,13 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 	http://movementarian.org/latex-xft-fonts-0.1.tar.gz
 	http://www.math.tau.ac.il/~dekelts/lyx/files/hebrew.bind
 	http://www.math.tau.ac.il/~dekelts/lyx/files/preferences
-	cjk? ( qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-1.patch )
-		!qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/CJK-LyX-xforms-${PV}-1.patch ) )"
+	cjk? ( qt3? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-1.patch )
+		!qt3? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/CJK-LyX-xforms-${PV}-1.patch ) )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="cjk cups debug nls qt"
+IUSE="cjk cups debug nls qt3"
 
 # these dependencies need looking at.
 # does lyx only need qt to compile but not run ?
@@ -34,8 +34,8 @@ DEPEND="|| (
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
-	qt? ( =x11-libs/qt-3* )
-	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
+	qt3? ( =x11-libs/qt-3* )
+	!qt3? ( cjk? ( =x11-libs/xforms-1.0-r1 )
 		!cjk? ( =x11-libs/xforms-1* ) )"
 
 RDEPEND="${DEPEND}
@@ -66,17 +66,17 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-1.3.2-nomktex.patch
 	epatch ${FILESDIR}/${PN}-1.3.3-configure-diff
 	epatch ${FILESDIR}/${P}-boost.patch
-	if use cjk && use qt ; then
+	if use cjk && use qt3 ; then
 		epatch ${DISTDIR}/CJK-LyX-qt-${PV}-1.patch
 	elif use cjk && built_with_use '=x11-libs/xforms-1.0-r1' cjk ; then
 		epatch ${DISTDIR}/CJK-LyX-xforms-${PV}-1.patch
 	elif use cjk ; then
 		eerror
-		eerror 'CJK-LyX requires qt USE flag enabled or x11-libs/xforms-1.0-r1'
+		eerror 'CJK-LyX requires qt3 USE flag enabled or x11-libs/xforms-1.0-r1'
 		eerror 'built with cjk USE flag. You should either'
-		eerror '1) USE="cjk qt" emerge lyx'
+		eerror '1) USE="cjk qt3" emerge lyx'
 		eerror 'or'
-		eerror '2) USE="cjk" emerge xforms-1.0-r1; USE="cjk -qt" emerge lyx'
+		eerror '2) USE="cjk" emerge xforms-1.0-r1; USE="cjk -qt3" emerge lyx'
 		eerror 'or'
 		eerror '3) USE="-cjk" emerge lyx (normal LyX will be built)'
 		eerror
@@ -87,7 +87,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	if use qt ; then
+	if use qt3 ; then
 		set-qtdir 3
 		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
 	else
@@ -151,10 +151,10 @@ pkg_postinst() {
 	einfo "2. unzip /usr/share/doc/${P}/preferences.gz into ~/.lyx/preferences"
 	einfo "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
 	einfo "for instructions on using lyx's own preferences dialog to equal effect."
-	einfo "3. use lyx's qt interface (compile with USE=qt) for maximum effect."
+	einfo "3. use lyx's qt interface (compile with USE=qt3) for maximum effect."
 	einfo ""
 
-	if ! useq qt ; then
+	if ! useq qt3 ; then
 	draw_line
 	einfo ""
 	einfo "If you have a multi-head setup not using xinerama you can only use lyx"
diff --git a/app-office/lyx/lyx-1.3.6.ebuild b/app-office/lyx/lyx-1.3.6.ebuild
index 1db9e3013523..63487ee8c07a 100644
--- a/app-office/lyx/lyx-1.3.6.ebuild
+++ b/app-office/lyx/lyx-1.3.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-office/lyx/lyx-1.3.6.ebuild,v 1.3 2006/04/05 07:32:03 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.6.ebuild,v 1.4 2006/06/24 01:17:29 cardoe Exp $
 
 inherit kde-functions eutils libtool flag-o-matic
 
@@ -10,13 +10,13 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 	http://movementarian.org/latex-xft-fonts-0.1.tar.gz
 	http://www.math.tau.ac.il/~dekelts/lyx/files/hebrew.bind
 	http://www.math.tau.ac.il/~dekelts/lyx/files/preferences
-	cjk? ( qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-1.patch )
-		!qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/CJK-LyX-xforms-${PV}-1.patch ) )"
+	cjk? ( qt3? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-1.patch )
+		!qt3? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/CJK-LyX-xforms-${PV}-1.patch ) )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="cjk cups debug nls qt"
+IUSE="cjk cups debug nls qt3"
 
 RDEPEND="|| ( (
 			x11-libs/libXi
@@ -51,8 +51,8 @@ DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
-	qt? ( =x11-libs/qt-3* )
-	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
+	qt3? ( =x11-libs/qt-3* )
+	!qt3? ( cjk? ( =x11-libs/xforms-1.0-r1 )
 		!cjk? ( =x11-libs/xforms-1* ) )
 	>=sys-devel/autoconf-2.58"
 
@@ -62,17 +62,17 @@ src_unpack() {
 	unpack latex-xft-fonts-0.1.tar.gz
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
-	if use cjk && use qt ; then
+	if use cjk && use qt3 ; then
 		epatch ${DISTDIR}/CJK-LyX-qt-${PV}-1.patch
 	elif use cjk && built_with_use '=x11-libs/xforms-1.0-r1' cjk ; then
 		epatch ${DISTDIR}/CJK-LyX-xforms-${PV}-1.patch
 	elif use cjk ; then
 		eerror
-		eerror 'CJK-LyX requires qt USE flag enabled or x11-libs/xforms-1.0-r1'
+		eerror 'CJK-LyX requires qt3 USE flag enabled or x11-libs/xforms-1.0-r1'
 		eerror 'built with cjk USE flag. You should either'
-		eerror '1) USE="cjk qt" emerge lyx'
+		eerror '1) USE="cjk qt3" emerge lyx'
 		eerror 'or'
-		eerror '2) USE="cjk" emerge xforms-1.0-r1; USE="cjk -qt" emerge lyx'
+		eerror '2) USE="cjk" emerge xforms-1.0-r1; USE="cjk -qt3" emerge lyx'
 		eerror 'or'
 		eerror '3) USE="-cjk" emerge lyx (normal LyX will be built)'
 		eerror
@@ -83,7 +83,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	if use qt ; then
+	if use qt3 ; then
 		set-qtdir 3
 		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
 	else
@@ -147,10 +147,10 @@ pkg_postinst() {
 	einfo "2. unzip /usr/share/doc/${P}/preferences.gz into ~/.lyx/preferences"
 	einfo "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
 	einfo "for instructions on using lyx's own preferences dialog to equal effect."
-	einfo "3. use lyx's qt interface (compile with USE=qt) for maximum effect."
+	einfo "3. use lyx's qt interface (compile with USE=qt3) for maximum effect."
 	einfo ""
 
-	if ! useq qt ; then
+	if ! useq qt3 ; then
 	draw_line
 	einfo ""
 	einfo "If you have a multi-head setup not using xinerama you can only use lyx"
diff --git a/app-office/lyx/lyx-1.4.1-r1.ebuild b/app-office/lyx/lyx-1.4.1-r1.ebuild
index 0bd26f95b0ac..074b27edb598 100644
--- a/app-office/lyx/lyx-1.4.1-r1.ebuild
+++ b/app-office/lyx/lyx-1.4.1-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-office/lyx/lyx-1.4.1-r1.ebuild,v 1.5 2006/05/23 06:16:58 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.1-r1.ebuild,v 1.6 2006/06/24 01:17:29 cardoe Exp $
 
 inherit kde-functions fdo-mime eutils libtool flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="cjk cups debug gtk nls qt gnome"
+IUSE="cjk cups debug gtk nls qt3 gnome"
 
 RDEPEND="|| (
 		virtual/x11
@@ -57,8 +57,8 @@ DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58
 	cjk? ( =x11-libs/qt-3* )
 	!cjk? (
-		qt? ( =x11-libs/qt-3* )
-		!qt? ( =x11-libs/xforms-1* )
+		qt3? ( =x11-libs/qt-3* )
+		!qt3? ( =x11-libs/xforms-1* )
 	)
 	gtk? (
 		>=dev-cpp/gtkmm-2.4
@@ -86,7 +86,7 @@ src_compile() {
 	local myconf=""
 
 	# Choose qt over gtk, since gtk is not feature complete
-	if use qt || use cjk ; then
+	if use qt3 || use cjk ; then
 		set-qtdir 3
 		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
 	elif use gtk ; then
@@ -167,10 +167,10 @@ pkg_postinst() {
 	einfo "2. unzip /usr/share/doc/${P}/preferences.gz into ~/.lyx/preferences"
 	einfo "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
 	einfo "for instructions on using lyx's own preferences dialog to equal effect."
-	einfo "3. use lyx's qt interface (compile with USE=qt) for maximum effect."
+	einfo "3. use lyx's qt interface (compile with USE=qt3) for maximum effect."
 	einfo ""
 
-	if ! useq qt ; then
+	if ! useq qt3 ; then
 		einfo ""
 		einfo "If you have a multi-head setup not using xinerama you can only use lyx"
 		einfo "on the 2nd head if not using qt (maybe due to a xforms bug). See bug #40392."