USE flag qt->qt3/qt4 change

(Portage version: 2.1.1_pre1-r1)

8 files changed, 36 insertions, 27 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 68f183dffe45..91fb05306a9c 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.88 2006/05/10 19:10:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.89 2006/06/24 00:49:20 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> wvstreams-4.0.2-r1.ebuild,
+  wvstreams-4.0.2-r2.ebuild, wvstreams-4.2.2.ebuild,
+  wvstreams-4.2.2-r1.ebuild, wvstreams-4.2.2-r2.ebuild:
+  USE flag qt->qt3/qt4 change
 
 *wvstreams-4.2.2-r2 (10 May 2006)
 
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1
index 2e9bdd6e87ec..02e8894f22b4 100644
--- a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1
@@ -1 +1,3 @@
 MD5 103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz 1269821
+RMD160 dece6092e847976d01568f20707701a8241d30d2 wvstreams-4.2.2.tar.gz 1269821
+SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14 wvstreams-4.2.2.tar.gz 1269821
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2
index 2e9bdd6e87ec..02e8894f22b4 100644
--- a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2
@@ -1 +1,3 @@
 MD5 103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz 1269821
+RMD160 dece6092e847976d01568f20707701a8241d30d2 wvstreams-4.2.2.tar.gz 1269821
+SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14 wvstreams-4.2.2.tar.gz 1269821
diff --git a/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
index 69932ee47f53..8bbd2d5206b7 100644
--- a/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.2-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/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild,v 1.6 2005/11/11 23:08:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild,v 1.7 2006/06/24 00:49:20 cardoe Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.csclub.uwaterloo.ca/~ja2morri/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug"
+IUSE="gtk qt3 vorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
 	>=sys-libs/db-3
@@ -19,7 +19,7 @@ RDEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.7
 	dev-libs/xplc
 	gtk? ( >=x11-libs/gtk+-2.2.0 )
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
 	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
 	fam? ( virtual/fam )
@@ -52,14 +52,14 @@ src_unpack() {
 	sed -i -e "s:^xplc_version=.*:xplc_version='${XPLC_VER}':" "${S}/configure.ac" \
 		|| die "failed to set current xplc version"
 
-	useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch
+	useq qt3 && epatch ${FILESDIR}/${P}-MOC-fix.patch
 }
 
 src_compile() {
 	env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed" #needed by xplc and tcl patch
 
 	local myconf
-	if useq qt; then
+	if useq qt3; then
 		myconf="--with-qt=/usr/qt/3/"
 		export MOC="/usr/qt/3/bin/moc"
 	else
diff --git a/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild
index d41739ac8dea..e60d920b40a9 100644
--- a/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.2-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/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild,v 1.6 2006/02/07 20:48:39 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild,v 1.7 2006/06/24 00:49:20 cardoe Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.csclub.uwaterloo.ca/~ja2morri/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
-IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug"
+IUSE="gtk qt3 vorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
 	>=sys-libs/db-3
@@ -19,7 +19,7 @@ RDEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.7
 	dev-libs/xplc
 	gtk? ( >=x11-libs/gtk+-2.2.0 )
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
 	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
 	fam? ( virtual/fam )
@@ -53,14 +53,14 @@ src_unpack() {
 	sed -i -e "s:^xplc_version=.*:xplc_version='${XPLC_VER}':" "${S}/configure.ac" \
 		|| die "failed to set current xplc version"
 
-	useq qt && epatch ${FILESDIR}/${P}-MOC-fix.patch
+	useq qt3 && epatch ${FILESDIR}/${P}-MOC-fix.patch
 }
 
 src_compile() {
 	env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed" #needed by xplc and tcl patch
 
 	local myconf
-	if useq qt; then
+	if useq qt3; then
 		myconf="--with-qt=/usr/qt/3/"
 		export MOC="/usr/qt/3/bin/moc"
 	else
diff --git a/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild b/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild
index 9de68f15fc25..aa6ac29c0f36 100644
--- a/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.2.2-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/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild,v 1.1 2006/05/06 07:54:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild,v 1.2 2006/06/24 00:49:20 cardoe Exp $
 
 inherit eutils fixheadtails
 
@@ -11,13 +11,13 @@ SRC_URI="http://open.nit.ca/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="gtk qt qdbm pam slp doc tcltk debug"
+IUSE="gtk qt3 qdbm pam slp doc tcltk debug"
 
 RDEPEND=">=sys-libs/db-3
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.7
 	>=dev-libs/xplc-0.3.13
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	qdbm? ( dev-db/qdbm )
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
@@ -48,7 +48,7 @@ src_unpack() {
 		|| die "failed to set current xplc version"
 	rm -r "${S}/xplc"
 
-	use qt && epatch "${FILESDIR}/${P}-MOC-fix.patch"
+	use qt3 && epatch "${FILESDIR}/${P}-MOC-fix.patch"
 
 	ht_fix_file "${S}/configure.ac"
 }
@@ -60,7 +60,7 @@ src_compile() {
 	touch include/wvautoconf.h.in configure
 
 	local myconf
-	if use qt; then
+	if use qt3; then
 		myconf="--with-qt=/usr/qt/3/"
 		export MOC="/usr/qt/3/bin/moc"
 	else
diff --git a/net-libs/wvstreams/wvstreams-4.2.2-r2.ebuild b/net-libs/wvstreams/wvstreams-4.2.2-r2.ebuild
index f5b923dad10f..0cf6a7cab557 100644
--- a/net-libs/wvstreams/wvstreams-4.2.2-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.2.2-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/net-libs/wvstreams/wvstreams-4.2.2-r2.ebuild,v 1.1 2006/05/10 19:10:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.2.2-r2.ebuild,v 1.2 2006/06/24 00:49:20 cardoe Exp $
 
 inherit eutils fixheadtails
 
@@ -11,7 +11,7 @@ SRC_URI="http://open.nit.ca/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="qt qdbm pam slp doc debug"
+IUSE="qt3 qdbm pam slp doc debug"
 
 RESTRICT="test"
 
@@ -19,7 +19,7 @@ RDEPEND=">=sys-libs/db-3
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.7
 	>=dev-libs/xplc-0.3.13
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	qdbm? ( dev-db/qdbm )
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
@@ -46,7 +46,7 @@ src_unpack() {
 		|| die "failed to set current xplc version"
 	rm -r "${S}/xplc"
 
-	use qt && epatch "${FILESDIR}/${P}-MOC-fix.patch"
+	use qt3 && epatch "${FILESDIR}/${P}-MOC-fix.patch"
 
 	ht_fix_file "${S}/configure.ac"
 
@@ -60,7 +60,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	if use qt; then
+	if use qt3; then
 		myconf="--with-qt=/usr/qt/3/"
 		export MOC="/usr/qt/3/bin/moc"
 	else
diff --git a/net-libs/wvstreams/wvstreams-4.2.2.ebuild b/net-libs/wvstreams/wvstreams-4.2.2.ebuild
index 04b150dd2541..f25a5c9fa949 100644
--- a/net-libs/wvstreams/wvstreams-4.2.2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.2.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/net-libs/wvstreams/wvstreams-4.2.2.ebuild,v 1.5 2006/04/24 02:37:42 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.2.2.ebuild,v 1.6 2006/06/24 00:49:20 cardoe Exp $
 
 inherit eutils fixheadtails
 
@@ -11,13 +11,13 @@ SRC_URI="http://open.nit.ca/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
-IUSE="gtk qt qdbm pam slp doc tcltk debug"
+IUSE="gtk qt3 qdbm pam slp doc tcltk debug"
 
 RDEPEND=">=sys-libs/db-3
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.7
 	>=dev-libs/xplc-0.3.13
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	qdbm? ( dev-db/qdbm )
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
@@ -47,7 +47,7 @@ src_unpack() {
 		|| die "failed to set current xplc version"
 	rm -r "${S}/xplc"
 
-	use qt && epatch "${FILESDIR}/${P}-MOC-fix.patch"
+	use qt3 && epatch "${FILESDIR}/${P}-MOC-fix.patch"
 
 	ht_fix_file "${S}/configure.ac"
 }
@@ -59,7 +59,7 @@ src_compile() {
 	touch include/wvautoconf.h.in configure
 
 	local myconf
-	if use qt; then
+	if use qt3; then
 		myconf="--with-qt=/usr/qt/3/"
 		export MOC="/usr/qt/3/bin/moc"
 	else