Masked for removal in 30 days since 26 May 2009.

16 files changed, 0 insertions, 1818 deletions

diff --git a/dev-tcltk/otcl/ChangeLog b/dev-tcltk/otcl/ChangeLog
deleted file mode 100644
index 200994040360..000000000000
--- a/dev-tcltk/otcl/ChangeLog
+++ /dev/null
@@ -1,108 +0,0 @@
-# ChangeLog for dev-tcltk/otcl
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/otcl/ChangeLog,v 1.27 2007/04/28 03:35:12 matsuu Exp $
-
-*otcl-1.13 (28 Apr 2007)
-
-  28 Apr 2007; MATSUU Takuto <matsuu@gentoo.org>
-  -files/otcl-1.8-badfreefix.patch,
-  +files/otcl-1.13-configure-cleanup.patch, -otcl-1.8-r3.ebuild,
-  -otcl-1.9.ebuild, +otcl-1.13.ebuild:
-  Version bumped.
-  Removed old versions, bug #160006.
-
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
-  Transition to Manifest2.
-
-  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> otcl-1.11.ebuild:
-  Fix broken autotools handling.
-
-  06 Aug 2006; Jason Wever <weeve@gentoo.org> otcl-1.11.ebuild:
-  Stable on SPARC wrt bug #123209.
-
-  27 Jul 2006; Joshua Jackson <tsunam@gentoo.org> otcl-1.11.ebuild:
-  Stable x86; bug #123209
-
-  07 Jul 2006; Jon Hood <squinky86@gentoo.org> otcl-1.11.ebuild:
-  Stable on amd64, bug #123209.
-
-*otcl-1.11 (15 May 2006)
-
-  15 May 2006; Robin H. Johnson <robbat2@gentoo.org>
-  +files/otcl-1.11-badfreefix.patch,
-  +files/otcl-1.11-configure-cleanup.patch, +otcl-1.11.ebuild:
-  Bug #119147 and #123209, a version bump, with a large configure cleanup to
-  work under modern Gentoo TCL and Bash3.1.
-
-  28 Mar 2006; Emanuele Giaquinta <exg@gentoo.org> otcl-1.9.ebuild:
-  Fix configure with bash-3.1.
-
-  24 Apr 2005; MATSUU Takuto <matsuu@gentoo.org> otcl-1.8-r3.ebuild:
-  stable on x86
-
-  24 Apr 2005; Simon Stelling <blubb@gentoo.org> otcl-1.8-r3.ebuild:
-  stable on amd64
-
-  23 Apr 2005; MATSUU Takuto <matsuu@gentoo.org> -otcl-1.8-r1.ebuild,
-  -otcl-1.8-r2.ebuild, otcl-1.9.ebuild:
-  Fixed parallel make problem, Bug 90149.
-  Removed old versions.
-
-*otcl-1.9 (03 Apr 2005)
-
-  03 Apr 2005; MATSUU Takuto <matsuu@gentoo.org> +otcl-1.9.ebuild:
-  Version bumped. Cleanup ebuild.
-
-  27 Oct 2004; Karol Wojtaszek <sekretarz@gentoo.org> otcl-1.8-r3.ebuild:
-  Added ~amd64
-
-  28 Aug 2004; Doug Goldstein <cardoe@gentoo.org> otcl-1.8-r3.ebuild:
-  That fix only worked on one system... not the other... this is the permenant
-  fix by fixing the Makefile
-
-*otcl-1.8-r3 (28 Aug 2004)
-
-  28 Aug 2004; Doug Goldstein <cardoe@gentoo.org> +otcl-1.8-r3.ebuild:
-  ebuild incorrectly attempted to recompile the shared library after the 
-  fact causing a failure. bug #61639
-
-  26 Aug 2004; Ferris McCormick <fmccor@gentoo.org> otcl-1.8-r2.ebuild:
-  Stable for sparc.
-
-  07 Aug 2004; Tom Martin <slarti@gentoo.org> otcl-1.8-r1.ebuild,
-  otcl-1.8-r2.ebuild:
-  Typo in DESCRIPTION: extention -> extension. Bug 59717.
-
-  03 Aug 2004; David Holm <dholm@gentoo.org> otcl-1.8-r2.ebuild:
-  Added to ~ppc.
-
-*otcl-1.8-r2 (27 Jul 2004)
-
-  27 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> otcl-1.8-r2.ebuild:
-  bug #57294.
-
-  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> otcl-1.8-r1.ebuild:
-  Add die following econf for bug 48950
-
-  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> otcl-1.8-r1.ebuild:
-  Inherit eutils.
-
-  04 Apr 2004; Chris Aniszczyk <zx@gentoo.org> metadata.xml,
-  otcl-1.8-r1.ebuild, otcl-1.8.ebuild:
-  Clean up.
-
-*otcl-1.8-r1 (13 Jan 2004)
-
-  13 Jan 2003; Robin H. Johnson <robbat2@gentoo.org> otcl-1.8-r1.ebuild:  
-  fix a big upstream bug myself, need to send it to them still. caused
-  segfaults.
-
-  10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> otcl-1.8.ebuild:
-  fix a slight glitch
-
-*otcl-1.8 (10 Jan 2004)
-
-  10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> otcl-1.8.ebuild:
-  Initial commit, original ebuild by Christophe Radovcic
-  <christophe.radovcic@laposte.net>, heavily updated by robbat2@gentoo.org
-
diff --git a/dev-tcltk/otcl/Manifest b/dev-tcltk/otcl/Manifest
deleted file mode 100644
index 735fdacd5794..000000000000
--- a/dev-tcltk/otcl/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX otcl-1.11-badfreefix.patch 6953 RMD160 18b4b1920466292d67a77c2ca0443cfb889a02db SHA1 203172da92b84ff5641ec067ca39d3c80c63ef22 SHA256 06e801547fdaed1e415cdf2d5cb6c01bbd1e22c826084a2e93c4e1e53beb05a9
-AUX otcl-1.11-configure-cleanup.patch 8969 RMD160 1644a5b5677baaa9cab6471e2109a20c901798b1 SHA1 d3a6d4d4fcd4aedb5b34c65f9633daaf6ab09e5b SHA256 5b7aa8765cecfe8734c113c1c73fac466a17699e3dff11742480fc4f9084e655
-AUX otcl-1.13-configure-cleanup.patch 8307 RMD160 5f8cef125030c29569a920633bbb0722b72595bf SHA1 c0c2d233c55b53d3fc1b4d07baa327809d948d13 SHA256 5fe1c053227c26a035fc6ecdf5d3ba4ddb38500133940f9a6966d0fbf51bc220
-DIST otcl-1.11.tar.gz 315835 RMD160 02148865a0734fe01171f0456ed89beda1f6074e SHA1 a16f4b82e98a2fa9c6ba632e772af182f47f07d4 SHA256 ac4998748b5eb870898796beb55eba299660bee097d8dbfd10224281548cb94f
-DIST otcl-src-1.13.tar.gz 317440 RMD160 7c0def77993ec6e48e4085d6a953b55c2fe2bc59 SHA1 e3310044628f0a59217abaa5ff8ac8234700dd83 SHA256 23b3b7a88fd5a7bfe9f91fd0afd0ac85981c1c2ff0cae6714aee54f7f38ab25d
-EBUILD otcl-1.11.ebuild 1506 RMD160 d583dd61f4d63bb6e2964b7e5a840adc4bbd3c4f SHA1 b98da8fd21103171177b4a7709cfacc0f53c2ec5 SHA256 a4c636ceff2d9300a70963fd26308a1acf658ef7afa702feaf9093de7e1a0413
-EBUILD otcl-1.13.ebuild 1483 RMD160 155e6ae4fb61a8e0b126f251af558a1b572992dd SHA1 6f8af3efe752312525ce4d57e028075dadd99bd0 SHA256 2afa5290e941ce0a4436c9e485d7f24b2bf4f45119e52d4d8de86c707213da4c
-MISC ChangeLog 3581 RMD160 78411a6dcb5b67f73342e47c49ed3e2d59f457ff SHA1 edaf86dc8381372f21084decdc8125e0b01d652c SHA256 c822bcf89ffa0615b77e96bb74f1598b59d4fbe945cd9eb182575744010477d3
-MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
diff --git a/dev-tcltk/otcl/files/otcl-1.11-badfreefix.patch b/dev-tcltk/otcl/files/otcl-1.11-badfreefix.patch
deleted file mode 100644
index 2282720330b1..000000000000
--- a/dev-tcltk/otcl/files/otcl-1.11-badfreefix.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff -ur otcl-1.11/otcl.c otcl-1.11.new/otcl.c
---- otcl-1.11/otcl.c	2004-01-05 16:56:07.000000000 -0800
-+++ otcl-1.11.new/otcl.c	2004-01-13 04:12:10.000000000 -0800
-@@ -290,7 +290,7 @@
-   if (!l) return 0;
-   if (l->cl == s) {
-     *sl = l->next;
--    ckfree((char*)l);
-+    ckfree((char*)l); l = NULL;
-     return 1;
-   }
-   while (l->next && l->next->cl != s) l = l->next;
-@@ -442,7 +442,7 @@
- 		    old_args2, argv[1], in->errorLine);
- 	    compat_Tcl_AddObjErrorInfo(in, msg, -1);
-     }
--    if (argc+2 > OTCLSMALLARGS) { ckfree((char*)args); args = 0; }
-+    if (argc+2 > OTCLSMALLARGS) { ckfree((char*)args); args = NULL; }
-     return result;
-   }
- 
-@@ -479,7 +479,7 @@
- 		    cl ? args[2] : argv[0], in->errorLine);
- 	    compat_Tcl_AddObjErrorInfo(in, msg, -1);
-     }
--    if (argc+3 > OTCLSMALLARGS) { ckfree((char*)args); args = 0; }
-+    if (argc+3 > OTCLSMALLARGS) { ckfree((char*)args); args = NULL; }
-     return result;
-   }  
- 
-@@ -500,7 +500,7 @@
- 
- static void
- AutoLoaderDP(ClientData cd) {
--  ckfree((char*)cd);
-+  ckfree((char*)cd); cd = NULL;
- }
- 
- static int
-@@ -579,8 +579,8 @@
-   Tcl_HashEntry *hPtr = Tcl_FindHashEntry(methods, nm);
-   if (hPtr != 0) {
-     Tcl_CmdInfo* co = (Tcl_CmdInfo*)Tcl_GetHashValue(hPtr);
--    if (co->deleteProc != 0) (*co->deleteProc)(co->deleteData);
--    ckfree((char*)co);
-+    if (co->deleteProc != 0) { (*co->deleteProc)(co->deleteData); } co->deleteProc = NULL;
-+    ckfree((char*)co); co = NULL;
-     Tcl_DeleteHashEntry(hPtr);
-     return 1;
-   }
-@@ -614,7 +614,7 @@
- 			(Tcl_Namespace*)NULL, 0);
-   if (cmd) 
- 	  Tcl_DeleteCommandFromToken(pdpd->interp, cmd);
--  ckfree((char*)pdpd);
-+  ckfree((char*)pdpd); pdpd = NULL;
- }
- #endif  
- 
-@@ -674,7 +674,7 @@
- 
-   for (i = 0; i < argc; i++)
-     Tcl_DecrRefCount(objv[i]);
--  ckfree((char *)objv);
-+  ckfree((char *)objv); objv = NULL;
-   
- #else /* TCL_MAJOR_VERSION < 8 */
-   
-@@ -691,7 +691,7 @@
- 
- #endif /* TCL_MAJOR_VERSION < 8 */
- 
--  ckfree((char*)nargs);
-+  ckfree((char*)nargs); nargs = NULL;
-   argv[1] = name;
-   argv[2] = oargs;
-   
-@@ -926,7 +926,7 @@
- static void 
- PrimitiveODestroy(ClientData cd) {
-   PrimitiveODestroyNoFree(cd);   
--  ckfree((char*)cd);
-+  ckfree((char*)cd); cd = NULL;
- }
- 
- static void
-@@ -1002,18 +1002,18 @@
-     Tcl_CmdInfo* co = (Tcl_CmdInfo*)Tcl_GetHashValue(hp2);
-     ClientData cdest = cd;
-     if (co->clientData != 0) cdest = co->clientData;
--    if (co->deleteProc != 0) (*co->deleteProc)(co->deleteData);
--    ckfree((char*)co);
-+    if (co->deleteProc != 0) { (*co->deleteProc)(co->deleteData); } co->deleteProc = NULL;
-+    ckfree((char*)co); co = NULL;
-   }
-   if (obj->procs) {
--    Tcl_DeleteHashTable(obj->procs); ckfree((char*)(obj->procs));
-+    Tcl_DeleteHashTable(obj->procs); ckfree((char*)(obj->procs)); obj->procs = NULL;
-   }
- 
-   (void)RemoveInstance(obj, obj->cl);
- 
- #if TCL_MAJOR_VERSION >= 8
--  ckfree((char*)(obj->variables.procPtr));
--  ckfree((char*)(obj->variables.varTablePtr));
-+  ckfree((char*)(obj->variables.procPtr)); obj->variables.procPtr = NULL;
-+  ckfree((char*)(obj->variables.varTablePtr)); obj->variables.varTablePtr = NULL;
- #endif
- }
- 
-@@ -1035,8 +1035,7 @@
-       obj->id = Tcl_CreateCommand(in, name, OTclDispatch, (ClientData)obj,
- 				PrimitiveODestroy);
-     } else {
--      ckfree((char *)obj);
--      obj = NULL;
-+      ckfree((char *)obj); obj = NULL;
-     }
- #endif
-   return obj;
-@@ -1123,14 +1122,14 @@
-     Tcl_CmdInfo* co = (Tcl_CmdInfo*)Tcl_GetHashValue(hPtr);
-     ClientData cdest = cd;
-     if (co->clientData != 0) cdest = co->clientData;
--    if (co->deleteProc != 0) (*co->deleteProc)(co->deleteData);
--    ckfree((char*)co);
-+    if (co->deleteProc != 0) { (*co->deleteProc)(co->deleteData); } co->deleteProc = NULL;
-+    ckfree((char*)co); co = NULL;
-   }
-   Tcl_DeleteHashTable(&cl->instprocs);
- 
-   if (cl->objectdata) {
-     Tcl_DeleteHashTable(cl->objectdata);
--    ckfree((char*)(cl->objectdata)); cl->objectdata = 0;
-+    ckfree((char*)(cl->objectdata)); cl->objectdata = NULL;
-   }
- 
-   /*
-@@ -1151,7 +1150,7 @@
-    * PrimitiveODestory to destory the hash entries first */
-   PrimitiveODestroyNoFree(cd);
-   Tcl_DeleteHashTable(&cl->instances);
--  ckfree((char*)cd);
-+  ckfree((char*)cd); cd = NULL;
- }
- 
- 
-@@ -1176,8 +1175,7 @@
-       obj->id = Tcl_CreateCommand(in, name, OTclDispatch, (ClientData)cl,
- 				PrimitiveCDestroy);
-     } else {
--      ckfree((char *)cl);
--      cl = NULL;
-+      ckfree((char *)cl); cl = NULL;
-     }
- #endif
-   return cl;
-@@ -1359,6 +1357,9 @@
-   OTclObject* obj = OTclAsObject(in, cd);
-   Tcl_CmdInfo proc;
-   int op;
-+  // NULL out the deleteProc value
-+  // as it may be filled with random data on variable creation
-+  proc.deleteProc = NULL; proc.deleteData = NULL;
- 
-   if (!obj) return OTclErrType(in, argv[0], "Object");
-   if (argc != 7) return OTclErrArgCnt(in,argv[0],"proc name args body");
-@@ -1488,7 +1489,7 @@
-       Tcl_AppendResult(in, "expected ?inst/local? or ?inst? ?local? but got ",
- 		       argv[i]);
-     }
--    ckfree((char*)av);
-+    ckfree((char*)av); av = NULL;
-     if (result != TCL_OK) break;
-   }
-   return result;
-@@ -1594,10 +1595,10 @@
- 	scl[i] = OTclGetClass(in, av[i]);
- 	loaded = (scl[i] != 0);
-       }
--      ckfree(args);
-+      ckfree(args); args = NULL;
-       if (!loaded) {
--	ckfree((char*)av);
--	ckfree((char*)scl);
-+	ckfree((char*)av); av = NULL;
-+	ckfree((char*)scl); scl = NULL;
- 	return OTclErrBadVal(in, "a list of classes", argv[4]);
-       }
-     }
-@@ -1621,8 +1622,8 @@
-   }
-   
-   if (reversed != 0) {
--    ckfree((char*)av);
--    ckfree((char*)scl);
-+    ckfree((char*)av); av = NULL;
-+    ckfree((char*)scl); scl = NULL;
-     return OTclErrBadVal(in, "classes in dependence order", argv[4]);
-   }
-   
-@@ -1641,8 +1642,8 @@
-   }
-   for (i = 0; i < ac; i++)
-     AddSuper(cl, scl[i]);
--  ckfree((char*)av);
--  ckfree((char*)scl);
-+  ckfree((char*)av); av = NULL;
-+  ckfree((char*)scl); scl = NULL;
-   FlushPrecedences(cl);
-   
-   if (!ComputePrecedence(cl)) {
-@@ -1784,17 +1785,25 @@
-   OTclClass* cl = OTclAsClass(in, cd);
-   Tcl_CmdInfo proc;
-   int op;
-+  // NULL out the deleteProc value
-+  // as it may be filled with random data on variable creation
-+  proc.deleteProc = NULL; proc.deleteData = NULL;
- 
-   if (!cl) return OTclErrType(in, argv[0], "Class");
-   if (argc != 7) return OTclErrArgCnt(in,argv[0],"instproc name args body");
-   
-+  
-   /*
-    * if the args list is "auto", the body is a script to load the proc
-    */
- 
--  if (!strcmp("auto", argv[5])) op = MakeAuto(&proc, argv[6]);
--  else if (argv[5][0]==0 && argv[6][0]==0) op = -1;
--  else op = MakeProc(&proc,in, argc-3, argv+3);
-+  if (!strcmp("auto", argv[5])) { 
-+      op = MakeAuto(&proc, argv[6]); 
-+  } else if (argv[5][0]==0 && argv[6][0]==0) { 
-+      op = -1; 
-+  } else {
-+      op = MakeProc(&proc,in, argc-3, argv+3);
-+  }
- 
-   (void)RemoveMethod(&cl->instprocs, argv[4], (ClientData)cl);
-   if (op == 1) AddMethod(&cl->instprocs, argv[4], proc.proc,
diff --git a/dev-tcltk/otcl/files/otcl-1.11-configure-cleanup.patch b/dev-tcltk/otcl/files/otcl-1.11-configure-cleanup.patch
deleted file mode 100644
index 21eab45733fd..000000000000
--- a/dev-tcltk/otcl/files/otcl-1.11-configure-cleanup.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-diff -Nuar otcl-1.11.orig/conf/configure.in.audio otcl-1.11/conf/configure.in.audio
---- otcl-1.11.orig/conf/configure.in.audio	1998-07-16 23:07:29.000000000 -0700
-+++ otcl-1.11/conf/configure.in.audio	2006-05-15 09:20:29.000000000 -0700
-@@ -90,10 +90,10 @@
- 	fi
- fi
- 
--AC_TEST_CPP([#include <sys/audioio.h>], x=audio/audio-sun.o, x="")
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
- 
--AC_TEST_CPP([#include <sun/audioio.h>], x=audio/audio-sun.o, x="")
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sun/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
- 
- case "$target" in 
-diff -Nuar otcl-1.11.orig/conf/configure.in.dynamic otcl-1.11/conf/configure.in.dynamic
---- otcl-1.11.orig/conf/configure.in.dynamic	1998-07-16 22:38:38.000000000 -0700
-+++ otcl-1.11/conf/configure.in.dynamic	2006-05-15 09:36:26.632757055 -0700
-@@ -59,7 +59,7 @@
- 	# results, and the version is kept in special file).
-     
- 	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--	    system=MP-RAS-`awk '{print $3}' /etc/.relid'`
-+	    system=MP-RAS-`awk '{print $3}' /etc/.relid`
- 	fi
- 	if test "`uname -s`" = "AIX" ; then
- 	    system=AIX-`uname -v`.`uname -r`
-@@ -311,7 +311,7 @@
- 	hold_ldflags=$LDFLAGS
- 	AC_MSG_CHECKING(for ld accepts -Bexport flag)
- 	LDFLAGS="${LDFLAGS} -Wl,-Bexport"
--	AC_TRY_LINK(, [int i;], found=yes, found=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],[found=yes],[found=no])
- 	LDFLAGS=$hold_ldflags
- 	AC_MSG_RESULT($found)
- 	if test $found = yes; then
-diff -Nuar otcl-1.11.orig/conf/configure.in.head otcl-1.11/conf/configure.in.head
---- otcl-1.11.orig/conf/configure.in.head	2001-04-11 16:49:06.000000000 -0700
-+++ otcl-1.11/conf/configure.in.head	2006-05-15 09:24:21.510388584 -0700
-@@ -32,12 +32,12 @@
- fi
- 
- 
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- 
- AC_PROG_CC
- AC_PROG_CXX
--AC_STDC_HEADERS
--AC_HAVE_HEADERS(string.h)
-+AC_HEADER_STDC([])
-+AC_CHECK_HEADERS([string.h])
- 
- V_INCLUDE=""
- V_LIB=""
-@@ -76,8 +76,7 @@
- else
-     if test "$CC" = gcc ; then
- 	    AC_MSG_CHECKING(that $CXX can handle -O2)
--	    AC_TRY_COMPILE(,
--		#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
-+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
- 		/* gcc */
- 		error
- 		#endif
-@@ -85,9 +84,9 @@
- 		/* egcs */
- 		int error;
- 		#endif
--	    ,AC_MSG_RESULT(yes)
--	    OonS="-O2",			# Optimize on Steroids
--	    AC_MSG_RESULT(no))
-+	    ]])],[AC_MSG_RESULT(yes)
-+	    OonS="-O2"],[# Optimize on Steroids
-+	    AC_MSG_RESULT(no)])
-     fi
- fi
- 
-@@ -152,19 +151,16 @@
- 
- # Checking validity of STL
- AC_MSG_CHECKING(standard STL is available)
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
-+
-+AC_LANG_PUSH([C++])
- enable_stl="no"
--AC_TRY_COMPILE(
--	#include <list>
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <list>
- 	#include <hash_map>
- 	template <class _T> class tlist : public list <_T> {};
--	,
--	return 0;
--	,AC_MSG_RESULT(yes)
--	enable_stl="yes",
--	AC_MSG_RESULT(no))
--AC_LANG_RESTORE
-+	]], [[return 0;
-+	]])],[AC_MSG_RESULT(yes)
-+	enable_stl="yes"],[AC_MSG_RESULT(no)])
-+AC_LANG_POP([C++])
- 
- # This can be extended to support compilation-time module selection
- V_STLOBJ=""
-diff -Nuar otcl-1.11.orig/conf/configure.in.int64_t otcl-1.11/conf/configure.in.int64_t
---- otcl-1.11.orig/conf/configure.in.int64_t	2005-08-31 18:54:05.000000000 -0700
-+++ otcl-1.11/conf/configure.in.int64_t	2006-05-15 09:20:30.000000000 -0700
-@@ -22,19 +22,17 @@
- fi
- 
- AC_CACHE_CHECK([for __int64_t],int64_t_HAVE___INT64_T,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); }
--],
--int64_t_HAVE___INT64_T=yes,int64_t_HAVE___INT64_T=no,int64_t_HAVE___INT64_T=cross)])
-+]])],[int64_t_HAVE___INT64_T=yes],[int64_t_HAVE___INT64_T=no],[int64_t_HAVE___INT64_T=cross])])
- if test x"$int64_t_HAVE___INT64_T" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
- 	INT64_T_ALTERNATIVE=__int64_t
- fi
- 
- AC_CACHE_CHECK([for long long],int64_t_HAVE_LONG_LONG,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- main() { long long x; exit (sizeof(x) >= 8 ? 0 : 1); }
--],
--int64_t_HAVE_LONG_LONG=yes,int64_t_HAVE_LONG_LONG=no,int64_t_HAVE_LONG_LONG=cross)])
-+]])],[int64_t_HAVE_LONG_LONG=yes],[int64_t_HAVE_LONG_LONG=no],[int64_t_HAVE_LONG_LONG=cross])])
- if test x"$int64_t_HAVE_LONG_LONG" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
- 	INT64_T_ALTERNATIVE="long long"
- fi
-diff -Nuar otcl-1.11.orig/conf/configure.in.nse otcl-1.11/conf/configure.in.nse
---- otcl-1.11.orig/conf/configure.in.nse	2000-03-09 17:49:32.000000000 -0800
-+++ otcl-1.11/conf/configure.in.nse	2006-05-15 09:20:30.000000000 -0700
-@@ -9,20 +9,20 @@
- dnl
- 
- AC_MSG_CHECKING([for struct ether_header])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <net/ethernet.h>
--], [
-+]], [[
- int main()
- {
- 	struct ether_header etherHdr;
- 
- 	return 1;
- }
--], [
-+]])],[
- AC_DEFINE(HAVE_ETHER_HEADER_STRUCT)
- AC_MSG_RESULT(found)
--], [
-+],[
- AC_MSG_RESULT(not found)
- ])
-  
-@@ -31,20 +31,20 @@
- dnl Look for ether_addr
- dnl
- AC_MSG_CHECKING([for struct ether_addr])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <net/ethernet.h>
--], [
-+]], [[
- int main()
- {
- 	struct ether_addr etherAddr;
- 
- 	return 0;
- }
--], [
-+]])],[
- AC_DEFINE(HAVE_ETHER_ADDRESS_STRUCT)
- AC_MSG_RESULT(found)
--], [
-+],[
- AC_MSG_RESULT(not found)
- ])
- 
-@@ -57,14 +57,13 @@
- dnl
- dnl look for SIOCGIFHWADDR
- dnl
--AC_TRY_RUN(
--#include <stdio.h>
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
- #include <sys/ioctl.h>
- int main()
- {
- 	int i = SIOCGIFHWADDR;
- 	return 0;
- }
--, AC_DEFINE(HAVE_SIOCGIFHWADDR), , echo 1
--)
-+]])],[AC_DEFINE(HAVE_SIOCGIFHWADDR)],[],[echo 1
-+])
- 
-diff -Nuar otcl-1.11.orig/conf/configure.in.perl otcl-1.11/conf/configure.in.perl
---- otcl-1.11.orig/conf/configure.in.perl	1999-01-21 18:37:20.000000000 -0800
-+++ otcl-1.11/conf/configure.in.perl	2006-05-15 09:20:30.000000000 -0700
-@@ -19,8 +19,8 @@
- dnl
- AC_DEFUN(CHECK_PERL_VERSION,
- [
--echo $[$1] -e "require $[$2]" 1>&AC_FD_CC
--if $[$1] -e "require $[$2]" 2>&AC_FD_CC
-+echo $[$1] -e "require $[$2]" 1>&AS_MESSAGE_LOG_FD()
-+if $[$1] -e "require $[$2]" 2>&AS_MESSAGE_LOG_FD()
- then
-     : good version
- else
-diff -Nuar otcl-1.11.orig/conf/configure.in.tail otcl-1.11/conf/configure.in.tail
---- otcl-1.11.orig/conf/configure.in.tail	2000-11-13 18:15:01.000000000 -0800
-+++ otcl-1.11/conf/configure.in.tail	2006-05-15 09:40:00.160276617 -0700
-@@ -144,7 +144,8 @@
- 
- dnl backwards compability---if nothing else, do Makefile
- define([AcOutputFiles],ifdef([AcOutputFiles],AcOutputFiles,Makefile))
--AC_OUTPUT(AcOutputFiles)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
- if test ! -d gen ; then 
- 	echo "creating ./gen"
-diff -Nuar otcl-1.11.orig/conf/configure.in.tcl otcl-1.11/conf/configure.in.tcl
---- otcl-1.11.orig/conf/configure.in.tcl	2005-09-26 21:58:15.000000000 -0700
-+++ otcl-1.11/conf/configure.in.tcl	2006-05-15 09:15:02.499646361 -0700
-@@ -84,6 +84,9 @@
- 		$d/include/tcl$TCL_VERS \
- 		$d/include/tcl$TCL_ALT_VERS \
- 		$d/include \
-+		$d/lib/tcl$TCL_HI_VERS/include \
-+		$d/lib/tcl$TCL_VERS/include \
-+		$d/lib/tcl$TCL_ALT_VERS/include \
- 		"
- TCL_H_PLACES=" \
- 		../include \
-@@ -134,7 +137,14 @@
- 		/usr/include/tcl$TCL_VERS \
- 		/usr/include/tcl$TCL_HI_VERS \
- 		/usr/include/tcl$TCL_ALT_VERS \
--		/usr/include/tcl"
-+		/usr/include/tcl \
-+		/usr/lib/tcl$TCL_VERS/include/unix \
-+		/usr/lib/tcl$TCL_HI_VERS/include/unix \
-+		/usr/lib/tcl$TCL_ALT_VERS/include/unix \
-+		/usr/lib/tcl$TCL_VERS/include/generic \
-+		/usr/lib/tcl$TCL_HI_VERS/include/generic \
-+		/usr/lib/tcl$TCL_ALT_VERS/include/generic \
-+		"
- dnl /usr/include/tcl is for Debian Linux
- dnl /usr/include/tcl-private/generic is for FC 4
- TCL_LIB_PLACES_D="$d \
-diff -Nuar otcl-1.11.orig/conf/configure.in.x11 otcl-1.11/conf/configure.in.x11
---- otcl-1.11.orig/conf/configure.in.x11	1997-03-15 17:59:46.000000000 -0800
-+++ otcl-1.11/conf/configure.in.x11	2006-05-15 09:20:31.000000000 -0700
-@@ -33,7 +33,7 @@
- 
- echo "checking for X11 header files"
- if test "$x_includes" = NONE ; then
--	AC_TEST_CPP([#include <X11/Intrinsic.h>],x_includes="",x_includes=NONE)
-+	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Intrinsic.h>]])],[x_includes=""],[x_includes=NONE])
- 	if test "$x_includes" = NONE ; then
- 	        for i in $xincdirs ; do
- 			if test -r $i/X11/Intrinsic.h; then
-diff -Nuar otcl-1.11.orig/configure.in otcl-1.11/configure.in
---- otcl-1.11.orig/configure.in	2005-10-13 23:45:28.000000000 -0700
-+++ otcl-1.11/configure.in	2006-05-15 09:37:50.480568397 -0700
-@@ -1,4 +1,5 @@
--AC_INIT(otcl.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([otcl.c])
- 
- #XXX
- V_PROG="otclsh"
-@@ -31,7 +32,7 @@
-     # results, and the version is kept in special file).
- 
-     if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--        system=MP-RAS-`awk '{print $3}' /etc/.relid'`
-+        system=MP-RAS-`awk '{print $3}' /etc/.relid`
-     fi
-     AC_MSG_RESULT($system)
- fi
diff --git a/dev-tcltk/otcl/files/otcl-1.13-configure-cleanup.patch b/dev-tcltk/otcl/files/otcl-1.13-configure-cleanup.patch
deleted file mode 100644
index 6ac498b6758a..000000000000
--- a/dev-tcltk/otcl/files/otcl-1.13-configure-cleanup.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-diff -Naur otcl-1.13.orig/conf/configure.in.audio otcl-1.13/conf/configure.in.audio
---- otcl-1.13.orig/conf/configure.in.audio	1998-07-17 15:07:29.000000000 +0900
-+++ otcl-1.13/conf/configure.in.audio	2007-04-28 09:49:05.000000000 +0900
-@@ -90,10 +90,10 @@
- 	fi
- fi
- 
--AC_TEST_CPP([#include <sys/audioio.h>], x=audio/audio-sun.o, x="")
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
- 
--AC_TEST_CPP([#include <sun/audioio.h>], x=audio/audio-sun.o, x="")
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sun/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
- 
- case "$target" in 
-diff -Naur otcl-1.13.orig/conf/configure.in.dynamic otcl-1.13/conf/configure.in.dynamic
---- otcl-1.13.orig/conf/configure.in.dynamic	2006-09-28 14:25:04.000000000 +0900
-+++ otcl-1.13/conf/configure.in.dynamic	2007-04-28 09:58:25.000000000 +0900
-@@ -148,7 +148,7 @@
- 	SHLIB_LD_LIBS=""
- 	SHLIB_SUFFIX=".so"
- 	if test "$have_dl" = yes; then
--	    SHLIB_LD="${CC} -shared"
-+	    SHLIB_LD="${CC} -shared -Wl,-soname,${@}"
- 	    DL_LIBS="-ldl"
- 	    DL_LD_FLAGS="-rdynamic"
- 	    DL_LD_SEARCH_FLAGS=""
-@@ -311,7 +311,7 @@
- 	hold_ldflags=$LDFLAGS
- 	AC_MSG_CHECKING(for ld accepts -Bexport flag)
- 	LDFLAGS="${LDFLAGS} -Wl,-Bexport"
--	AC_TRY_LINK(, [int i;], found=yes, found=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],[found=yes],[found=no])
- 	LDFLAGS=$hold_ldflags
- 	AC_MSG_RESULT($found)
- 	if test $found = yes; then
-diff -Naur otcl-1.13.orig/conf/configure.in.head otcl-1.13/conf/configure.in.head
---- otcl-1.13.orig/conf/configure.in.head	2001-04-12 08:49:06.000000000 +0900
-+++ otcl-1.13/conf/configure.in.head	2007-04-28 09:49:05.000000000 +0900
-@@ -32,12 +32,12 @@
- fi
- 
- 
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- 
- AC_PROG_CC
- AC_PROG_CXX
--AC_STDC_HEADERS
--AC_HAVE_HEADERS(string.h)
-+AC_HEADER_STDC([])
-+AC_CHECK_HEADERS([string.h])
- 
- V_INCLUDE=""
- V_LIB=""
-@@ -76,8 +76,7 @@
- else
-     if test "$CC" = gcc ; then
- 	    AC_MSG_CHECKING(that $CXX can handle -O2)
--	    AC_TRY_COMPILE(,
--		#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
-+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
- 		/* gcc */
- 		error
- 		#endif
-@@ -85,9 +84,9 @@
- 		/* egcs */
- 		int error;
- 		#endif
--	    ,AC_MSG_RESULT(yes)
--	    OonS="-O2",			# Optimize on Steroids
--	    AC_MSG_RESULT(no))
-+	    ]])],[AC_MSG_RESULT(yes)
-+	    OonS="-O2"],[# Optimize on Steroids
-+	    AC_MSG_RESULT(no)])
-     fi
- fi
- 
-@@ -152,19 +151,16 @@
- 
- # Checking validity of STL
- AC_MSG_CHECKING(standard STL is available)
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
-+
-+AC_LANG_PUSH([C++])
- enable_stl="no"
--AC_TRY_COMPILE(
--	#include <list>
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <list>
- 	#include <hash_map>
- 	template <class _T> class tlist : public list <_T> {};
--	,
--	return 0;
--	,AC_MSG_RESULT(yes)
--	enable_stl="yes",
--	AC_MSG_RESULT(no))
--AC_LANG_RESTORE
-+	]], [[return 0;
-+	]])],[AC_MSG_RESULT(yes)
-+	enable_stl="yes"],[AC_MSG_RESULT(no)])
-+AC_LANG_POP([C++])
- 
- # This can be extended to support compilation-time module selection
- V_STLOBJ=""
-diff -Naur otcl-1.13.orig/conf/configure.in.int64_t otcl-1.13/conf/configure.in.int64_t
---- otcl-1.13.orig/conf/configure.in.int64_t	2005-09-01 10:54:05.000000000 +0900
-+++ otcl-1.13/conf/configure.in.int64_t	2007-04-28 09:49:05.000000000 +0900
-@@ -22,19 +22,17 @@
- fi
- 
- AC_CACHE_CHECK([for __int64_t],int64_t_HAVE___INT64_T,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); }
--],
--int64_t_HAVE___INT64_T=yes,int64_t_HAVE___INT64_T=no,int64_t_HAVE___INT64_T=cross)])
-+]])],[int64_t_HAVE___INT64_T=yes],[int64_t_HAVE___INT64_T=no],[int64_t_HAVE___INT64_T=cross])])
- if test x"$int64_t_HAVE___INT64_T" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
- 	INT64_T_ALTERNATIVE=__int64_t
- fi
- 
- AC_CACHE_CHECK([for long long],int64_t_HAVE_LONG_LONG,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- main() { long long x; exit (sizeof(x) >= 8 ? 0 : 1); }
--],
--int64_t_HAVE_LONG_LONG=yes,int64_t_HAVE_LONG_LONG=no,int64_t_HAVE_LONG_LONG=cross)])
-+]])],[int64_t_HAVE_LONG_LONG=yes],[int64_t_HAVE_LONG_LONG=no],[int64_t_HAVE_LONG_LONG=cross])])
- if test x"$int64_t_HAVE_LONG_LONG" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
- 	INT64_T_ALTERNATIVE="long long"
- fi
-diff -Naur otcl-1.13.orig/conf/configure.in.nse otcl-1.13/conf/configure.in.nse
---- otcl-1.13.orig/conf/configure.in.nse	2000-03-10 10:49:32.000000000 +0900
-+++ otcl-1.13/conf/configure.in.nse	2007-04-28 09:49:05.000000000 +0900
-@@ -9,20 +9,20 @@
- dnl
- 
- AC_MSG_CHECKING([for struct ether_header])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <net/ethernet.h>
--], [
-+]], [[
- int main()
- {
- 	struct ether_header etherHdr;
- 
- 	return 1;
- }
--], [
-+]])],[
- AC_DEFINE(HAVE_ETHER_HEADER_STRUCT)
- AC_MSG_RESULT(found)
--], [
-+],[
- AC_MSG_RESULT(not found)
- ])
-  
-@@ -31,20 +31,20 @@
- dnl Look for ether_addr
- dnl
- AC_MSG_CHECKING([for struct ether_addr])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <net/ethernet.h>
--], [
-+]], [[
- int main()
- {
- 	struct ether_addr etherAddr;
- 
- 	return 0;
- }
--], [
-+]])],[
- AC_DEFINE(HAVE_ETHER_ADDRESS_STRUCT)
- AC_MSG_RESULT(found)
--], [
-+],[
- AC_MSG_RESULT(not found)
- ])
- 
-@@ -57,14 +57,13 @@
- dnl
- dnl look for SIOCGIFHWADDR
- dnl
--AC_TRY_RUN(
--#include <stdio.h>
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
- #include <sys/ioctl.h>
- int main()
- {
- 	int i = SIOCGIFHWADDR;
- 	return 0;
- }
--, AC_DEFINE(HAVE_SIOCGIFHWADDR), , echo 1
--)
-+]])],[AC_DEFINE(HAVE_SIOCGIFHWADDR)],[],[echo 1
-+])
- 
-diff -Naur otcl-1.13.orig/conf/configure.in.perl otcl-1.13/conf/configure.in.perl
---- otcl-1.13.orig/conf/configure.in.perl	1999-01-22 11:37:20.000000000 +0900
-+++ otcl-1.13/conf/configure.in.perl	2007-04-28 09:49:05.000000000 +0900
-@@ -19,8 +19,8 @@
- dnl
- AC_DEFUN(CHECK_PERL_VERSION,
- [
--echo $[$1] -e "require $[$2]" 1>&AC_FD_CC
--if $[$1] -e "require $[$2]" 2>&AC_FD_CC
-+echo $[$1] -e "require $[$2]" 1>&AS_MESSAGE_LOG_FD()
-+if $[$1] -e "require $[$2]" 2>&AS_MESSAGE_LOG_FD()
- then
-     : good version
- else
-diff -Naur otcl-1.13.orig/conf/configure.in.tail otcl-1.13/conf/configure.in.tail
---- otcl-1.13.orig/conf/configure.in.tail	2000-11-14 11:15:01.000000000 +0900
-+++ otcl-1.13/conf/configure.in.tail	2007-04-28 09:49:05.000000000 +0900
-@@ -144,7 +144,8 @@
- 
- dnl backwards compability---if nothing else, do Makefile
- define([AcOutputFiles],ifdef([AcOutputFiles],AcOutputFiles,Makefile))
--AC_OUTPUT(AcOutputFiles)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
- if test ! -d gen ; then 
- 	echo "creating ./gen"
-diff -Naur otcl-1.13.orig/conf/configure.in.tcl otcl-1.13/conf/configure.in.tcl
---- otcl-1.13.orig/conf/configure.in.tcl	2007-02-19 07:16:52.000000000 +0900
-+++ otcl-1.13/conf/configure.in.tcl	2007-04-28 09:50:03.000000000 +0900
-@@ -91,6 +91,9 @@
- 		$d/include/tcl$TCL_ALT_VERS \
- 		$d/include \
- 		/usr/local/include \ 
-+ 		$d/lib/tcl$TCL_HI_VERS/include \
-+ 		$d/lib/tcl$TCL_VERS/include \
-+ 		$d/lib/tcl$TCL_ALT_VERS/include \
- 		"
- TCL_H_PLACES=" \
- 		../include \
-@@ -144,7 +147,14 @@
- 		/usr/include/tcl$TCL_VERS \
- 		/usr/include/tcl$TCL_HI_VERS \
- 		/usr/include/tcl$TCL_ALT_VERS \
--		/usr/include/tcl"
-+		/usr/include/tcl \
-+		/usr/lib/tcl$TCL_VERS/include/unix \
-+		/usr/lib/tcl$TCL_HI_VERS/include/unix \
-+		/usr/lib/tcl$TCL_ALT_VERS/include/unix \
-+		/usr/lib/tcl$TCL_VERS/include/generic \
-+		/usr/lib/tcl$TCL_HI_VERS/include/generic \
-+		/usr/lib/tcl$TCL_ALT_VERS/include/generic \
-+		"
- dnl /usr/include/tcl is for Debian Linux
- dnl /usr/include/tcl-private/generic is for FC 4
- TCL_LIB_PLACES_D="$d \
-diff -Naur otcl-1.13.orig/conf/configure.in.x11 otcl-1.13/conf/configure.in.x11
---- otcl-1.13.orig/conf/configure.in.x11	2006-09-28 14:25:04.000000000 +0900
-+++ otcl-1.13/conf/configure.in.x11	2007-04-28 09:49:05.000000000 +0900
-@@ -34,7 +34,7 @@
- 
- echo "checking for X11 header files"
- if test "$x_includes" = NONE ; then
--	AC_TEST_CPP([#include <X11/Intrinsic.h>],x_includes="",x_includes=NONE)
-+	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Intrinsic.h>]])],[x_includes=""],[x_includes=NONE])
- 	if test "$x_includes" = NONE ; then
- 	        for i in $xincdirs ; do
- 			if test -r $i/X11/Intrinsic.h; then
diff --git a/dev-tcltk/otcl/metadata.xml b/dev-tcltk/otcl/metadata.xml
deleted file mode 100644
index d9408d8ab078..000000000000
--- a/dev-tcltk/otcl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>tcltk</herd>
-</pkgmetadata>
diff --git a/dev-tcltk/otcl/otcl-1.11.ebuild b/dev-tcltk/otcl/otcl-1.11.ebuild
deleted file mode 100644
index 115f27e6653e..000000000000
--- a/dev-tcltk/otcl/otcl-1.11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/otcl/otcl-1.11.ebuild,v 1.5 2007/01/04 14:47:26 flameeyes Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils autotools virtualx
-
-DESCRIPTION="MIT Object extension to Tcl"
-HOMEPAGE="http://otcl-tclcl.sourceforge.net/otcl/"
-SRC_URI="mirror://sourceforge/otcl-tclcl/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/tcl-8.4.5
-		>=dev-lang/tk-8.4.5"
-
-# the package is not safe :-(
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-
-	EPATCH_OPTS="-p1 -d${S}" epatch ${FILESDIR}/otcl-1.11-badfreefix.patch
-	EPATCH_OPTS="-p1 -d${S}" epatch ${FILESDIR}/otcl-1.11-configure-cleanup.patch
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	local tclv tkv myconf
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-	myconf="--with-tcl-ver=${tclv} --with-tk-ver=${tkv}"
-	CFLAGS="${CFLAGS} -I/usr/$(get_libdir)/tcl${tkv}/include/generic"
-
-	echo myconf $myconf
-	econf ${myconf} || die "econf failed"
-	emake all || die "emake all failed"
-	emake libotcl.so || die	 "emake libotcl.so failed"
-}
-
-src_install() {
-	dobin otclsh owish
-	dolib libotcl.so
-	dolib.a libotcl.a
-	insinto /usr/include
-	doins otcl.h
-
-	# docs
-	dodoc VERSION
-	dohtml README.html CHANGES.html
-	docinto doc
-	dohtml doc/*.html
-}
-
-src_test() {
-	Xmake test
-}
diff --git a/dev-tcltk/otcl/otcl-1.13.ebuild b/dev-tcltk/otcl/otcl-1.13.ebuild
deleted file mode 100644
index 69b8e33c99fa..000000000000
--- a/dev-tcltk/otcl/otcl-1.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/otcl/otcl-1.13.ebuild,v 1.1 2007/04/28 03:35:12 matsuu Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils autotools virtualx
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="MIT Object extension to Tcl"
-HOMEPAGE="http://otcl-tclcl.sourceforge.net/otcl/"
-SRC_URI="mirror://sourceforge/otcl-tclcl/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/tcl-8.4.5
-		>=dev-lang/tk-8.4.5"
-
-# the package is not safe :-(
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.11-badfreefix.patch
-	epatch "${FILESDIR}"/${P}-configure-cleanup.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	local tclv tkv myconf
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-	myconf="--with-tcl-ver=${tclv} --with-tk-ver=${tkv}"
-	CFLAGS="${CFLAGS} -I/usr/$(get_libdir)/tcl${tkv}/include/generic"
-
-	echo myconf $myconf
-	econf ${myconf} || die "econf failed"
-	emake all || die "emake all failed"
-	emake libotcl.so || die	 "emake libotcl.so failed"
-}
-
-src_install() {
-	dobin otclsh owish
-	dolib libotcl.so
-	dolib.a libotcl.a
-	insinto /usr/include
-	doins otcl.h
-
-	# docs
-	dodoc VERSION
-	dohtml README.html CHANGES.html
-	docinto doc
-	dohtml doc/*.html
-}
-
-src_test() {
-	Xmake test
-}
diff --git a/dev-tcltk/tclcl/ChangeLog b/dev-tcltk/tclcl/ChangeLog
deleted file mode 100644
index 5cf63758fc29..000000000000
--- a/dev-tcltk/tclcl/ChangeLog
+++ /dev/null
@@ -1,73 +0,0 @@
-# ChangeLog for dev-tcltk/tclcl
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/ChangeLog,v 1.18 2007/05/03 15:19:16 gustavoz Exp $
-
-  03 May 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  -files/tclcl-1.15-gcc34.patch, -tclcl-1.15.ebuild, -tclcl-1.16.ebuild,
-  tclcl-1.17.ebuild, tclcl-1.19.ebuild:
-  sparc stable the correct one and cleanup
-
-  03 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> tclcl-1.19.ebuild:
-  Stable on sparc wrt #160007
-
-  29 Apr 2007; Raúl Porcel <armin76@gentoo.org> tclcl-1.17.ebuild:
-  x86 stable wrt #160007
-
-*tclcl-1.19 (28 Apr 2007)
-
-  28 Apr 2007; MATSUU Takuto <matsuu@gentoo.org>
-  +files/tclcl-1.19-configure-cleanup.patch, +tclcl-1.19.ebuild:
-  Version bumped.
-  Added xorg dependency, bug #155129.
-
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
-  Transition to Manifest2.
-
-  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> tclcl-1.17.ebuild:
-  Fix broken autotools handling.
-
-*tclcl-1.17 (15 May 2006)
-
-  15 May 2006; Robin H. Johnson <robbat2@gentoo.org>
-  +files/tclcl-1.17-configure-cleanup.patch, +tclcl-1.17.ebuild:
-  Version bump, cleaning up configure stuff, needs to be sent upstream.
-
-  19 Jul 2005; David Holm <dholm@gentoo.org> tclcl-1.16.ebuild:
-  Added to ~ppc.
-
-  14 May 2005; MATSUU Takuto <matsuu@gentoo.org> tclcl-1.15.ebuild:
-  Fixed compilation failure, Bug 78537.
-
-  13 May 2005; MATSUU Takuto <matsuu@gentoo.org>
-  +files/tclcl-1.16-http.patch, tclcl-1.16.ebuild:
-  Fixed http.tcl library location.
-
-*tclcl-1.16 (03 Apr 2005)
-
-  03 Apr 2005; MATSUU Takuto <matsuu@gentoo.org> +tclcl-1.16.ebuild:
-  Version bumped. Cleanup ebuild.
-
-  27 Oct 2004; Karol Wojtaszek <sekretarz@gentoo.org>
-  +files/tclcl-1.15-gcc34.patch, tclcl-1.15.ebuild:
-  Added ~amd64. Fixed gcc-34 compile issues. Thanks to aye@gentoo.pl in bug
-  #58455
-
-  26 Aug 2004; Ferris McCormick <fmccor@gentoo.org> tclcl-1.15.ebuild:
-  Stable for sparc.
-
-  27 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> tclcl-1.15.ebuild:
-  fix bug #57294.
-
-  04 Apr 2004; Chris Aniszczyk <zx@gentoo.org> metadata.xml,
-  tclcl-1.15.ebuild:
-  Clean up. Added missing metadata.xml
-
-  10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> tclcl-1.15.ebuild:
-  clean up ebuild
-
-*tclcl-1.15 (10 Jan 2004)
-
-  10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> tclcl-1.15.ebuild:
-  Initial commit, original ebuild by Christophe Radovcic
-  <christophe.radovcic@laposte.net>, heavily updated by robbat2@gentoo.org
-
diff --git a/dev-tcltk/tclcl/Manifest b/dev-tcltk/tclcl/Manifest
deleted file mode 100644
index 06c6cd752b64..000000000000
--- a/dev-tcltk/tclcl/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX tclcl-1.16-http.patch 804 RMD160 d1c8f6250bde12bddc94224e5da31c0e71dd0a0f SHA1 f238f448630aa8d52f76d167e12b59a4bbcc121c SHA256 b4491f3e30d6379fbfd1d8a4e389f5d50203af89a4e1c62dcb572a883ead85bf
-AUX tclcl-1.17-configure-cleanup.patch 8941 RMD160 71a7a38110a1ac4374a8bb2d1fd17c34bcb4b3eb SHA1 59aa0b8b13d2d6884c7ab6bb4f8ae4c881f37b10 SHA256 7144466bbd2cb9884a79250de838fa68efc479662bd2ae75e575d9c812c6f7da
-AUX tclcl-1.19-configure-cleanup.patch 8032 RMD160 377de740a42ccfa151b8cacf5f4e6fc720b8d517 SHA1 2e1a9eef45dbb7a1bd92d2a94ea2d2bb77c20a76 SHA256 7ec32b046c12e37bb8102a1411853f58b3bb2ad5bfb67b4039a7d0a0a36e2ec3
-DIST tclcl-1.17.tar.gz 157001 RMD160 c2741cee05616f4b45e605e93896407592188855 SHA1 3b263e86c17d7e456926f981d5df0e381e217de3 SHA256 9f5753e12d04df0781383f0141b9dfa732cefec27a01ab27b3af64ff0aa89180
-DIST tclcl-src-1.19.tar.gz 174080 RMD160 a7bc0088e20fd91fd6a3ff1f8ff4d99649db7047 SHA1 4ecb4b45f439f9bf10539936a138d70dd32aa6d4 SHA256 460fbad1f9bca42ec41581df008c2b450155f655cfc7df46a92f80179efd9b36
-EBUILD tclcl-1.17.ebuild 1247 RMD160 84a64b202800d1c1e1aa83247375393be8a8a8c9 SHA1 f3ea9bcb6e203c9e93d5a753056fcedac0454a6b SHA256 ed9fbf94337e80cc632f54505933a11f3095e6f7eaf7a93fa9ab18cbde47e4b8
-EBUILD tclcl-1.19.ebuild 1228 RMD160 21039b17469b42b2bb9601ab10ac748e421f5770 SHA1 0469d923e27446aadcd2cb46b71902ba748c9692 SHA256 9fb1fe6b28c3ff56a3f2c6451228b60ec0edd29fcb735b9c2c137fdd384b412f
-MISC ChangeLog 2507 RMD160 2abca97f72320ccb803ce21c99fb2879734bed70 SHA1 d1d49589d27ef0ee6de53d954b5a716a008b09d9 SHA256 09dabf1470279eba1446785c26bbcfee254b6f372f66132e809dad7a104cd06e
-MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
diff --git a/dev-tcltk/tclcl/files/tclcl-1.16-http.patch b/dev-tcltk/tclcl/files/tclcl-1.16-http.patch
deleted file mode 100644
index 2e7c79b3b47f..000000000000
--- a/dev-tcltk/tclcl/files/tclcl-1.16-http.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur tclcl-1.16.orig/conf/configure.in.tcl tclcl-1.16/conf/configure.in.tcl
---- tclcl-1.16.orig/conf/configure.in.tcl	2005-01-04 06:33:01.000000000 +0900
-+++ tclcl-1.16/conf/configure.in.tcl	2005-05-14 07:02:53.000000000 +0900
-@@ -178,6 +178,7 @@
- tcl_http_places=" \
- 	$V_LIBRARY_TCL \
- 	$V_LIBRARY_TCL/http \
-+	$V_LIBRARY_TCL/http2.5 \
- 	$V_LIBRARY_TCL/http2.4 \
- 	$V_LIBRARY_TCL/http2.3 \
- 	$V_LIBRARY_TCL/http2.1 \
-diff -Naur tclcl-1.16.orig/configure tclcl-1.16/configure
---- tclcl-1.16.orig/configure	2005-01-20 05:58:48.000000000 +0900
-+++ tclcl-1.16/configure	2005-05-14 07:03:06.000000000 +0900
-@@ -5531,6 +5531,7 @@
- tcl_http_places=" \
- 	$V_LIBRARY_TCL \
- 	$V_LIBRARY_TCL/http \
-+	$V_LIBRARY_TCL/http2.5 \
- 	$V_LIBRARY_TCL/http2.4 \
- 	$V_LIBRARY_TCL/http2.3 \
- 	$V_LIBRARY_TCL/http2.1 \
diff --git a/dev-tcltk/tclcl/files/tclcl-1.17-configure-cleanup.patch b/dev-tcltk/tclcl/files/tclcl-1.17-configure-cleanup.patch
deleted file mode 100644
index 1f51aad65157..000000000000
--- a/dev-tcltk/tclcl/files/tclcl-1.17-configure-cleanup.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-diff -Nuar tclcl-1.17.orig/conf/configure.in.audio tclcl-1.17/conf/configure.in.audio
---- tclcl-1.17.orig/conf/configure.in.audio	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.audio	2006-05-15 09:57:52.141864653 -0700
-@@ -90,10 +90,10 @@
- 	fi
- fi
- 
--AC_TEST_CPP([#include <sys/audioio.h>], x=audio/audio-sun.o, x="")
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
- 
--AC_TEST_CPP([#include <sun/audioio.h>], x=audio/audio-sun.o, x="")
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sun/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
- 
- case "$target" in 
-diff -Nuar tclcl-1.17.orig/conf/configure.in.dynamic tclcl-1.17/conf/configure.in.dynamic
---- tclcl-1.17.orig/conf/configure.in.dynamic	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.dynamic	2006-05-15 09:57:52.141864653 -0700
-@@ -59,7 +59,7 @@
- 	# results, and the version is kept in special file).
-     
- 	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--	    system=MP-RAS-`awk '{print $3}' /etc/.relid'`
-+	    system=MP-RAS-`awk '{print $3}' /etc/.relid`
- 	fi
- 	if test "`uname -s`" = "AIX" ; then
- 	    system=AIX-`uname -v`.`uname -r`
-@@ -311,7 +311,7 @@
- 	hold_ldflags=$LDFLAGS
- 	AC_MSG_CHECKING(for ld accepts -Bexport flag)
- 	LDFLAGS="${LDFLAGS} -Wl,-Bexport"
--	AC_TRY_LINK(, [int i;], found=yes, found=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],[found=yes],[found=no])
- 	LDFLAGS=$hold_ldflags
- 	AC_MSG_RESULT($found)
- 	if test $found = yes; then
-diff -Nuar tclcl-1.17.orig/conf/configure.in.head tclcl-1.17/conf/configure.in.head
---- tclcl-1.17.orig/conf/configure.in.head	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.head	2006-05-15 09:57:52.145864644 -0700
-@@ -32,12 +32,12 @@
- fi
- 
- 
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- 
- AC_PROG_CC
- AC_PROG_CXX
--AC_STDC_HEADERS
--AC_HAVE_HEADERS(string.h)
-+AC_HEADER_STDC([])
-+AC_CHECK_HEADERS([string.h])
- 
- V_INCLUDE=""
- V_LIB=""
-@@ -76,8 +76,7 @@
- else
-     if test "$CC" = gcc ; then
- 	    AC_MSG_CHECKING(that $CXX can handle -O2)
--	    AC_TRY_COMPILE(,
--		#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
-+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
- 		/* gcc */
- 		error
- 		#endif
-@@ -85,9 +84,9 @@
- 		/* egcs */
- 		int error;
- 		#endif
--	    ,AC_MSG_RESULT(yes)
--	    OonS="-O2",			# Optimize on Steroids
--	    AC_MSG_RESULT(no))
-+	    ]])],[AC_MSG_RESULT(yes)
-+	    OonS="-O2"],[# Optimize on Steroids
-+	    AC_MSG_RESULT(no)])
-     fi
- fi
- 
-@@ -152,19 +151,16 @@
- 
- # Checking validity of STL
- AC_MSG_CHECKING(standard STL is available)
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
-+
-+AC_LANG_PUSH([C++])
- enable_stl="no"
--AC_TRY_COMPILE(
--	#include <list>
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <list>
- 	#include <hash_map>
- 	template <class _T> class tlist : public list <_T> {};
--	,
--	return 0;
--	,AC_MSG_RESULT(yes)
--	enable_stl="yes",
--	AC_MSG_RESULT(no))
--AC_LANG_RESTORE
-+	]], [[return 0;
-+	]])],[AC_MSG_RESULT(yes)
-+	enable_stl="yes"],[AC_MSG_RESULT(no)])
-+AC_LANG_POP([C++])
- 
- # This can be extended to support compilation-time module selection
- V_STLOBJ=""
-diff -Nuar tclcl-1.17.orig/conf/configure.in.int64_t tclcl-1.17/conf/configure.in.int64_t
---- tclcl-1.17.orig/conf/configure.in.int64_t	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.int64_t	2006-05-15 09:57:52.145864644 -0700
-@@ -22,19 +22,17 @@
- fi
- 
- AC_CACHE_CHECK([for __int64_t],int64_t_HAVE___INT64_T,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); }
--],
--int64_t_HAVE___INT64_T=yes,int64_t_HAVE___INT64_T=no,int64_t_HAVE___INT64_T=cross)])
-+]])],[int64_t_HAVE___INT64_T=yes],[int64_t_HAVE___INT64_T=no],[int64_t_HAVE___INT64_T=cross])])
- if test x"$int64_t_HAVE___INT64_T" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
- 	INT64_T_ALTERNATIVE=__int64_t
- fi
- 
- AC_CACHE_CHECK([for long long],int64_t_HAVE_LONG_LONG,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- main() { long long x; exit (sizeof(x) >= 8 ? 0 : 1); }
--],
--int64_t_HAVE_LONG_LONG=yes,int64_t_HAVE_LONG_LONG=no,int64_t_HAVE_LONG_LONG=cross)])
-+]])],[int64_t_HAVE_LONG_LONG=yes],[int64_t_HAVE_LONG_LONG=no],[int64_t_HAVE_LONG_LONG=cross])])
- if test x"$int64_t_HAVE_LONG_LONG" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
- 	INT64_T_ALTERNATIVE="long long"
- fi
-diff -Nuar tclcl-1.17.orig/conf/configure.in.nse tclcl-1.17/conf/configure.in.nse
---- tclcl-1.17.orig/conf/configure.in.nse	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.nse	2006-05-15 09:57:52.145864644 -0700
-@@ -9,20 +9,20 @@
- dnl
- 
- AC_MSG_CHECKING([for struct ether_header])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <net/ethernet.h>
--], [
-+]], [[
- int main()
- {
- 	struct ether_header etherHdr;
- 
- 	return 1;
- }
--], [
-+]])],[
- AC_DEFINE(HAVE_ETHER_HEADER_STRUCT)
- AC_MSG_RESULT(found)
--], [
-+],[
- AC_MSG_RESULT(not found)
- ])
-  
-@@ -31,20 +31,20 @@
- dnl Look for ether_addr
- dnl
- AC_MSG_CHECKING([for struct ether_addr])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <net/ethernet.h>
--], [
-+]], [[
- int main()
- {
- 	struct ether_addr etherAddr;
- 
- 	return 0;
- }
--], [
-+]])],[
- AC_DEFINE(HAVE_ETHER_ADDRESS_STRUCT)
- AC_MSG_RESULT(found)
--], [
-+],[
- AC_MSG_RESULT(not found)
- ])
- 
-@@ -57,14 +57,13 @@
- dnl
- dnl look for SIOCGIFHWADDR
- dnl
--AC_TRY_RUN(
--#include <stdio.h>
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
- #include <sys/ioctl.h>
- int main()
- {
- 	int i = SIOCGIFHWADDR;
- 	return 0;
- }
--, AC_DEFINE(HAVE_SIOCGIFHWADDR), , echo 1
--)
-+]])],[AC_DEFINE(HAVE_SIOCGIFHWADDR)],[],[echo 1
-+])
- 
-diff -Nuar tclcl-1.17.orig/conf/configure.in.perl tclcl-1.17/conf/configure.in.perl
---- tclcl-1.17.orig/conf/configure.in.perl	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.perl	2006-05-15 09:57:52.145864644 -0700
-@@ -19,8 +19,8 @@
- dnl
- AC_DEFUN(CHECK_PERL_VERSION,
- [
--echo $[$1] -e "require $[$2]" 1>&AC_FD_CC
--if $[$1] -e "require $[$2]" 2>&AC_FD_CC
-+echo $[$1] -e "require $[$2]" 1>&AS_MESSAGE_LOG_FD()
-+if $[$1] -e "require $[$2]" 2>&AS_MESSAGE_LOG_FD()
- then
-     : good version
- else
-diff -Nuar tclcl-1.17.orig/conf/configure.in.tail tclcl-1.17/conf/configure.in.tail
---- tclcl-1.17.orig/conf/configure.in.tail	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.tail	2006-05-15 09:57:52.145864644 -0700
-@@ -144,7 +144,8 @@
- 
- dnl backwards compability---if nothing else, do Makefile
- define([AcOutputFiles],ifdef([AcOutputFiles],AcOutputFiles,Makefile))
--AC_OUTPUT(AcOutputFiles)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
- if test ! -d gen ; then 
- 	echo "creating ./gen"
-diff -Nuar tclcl-1.17.orig/conf/configure.in.tcl tclcl-1.17/conf/configure.in.tcl
---- tclcl-1.17.orig/conf/configure.in.tcl	2006-05-15 09:56:25.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.tcl	2006-05-15 09:57:52.145864644 -0700
-@@ -84,6 +84,9 @@
- 		$d/include/tcl$TCL_VERS \
- 		$d/include/tcl$TCL_ALT_VERS \
- 		$d/include \
-+		$d/lib/tcl$TCL_HI_VERS/include \
-+		$d/lib/tcl$TCL_VERS/include \
-+		$d/lib/tcl$TCL_ALT_VERS/include \
- 		"
- TCL_H_PLACES=" \
- 		../include \
-@@ -134,7 +137,14 @@
- 		/usr/include/tcl$TCL_VERS \
- 		/usr/include/tcl$TCL_HI_VERS \
- 		/usr/include/tcl$TCL_ALT_VERS \
--		/usr/include/tcl"
-+		/usr/include/tcl \
-+		/usr/lib/tcl$TCL_VERS/include/unix \
-+		/usr/lib/tcl$TCL_HI_VERS/include/unix \
-+		/usr/lib/tcl$TCL_ALT_VERS/include/unix \
-+		/usr/lib/tcl$TCL_VERS/include/generic \
-+		/usr/lib/tcl$TCL_HI_VERS/include/generic \
-+		/usr/lib/tcl$TCL_ALT_VERS/include/generic \
-+		"
- dnl /usr/include/tcl is for Debian Linux
- dnl /usr/include/tcl-private/generic is for FC 4
- TCL_LIB_PLACES_D="$d \
-diff -Nuar tclcl-1.17.orig/conf/configure.in.x11 tclcl-1.17/conf/configure.in.x11
---- tclcl-1.17.orig/conf/configure.in.x11	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/conf/configure.in.x11	2006-05-15 09:57:52.145864644 -0700
-@@ -33,7 +33,7 @@
- 
- echo "checking for X11 header files"
- if test "$x_includes" = NONE ; then
--	AC_TEST_CPP([#include <X11/Intrinsic.h>],x_includes="",x_includes=NONE)
-+	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Intrinsic.h>]])],[x_includes=""],[x_includes=NONE])
- 	if test "$x_includes" = NONE ; then
- 	        for i in $xincdirs ; do
- 			if test -r $i/X11/Intrinsic.h; then
-diff -Nuar tclcl-1.17.orig/configure.in tclcl-1.17/configure.in
---- tclcl-1.17.orig/configure.in	2005-10-02 14:26:19.000000000 -0700
-+++ tclcl-1.17/configure.in	2006-05-15 09:58:33.000000000 -0700
-@@ -1,7 +1,8 @@
- dnl 'autoconf' input file for the LBL C++ object Tcl library
- dnl $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/files/tclcl-1.17-configure-cleanup.patch,v 1.1 2006/05/15 17:13:54 robbat2 Exp $ (LBL)
- 
--AC_INIT(Tcl.cc)
-+AC_INIT
-+AC_CONFIG_SRCDIR([Tcl.cc])
- 
- AC_CONFIG_HEADERS([config.h:config.h.in])
- 
diff --git a/dev-tcltk/tclcl/files/tclcl-1.19-configure-cleanup.patch b/dev-tcltk/tclcl/files/tclcl-1.19-configure-cleanup.patch
deleted file mode 100644
index 471bf871bee1..000000000000
--- a/dev-tcltk/tclcl/files/tclcl-1.19-configure-cleanup.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-diff -Naur tclcl-1.19.orig/conf/configure.in.audio tclcl-1.19/conf/configure.in.audio
---- tclcl-1.19.orig/conf/configure.in.audio	1998-07-17 15:07:29.000000000 +0900
-+++ tclcl-1.19/conf/configure.in.audio	2007-04-28 12:55:36.000000000 +0900
-@@ -90,10 +90,10 @@
- 	fi
- fi
- 
--AC_TEST_CPP([#include <sys/audioio.h>], x=audio/audio-sun.o, x="")
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
- 
--AC_TEST_CPP([#include <sun/audioio.h>], x=audio/audio-sun.o, x="")
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sun/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
- 
- case "$target" in 
-diff -Naur tclcl-1.19.orig/conf/configure.in.head tclcl-1.19/conf/configure.in.head
---- tclcl-1.19.orig/conf/configure.in.head	2001-04-12 08:49:06.000000000 +0900
-+++ tclcl-1.19/conf/configure.in.head	2007-04-28 12:55:36.000000000 +0900
-@@ -32,12 +32,12 @@
- fi
- 
- 
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- 
- AC_PROG_CC
- AC_PROG_CXX
--AC_STDC_HEADERS
--AC_HAVE_HEADERS(string.h)
-+AC_HEADER_STDC([])
-+AC_CHECK_HEADERS([string.h])
- 
- V_INCLUDE=""
- V_LIB=""
-@@ -76,8 +76,7 @@
- else
-     if test "$CC" = gcc ; then
- 	    AC_MSG_CHECKING(that $CXX can handle -O2)
--	    AC_TRY_COMPILE(,
--		#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
-+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
- 		/* gcc */
- 		error
- 		#endif
-@@ -85,9 +84,9 @@
- 		/* egcs */
- 		int error;
- 		#endif
--	    ,AC_MSG_RESULT(yes)
--	    OonS="-O2",			# Optimize on Steroids
--	    AC_MSG_RESULT(no))
-+	    ]])],[AC_MSG_RESULT(yes)
-+	    OonS="-O2"],[# Optimize on Steroids
-+	    AC_MSG_RESULT(no)])
-     fi
- fi
- 
-@@ -152,19 +151,16 @@
- 
- # Checking validity of STL
- AC_MSG_CHECKING(standard STL is available)
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
-+
-+AC_LANG_PUSH([C++])
- enable_stl="no"
--AC_TRY_COMPILE(
--	#include <list>
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <list>
- 	#include <hash_map>
- 	template <class _T> class tlist : public list <_T> {};
--	,
--	return 0;
--	,AC_MSG_RESULT(yes)
--	enable_stl="yes",
--	AC_MSG_RESULT(no))
--AC_LANG_RESTORE
-+	]], [[return 0;
-+	]])],[AC_MSG_RESULT(yes)
-+	enable_stl="yes"],[AC_MSG_RESULT(no)])
-+AC_LANG_POP([C++])
- 
- # This can be extended to support compilation-time module selection
- V_STLOBJ=""
-diff -Naur tclcl-1.19.orig/conf/configure.in.int64_t tclcl-1.19/conf/configure.in.int64_t
---- tclcl-1.19.orig/conf/configure.in.int64_t	2005-09-01 10:54:05.000000000 +0900
-+++ tclcl-1.19/conf/configure.in.int64_t	2007-04-28 12:55:36.000000000 +0900
-@@ -22,19 +22,17 @@
- fi
- 
- AC_CACHE_CHECK([for __int64_t],int64_t_HAVE___INT64_T,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); }
--],
--int64_t_HAVE___INT64_T=yes,int64_t_HAVE___INT64_T=no,int64_t_HAVE___INT64_T=cross)])
-+]])],[int64_t_HAVE___INT64_T=yes],[int64_t_HAVE___INT64_T=no],[int64_t_HAVE___INT64_T=cross])])
- if test x"$int64_t_HAVE___INT64_T" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
- 	INT64_T_ALTERNATIVE=__int64_t
- fi
- 
- AC_CACHE_CHECK([for long long],int64_t_HAVE_LONG_LONG,[
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- main() { long long x; exit (sizeof(x) >= 8 ? 0 : 1); }
--],
--int64_t_HAVE_LONG_LONG=yes,int64_t_HAVE_LONG_LONG=no,int64_t_HAVE_LONG_LONG=cross)])
-+]])],[int64_t_HAVE_LONG_LONG=yes],[int64_t_HAVE_LONG_LONG=no],[int64_t_HAVE_LONG_LONG=cross])])
- if test x"$int64_t_HAVE_LONG_LONG" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
- 	INT64_T_ALTERNATIVE="long long"
- fi
-diff -Naur tclcl-1.19.orig/conf/configure.in.nse tclcl-1.19/conf/configure.in.nse
---- tclcl-1.19.orig/conf/configure.in.nse	2000-03-10 10:49:32.000000000 +0900
-+++ tclcl-1.19/conf/configure.in.nse	2007-04-28 12:55:36.000000000 +0900
-@@ -9,20 +9,20 @@
- dnl
- 
- AC_MSG_CHECKING([for struct ether_header])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <net/ethernet.h>
--], [
-+]], [[
- int main()
- {
- 	struct ether_header etherHdr;
- 
- 	return 1;
- }
--], [
-+]])],[
- AC_DEFINE(HAVE_ETHER_HEADER_STRUCT)
- AC_MSG_RESULT(found)
--], [
-+],[
- AC_MSG_RESULT(not found)
- ])
-  
-@@ -31,20 +31,20 @@
- dnl Look for ether_addr
- dnl
- AC_MSG_CHECKING([for struct ether_addr])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <net/ethernet.h>
--], [
-+]], [[
- int main()
- {
- 	struct ether_addr etherAddr;
- 
- 	return 0;
- }
--], [
-+]])],[
- AC_DEFINE(HAVE_ETHER_ADDRESS_STRUCT)
- AC_MSG_RESULT(found)
--], [
-+],[
- AC_MSG_RESULT(not found)
- ])
- 
-@@ -57,14 +57,13 @@
- dnl
- dnl look for SIOCGIFHWADDR
- dnl
--AC_TRY_RUN(
--#include <stdio.h>
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
- #include <sys/ioctl.h>
- int main()
- {
- 	int i = SIOCGIFHWADDR;
- 	return 0;
- }
--, AC_DEFINE(HAVE_SIOCGIFHWADDR), , echo 1
--)
-+]])],[AC_DEFINE(HAVE_SIOCGIFHWADDR)],[],[echo 1
-+])
- 
-diff -Naur tclcl-1.19.orig/conf/configure.in.perl tclcl-1.19/conf/configure.in.perl
---- tclcl-1.19.orig/conf/configure.in.perl	1999-01-22 11:37:20.000000000 +0900
-+++ tclcl-1.19/conf/configure.in.perl	2007-04-28 12:55:36.000000000 +0900
-@@ -19,8 +19,8 @@
- dnl
- AC_DEFUN(CHECK_PERL_VERSION,
- [
--echo $[$1] -e "require $[$2]" 1>&AC_FD_CC
--if $[$1] -e "require $[$2]" 2>&AC_FD_CC
-+echo $[$1] -e "require $[$2]" 1>&AS_MESSAGE_LOG_FD()
-+if $[$1] -e "require $[$2]" 2>&AS_MESSAGE_LOG_FD()
- then
-     : good version
- else
-diff -Naur tclcl-1.19.orig/conf/configure.in.tail tclcl-1.19/conf/configure.in.tail
---- tclcl-1.19.orig/conf/configure.in.tail	2000-11-14 11:15:01.000000000 +0900
-+++ tclcl-1.19/conf/configure.in.tail	2007-04-28 12:55:36.000000000 +0900
-@@ -144,7 +144,8 @@
- 
- dnl backwards compability---if nothing else, do Makefile
- define([AcOutputFiles],ifdef([AcOutputFiles],AcOutputFiles,Makefile))
--AC_OUTPUT(AcOutputFiles)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
- if test ! -d gen ; then 
- 	echo "creating ./gen"
-diff -Naur tclcl-1.19.orig/conf/configure.in.tcl tclcl-1.19/conf/configure.in.tcl
---- tclcl-1.19.orig/conf/configure.in.tcl	2007-02-19 07:16:52.000000000 +0900
-+++ tclcl-1.19/conf/configure.in.tcl	2007-04-28 12:56:21.000000000 +0900
-@@ -91,6 +91,9 @@
- 		$d/include/tcl$TCL_ALT_VERS \
- 		$d/include \
- 		/usr/local/include \ 
-+ 		$d/lib/tcl$TCL_HI_VERS/include \
-+ 		$d/lib/tcl$TCL_VERS/include \
-+ 		$d/lib/tcl$TCL_ALT_VERS/include \
- 		"
- TCL_H_PLACES=" \
- 		../include \
-@@ -144,7 +147,14 @@
- 		/usr/include/tcl$TCL_VERS \
- 		/usr/include/tcl$TCL_HI_VERS \
- 		/usr/include/tcl$TCL_ALT_VERS \
--		/usr/include/tcl"
-+		/usr/include/tcl \
-+		/usr/lib/tcl$TCL_VERS/include/unix \
-+		/usr/lib/tcl$TCL_HI_VERS/include/unix \
-+		/usr/lib/tcl$TCL_ALT_VERS/include/unix \
-+		/usr/lib/tcl$TCL_VERS/include/generic \
-+		/usr/lib/tcl$TCL_HI_VERS/include/generic \
-+		/usr/lib/tcl$TCL_ALT_VERS/include/generic \
-+		"
- dnl /usr/include/tcl is for Debian Linux
- dnl /usr/include/tcl-private/generic is for FC 4
- TCL_LIB_PLACES_D="$d \
-diff -Naur tclcl-1.19.orig/conf/configure.in.x11 tclcl-1.19/conf/configure.in.x11
---- tclcl-1.19.orig/conf/configure.in.x11	2006-09-28 14:25:04.000000000 +0900
-+++ tclcl-1.19/conf/configure.in.x11	2007-04-28 12:55:36.000000000 +0900
-@@ -34,7 +34,7 @@
- 
- echo "checking for X11 header files"
- if test "$x_includes" = NONE ; then
--	AC_TEST_CPP([#include <X11/Intrinsic.h>],x_includes="",x_includes=NONE)
-+	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Intrinsic.h>]])],[x_includes=""],[x_includes=NONE])
- 	if test "$x_includes" = NONE ; then
- 	        for i in $xincdirs ; do
- 			if test -r $i/X11/Intrinsic.h; then
-diff -Naur tclcl-1.19.orig/configure.in tclcl-1.19/configure.in
---- tclcl-1.19.orig/configure.in	2005-09-01 10:54:05.000000000 +0900
-+++ tclcl-1.19/configure.in	2007-04-28 12:55:36.000000000 +0900
-@@ -1,7 +1,8 @@
- dnl 'autoconf' input file for the LBL C++ object Tcl library
- dnl $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/files/tclcl-1.19-configure-cleanup.patch,v 1.1 2007/04/28 17:18:09 matsuu Exp $ (LBL)
- 
--AC_INIT(Tcl.cc)
-+AC_INIT
-+AC_CONFIG_SRCDIR([Tcl.cc])
- 
- AC_CONFIG_HEADERS([config.h:config.h.in])
- 
diff --git a/dev-tcltk/tclcl/metadata.xml b/dev-tcltk/tclcl/metadata.xml
deleted file mode 100644
index d9408d8ab078..000000000000
--- a/dev-tcltk/tclcl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>tcltk</herd>
-</pkgmetadata>
diff --git a/dev-tcltk/tclcl/tclcl-1.17.ebuild b/dev-tcltk/tclcl/tclcl-1.17.ebuild
deleted file mode 100644
index 097f64fee12c..000000000000
--- a/dev-tcltk/tclcl/tclcl-1.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/tclcl-1.17.ebuild,v 1.4 2007/05/03 15:19:16 gustavoz Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils autotools
-
-#MY_P="${PN}-src-${PV}"
-DESCRIPTION="Tcl/C++ interface library"
-HOMEPAGE="http://otcl-tclcl.sourceforge.net/tclcl/"
-SRC_URI="mirror://sourceforge/otcl-tclcl/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/tcl-8.4.5
-		>=dev-lang/tk-8.4.5
-		>=dev-tcltk/otcl-1.11"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.16-http.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.17-configure-cleanup.patch
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	local tclv tkv myconf
-
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-	myconf="--with-tcl-ver=${tclv} --with-tk-ver=${tkv}"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dolib.a libtclcl.a
-	dobin tcl2c++
-	insinto /usr/include
-	doins *.h
-
-	dodoc FILES README VERSION
-	dohtml CHANGES.html
-}
diff --git a/dev-tcltk/tclcl/tclcl-1.19.ebuild b/dev-tcltk/tclcl/tclcl-1.19.ebuild
deleted file mode 100644
index cb79edbacf7e..000000000000
--- a/dev-tcltk/tclcl/tclcl-1.19.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/tclcl-1.19.ebuild,v 1.3 2007/05/03 15:19:16 gustavoz Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils autotools
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Tcl/C++ interface library"
-HOMEPAGE="http://otcl-tclcl.sourceforge.net/tclcl/"
-SRC_URI="mirror://sourceforge/otcl-tclcl/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXt
-	>=dev-lang/tcl-8.4.5
-	>=dev-lang/tk-8.4.5
-	>=dev-tcltk/otcl-1.11"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.16-http.patch
-	epatch "${FILESDIR}"/${P}-configure-cleanup.patch
-	eautoreconf
-}
-
-src_compile() {
-	local tclv tkv myconf
-
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-	myconf="--with-tcl-ver=${tclv} --with-tk-ver=${tkv}"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dolib.a libtclcl.a
-	dobin tcl2c++
-	insinto /usr/include
-	doins *.h
-
-	dodoc FILES README VERSION
-	dohtml CHANGES.html
-}