Split tcltk USE flag. Bug #17808.

(Portage version: 2.1.1)

5 files changed, 52 insertions, 31 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index cac9dee7c3f7..270ca39c702a 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.38 2006/09/16 21:25:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.39 2006/09/17 02:35:24 keri Exp $
+
+  17 Sep 2006; keri <keri@gentoo.org> mercury-extras-0.12.2.ebuild,
+  mercury-extras-0.12.2-r1.ebuild, mercury-extras-0.12.2-r2.ebuild,
+  mercury-extras-0.13.0.ebuild:
+  Split tcltk USE flag. Bug #17808.
+
+  16 Sep 2006; keri <keri@gentoo.org>
+  -files/mercury-extras-0.13.0_beta-concurrency-r1.patch,
+  -files/mercury-extras-0.13.0_beta-dynamic_linking.patch,
+  -files/mercury-extras-0.13.0_beta-lex.patch,
+  -files/mercury-extras-0.13.0_beta-mercury_glut.patch,
+  -files/mercury-extras-0.13.0_beta-mercury_opengl.patch,
+  -files/mercury-extras-0.13.0_beta-mercury_tcltk.patch,
+  -files/mercury-extras-0.13.0_beta-odbc-r1.patch,
+  -files/mercury-extras-0.13.0_beta-posix.patch,
+  -files/mercury-extras-0.13.0_beta-references.patch,
+  -files/mercury-extras-0.13.0_beta-trailed_update-r1.patch,
+  -mercury-extras-0.13.0_beta20060907.ebuild:
+  Remove 0.13.0_beta development snapshot.
 
 *mercury-extras-0.13.0 (16 Sep 2006)
 
diff --git a/dev-lang/mercury-extras/mercury-extras-0.12.2-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-0.12.2-r1.ebuild
index 981f3714d8b7..125c1bb793f4 100644
--- a/dev-lang/mercury-extras/mercury-extras-0.12.2-r1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-0.12.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/dev-lang/mercury-extras/mercury-extras-0.12.2-r1.ebuild,v 1.2 2006/06/11 19:19:31 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2-r1.ebuild,v 1.3 2006/09/17 02:35:24 keri Exp $
 
 inherit eutils
 
@@ -12,18 +12,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 
-IUSE="doc glut iodbc opengl tcltk"
+IUSE="doc glut iodbc opengl tcl tk"
 
 DEPEND="~dev-lang/mercury-0.12.2
 	sys-libs/ncurses
 	glut? ( virtual/glut )
 	iodbc? ( dev-db/libiodbc )
 	opengl? ( virtual/opengl )
-	tcltk? ( =dev-lang/tk-8.4*
-		|| ( (
+	tcl? ( tk? (
+			=dev-lang/tcl-8.4*
+			=dev-lang/tk-8.4*
 			x11-libs/libX11
-			x11-libs/libXmu )
-		virtual/x11 ) )"
+			x11-libs/libXmu ) )"
 
 src_unpack() {
 	unpack ${A}
@@ -51,7 +51,7 @@ src_unpack() {
 
 	use iodbc && sed -i -e "s:moose:moose odbc:" Mmakefile
 	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
+	use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
 	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
 }
 
@@ -59,7 +59,7 @@ src_compile() {
 	mmake depend || die "mmake depend failed"
 	mmake || die "mmake failed"
 
-	if use opengl && use tcltk ; then
+	if use opengl && use tcl && use tk ; then
 		cd "${S}"/graphics/mercury_opengl
 		cp ../mercury_tcltk/mtcltk.m ./
 		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
@@ -71,7 +71,7 @@ src_install() {
 	cd "${S}"
 	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
 
-	if use opengl && use tcltk ; then
+	if use opengl && use tcl && use tk ; then
 		cd "${S}"/graphics/mercury_opengl
 		mv Mmakefile Mmakefile.opengl
 		mv Mmakefile.mtogl Mmakefile
diff --git a/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild
index 9d68ecd9cd8f..14859a136d83 100644
--- a/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-0.12.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/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild,v 1.1 2006/09/09 22:12:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild,v 1.2 2006/09/17 02:35:24 keri Exp $
 
 inherit eutils
 
@@ -12,18 +12,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 
-IUSE="doc glut iodbc opengl ncurses tcltk xml"
+IUSE="doc glut iodbc opengl ncurses tcl tk xml"
 
 DEPEND="~dev-lang/mercury-0.12.2
 	glut? ( virtual/glut )
 	iodbc? ( dev-db/libiodbc )
 	ncurses? ( sys-libs/ncurses )
 	opengl? ( virtual/opengl )
-	tcltk? ( =dev-lang/tk-8.4*
-		|| ( (
+	tcl? ( tk? (
+			=dev-lang/tcl-8.4*
+			=dev-lang/tk-8.4*
 			x11-libs/libX11
-			x11-libs/libXmu )
-		virtual/x11 ) )"
+			x11-libs/libXmu ) )"
 
 src_unpack() {
 	unpack ${A}
@@ -46,12 +46,13 @@ src_unpack() {
 	if built_with_use dev-lang/mercury minimal; then
 		sed -i -e "s:references::" Mmakefile
 	else
-		sed -i -e "s:xml:trailed_update xml:" Mmakefile
+		sed -i	-e "s:cgi:cgi clpr:" \
+			-e "s:xml:trailed_update xml:" Mmakefile
 	fi
 
 	use iodbc && sed -i -e "s:moose:moose odbc:" Mmakefile
 	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
+	use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
 	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
 	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
 	! use xml && sed -i -e "s:xml::" Mmakefile
@@ -61,7 +62,7 @@ src_compile() {
 	mmake depend || die "mmake depend failed"
 	mmake || die "mmake failed"
 
-	if use opengl && use tcltk ; then
+	if use opengl && use tcl && use tk ; then
 		cd "${S}"/graphics/mercury_opengl
 		cp ../mercury_tcltk/mtcltk.m ./
 		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
@@ -73,7 +74,7 @@ src_install() {
 	cd "${S}"
 	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
 
-	if use opengl && use tcltk ; then
+	if use opengl && use tcl && use tk ; then
 		cd "${S}"/graphics/mercury_opengl
 		mv Mmakefile Mmakefile.opengl
 		mv Mmakefile.mtogl Mmakefile
diff --git a/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild
index 62dc1b67f062..c416edc6c093 100644
--- a/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-0.12.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/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild,v 1.8 2006/06/17 09:41:26 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild,v 1.9 2006/09/17 02:35:24 keri Exp $
 
 inherit eutils
 
@@ -12,18 +12,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 
-IUSE="doc glut iodbc opengl tcltk"
+IUSE="doc glut iodbc opengl tcl tk"
 
 DEPEND="~dev-lang/mercury-0.12.2
 	sys-libs/ncurses
 	glut? ( virtual/glut )
 	iodbc? ( dev-db/libiodbc )
 	opengl? ( virtual/opengl )
-	tcltk? ( =dev-lang/tk-8.4*
-		|| ( (
+	tcl? ( tk? (
+			=dev-lang/tcl-8.4*
+			=dev-lang/tk-8.4*
 			x11-libs/libX11
-			x11-libs/libXmu )
-		virtual/x11 ) )"
+			x11-libs/libXmu ) )"
 
 src_unpack() {
 	unpack ${A}
@@ -45,7 +45,7 @@ src_unpack() {
 
 	use iodbc && sed -i -e "s:moose:moose odbc:" Mmakefile
 	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
+	use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
 	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
 }
 
@@ -53,7 +53,7 @@ src_compile() {
 	mmake depend || die "mmake depend failed"
 	mmake || die "mmake failed"
 
-	if use opengl && use tcltk ; then
+	if use opengl && use tcl && use tk ; then
 		cd "${S}"/graphics/mercury_opengl
 		cp ../mercury_tcltk/mtcltk.m ./
 		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
@@ -65,7 +65,7 @@ src_install() {
 	cd "${S}"
 	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
 
-	if use opengl && use tcltk ; then
+	if use opengl && use tcl && use tk ; then
 		cd "${S}"/graphics/mercury_opengl
 		mv Mmakefile Mmakefile.opengl
 		mv Mmakefile.mtogl Mmakefile
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild
index 0725971e180e..c80770c381c7 100644
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.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-lang/mercury-extras/mercury-extras-0.13.0.ebuild,v 1.1 2006/09/16 21:25:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild,v 1.2 2006/09/17 02:35:24 keri Exp $
 
 inherit eutils
 
@@ -48,7 +48,8 @@ src_unpack() {
 	if built_with_use dev-lang/mercury minimal; then
 		sed -i -e "s:references::" Mmakefile
 	else
-		sed -i -e "s:xml:trailed_update xml:" Mmakefile
+		sed -i	-e "s:cgi:cgi clpr:" \
+			-e "s:xml:trailed_update xml:" Mmakefile
 	fi
 
 	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile