Replace deprecated tcltk USE flag with tcl (#17808).

(Portage version: 2.1.1)

4 files changed, 41 insertions, 37 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index fdfcc49f2059..a4668ee5bf04 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,10 @@
 # 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.94 2006/09/24 09:12:32 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.95 2006/10/23 07:46:37 mrness Exp $
+
+  23 Oct 2006; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.2-r2.ebuild,
+  wvstreams-4.2.2.ebuild, wvstreams-4.2.2-r1.ebuild:
+  Replace deprecated tcltk USE flag with tcl (#17808).
 
   24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org>
   wvstreams-4.2.2-r2.ebuild:
diff --git a/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild
index 6b3f32e05d75..b2ef28a1f482 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.8 2006/08/28 05:33:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild,v 1.9 2006/10/23 07:46:37 mrness 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 qt3 vorbis speex fam qdbm pam slp doc fftw tcltk debug"
+IUSE="gtk qt3 vorbis speex fam qdbm pam slp doc fftw tcl debug"
 
 RDEPEND="virtual/libc
 	>=sys-libs/db-3
@@ -28,7 +28,7 @@ RDEPEND="virtual/libc
 	slp? ( >=net-libs/openslp-1.0.9a )
 	doc? ( app-doc/doxygen )
 	fftw? ( sci-libs/fftw )
-	tcltk? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
+	tcl? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -42,12 +42,12 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-wireless-user.patch
 	epatch ${FILESDIR}/${P}-speex-const.patch
 
-	if useq tcltk; then
+	if useq tcl; then
 		epatch ${FILESDIR}/${P}-tcl_8_4.patch
 	fi
 
 	epatch ${FILESDIR}/${P}-external-xplc.patch
-	local XPLC_VER=`best_version dev-libs/xplc`
+	local XPLC_VER=$(best_version dev-libs/xplc)
 	XPLC_VER=${XPLC_VER#*/*-} #reduce it to ${PV}-${PR}
 	XPLC_VER=${XPLC_VER%%[_-]*} # main version without beta/pre/patch/revision
 	sed -i -e "s:^xplc_version=.*:xplc_version='${XPLC_VER}':" "${S}/configure.ac" \
@@ -67,17 +67,17 @@ src_compile() {
 		myconf="--without-qt"
 	fi
 	econf ${myconf} \
-		`use_with gtk` \
-		`use_with vorbis ogg` \
-		`use_with vorbis` \
-		`use_with speex` \
-		`use_with fam` \
-		`use_with qdbm` \
-		`use_with pam` \
-		`use_with fftw` \
-		`use_with slp openslp` \
-		`use_with tcltk tcl` \
-		`use_enable debug` \
+		$(use_with gtk) \
+		$(use_with vorbis ogg) \
+		$(use_with vorbis) \
+		$(use_with speex) \
+		$(use_with fam) \
+		$(use_with qdbm) \
+		$(use_with pam) \
+		$(use_with fftw) \
+		$(use_with slp openslp) \
+		$(use_with tcl) \
+		$(use_enable debug) \
 		--enable-verbose \
 		--with-bdb \
 		--with-zlib \
diff --git a/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild b/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild
index fdbe15ea2e88..e8f1559d8062 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.3 2006/08/28 05:33:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild,v 1.4 2006/10/23 07:46:37 mrness 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="gtk qt3 qdbm pam slp doc tcltk debug"
+IUSE="gtk qt3 qdbm pam slp doc tcl debug"
 
 RDEPEND=">=sys-libs/db-3
 	>=sys-libs/zlib-1.1.4
@@ -22,7 +22,7 @@ RDEPEND=">=sys-libs/db-3
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
 	doc? ( app-doc/doxygen )
-	tcltk? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
+	tcl? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -36,12 +36,12 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-wireless-user.patch"
 	epatch "${FILESDIR}/${P}-uniconfd-ini.patch"
 
-	if use tcltk; then
+	if use tcl; then
 		epatch "${FILESDIR}/${P}-tcl_8_4.patch"
 	fi
 
 	epatch "${FILESDIR}/${P}-external-xplc.patch"
-	local XPLC_VER=`best_version dev-libs/xplc`
+	local XPLC_VER=$(best_version dev-libs/xplc)
 	XPLC_VER=${XPLC_VER#*/*-} #reduce it to ${PV}-${PR}
 	XPLC_VER=${XPLC_VER%%[_-]*} # main version without beta/pre/patch/revision
 	sed -i -e "s:^xplc_version=.*:xplc_version='${XPLC_VER}':" "${S}/configure.ac" \
@@ -67,11 +67,11 @@ src_compile() {
 		myconf="--without-qt"
 	fi
 	econf ${myconf} \
-		`use_with qdbm` \
-		`use_with pam` \
-		`use_with slp openslp` \
-		`use_with tcltk tcl` \
-		`use_enable debug` \
+		$(use_with qdbm) \
+		$(use_with pam) \
+		$(use_with slp openslp) \
+		$(use_with tcl) \
+		$(use_enable debug) \
 		--with-xplc \
 		--enable-verbose \
 		--with-bdb \
diff --git a/net-libs/wvstreams/wvstreams-4.2.2.ebuild b/net-libs/wvstreams/wvstreams-4.2.2.ebuild
index d11cd64094e6..f19499fce8b3 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.8 2006/08/28 05:33:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.2.2.ebuild,v 1.9 2006/10/23 07:46:37 mrness 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="gtk qt3 qdbm pam slp doc tcltk debug"
+IUSE="gtk qt3 qdbm pam slp doc tcl debug"
 
 RDEPEND=">=sys-libs/db-3
 	>=sys-libs/zlib-1.1.4
@@ -22,7 +22,7 @@ RDEPEND=">=sys-libs/db-3
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
 	doc? ( app-doc/doxygen )
-	tcltk? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
+	tcl? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -35,12 +35,12 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-linux-serial.patch"
 	epatch "${FILESDIR}/${P}-wireless-user.patch"
 
-	if use tcltk; then
+	if use tcl; then
 		epatch "${FILESDIR}/${P}-tcl_8_4.patch"
 	fi
 
 	epatch "${FILESDIR}/${P}-external-xplc.patch"
-	local XPLC_VER=`best_version dev-libs/xplc`
+	local XPLC_VER=$(best_version dev-libs/xplc)
 	XPLC_VER=${XPLC_VER#*/*-} #reduce it to ${PV}-${PR}
 	XPLC_VER=${XPLC_VER%%[_-]*} # main version without beta/pre/patch/revision
 	sed -i -e "s:^xplc_version=.*:xplc_version='${XPLC_VER}':" "${S}/configure.ac" \
@@ -66,11 +66,11 @@ src_compile() {
 		myconf="--without-qt"
 	fi
 	econf ${myconf} \
-		`use_with qdbm` \
-		`use_with pam` \
-		`use_with slp openslp` \
-		`use_with tcltk tcl` \
-		`use_enable debug` \
+		$(use_with qdbm) \
+		$(use_with pam) \
+		$(use_with slp openslp) \
+		$(use_with tcl) \
+		$(use_enable debug) \
 		--with-xplc \
 		--enable-verbose \
 		--with-bdb \