moved tcltk USE flag over to separate tk and tcl flags, see bug #17808

Package-Manager: portage-2.1.1-r2

diff --git a/dev-lisp/gcl-cvs/ChangeLog b/dev-lisp/gcl-cvs/ChangeLog
index 8fc91d7a30324672787b5847f880c9a136020c47..8683b026f152c7276307a34e4b810da0fddfa4b0 100644 (file)
--- a/dev-lisp/gcl-cvs/ChangeLog
+++ b/dev-lisp/gcl-cvs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lisp/gcl-cvs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl-cvs/ChangeLog,v 1.4 2006/02/13 21:43:28 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl-cvs/ChangeLog,v 1.5 2006/11/29 15:44:17 opfer Exp $
+
+  29 Nov 2006; Christian Faulhammer <opfer@gentoo.org> gcl-cvs-2.7.0.ebuild:
+  moved tcltk USE flag over to separate tk and tcl flags, see bug #17808
 
   13 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org> gcl-cvs-2.7.0.ebuild:
   Modular X dependencies.

diff --git a/dev-lisp/gcl-cvs/files/digest-gcl-cvs-2.7.0 b/dev-lisp/gcl-cvs/files/digest-gcl-cvs-2.7.0
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/dev-lisp/gcl-cvs/files/digest-gcl-cvs-2.7.0
+++ b/dev-lisp/gcl-cvs/files/digest-gcl-cvs-2.7.0
@@ -0,0 +1 @@
+

diff --git a/dev-lisp/gcl-cvs/gcl-cvs-2.7.0.ebuild b/dev-lisp/gcl-cvs/gcl-cvs-2.7.0.ebuild
index 067359bffe327f64598a563c18150d542016cae4..f24577036ed9f4ebd0c8b4bb1e8e7aef572b22a0 100644 (file)
--- a/dev-lisp/gcl-cvs/gcl-cvs-2.7.0.ebuild
+++ b/dev-lisp/gcl-cvs/gcl-cvs-2.7.0.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-lisp/gcl-cvs/gcl-cvs-2.7.0.ebuild,v 1.4 2006/02/13 21:43:28 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl-cvs/gcl-cvs-2.7.0.ebuild,v 1.5 2006/11/29 15:44:17 opfer Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/gcl"
@@ -16,7 +16,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="emacs readline debug X tcltk custreloc dlopen gprof doc"
+IUSE="emacs readline debug X tk custreloc dlopen gprof doc"
 RESTRICT="$RESTRICT nostrip"
 
 DEPEND=">=app-text/texi2html-1.64
@@ -25,7 +25,7 @@ DEPEND=">=app-text/texi2html-1.64
        readline? ( sys-libs/readline )
        >=dev-libs/gmp-4.1
        doc? ( virtual/tetex )
-       tcltk? ( dev-lang/tk )
+       tk? ( dev-lang/tk )
        sys-devel/autoconf
        sys-devel/automake
        sys-devel/libtool"
@@ -109,7 +109,7 @@ src_compile() {
 #              --disable-statsysbfd"
 #      fi
 
-       if use tcltk; then
+       if use tk; then
                myconfig="${myconfig}
                --enable-tkconfig=/usr/lib
                --enable-tclconfig=/usr/lib"
@@ -151,7 +151,7 @@ src_install() {
 
        exeinto /usr/bin
 
-       if use tcltk; then
+       if use tk; then
                newexe ${FILESDIR}/gcl gcl
                dosed "s,@TKVER@,/usr/lib/tk$(source /usr/lib/tkConfig.sh; echo $TK_VERSION),g" \
                        /usr/bin/gcl

diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index 70be161d05b7afc89c00eba4bd082d94283a05b1..faf0040bda66632a5fb14a5ebfd9bde5edca1519 100644 (file)
--- a/dev-lisp/gcl/ChangeLog
+++ b/dev-lisp/gcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/gcl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.38 2006/05/11 06:18:52 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.39 2006/11/29 15:42:17 opfer Exp $
+
+  29 Nov 2006; Christian Faulhammer <opfer@gentoo.org> gcl-2.6.7.ebuild,
+  gcl-2.6.7-r1.ebuild:
+  moved tcltk USE flag over to separate tk and tcl flags, see bug #17808
 
   11 May 2006; Matthew Kennedy <mkennedy@gentoo.org>
   +files/flex-configure-LANG.patch, gcl-2.6.7-r1.ebuild:

diff --git a/dev-lisp/gcl/gcl-2.6.7-r1.ebuild b/dev-lisp/gcl/gcl-2.6.7-r1.ebuild
index 342c71eae27f38ad42be9869a6f8e535fb13a7e5..2f70c5f8fdbb42df18a38378dea245f7e24f63b7 100644 (file)
--- a/dev-lisp/gcl/gcl-2.6.7-r1.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.7-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-lisp/gcl/gcl-2.6.7-r1.ebuild,v 1.3 2006/05/11 06:18:52 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7-r1.ebuild,v 1.4 2006/11/29 15:42:17 opfer Exp $
 
 inherit elisp-common flag-o-matic autotools
 
@@ -11,12 +11,12 @@ SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE="emacs readline debug X tcltk custreloc dlopen gprof doc ansi"
+IUSE="emacs readline debug X tk custreloc dlopen gprof doc ansi"
 
 RDEPEND="emacs? ( virtual/emacs )
        readline? ( sys-libs/readline )
        >=dev-libs/gmp-4.1
-       tcltk? ( dev-lang/tk )
+       tk? ( dev-lang/tk )
        X? ( || ( ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/x11 ) )"
 
 DEPEND="$RDEPEND
@@ -103,7 +103,7 @@ src_compile() {
                myconfig="${myconfig} --enable-locbfd --disable-dynsysbfd --disable-statsysbfd"
        fi
 
-       if use tcltk; then
+       if use tk; then
                myconfig="${myconfig}
                --enable-tkconfig=/usr/lib
                --enable-tclconfig=/usr/lib"

diff --git a/dev-lisp/gcl/gcl-2.6.7.ebuild b/dev-lisp/gcl/gcl-2.6.7.ebuild
index ed177fa9decb512ea537e6c4a3477c1384952e62..50aabdaf2dd9d2f8c492a808b41171f79664f326 100644 (file)
--- a/dev-lisp/gcl/gcl-2.6.7.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.7.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-lisp/gcl/gcl-2.6.7.ebuild,v 1.7 2006/04/08 23:37:58 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7.ebuild,v 1.8 2006/11/29 15:42:17 opfer Exp $
 
 inherit elisp-common flag-o-matic autotools
 
@@ -11,13 +11,13 @@ SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc amd64 sparc"
-IUSE="emacs readline debug X tcltk custreloc dlopen gprof doc ansi"
+IUSE="emacs readline debug X tk custreloc dlopen gprof doc ansi"
 
 RDEPEND="emacs? ( virtual/emacs )
        X? ( || ( ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/x11 ) )
        readline? ( sys-libs/readline )
        >=dev-libs/gmp-4.1
-       tcltk? ( dev-lang/tk )"
+       tk? ( dev-lang/tk )"
 
 DEPEND="$RDEPEND
        doc? ( virtual/tetex )
@@ -102,7 +102,7 @@ src_compile() {
                myconfig="${myconfig} --enable-locbfd --disable-dynsysbfd --disable-statsysbfd"
        fi
 
-       if use tcltk; then
+       if use tk; then
                myconfig="${myconfig}
                --enable-tkconfig=/usr/lib
                --enable-tclconfig=/usr/lib"