Split tcltk USE flag. Bug #17808.

Package-Manager: portage-2.1.1

6 files changed, 72 insertions, 51 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/Manifest b/dev-lang/mercury-extras/Manifest
index ead746b09a62..54892b02cc84 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -84,26 +84,26 @@ RMD160 d079c3a8d19b74f71bf8d972577f52c492f7d214 files/mercury-extras-0.13.0-trai
 SHA256 034c6dfde10f3514646491630eee005bd35365f427cbf236739ff89ed0cc4f33 files/mercury-extras-0.13.0-trailed_update.patch 759
 DIST mercury-extras-0.12.2.tar.gz 759070 RMD160 3e7c4c67590408d2da056135c9560ff4d078eff6 SHA1 fc0f446f8b7f448c27f61bfe226a33fbaa007e0a SHA256 3a5be0941fad7ed8f8d2e967138984127510ba388b65b0f3f35f46ae8b6b43a8
 DIST mercury-extras-0.13.0.tar.gz 876713 RMD160 a310a51b050647ec49e797a6469ce11145368c6d SHA1 4e12415003488eac13991c55164f42e10d827fcc SHA256 0e4238a9b891067f75c9f792e9dc970005d66a3248be6e8a4adc24e5291b1f24
-EBUILD mercury-extras-0.12.2-r1.ebuild 2925 RMD160 41a913f2802c9ce9dadc1188cc7df763ffbfd45a SHA1 7d6bb912018a41c4dd77d0d8549f79dabe9136df SHA256 ae00eb0a2d28f2ad6606864e0ed92fb0bbaaa35c238a5aacb68668154851463b
-MD5 124745e0d3a42531366cfc18fba3f7b9 mercury-extras-0.12.2-r1.ebuild 2925
-RMD160 41a913f2802c9ce9dadc1188cc7df763ffbfd45a mercury-extras-0.12.2-r1.ebuild 2925
-SHA256 ae00eb0a2d28f2ad6606864e0ed92fb0bbaaa35c238a5aacb68668154851463b mercury-extras-0.12.2-r1.ebuild 2925
-EBUILD mercury-extras-0.12.2-r2.ebuild 3083 RMD160 06eb2f2a09d01c557e53d97fd5bf71dd382f42aa SHA1 ad3865c02b784907ad9c38fc8789e3a65928b8c3 SHA256 d195980502d149d612ef51c7fe3965099368431236808c45fa628ecdb49fb544
-MD5 2ff052c0fa42ad94f5d511140acfda85 mercury-extras-0.12.2-r2.ebuild 3083
-RMD160 06eb2f2a09d01c557e53d97fd5bf71dd382f42aa mercury-extras-0.12.2-r2.ebuild 3083
-SHA256 d195980502d149d612ef51c7fe3965099368431236808c45fa628ecdb49fb544 mercury-extras-0.12.2-r2.ebuild 3083
-EBUILD mercury-extras-0.12.2.ebuild 2776 RMD160 89b69551c1a1144b11cd7584c1752cb17640b7fd SHA1 2514361f424d440c01e42394414db0687b401e14 SHA256 ad64576bbef6ccbc08c906aa85b2332ef3796fbd1a334a4d3eb4d1536c9d05a8
-MD5 7b6076b8af4283b1abca548a13015298 mercury-extras-0.12.2.ebuild 2776
-RMD160 89b69551c1a1144b11cd7584c1752cb17640b7fd mercury-extras-0.12.2.ebuild 2776
-SHA256 ad64576bbef6ccbc08c906aa85b2332ef3796fbd1a334a4d3eb4d1536c9d05a8 mercury-extras-0.12.2.ebuild 2776
-EBUILD mercury-extras-0.13.0.ebuild 3359 RMD160 1a77d77258ea5878d5f62aba3c90d682c3b59e09 SHA1 9b7ea52d570cedd7ec388bf16e265911cd287406 SHA256 532456c6489a0be114176f6faf8face13b5e09dcbe10489e7231dfb53741dbef
-MD5 f34f3fbd5f105e982e712f77413d4b84 mercury-extras-0.13.0.ebuild 3359
-RMD160 1a77d77258ea5878d5f62aba3c90d682c3b59e09 mercury-extras-0.13.0.ebuild 3359
-SHA256 532456c6489a0be114176f6faf8face13b5e09dcbe10489e7231dfb53741dbef mercury-extras-0.13.0.ebuild 3359
-MISC ChangeLog 11377 RMD160 ea480823653e055ab238b0196ef9fc611eab585b SHA1 e41ccc614d5a1c3b61398a128d36ea05ffaa0fc0 SHA256 2d9f1187306c26e5549d9da751db5fbfe3d373a014faa205dfb4962a45e8a8f8
-MD5 7fa49e59c89e8226ff175c041bd7e7d9 ChangeLog 11377
-RMD160 ea480823653e055ab238b0196ef9fc611eab585b ChangeLog 11377
-SHA256 2d9f1187306c26e5549d9da751db5fbfe3d373a014faa205dfb4962a45e8a8f8 ChangeLog 11377
+EBUILD mercury-extras-0.12.2-r1.ebuild 2954 RMD160 b38a16819d30a14bc9733adf5b45c99ccb97844a SHA1 acec6bdf21e49cfc76a8668a064e10ee40a4c90c SHA256 1e9c8b3b62453ce5a460bca0104cab068ef3b4f63184547f72c8bd199f59f06b
+MD5 ac3a157529b1ff7f445ce97b4bc55954 mercury-extras-0.12.2-r1.ebuild 2954
+RMD160 b38a16819d30a14bc9733adf5b45c99ccb97844a mercury-extras-0.12.2-r1.ebuild 2954
+SHA256 1e9c8b3b62453ce5a460bca0104cab068ef3b4f63184547f72c8bd199f59f06b mercury-extras-0.12.2-r1.ebuild 2954
+EBUILD mercury-extras-0.12.2-r2.ebuild 3138 RMD160 9abf1742e157955644a086234b21c8865b9ccf17 SHA1 eb5a4f728b419fb224fd5b2ee6d61bcf5a535271 SHA256 150e20577068b6cdc55278832b7f8d5ff9e755bc2717170940879d411535c476
+MD5 06f7c7914a7d57f960ee2139508572a0 mercury-extras-0.12.2-r2.ebuild 3138
+RMD160 9abf1742e157955644a086234b21c8865b9ccf17 mercury-extras-0.12.2-r2.ebuild 3138
+SHA256 150e20577068b6cdc55278832b7f8d5ff9e755bc2717170940879d411535c476 mercury-extras-0.12.2-r2.ebuild 3138
+EBUILD mercury-extras-0.12.2.ebuild 2805 RMD160 dcaf180536a27b4feb26be903eb014665bd0157c SHA1 894b9df7a585ced7b820d410e4b49dce752fc0dc SHA256 1f0698cd40c256629c24220d2519e5df26da7eaa7fb0964bfd9c1da19d6cb32f
+MD5 98557ba05682185a9127512b0e0d053d mercury-extras-0.12.2.ebuild 2805
+RMD160 dcaf180536a27b4feb26be903eb014665bd0157c mercury-extras-0.12.2.ebuild 2805
+SHA256 1f0698cd40c256629c24220d2519e5df26da7eaa7fb0964bfd9c1da19d6cb32f mercury-extras-0.12.2.ebuild 2805
+EBUILD mercury-extras-0.13.0.ebuild 3385 RMD160 6a435cd05a5b9bcf48d8b721340b21b5721b0a59 SHA1 343a83e520566d15fc1b89b6590aed3e048063d2 SHA256 fdc05bfd033be8b51883655903c91c11f3bde79f152dec53b8fe47b0af7d744b
+MD5 be3c2c3b30bbac5aaba34c941f24ac41 mercury-extras-0.13.0.ebuild 3385
+RMD160 6a435cd05a5b9bcf48d8b721340b21b5721b0a59 mercury-extras-0.13.0.ebuild 3385
+SHA256 fdc05bfd033be8b51883655903c91c11f3bde79f152dec53b8fe47b0af7d744b mercury-extras-0.13.0.ebuild 3385
+MISC ChangeLog 12260 RMD160 2266896276474912d2797e20b01e81bca7606460 SHA1 61df2437a5025a9b4e2a76644eb3c0682bb01ba8 SHA256 2441eba299e2996db4445f5ee627ae447c9bdd31823d1515e7a7d40e3818ed4d
+MD5 8f52baa809d2fee01492a7168ed655e9 ChangeLog 12260
+RMD160 2266896276474912d2797e20b01e81bca7606460 ChangeLog 12260
+SHA256 2441eba299e2996db4445f5ee627ae447c9bdd31823d1515e7a7d40e3818ed4d ChangeLog 12260
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
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