sparc stable the correct one and cleanup

Package-Manager: portage-2.1.2.2

9 files changed, 25 insertions, 380 deletions

diff --git a/dev-tcltk/tclcl/ChangeLog b/dev-tcltk/tclcl/ChangeLog
index 4cd6503d62a8..5cf63758fc29 100644
--- a/dev-tcltk/tclcl/ChangeLog
+++ b/dev-tcltk/tclcl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2007/05/03 15:15:42 gustavoz Exp $
+# $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
diff --git a/dev-tcltk/tclcl/Manifest b/dev-tcltk/tclcl/Manifest
index 3a8017df0709..9e7ec8764a06 100644
--- a/dev-tcltk/tclcl/Manifest
+++ b/dev-tcltk/tclcl/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX tclcl-1.15-gcc34.patch 7960 RMD160 e6cb3a310b9ff300cb5cd678ef285bc8631d80f8 SHA1 f1af61cea13a714ba058c4a88f1a57c3e580f66d SHA256 a74422dc5d3450b75355df08c0def7ce68c73c6195aded0498995313129ab9a3
-MD5 867b075f7f3c38a720b2d9bb28a5da34 files/tclcl-1.15-gcc34.patch 7960
-RMD160 e6cb3a310b9ff300cb5cd678ef285bc8631d80f8 files/tclcl-1.15-gcc34.patch 7960
-SHA256 a74422dc5d3450b75355df08c0def7ce68c73c6195aded0498995313129ab9a3 files/tclcl-1.15-gcc34.patch 7960
 AUX tclcl-1.16-http.patch 804 RMD160 d1c8f6250bde12bddc94224e5da31c0e71dd0a0f SHA1 f238f448630aa8d52f76d167e12b59a4bbcc121c SHA256 b4491f3e30d6379fbfd1d8a4e389f5d50203af89a4e1c62dcb572a883ead85bf
 MD5 66d2ecc74612a2998970011f3c427428 files/tclcl-1.16-http.patch 804
 RMD160 d1c8f6250bde12bddc94224e5da31c0e71dd0a0f files/tclcl-1.16-http.patch 804
@@ -18,39 +14,23 @@ MD5 cf4043d893c78980cd396ef4fd27d8c3 files/tclcl-1.19-configure-cleanup.patch 80
 RMD160 377de740a42ccfa151b8cacf5f4e6fc720b8d517 files/tclcl-1.19-configure-cleanup.patch 8032
 SHA256 7ec32b046c12e37bb8102a1411853f58b3bb2ad5bfb67b4039a7d0a0a36e2ec3 files/tclcl-1.19-configure-cleanup.patch 8032
 DIST tclcl-1.17.tar.gz 157001 RMD160 c2741cee05616f4b45e605e93896407592188855 SHA1 3b263e86c17d7e456926f981d5df0e381e217de3 SHA256 9f5753e12d04df0781383f0141b9dfa732cefec27a01ab27b3af64ff0aa89180
-DIST tclcl-src-1.15.tar.gz 143000 RMD160 9ae3aad5d53ba67df6a5e25f5f3813f4ad162029 SHA1 5b927893d4d3b3f49e86f4ee43266668595d34e3 SHA256 9be16d5e7df7e201bab3611ac53c3d8894f95e6e0059477403ea8004fdd56a34
-DIST tclcl-src-1.16.tar.gz 203269 RMD160 3373ba084ed2a278f47d135af67957cf26856069 SHA1 b7eea104131b0472c79a2d7ad2b8763c087fe731 SHA256 75efa77a0c6cd8a3bab65b794f87dceab25ed34183688bf2e564ee0cbadf8e1b
 DIST tclcl-src-1.19.tar.gz 174080 RMD160 a7bc0088e20fd91fd6a3ff1f8ff4d99649db7047 SHA1 4ecb4b45f439f9bf10539936a138d70dd32aa6d4 SHA256 460fbad1f9bca42ec41581df008c2b450155f655cfc7df46a92f80179efd9b36
-EBUILD tclcl-1.15.ebuild 1218 RMD160 7969d5ba3f28c0607ca1581e61dd0a8b2706c69f SHA1 dbad10767ec3d74fd1de1dbd183885e88e0fb84f SHA256 7bf37c6354e41af51ee75b340c5a1748a30fbf567445787711d1c9dd8783385b
-MD5 0891e7027818eb0a593ae3ac91f17cda tclcl-1.15.ebuild 1218
-RMD160 7969d5ba3f28c0607ca1581e61dd0a8b2706c69f tclcl-1.15.ebuild 1218
-SHA256 7bf37c6354e41af51ee75b340c5a1748a30fbf567445787711d1c9dd8783385b tclcl-1.15.ebuild 1218
-EBUILD tclcl-1.16.ebuild 1062 RMD160 ba619022f3a7961e38ba86a67b8934aeafa41ecb SHA1 5a68b8ee7e446b5fb9a5a92e71006b709051e69e SHA256 60779c9f81c7130d23ff838ae6b6c17be665bae401ad966e9ab46b4ba569ba2c
-MD5 cc303130c7e8d0a63f2fba31d9aceee0 tclcl-1.16.ebuild 1062
-RMD160 ba619022f3a7961e38ba86a67b8934aeafa41ecb tclcl-1.16.ebuild 1062
-SHA256 60779c9f81c7130d23ff838ae6b6c17be665bae401ad966e9ab46b4ba569ba2c tclcl-1.16.ebuild 1062
-EBUILD tclcl-1.17.ebuild 1247 RMD160 27e2c3e6f3d8d44b4b0b9f020d67bb25402314fd SHA1 45d5844ac17cf49cceb81e335e96ae7742bcfa2e SHA256 7048b74eb8a3707f7915ddee397019a814d304d02732aa1bdc4219b5c8b726cb
-MD5 fcf31d2701b9c3b7261f58b6d9088abd tclcl-1.17.ebuild 1247
-RMD160 27e2c3e6f3d8d44b4b0b9f020d67bb25402314fd tclcl-1.17.ebuild 1247
-SHA256 7048b74eb8a3707f7915ddee397019a814d304d02732aa1bdc4219b5c8b726cb tclcl-1.17.ebuild 1247
-EBUILD tclcl-1.19.ebuild 1227 RMD160 ad9bbb7b29e88df6e3f5423da55ab079dc33d649 SHA1 b7a5cb588bedb8fca03efd67ae4918476ccba6a5 SHA256 1c0683ef260b1c329df84316fb0887b14860dd84c5f374aedf2aa0a7c8a6d5fe
-MD5 cc033f8404bde4023d5265c1c5efe44d tclcl-1.19.ebuild 1227
-RMD160 ad9bbb7b29e88df6e3f5423da55ab079dc33d649 tclcl-1.19.ebuild 1227
-SHA256 1c0683ef260b1c329df84316fb0887b14860dd84c5f374aedf2aa0a7c8a6d5fe tclcl-1.19.ebuild 1227
-MISC ChangeLog 2296 RMD160 6844e5612ca9682bd9f18b0238c750839c02951e SHA1 394ff6eb1e59f84883779b088b4f4f9afb214c60 SHA256 02cb2db4d405a876651b9af517aca1de8f8598e6296a2e0b52fd4ccf1d6725f8
-MD5 231ec259b0411c17348a80ecca10d242 ChangeLog 2296
-RMD160 6844e5612ca9682bd9f18b0238c750839c02951e ChangeLog 2296
-SHA256 02cb2db4d405a876651b9af517aca1de8f8598e6296a2e0b52fd4ccf1d6725f8 ChangeLog 2296
+EBUILD tclcl-1.17.ebuild 1247 RMD160 84a64b202800d1c1e1aa83247375393be8a8a8c9 SHA1 f3ea9bcb6e203c9e93d5a753056fcedac0454a6b SHA256 ed9fbf94337e80cc632f54505933a11f3095e6f7eaf7a93fa9ab18cbde47e4b8
+MD5 1eb3c5eeec652be0369b35e669a9356e tclcl-1.17.ebuild 1247
+RMD160 84a64b202800d1c1e1aa83247375393be8a8a8c9 tclcl-1.17.ebuild 1247
+SHA256 ed9fbf94337e80cc632f54505933a11f3095e6f7eaf7a93fa9ab18cbde47e4b8 tclcl-1.17.ebuild 1247
+EBUILD tclcl-1.19.ebuild 1228 RMD160 21039b17469b42b2bb9601ab10ac748e421f5770 SHA1 0469d923e27446aadcd2cb46b71902ba748c9692 SHA256 9fb1fe6b28c3ff56a3f2c6451228b60ec0edd29fcb735b9c2c137fdd384b412f
+MD5 517eb38d39c098bb106ee95bfe0e5860 tclcl-1.19.ebuild 1228
+RMD160 21039b17469b42b2bb9601ab10ac748e421f5770 tclcl-1.19.ebuild 1228
+SHA256 9fb1fe6b28c3ff56a3f2c6451228b60ec0edd29fcb735b9c2c137fdd384b412f tclcl-1.19.ebuild 1228
+MISC ChangeLog 2507 RMD160 2abca97f72320ccb803ce21c99fb2879734bed70 SHA1 d1d49589d27ef0ee6de53d954b5a716a008b09d9 SHA256 09dabf1470279eba1446785c26bbcfee254b6f372f66132e809dad7a104cd06e
+MD5 5215358add48d3b9b182a56b4dccb55f ChangeLog 2507
+RMD160 2abca97f72320ccb803ce21c99fb2879734bed70 ChangeLog 2507
+SHA256 09dabf1470279eba1446785c26bbcfee254b6f372f66132e809dad7a104cd06e ChangeLog 2507
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158
 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 metadata.xml 158
-MD5 8822b00748f9f940ddef319e16ee00a6 files/digest-tclcl-1.15 244
-RMD160 39d31d1f6f3b5a2e640c205476cdda60eb9135e9 files/digest-tclcl-1.15 244
-SHA256 566e4e98e726078a52185857186b293246294a31d42f26759fa3901246dd52cd files/digest-tclcl-1.15 244
-MD5 7a32630aa902e37c1d3f78ce71f77d85 files/digest-tclcl-1.16 244
-RMD160 ece19aab7909fcae10227fc0ba57e9ec57b84170 files/digest-tclcl-1.16 244
-SHA256 bda38bf3ce9bce656b15ea13a863d9590eaad669cbcd3dfc34716fd8a4e89a3d files/digest-tclcl-1.16 244
 MD5 40255054e5cc063731517017e88a63ab files/digest-tclcl-1.17 232
 RMD160 16b4d11b3fef4038c96d6041e6efa61a092198a3 files/digest-tclcl-1.17 232
 SHA256 f9c8a0fbb98e5426c77b20cbcfb483692e15d2cc789cd3e8b82a59d695b67224 files/digest-tclcl-1.17 232
@@ -60,7 +40,7 @@ SHA256 90e0e6bc7b82ebed41c614cc231838f18a7b884c0e60e04ede6c2a2ba0bacff8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
 
-iD8DBQFGOfymKRy60XGEcJIRAq+kAKCU/JvYZUf+fRO3ExCVFzcURSyLNwCdHG47
-GKOSNOjWuzYXQoOVzYhNP1w=
-=vv4m
+iD8DBQFGOf1+KRy60XGEcJIRAk+EAJ0c4aAhw4f1qu2G357YvaWOf6bdNACbB8r8
+Sc+1DHVXJsDK/lsiy7P8tzk=
+=2Wnf
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclcl/files/digest-tclcl-1.15 b/dev-tcltk/tclcl/files/digest-tclcl-1.15
deleted file mode 100644
index 109a06e5c55f..000000000000
--- a/dev-tcltk/tclcl/files/digest-tclcl-1.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0b6403ea9303d776717855eb0828a408 tclcl-src-1.15.tar.gz 143000
-RMD160 9ae3aad5d53ba67df6a5e25f5f3813f4ad162029 tclcl-src-1.15.tar.gz 143000
-SHA256 9be16d5e7df7e201bab3611ac53c3d8894f95e6e0059477403ea8004fdd56a34 tclcl-src-1.15.tar.gz 143000
diff --git a/dev-tcltk/tclcl/files/digest-tclcl-1.16 b/dev-tcltk/tclcl/files/digest-tclcl-1.16
deleted file mode 100644
index 621ffc7dc1ef..000000000000
--- a/dev-tcltk/tclcl/files/digest-tclcl-1.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2a25a4736c1bf4ec7f4e6343aa533bc6 tclcl-src-1.16.tar.gz 203269
-RMD160 3373ba084ed2a278f47d135af67957cf26856069 tclcl-src-1.16.tar.gz 203269
-SHA256 75efa77a0c6cd8a3bab65b794f87dceab25ed34183688bf2e564ee0cbadf8e1b tclcl-src-1.16.tar.gz 203269
diff --git a/dev-tcltk/tclcl/files/tclcl-1.15-gcc34.patch b/dev-tcltk/tclcl/files/tclcl-1.15-gcc34.patch
deleted file mode 100644
index 70314ebcf359..000000000000
--- a/dev-tcltk/tclcl/files/tclcl-1.15-gcc34.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-diff -Naur tclcl-1.15/tclcl.h tclcl-1.15-fix/tclcl.h
---- tclcl-1.15/tclcl.h	2004-01-06 02:50:24.000000000 +0100
-+++ tclcl-1.15-fix/tclcl.h	2004-10-18 14:46:15.123314528 +0200
-@@ -49,115 +49,6 @@
- #include "tracedvar.h"
- 
- struct Tk_Window_;
--
--class Tcl {
--    public:
--	/* constructor should be private but SGIs C++ compiler complains*/
--	Tcl();
--
--	static void init(const char* application);
--	static void init(Tcl_Interp*, const char* application);
--	static inline Tcl& instance() { return (instance_); }
--	inline int dark() const { return (tcl_ == 0); }
--	inline Tcl_Interp* interp() const { return (tcl_); }
--	
--#if TCL_MAJOR_VERSION >= 8
--	int evalObj(Tcl_Obj *pObj) { return Tcl_GlobalEvalObj(tcl_, pObj); }
--	int evalObjs(int objc, Tcl_Obj **objv) {
--		Tcl_Obj* pListObj = Tcl_NewListObj(objc, objv);
--		int retcode = evalObj(pListObj);
--		Tcl_DecrRefCount(pListObj);
--		return retcode; 
--	}
--	Tcl_Obj* objResult() const { return Tcl_GetObjResult(tcl_); }
--	int resultAs(int* pInt) {
--		return Tcl_GetIntFromObj(tcl_, objResult(), pInt);
--	}
--	int resultAs(long* pLong) {
--		return Tcl_GetLongFromObj(tcl_, objResult(), pLong);
--	}
--	int resultAs(double* pDbl) {
--		return Tcl_GetDoubleFromObj(tcl_, objResult(), pDbl);
--	}
--	void result(Tcl_Obj *pObj) { Tcl_SetObjResult(tcl_, pObj); }
--	inline const char* result() const { return Tcl_GetStringResult(tcl_); }
--#else /* TCL_MAJOR_VERSION >= 8 */	
--	/* may not work at all! */
--	inline char* result() const { return (tcl_->result); }
--#endif  /* TCL_MAJOR_VERSION >= 8 */
--	inline void result(const char* p) { tcl_->result = (char*)p; }
--	void resultf(const char* fmt, ...);
--	inline void CreateCommand(const char* cmd, Tcl_CmdProc* cproc,
--				  ClientData cd = 0,
--				  Tcl_CmdDeleteProc* dproc = 0) {
--		Tcl_CreateCommand(tcl_, (char*)cmd, cproc, cd, dproc);
--	}
--	inline void CreateCommand(Tcl_CmdProc* cproc,
--				  ClientData cd = 0,
--				  Tcl_CmdDeleteProc* dproc = 0) {
--		Tcl_CreateCommand(tcl_, buffer_, cproc, cd, dproc);
--	}
--	inline void DeleteCommand(const char* cmd) {
--		Tcl_DeleteCommand(tcl_, (char*)cmd);
--	}
--	inline void EvalFile(const char* file) {
--		if (Tcl_EvalFile(tcl_, (char*)file) != TCL_OK)
--			error(file);
--	}
--	inline const char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) {
--		return (Tcl_GetVar(tcl_, (char*)varname, flags));
--	}
--	/*
--	 * Hooks for invoking the tcl interpreter:
--	 *  eval(char*) - when string is in writable store
--	 *  evalc() - when string is in read-only store (e.g., string consts)
--	 *  [ eval(const char*) is a synonym ]
--	 *  evalf() - printf style formatting of command
--	 * Or, write into the buffer returned by buffer() and
--	 * then call eval(void).
--	 */
--	void eval(char* s);
--	void eval(const char* s) { evalc(s); };
--	void evalc(const char* s);
--	void eval();
--	char* buffer() { return (bp_); }
--	/*
--	 * This routine used to be inlined, but SGI's C++ compiler
--	 * can't hack stdarg inlining.  No big deal here.
--	 */
--	void evalf(const char* fmt, ...);
--
--	inline void add_error(const char *string) {
--		Tcl_AddErrorInfo(interp(), (char *) string);
--	}
--	void add_errorf(const char *fmt, ...);
--
--	inline struct Tk_Window_* tkmain() const { return (tkmain_); }
--	inline void tkmain(struct Tk_Window_* w) { tkmain_ = w; }
--	void add_option(const char* name, const char* value);
--	void add_default(const char* name, const char* value);
--	const char* attr(const char* attr) const;
--	const char* application() const { return (application_); }
--	inline const char* rds(const char* a, const char* fld) const {
--		return (Tcl_GetVar2(tcl_, (char*)a, (char*)fld,
--				    TCL_GLOBAL_ONLY));
--	}
--
--	TclObject* lookup(const char* name);
--	void enter(TclObject*);
--	void remove(TclObject*);
--    private:
--	void error(const char*);
--
--	static Tcl instance_;
--	Tcl_Interp* tcl_;
--	Tk_Window_* tkmain_;
--	char* bp_;
--	const char* application_;
--	char buffer_[4096];
--	Tcl_HashTable objs_;
--};
--
- class InstVar;
- 
- class TclObject {
-diff -Naur tclcl-1.15/tclcl-mappings.h tclcl-1.15-fix/tclcl-mappings.h
---- tclcl-1.15/tclcl-mappings.h	2004-01-06 02:50:24.000000000 +0100
-+++ tclcl-1.15-fix/tclcl-mappings.h	2004-10-18 14:47:14.457294392 +0200
-@@ -38,7 +38,116 @@
- 
- 
- class TclObject;
--class Tcl;
-+class Tcl {
-+    public:
-+	/* constructor should be private but SGIs C++ compiler complains*/
-+	Tcl();
-+
-+	static void init(const char* application);
-+	static void init(Tcl_Interp*, const char* application);
-+	static inline Tcl& instance() { return (instance_); }
-+	inline int dark() const { return (tcl_ == 0); }
-+	inline Tcl_Interp* interp() const { return (tcl_); }
-+	
-+#if TCL_MAJOR_VERSION >= 8
-+	int evalObj(Tcl_Obj *pObj) { return Tcl_GlobalEvalObj(tcl_, pObj); }
-+	int evalObjs(int objc, Tcl_Obj **objv) {
-+		Tcl_Obj* pListObj = Tcl_NewListObj(objc, objv);
-+		int retcode = evalObj(pListObj);
-+		Tcl_DecrRefCount(pListObj);
-+		return retcode; 
-+	}
-+	Tcl_Obj* objResult() const { return Tcl_GetObjResult(tcl_); }
-+	int resultAs(int* pInt) {
-+		return Tcl_GetIntFromObj(tcl_, objResult(), pInt);
-+	}
-+	int resultAs(long* pLong) {
-+		return Tcl_GetLongFromObj(tcl_, objResult(), pLong);
-+	}
-+	int resultAs(double* pDbl) {
-+		return Tcl_GetDoubleFromObj(tcl_, objResult(), pDbl);
-+	}
-+	void result(Tcl_Obj *pObj) { Tcl_SetObjResult(tcl_, pObj); }
-+	inline const char* result() const { return Tcl_GetStringResult(tcl_); }
-+#else /* TCL_MAJOR_VERSION >= 8 */	
-+	/* may not work at all! */
-+	inline char* result() const { return (tcl_->result); }
-+#endif  /* TCL_MAJOR_VERSION >= 8 */
-+	inline void result(const char* p) { tcl_->result = (char*)p; }
-+	void resultf(const char* fmt, ...);
-+	inline void CreateCommand(const char* cmd, Tcl_CmdProc* cproc,
-+				  ClientData cd = 0,
-+				  Tcl_CmdDeleteProc* dproc = 0) {
-+		Tcl_CreateCommand(tcl_, (char*)cmd, cproc, cd, dproc);
-+	}
-+	inline void CreateCommand(Tcl_CmdProc* cproc,
-+				  ClientData cd = 0,
-+				  Tcl_CmdDeleteProc* dproc = 0) {
-+		Tcl_CreateCommand(tcl_, buffer_, cproc, cd, dproc);
-+	}
-+	inline void DeleteCommand(const char* cmd) {
-+		Tcl_DeleteCommand(tcl_, (char*)cmd);
-+	}
-+	inline void EvalFile(const char* file) {
-+		if (Tcl_EvalFile(tcl_, (char*)file) != TCL_OK)
-+			error(file);
-+	}
-+	inline const char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) {
-+		return (Tcl_GetVar(tcl_, (char*)varname, flags));
-+	}
-+	/*
-+	 * Hooks for invoking the tcl interpreter:
-+	 *  eval(char*) - when string is in writable store
-+	 *  evalc() - when string is in read-only store (e.g., string consts)
-+	 *  [ eval(const char*) is a synonym ]
-+	 *  evalf() - printf style formatting of command
-+	 * Or, write into the buffer returned by buffer() and
-+	 * then call eval(void).
-+	 */
-+	void eval(char* s);
-+	void eval(const char* s) { evalc(s); };
-+	void evalc(const char* s);
-+	void eval();
-+	char* buffer() { return (bp_); }
-+	/*
-+	 * This routine used to be inlined, but SGI's C++ compiler
-+	 * can't hack stdarg inlining.  No big deal here.
-+	 */
-+	void evalf(const char* fmt, ...);
-+
-+	inline void add_error(const char *string) {
-+		Tcl_AddErrorInfo(interp(), (char *) string);
-+	}
-+	void add_errorf(const char *fmt, ...);
-+
-+	inline struct Tk_Window_* tkmain() const { return (tkmain_); }
-+	inline void tkmain(struct Tk_Window_* w) { tkmain_ = w; }
-+	void add_option(const char* name, const char* value);
-+	void add_default(const char* name, const char* value);
-+	const char* attr(const char* attr) const;
-+	const char* application() const { return (application_); }
-+	inline const char* rds(const char* a, const char* fld) const {
-+		return (Tcl_GetVar2(tcl_, (char*)a, (char*)fld,
-+				    TCL_GLOBAL_ONLY));
-+	}
-+
-+	TclObject* lookup(const char* name);
-+	void enter(TclObject*);
-+	void remove(TclObject*);
-+    private:
-+	void error(const char*);
-+
-+	static Tcl instance_;
-+	Tcl_Interp* tcl_;
-+	Tk_Window_* tkmain_;
-+	char* bp_;
-+	const char* application_;
-+	char buffer_[4096];
-+	Tcl_HashTable objs_;
-+};
-+
-+
-+
- 
- template <class T>
- class TclObjectHelper {
diff --git a/dev-tcltk/tclcl/tclcl-1.15.ebuild b/dev-tcltk/tclcl/tclcl-1.15.ebuild
deleted file mode 100644
index fe526bb614a0..000000000000
--- a/dev-tcltk/tclcl/tclcl-1.15.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/tclcl-1.15.ebuild,v 1.9 2005/05/14 18:20:29 matsuu Exp $
-
-inherit eutils
-
-DESCRIPTION="Tcl/C++ interface library"
-SF_PN="otcl-tclcl"
-HOMEPAGE="http://sourceforge.net/projects/${SF_PN}/"
-MY_P="${PN}-src-${PV}"
-SRC_URI="mirror://sourceforge/${SF_PN}/${MY_P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc ~amd64"
-IUSE=""
-DEPEND=">=dev-lang/tcl-8.3.2
-		>=dev-lang/tk-8.3.2
-		>=dev-tcltk/otcl-1.0.8"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gcc34.patch
-
-	libtoolize -f
-}
-
-src_compile() {
-	local tclv tkv
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-	local myconf="--with-tcl-ver=${tclv} --with-tk-ver=${tkv}"
-	econf ${myconf} || die "econf failed"
-	sed 's|$(LIBRARY_TCL)/http.*/http.tcl|$(LIBRARY_TCL)/http2.5/http.tcl|g' \
-		-i Makefile || die "sed failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dolib.a libtclcl.a
-	dobin tcl2c++
-	dodir /usr/include
-	insinto /usr/include
-	doins *.h
-	dohtml CHANGES.html
-	dodoc FILES README VERSION
-}
diff --git a/dev-tcltk/tclcl/tclcl-1.16.ebuild b/dev-tcltk/tclcl/tclcl-1.16.ebuild
deleted file mode 100644
index 7bdf5a364b28..000000000000
--- a/dev-tcltk/tclcl/tclcl-1.16.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/tclcl-1.16.ebuild,v 1.3 2005/07/19 14:05:31 dholm Exp $
-
-inherit eutils
-
-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=">=dev-lang/tcl-8.3.2
-	>=dev-lang/tk-8.3.2
-	>=dev-tcltk/otcl-1.0.8"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-http.patch
-}
-
-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.17.ebuild b/dev-tcltk/tclcl/tclcl-1.17.ebuild
index 273451c04e25..097f64fee12c 100644
--- a/dev-tcltk/tclcl/tclcl-1.17.ebuild
+++ b/dev-tcltk/tclcl/tclcl-1.17.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2007/04/29 13:30:30 armin76 Exp $
+# $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"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/otcl-tclcl/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/tcl-8.4.5
diff --git a/dev-tcltk/tclcl/tclcl-1.19.ebuild b/dev-tcltk/tclcl/tclcl-1.19.ebuild
index 1d45433c6be8..cb79edbacf7e 100644
--- a/dev-tcltk/tclcl/tclcl-1.19.ebuild
+++ b/dev-tcltk/tclcl/tclcl-1.19.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/05/03 15:15:42 gustavoz Exp $
+# $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"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/otcl-tclcl/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11