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

Package-Manager: portage-2.1.1_pre1-r1

8 files changed, 118 insertions, 52 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 3b623faa2638..fb6d483d8915 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.54 2006/01/14 08:16:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.55 2006/06/24 15:08:38 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> unixODBC-2.2.2.ebuild,
+  unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild,
+  unixODBC-2.2.11.ebuild, unixODBC-2.2.11-r1.ebuild:
+  USE flag change qt->qt3/qt4 bug #137785
 
   14 Jan 2006; Mike Frysinger <vapier@gentoo.org>
   +files/unixODBC-2.2.11-flex.patch, unixODBC-2.2.11-r1.ebuild:
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 4c016bc3511e..d1ffec7aa328 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,31 +1,92 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4ba9c0f5728ace2c923833c20da45c80 ChangeLog 7169
+AUX gentoo-yac.diff 316 RMD160 f1db43556554af47d07e741dc0c084b0ee9a227e SHA1 862c00267ef19c8867ef69a4b68b46f9ea05f06c SHA256 6c5534a058cf87d2643435ab9871a7b6235de303e1bf143e7d9b63e0fef0896f
+MD5 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316
+RMD160 f1db43556554af47d07e741dc0c084b0ee9a227e files/gentoo-yac.diff 316
+SHA256 6c5534a058cf87d2643435ab9871a7b6235de303e1bf143e7d9b63e0fef0896f files/gentoo-yac.diff 316
+AUX unixODBC-2.2.11-Makefile.am.patch 1295 RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 SHA1 2b0953ffb879b8dfc98beab0a01eceeaaa01112b SHA256 669c3f0897fad09cb7dd750319605a34221eaeac633501550ca791a83e7e64c5
+MD5 9e8b6228770e807090916883a6903351 files/unixODBC-2.2.11-Makefile.am.patch 1295
+RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 files/unixODBC-2.2.11-Makefile.am.patch 1295
+SHA256 669c3f0897fad09cb7dd750319605a34221eaeac633501550ca791a83e7e64c5 files/unixODBC-2.2.11-Makefile.am.patch 1295
+AUX unixODBC-2.2.11-configure.in.patch 239 RMD160 c3821bbe8c815997698d66bf6b1c7151cdb853c5 SHA1 ab6493ab5387d27a3c1130cf46b46f603829d965 SHA256 e41f79814d320104273aa9f9b4eaaece593ed07d14fd36c8a6cfe313c93b80fe
+MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.11-configure.in.patch 239
+RMD160 c3821bbe8c815997698d66bf6b1c7151cdb853c5 files/unixODBC-2.2.11-configure.in.patch 239
+SHA256 e41f79814d320104273aa9f9b4eaaece593ed07d14fd36c8a6cfe313c93b80fe files/unixODBC-2.2.11-configure.in.patch 239
+AUX unixODBC-2.2.11-flex.patch 486 RMD160 5962bd7cceb3547446ec384bbb1474151f0eaaf7 SHA1 4b24b239d3c2240f9df11397150946a84be903ab SHA256 9bd580e29ec4211b8bceccd044cd1bb4c6f32af4ae60b847548d08bbdb011ec7
+MD5 b07177ad3a171508d9be501501809193 files/unixODBC-2.2.11-flex.patch 486
+RMD160 5962bd7cceb3547446ec384bbb1474151f0eaaf7 files/unixODBC-2.2.11-flex.patch 486
+SHA256 9bd580e29ec4211b8bceccd044cd1bb4c6f32af4ae60b847548d08bbdb011ec7 files/unixODBC-2.2.11-flex.patch 486
+AUX unixODBC-2.2.6-configure.in.patch 239 RMD160 c3821bbe8c815997698d66bf6b1c7151cdb853c5 SHA1 ab6493ab5387d27a3c1130cf46b46f603829d965 SHA256 e41f79814d320104273aa9f9b4eaaece593ed07d14fd36c8a6cfe313c93b80fe
+MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239
+RMD160 c3821bbe8c815997698d66bf6b1c7151cdb853c5 files/unixODBC-2.2.6-configure.in.patch 239
+SHA256 e41f79814d320104273aa9f9b4eaaece593ed07d14fd36c8a6cfe313c93b80fe files/unixODBC-2.2.6-configure.in.patch 239
+DIST unixODBC-2.0.8.tar.gz 1626832
+DIST unixODBC-2.2.11.tar.gz 2406740
+DIST unixODBC-2.2.2.tar.gz 2134570
+DIST unixODBC-2.2.6.tar.gz 2179245
+DIST unixODBC-2.2.8.tar.gz 2351939
+EBUILD unixODBC-2.0.8.ebuild 969 RMD160 0c25aeb909bc2f3b20386de10d9de6bb53954c08 SHA1 58cbf35b7d603ae8ee9b880a91468d789778cc51 SHA256 e1bc20a16ff0a7cf0a224fb2f115ba7ca213eba9f6920e8d9b50417f42a5ef3b
+MD5 eea61e477011ec918b75ba766aaad67a unixODBC-2.0.8.ebuild 969
+RMD160 0c25aeb909bc2f3b20386de10d9de6bb53954c08 unixODBC-2.0.8.ebuild 969
+SHA256 e1bc20a16ff0a7cf0a224fb2f115ba7ca213eba9f6920e8d9b50417f42a5ef3b unixODBC-2.0.8.ebuild 969
+EBUILD unixODBC-2.2.11-r1.ebuild 1984 RMD160 bba0e740f6b9dc74275702213858adac5a0c4431 SHA1 89ae9eb10901087bb9ff82fe22224f466d0fb078 SHA256 b2ad65f162c3723883a31c6f39a312780cd840fc5352db8c0f7b0b53e0c9ca15
+MD5 3e63adc1810a04921be48530b575f291 unixODBC-2.2.11-r1.ebuild 1984
+RMD160 bba0e740f6b9dc74275702213858adac5a0c4431 unixODBC-2.2.11-r1.ebuild 1984
+SHA256 b2ad65f162c3723883a31c6f39a312780cd840fc5352db8c0f7b0b53e0c9ca15 unixODBC-2.2.11-r1.ebuild 1984
+EBUILD unixODBC-2.2.11.ebuild 1948 RMD160 00571b3ce4f8ff97aa35c100a8f813d1b73a38ab SHA1 4ab1c49bdf52bae3407c24755ddba3f2a8f57045 SHA256 9b76f86879efd78557ca83e6a30c84b24f18f0b587fbfd022cef2178fb316053
+MD5 3be7f31c4b5da4c29a9d2dcad07e43b2 unixODBC-2.2.11.ebuild 1948
+RMD160 00571b3ce4f8ff97aa35c100a8f813d1b73a38ab unixODBC-2.2.11.ebuild 1948
+SHA256 9b76f86879efd78557ca83e6a30c84b24f18f0b587fbfd022cef2178fb316053 unixODBC-2.2.11.ebuild 1948
+EBUILD unixODBC-2.2.2.ebuild 1286 RMD160 414d160c39454c7db1e9992a7339d21293e73cac SHA1 119643b8c814026a775b202193b3504463fabc9c SHA256 e08c25d76c14287eb535d10c906fa8ad1b70bed8df555ce326dfee7531bdfd78
+MD5 72ee8ba5f1571f41a200ce89a20b0da6 unixODBC-2.2.2.ebuild 1286
+RMD160 414d160c39454c7db1e9992a7339d21293e73cac unixODBC-2.2.2.ebuild 1286
+SHA256 e08c25d76c14287eb535d10c906fa8ad1b70bed8df555ce326dfee7531bdfd78 unixODBC-2.2.2.ebuild 1286
+EBUILD unixODBC-2.2.6-r1.ebuild 1643 RMD160 6fe3a7895ae163bb4979adbb7a36093d1b567166 SHA1 d0a62bb2b26eb3e7bfc0736210dc25eb8efd3c6a SHA256 bf2827ed5638f009b3f629619ce50638832e010e5261a906e0eb12756283d543
+MD5 0846d5e62b3d26df7fc38a4bd643f640 unixODBC-2.2.6-r1.ebuild 1643
+RMD160 6fe3a7895ae163bb4979adbb7a36093d1b567166 unixODBC-2.2.6-r1.ebuild 1643
+SHA256 bf2827ed5638f009b3f629619ce50638832e010e5261a906e0eb12756283d543 unixODBC-2.2.6-r1.ebuild 1643
+EBUILD unixODBC-2.2.6.ebuild 1570 RMD160 72dfc3323bcef5d26796b7804d82c72b75f3c59d SHA1 74811d357382e77471677c81cd416d429064cf13 SHA256 f3f17ba8f7a29ed0278a092bf681ca4a9faa3741433db8dd14c95b999f25e7c3
+MD5 ab835aa154e24a999dadff428562aa75 unixODBC-2.2.6.ebuild 1570
+RMD160 72dfc3323bcef5d26796b7804d82c72b75f3c59d unixODBC-2.2.6.ebuild 1570
+SHA256 f3f17ba8f7a29ed0278a092bf681ca4a9faa3741433db8dd14c95b999f25e7c3 unixODBC-2.2.6.ebuild 1570
+EBUILD unixODBC-2.2.8.ebuild 2088 RMD160 8fad1375ffcabbd448f493e5e3313fcc70046408 SHA1 daceed84935e76c6f0925c85b914a53b89b48c84 SHA256 ad05a74f6fa0cf1bc5626bfd7766de3d645c5c18f022a28047e72c4f2fa5bd25
+MD5 26562e3a890560f6b1bcf3876e2b11fc unixODBC-2.2.8.ebuild 2088
+RMD160 8fad1375ffcabbd448f493e5e3313fcc70046408 unixODBC-2.2.8.ebuild 2088
+SHA256 ad05a74f6fa0cf1bc5626bfd7766de3d645c5c18f022a28047e72c4f2fa5bd25 unixODBC-2.2.8.ebuild 2088
+MISC ChangeLog 7412 RMD160 163b4ea389248d0a48ec4e916045f6733e207e98 SHA1 3ac80cb0673c53caae3ee83a3f84c49bcdf9bae5 SHA256 ca7dd600e35c534b1eceae2f67a40955c6d23f901bec57529d0396c653cb87cc
+MD5 b4b810903ca59907fe030d3dacbbdb05 ChangeLog 7412
+RMD160 163b4ea389248d0a48ec4e916045f6733e207e98 ChangeLog 7412
+SHA256 ca7dd600e35c534b1eceae2f67a40955c6d23f901bec57529d0396c653cb87cc ChangeLog 7412
+MISC metadata.xml 225 RMD160 0da74d657a95d049f8bb21cdcd2014fae7d17b15 SHA1 cfb1d2aaf0bbf84ac42bb207eaddcb5b8dcf4352 SHA256 e6017c466b499394a9fc91a5294d7dc31e2743427ff63c6cb4c6c0521247741c
+MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
+RMD160 0da74d657a95d049f8bb21cdcd2014fae7d17b15 metadata.xml 225
+SHA256 e6017c466b499394a9fc91a5294d7dc31e2743427ff63c6cb4c6c0521247741c metadata.xml 225
 MD5 f383c7806ba5f687ba55d5f1bc6a36aa files/digest-unixODBC-2.0.8 67
+RMD160 204d29898e9e2fafe0217ed2978a41dfef80a377 files/digest-unixODBC-2.0.8 67
+SHA256 09b8014d9e43c49f623146c1f05d8d4aa6aa4ac45fb9fbee62b538e7afdf3ab4 files/digest-unixODBC-2.0.8 67
 MD5 4baf7bca71abaad73ebb6a576517f435 files/digest-unixODBC-2.2.11 68
+RMD160 fb653b896be5ae9b1dadff34fd0c64520851f68e files/digest-unixODBC-2.2.11 68
+SHA256 52fe835afa765cb701967daa6997e2718e676479172d9ac8606572f17266aa79 files/digest-unixODBC-2.2.11 68
 MD5 4baf7bca71abaad73ebb6a576517f435 files/digest-unixODBC-2.2.11-r1 68
+RMD160 fb653b896be5ae9b1dadff34fd0c64520851f68e files/digest-unixODBC-2.2.11-r1 68
+SHA256 52fe835afa765cb701967daa6997e2718e676479172d9ac8606572f17266aa79 files/digest-unixODBC-2.2.11-r1 68
 MD5 0f7614b93d6ede252ed2f7d7ff1aac90 files/digest-unixODBC-2.2.2 67
+RMD160 f58bc1cfca5147d24792960fab20994dbdd72aa6 files/digest-unixODBC-2.2.2 67
+SHA256 e3cb51a592594fdceb678a13f2d107a6eb92bcdb2fe1ee70212fe5e5185747c7 files/digest-unixODBC-2.2.2 67
 MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6 67
+RMD160 71c926307ab82b345e552bf7658ab7d369615d9d files/digest-unixODBC-2.2.6 67
+SHA256 75dc5c7b053c6e4c7f42a4292500473290187ccdf8e4a80da75ccbe4d4927158 files/digest-unixODBC-2.2.6 67
 MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6-r1 67
+RMD160 71c926307ab82b345e552bf7658ab7d369615d9d files/digest-unixODBC-2.2.6-r1 67
+SHA256 75dc5c7b053c6e4c7f42a4292500473290187ccdf8e4a80da75ccbe4d4927158 files/digest-unixODBC-2.2.6-r1 67
 MD5 a60388d8cb9cb0dca3df5429fb364051 files/digest-unixODBC-2.2.8 67
-MD5 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316
-MD5 9e8b6228770e807090916883a6903351 files/unixODBC-2.2.11-Makefile.am.patch 1295
-MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.11-configure.in.patch 239
-MD5 b07177ad3a171508d9be501501809193 files/unixODBC-2.2.11-flex.patch 486
-MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239
-MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
-MD5 eea61e477011ec918b75ba766aaad67a unixODBC-2.0.8.ebuild 969
-MD5 29e5bfa7c932422b44f7887b5c2b79cb unixODBC-2.2.11-r1.ebuild 1980
-MD5 fa5c8601aa8d0ca9486efb4204c4b962 unixODBC-2.2.11.ebuild 1943
-MD5 6b993e56b0c08a88fccb44abfc1ed502 unixODBC-2.2.2.ebuild 1282
-MD5 7956dac74a0516140e437590070a0150 unixODBC-2.2.6-r1.ebuild 1638
-MD5 b9f4602957a14f85748533d4f1fcfd4b unixODBC-2.2.6.ebuild 1566
-MD5 83a56fac1dc29fabea067942e93f768f unixODBC-2.2.8.ebuild 2083
+RMD160 965822ef5dc4cd9d0cf1ba10c61f6b9b29356846 files/digest-unixODBC-2.2.8 67
+SHA256 5d02f5c55219388ec3adf76ff18c6f4e96ac737fa2b9c11468df6802255a1b5b files/digest-unixODBC-2.2.8 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFDyLO92+ySkm8kpY0RAmMGAJ0eIyTynx9YN1RxtgoAHKyKXxt1bQCeMKe7
-JHvmsZTpZE35iDpZgd1PkGA=
-=XEnS
+iD8DBQFEnVWPoeSe8B0zEfwRAsVyAJ9WK1Y48NDjLgt1WTFYbpJr/TYDmQCfXVHK
+bZk17iWvUUCWJsS5734loWA=
+=crWL
 -----END PGP SIGNATURE-----
diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
index 93385cad974f..9ea8b670bf5b 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11-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/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.11 2006/01/14 08:16:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.12 2006/06/24 15:08:38 cardoe Exp $
 
 inherit eutils
 
@@ -11,15 +11,15 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="qt gnome"
+IUSE="qt3 gnome"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
 	gnome? ( gnome-base/gnome-libs )
-	qt? ( =x11-libs/qt-3* )"
+	qt3? ( =x11-libs/qt-3* )"
 
-# the configure.in patch is required for 'use qt'
+# the configure.in patch is required for 'use qt3'
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
@@ -37,7 +37,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if use qt && ! use mips;
+	if use qt3 && ! use mips;
 	then
 		myconf="--enable-gui=yes --x-libraries=/usr/lib "
 	else
diff --git a/dev-db/unixODBC/unixODBC-2.2.11.ebuild b/dev-db/unixODBC/unixODBC-2.2.11.ebuild
index 4148c96a3a57..41877afce764 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11.ebuild,v 1.4 2005/07/25 15:38:13 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11.ebuild,v 1.5 2006/06/24 15:08:38 cardoe Exp $
 
 inherit eutils gnuconfig
 
@@ -11,15 +11,15 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="qt gnome"
+IUSE="qt3 gnome"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
 	gnome? ( gnome-base/gnome-libs )
-	qt? ( =x11-libs/qt-3* )"
+	qt3? ( =x11-libs/qt-3* )"
 
-# the configure.in patch is required for 'use qt'
+# the configure.in patch is required for 'use qt3'
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
@@ -36,7 +36,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if use qt && ! use mips;
+	if use qt3 && ! use mips;
 	then
 		myconf="--enable-gui=yes --x-libraries=/usr/lib "
 	else
diff --git a/dev-db/unixODBC/unixODBC-2.2.2.ebuild b/dev-db/unixODBC/unixODBC-2.2.2.ebuild
index 98774290bf04..d8ccd3c6aa12 100644
--- a/dev-db/unixODBC/unixODBC-2.2.2.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.2.ebuild,v 1.21 2005/07/07 04:31:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.2.ebuild,v 1.22 2006/06/24 15:08:38 cardoe Exp $
 
 inherit eutils
 
@@ -11,12 +11,12 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~hppa ~alpha amd64"
-IUSE="qt"
+IUSE="qt3"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	qt? ( =x11-libs/qt-3* )"
+	qt3? ( =x11-libs/qt-3* )"
 
 src_unpack() {
 	unpack ${A}
@@ -30,7 +30,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	if use qt ; then
+	if use qt3 ; then
 		myconf="--enable-gui=yes"
 	else
 		myconf="--enable-gui=no"
diff --git a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
index 2caecb8a2748..7336d7cc1cf3 100644
--- a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.12 2005/07/07 04:31:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.13 2006/06/24 15:08:38 cardoe Exp $
 
 inherit eutils
 
@@ -11,15 +11,15 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64 ~sparc"
-IUSE="qt gnome"
+IUSE="qt3 gnome"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
 	gnome? ( gnome-base/gnome-libs )
-	qt? ( =x11-libs/qt-3* )"
+	qt3? ( =x11-libs/qt-3* )"
 
-# the configure.in patch is required for 'use qt'
+# the configure.in patch is required for 'use qt3'
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
@@ -33,7 +33,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if use qt ; then
+	if use qt3 ; then
 		myconf="--enable-gui=yes --x-libraries=/usr/lib "
 	else
 		myconf="--enable-gui=no"
diff --git a/dev-db/unixODBC/unixODBC-2.2.6.ebuild b/dev-db/unixODBC/unixODBC-2.2.6.ebuild
index e5a45845b110..08febb0fb03c 100644
--- a/dev-db/unixODBC/unixODBC-2.2.6.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.18 2005/07/07 04:31:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.19 2006/06/24 15:08:38 cardoe Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -9,18 +9,18 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc hppa alpha amd64 sparc ia64"
-IUSE="qt gnome"
+IUSE="qt3 gnome"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	gnome? ( gnome-base/gnome-libs )"
 
 src_compile() {
 	local myconf
 
-	if use qt
+	if use qt3
 	then
 		myconf="--enable-gui=yes --x-libraries=/usr/lib --x-includes=/usr/include/X11"
 	else
diff --git a/dev-db/unixODBC/unixODBC-2.2.8.ebuild b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
index b2e453601c02..431e1c5b94ea 100644
--- a/dev-db/unixODBC/unixODBC-2.2.8.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.21 2005/07/07 04:31:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.22 2006/06/24 15:08:38 cardoe Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -11,17 +11,17 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ppc ~sparc mips ~alpha arm hppa ~amd64 s390 ppc64"
-IUSE="qt gnome"
+IUSE="qt3 gnome"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
 	!mips? (
 		gnome? ( gnome-base/gnome-libs )
-		qt? ( =x11-libs/qt-3* )
+		qt3? ( =x11-libs/qt-3* )
 	)"
 
-# the configure.in patch is required for 'use qt'
+# the configure.in patch is required for 'use qt3'
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
@@ -36,7 +36,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if use qt && ! use mips
+	if use qt3 && ! use mips
 	then
 		myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir) "
 	else