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

Package-Manager: portage-2.1.1

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index fdfcc49f2059d4e08d64e137f5e28a310c610181..a4668ee5bf04a989ffc4a468d254247b03e3507c 100644 (file)
--- 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/Manifest b/net-libs/wvstreams/Manifest
index 02d39a4ed3f39ab25a485ddfafa15ee00188cef7..39a5a582c867d384e5bbc72031769f676d62eb45 100644 (file)
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wvstreams-4.0.2-MOC-fix.patch 479 RMD160 97a8dd0d22964de2bde0250bc0aceae049b4807c SHA1 a66e0cf352cf75e97e3162ec356ffed5bdfac153 SHA256 01144a9794da9b61cbb114f061543874979e8bec6b7b4a7844fec73ce1de4c5a
 MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
 RMD160 97a8dd0d22964de2bde0250bc0aceae049b4807c files/wvstreams-4.0.2-MOC-fix.patch 479
@@ -60,26 +63,26 @@ RMD160 1d3d9d5ef17892ba941fddac841b908de9303562 files/wvstreams-4.2.2-wireless-u
 SHA256 b47b42821695cd8621156e52f89c0205bfd2ab7f5814892c95575eb5047315fa files/wvstreams-4.2.2-wireless-user.patch 466
 DIST wvstreams-4.0.2.tar.gz 1098599 RMD160 8f041f3b8059d20230f114f171f6c31b6ad872f3 SHA1 c613491cff9e002f73ffcf40abb907bea4fc81b7 SHA256 186a576115916598a3786df28aed7689bd9551c0ed3eda1a9f991f3bf5b18bb6
 DIST wvstreams-4.2.2.tar.gz 1269821 RMD160 dece6092e847976d01568f20707701a8241d30d2 SHA1 a44a9ded6339fb2c53eb472d0763e4cf6b0c0534 SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14
-EBUILD wvstreams-4.0.2-r2.ebuild 2599 RMD160 de3b7c5838ac7a7167c3c4f660782bf8c50392f0 SHA1 c4878fd1f43265230e50ec507a227fc070dd0dd1 SHA256 892ea78b439e044dbbcfd294f5bb7d1129e4d9513e1eb0b0502c12b01f728667
-MD5 ed353ab18be9d8adb7e80ecca6296a6d wvstreams-4.0.2-r2.ebuild 2599
-RMD160 de3b7c5838ac7a7167c3c4f660782bf8c50392f0 wvstreams-4.0.2-r2.ebuild 2599
-SHA256 892ea78b439e044dbbcfd294f5bb7d1129e4d9513e1eb0b0502c12b01f728667 wvstreams-4.0.2-r2.ebuild 2599
-EBUILD wvstreams-4.2.2-r1.ebuild 2597 RMD160 e0d2e9884a5dbb2f6ca2a484d29cf5aa59688e2a SHA1 7f35d715eec912f7e9ee64c39783e7380e6fc9c7 SHA256 d2b31b284cf4e43824edf4179cfdd8501a25e922a6d6401cf01e7ca9b464268b
-MD5 6a07d049933be43d3f66008cccdd1cab wvstreams-4.2.2-r1.ebuild 2597
-RMD160 e0d2e9884a5dbb2f6ca2a484d29cf5aa59688e2a wvstreams-4.2.2-r1.ebuild 2597
-SHA256 d2b31b284cf4e43824edf4179cfdd8501a25e922a6d6401cf01e7ca9b464268b wvstreams-4.2.2-r1.ebuild 2597
+EBUILD wvstreams-4.0.2-r2.ebuild 2599 RMD160 47975e4856c24e7c9879828c1c82462ec9e41ded SHA1 c10bbb4556e3ebf170e302bd6d5eca6a8453e642 SHA256 2371df059b4b5251879e19799aab109a8609edacb0f4f8afd06f98ea66b3c0fd
+MD5 ea7a9e1b0dfb4af03478f51167572ec6 wvstreams-4.0.2-r2.ebuild 2599
+RMD160 47975e4856c24e7c9879828c1c82462ec9e41ded wvstreams-4.0.2-r2.ebuild 2599
+SHA256 2371df059b4b5251879e19799aab109a8609edacb0f4f8afd06f98ea66b3c0fd wvstreams-4.0.2-r2.ebuild 2599
+EBUILD wvstreams-4.2.2-r1.ebuild 2591 RMD160 ef47391e4f09540cffd12c0d0c9f50f004ad8698 SHA1 ad06304875efa2c89a7fe454cb4ec101ec8f6c6e SHA256 3cffc3c69ed77d3069b35325aecc3cc53e65df44f481505448e1b34831dcf807
+MD5 8b68be64daf0efbb10742bc8e1acd2f2 wvstreams-4.2.2-r1.ebuild 2591
+RMD160 ef47391e4f09540cffd12c0d0c9f50f004ad8698 wvstreams-4.2.2-r1.ebuild 2591
+SHA256 3cffc3c69ed77d3069b35325aecc3cc53e65df44f481505448e1b34831dcf807 wvstreams-4.2.2-r1.ebuild 2591
 EBUILD wvstreams-4.2.2-r2.ebuild 2503 RMD160 931dbe46f4c5a154406848ebc29676d95be8729a SHA1 e187435a7abf4345ca282d41ad5ea5ea30e3b171 SHA256 e0267dddca3ea40f24a88c4dcbf8f58a360e613129b33092b6cb6496349a31f0
 MD5 1905d65c5532fea7d726824dd1ed9a18 wvstreams-4.2.2-r2.ebuild 2503
 RMD160 931dbe46f4c5a154406848ebc29676d95be8729a wvstreams-4.2.2-r2.ebuild 2503
 SHA256 e0267dddca3ea40f24a88c4dcbf8f58a360e613129b33092b6cb6496349a31f0 wvstreams-4.2.2-r2.ebuild 2503
-EBUILD wvstreams-4.2.2.ebuild 2543 RMD160 5ffbc9d3b2a7f01bff3c3218b5d726233396b481 SHA1 106da00b68783f20d24418340701c1b397d05892 SHA256 9088fd6c23c7fac5fe801c87fc0571091a82598ff2eaf87cf13acf10e9480a94
-MD5 b0e83f868b40af8fba045e7d9dd038dd wvstreams-4.2.2.ebuild 2543
-RMD160 5ffbc9d3b2a7f01bff3c3218b5d726233396b481 wvstreams-4.2.2.ebuild 2543
-SHA256 9088fd6c23c7fac5fe801c87fc0571091a82598ff2eaf87cf13acf10e9480a94 wvstreams-4.2.2.ebuild 2543
-MISC ChangeLog 14883 RMD160 0df7b352f93386f0246fbda392932d6b70a65f6d SHA1 e169cb78cb8ffa378e5d1416e796adfcf94526bf SHA256 708b934c11ae1fce3bcafaced311b24f92d0458a2b513c2bf62ecbd7f32f7ef1
-MD5 2c954e71a5ed6c2a37945f0474e93579 ChangeLog 14883
-RMD160 0df7b352f93386f0246fbda392932d6b70a65f6d ChangeLog 14883
-SHA256 708b934c11ae1fce3bcafaced311b24f92d0458a2b513c2bf62ecbd7f32f7ef1 ChangeLog 14883
+EBUILD wvstreams-4.2.2.ebuild 2537 RMD160 93309344254038873a0c706117c850e280e01ab0 SHA1 709997e1e5e3aeff42a0f46c9987000c2a26b10a SHA256 01d7807c175eaa446084241b2e123ed87449a3289c62992686f0e37db77b22c3
+MD5 bfef0ede67c42cb43776f76d6ec982e3 wvstreams-4.2.2.ebuild 2537
+RMD160 93309344254038873a0c706117c850e280e01ab0 wvstreams-4.2.2.ebuild 2537
+SHA256 01d7807c175eaa446084241b2e123ed87449a3289c62992686f0e37db77b22c3 wvstreams-4.2.2.ebuild 2537
+MISC ChangeLog 15066 RMD160 0cf52c5b35cb5607f8e3a987d13dee26414d5f97 SHA1 58a566bbfe6d25c9e399dc32344f2b39d803e73f SHA256 e4967e2c53a8b6481745c587b7dcd1bee6e5804b020e7272ee8936bfb090a5a2
+MD5 89ae961d963af69a71164e85cfdbe7e0 ChangeLog 15066
+RMD160 0cf52c5b35cb5607f8e3a987d13dee26414d5f97 ChangeLog 15066
+SHA256 e4967e2c53a8b6481745c587b7dcd1bee6e5804b020e7272ee8936bfb090a5a2 ChangeLog 15066
 MISC metadata.xml 313 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b SHA1 a40d5fd17e50dc9f983efc63e5cbb8b407b95c7a SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b metadata.xml 313
@@ -96,3 +99,10 @@ SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/di
 MD5 ce2f63ffae6742f96ede8200eb39c3d1 files/digest-wvstreams-4.2.2-r2 250
 RMD160 ad134621ec5ac0b3b3884506e3abfbf770e34b52 files/digest-wvstreams-4.2.2-r2 250
 SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/digest-wvstreams-4.2.2-r2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFPHNr3sf9c6kjmR8RAqN+AJ9/8m6eVckcn3w6ASbMDbOdNNqSuACfYnYk
+H9dTzWlosV5xuKWqYkxzMt4=
+=kxl5
+-----END PGP SIGNATURE-----

diff --git a/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild
index 6b3f32e05d75c061b27706549ab36b7049cf5cbb..b2ef28a1f482f07dcd74c62b7df96dee0272f7f9 100644 (file)
--- 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 fdbe15ea2e88bb58e75cfb4151f8bf9a8b114567..e8f1559d80627ab2759b53dcb75a5e5c635e3141 100644 (file)
--- 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 d11cd64094e63baf29197353018dd00dd4b4c08e..f19499fce8b36d81ab54cefb7f8da4ff95e6810b 100644 (file)
--- 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 \