From ce2495c8539c3405eed46a9d17f7dc21fdc8590b Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Tue, 28 Nov 2006 20:20:38 +0000 Subject: moved tcltk USE flag over to separate tk and tcl flags, see bug #17808 (Portage version: 2.1.1-r2) --- app-text/txt2tags/ChangeLog | 6 +++++- app-text/txt2tags/txt2tags-1.7.ebuild | 16 ++++++++-------- app-text/txt2tags/txt2tags-2.1.ebuild | 16 ++++++++-------- app-text/txt2tags/txt2tags-2.2.ebuild | 16 ++++++++-------- app-text/txt2tags/txt2tags-2.3.ebuild | 14 +++++++------- 5 files changed, 36 insertions(+), 32 deletions(-) (limited to 'app-text') diff --git a/app-text/txt2tags/ChangeLog b/app-text/txt2tags/ChangeLog index a2970f4942cf..7cac10ff0f27 100644 --- a/app-text/txt2tags/ChangeLog +++ b/app-text/txt2tags/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/txt2tags # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/ChangeLog,v 1.20 2006/04/27 14:46:51 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/ChangeLog,v 1.21 2006/11/28 20:20:38 opfer Exp $ + + 28 Nov 2006; Christian Faulhammer txt2tags-1.7.ebuild, + txt2tags-2.1.ebuild, txt2tags-2.2.ebuild, txt2tags-2.3.ebuild: + moved tcltk USE flag over to separate tk and tcl flags, see bug #17808 27 Apr 2006; Marien Zwart files/digest-txt2tags-1.7, files/digest-txt2tags-2.1, files/digest-txt2tags-2.2, Manifest: diff --git a/app-text/txt2tags/txt2tags-1.7.ebuild b/app-text/txt2tags/txt2tags-1.7.ebuild index 2a8c0c5b1181..680241fb8be8 100644 --- a/app-text/txt2tags/txt2tags-1.7.ebuild +++ b/app-text/txt2tags/txt2tags-1.7.ebuild @@ -1,10 +1,10 @@ -# 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/app-text/txt2tags/txt2tags-1.7.ebuild,v 1.7 2005/07/09 19:41:16 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-1.7.ebuild,v 1.8 2006/11/28 20:20:38 opfer Exp $ inherit elisp-common -IUSE="emacs tcltk" +IUSE="emacs tk" DESCRIPTION="Txt2tags is a tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup." SRC_URI="http://txt2tags.sourceforge.net/src/${P}.tgz" @@ -15,19 +15,19 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 sparc ~ppc" DEPEND="virtual/python - tcltk? ( dev-lang/tk ) + tk? ( dev-lang/tk ) emacs? ( virtual/emacs )" pkg_setup() { - # need to test if the tcltk support in python is working - if use tcltk; then + # need to test if the tk support in python is working + if use tk; then if ! python -c "import _tkinter" 2>&1 > /dev/null ; then echo - eerror "You have requested tcltk, but your build of Python" + eerror "You have requested tk, but your build of Python" eerror "doesnt support import _tkinter. You may need to" eerror "remerge dev-lang/python, or build ${P}" - eerror "with USE=\"-tcltk\"" + eerror "with USE=\"-tk\"" die fi fi diff --git a/app-text/txt2tags/txt2tags-2.1.ebuild b/app-text/txt2tags/txt2tags-2.1.ebuild index d603376e13c0..1b59e1a2a127 100644 --- a/app-text/txt2tags/txt2tags-2.1.ebuild +++ b/app-text/txt2tags/txt2tags-2.1.ebuild @@ -1,10 +1,10 @@ -# 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/app-text/txt2tags/txt2tags-2.1.ebuild,v 1.8 2005/07/09 19:41:16 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-2.1.ebuild,v 1.9 2006/11/28 20:20:38 opfer Exp $ inherit elisp-common -IUSE="emacs tcltk" +IUSE="emacs tk" DESCRIPTION="Txt2tags is a tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup." SRC_URI="http://txt2tags.sourceforge.net/src/${P}.tgz" @@ -15,19 +15,19 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 sparc ppc amd64" DEPEND="virtual/python - tcltk? ( dev-lang/tk ) + tk? ( dev-lang/tk ) emacs? ( virtual/emacs )" pkg_setup() { - # need to test if the tcltk support in python is working - if use tcltk; then + # need to test if the tk support in python is working + if use tk; then if ! python -c "import _tkinter" 2>&1 > /dev/null ; then echo - eerror "You have requested tcltk, but your build of Python" + eerror "You have requested tk, but your build of Python" eerror "doesnt support import _tkinter. You may need to" eerror "remerge dev-lang/python, or build ${P}" - eerror "with USE=\"-tcltk\"" + eerror "with USE=\"-tk\"" die fi fi diff --git a/app-text/txt2tags/txt2tags-2.2.ebuild b/app-text/txt2tags/txt2tags-2.2.ebuild index 28b69acfb5a4..5955a9ecce9f 100644 --- a/app-text/txt2tags/txt2tags-2.2.ebuild +++ b/app-text/txt2tags/txt2tags-2.2.ebuild @@ -1,10 +1,10 @@ -# 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/app-text/txt2tags/txt2tags-2.2.ebuild,v 1.3 2005/11/26 20:22:28 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-2.2.ebuild,v 1.4 2006/11/28 20:20:38 opfer Exp $ inherit elisp-common -IUSE="emacs tcltk" +IUSE="emacs tk" DESCRIPTION="Txt2tags is a tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup." SRC_URI="http://txt2tags.sourceforge.net/src/${P}.tgz" @@ -15,19 +15,19 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86" DEPEND="virtual/python - tcltk? ( dev-lang/tk ) + tk? ( dev-lang/tk ) emacs? ( virtual/emacs )" pkg_setup() { - # need to test if the tcltk support in python is working - if use tcltk; then + # need to test if the tk support in python is working + if use tk; then if ! python -c "import _tkinter" 2>&1 > /dev/null ; then echo - eerror "You have requested tcltk, but your build of Python" + eerror "You have requested tk, but your build of Python" eerror "doesnt support import _tkinter. You may need to" eerror "remerge dev-lang/python, or build ${P}" - eerror "with USE=\"-tcltk\"" + eerror "with USE=\"-tk\"" die fi fi diff --git a/app-text/txt2tags/txt2tags-2.3.ebuild b/app-text/txt2tags/txt2tags-2.3.ebuild index 2ec305814766..be0b9810de9d 100644 --- a/app-text/txt2tags/txt2tags-2.3.ebuild +++ b/app-text/txt2tags/txt2tags-2.3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-2.3.ebuild,v 1.1 2006/04/14 09:10:03 ehmsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-2.3.ebuild,v 1.2 2006/11/28 20:20:38 opfer Exp $ inherit elisp-common -IUSE="emacs tcltk" +IUSE="emacs tk" DESCRIPTION="Txt2tags is a tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup." SRC_URI="http://txt2tags.sourceforge.net/src/${P}.tgz" @@ -15,19 +15,19 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86" DEPEND="virtual/python - tcltk? ( dev-lang/tk ) + tk? ( dev-lang/tk ) emacs? ( virtual/emacs )" pkg_setup() { - # need to test if the tcltk support in python is working - if use tcltk; then + # need to test if the tk support in python is working + if use tk; then if ! python -c "import _tkinter" 2>&1 > /dev/null ; then echo - eerror "You have requested tcltk, but your build of Python" + eerror "You have requested tk, but your build of Python" eerror "doesnt support import _tkinter. You may need to" eerror "remerge dev-lang/python, or build ${P}" - eerror "with USE=\"-tcltk\"" + eerror "with USE=\"-tk\"" die fi fi -- cgit v1.2.3-65-gdbad