dev-tcltk/tkimg: Drop old

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

7 files changed, 18 insertions, 428 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index bd4f1c3923c6..fe8b2ad385c1 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.56 2012/11/21 11:28:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.57 2012/12/05 07:24:46 jlec Exp $
+
+  05 Dec 2012; Justin Lecher <jlec@gentoo.org> -tkimg-1.4-r4.ebuild,
+  -tkimg-1.4-r5.ebuild, -tkimg-1.4-r6.ebuild,
+  -files/tkimg-1.4.20100510-boolean.patch,
+  -files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch:
+  Drop old
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> tkimg-1.4-r7.ebuild:
   Stable for x86, wrt bug #433016
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 77aa49d9f193..08bf58bb28df 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,15 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tkimg-1.4-jbig.patch 910 SHA256 7ee39eb27556b3e990ff2514065a8a8c4b1e128aa1d7e2e61afb19d1e2384714 SHA512 fae1bb3d8524ebd47ca37e417b04327138308af83aa82269c5ff74f795e3a0b2334a84e66b84c80831708e95dce99f1cc295f0d755f07cad154d2c2f1520d33b WHIRLPOOL 0fda5415a005d2d219df950af1b2e36d8d64f0b5672b617964227ae11d561a9cb58ea894fb99303b525e33ee259312abaad58529af50e97a643852cc3e4b627c
 AUX tkimg-1.4-libtiff.patch 5069 SHA256 07c4f995aea0f135107a331b8df434b3af7ec934c108ace8367e61d9889c0f16 SHA512 123f3fed7121290164eefda5122cbe2705a642ca6826d96ea6be3cbc134d8ce5ed6adcb0a335599312a80fb8bf8b8d0dd35ec9f812fc25607ae489040b938e7e WHIRLPOOL e99ac303511968d2073ce247b7e0eaf3961410bd60b78d57199e7e27169186d2950179e4c092c6924f0c26cd55a054f1a153d542544a8c14fb70c47a56011f3b
 AUX tkimg-1.4-libtiff4.patch 33987 SHA256 f6441799ad59afc12011b0ded8f1d2f6e45f7a6316a83a4114438041a400090f SHA512 8b0e50bb1d440e95e2b5a4d9044a165bcafd0140287fbbabf589ff3514d27f06803e99f2ed38756a780206a01c7dc2e7aa3442500b0a2a75754155014fa93875 WHIRLPOOL ccd9cba9b4dbfb2afa902ec2de86c791e484e39ea281f28afad03c69cd106b8e379e0714e6960347b1851ac13209a2c794baa79faa41f09ae3195ad51fe91f09
 AUX tkimg-1.4-zlib-1.2.6.patch 496 SHA256 4abf9ccffb9ddc186211b9955d52d566ecf6d9d7c3e11324dab18a86ac1dcc2d SHA512 d9b698da5abfbd5b2a921200a139e1d01244a8d983f0801e76d77ebcba15ba224707fe4290317b2fd06e0b597a254fbb2a97943c0220cd3e6fe9786f30bc4a8f WHIRLPOOL 4440cb147f9eeb0139b82d1d66e1404608b7b6ef1f9ab193eb8f5d9c6b7e74731942bb8a1a1f05bdeb82aae6b18d30fe3b2bfd12adbeb5bc6fc7ad317e1fa957
 AUX tkimg-1.4-zlib127-gzgetc_fix.patch 1518 SHA256 d44338b06f10da1f52a960e97bac6663f87dc852e20bccb1ece652fb7b430b82 SHA512 080add14d7e1edc5e0a6884a7aa9e8442c12156842c629e5a9393dcc3150a74d2a21293302fcf777a46fcc2e1f8ed3ba9e558eddd2caf35d3437112daf90bb42 WHIRLPOOL b0c9bda7f48ddeb7d36324b051d8bc11834942cdaf7e064365a61ae1ebfca901c76227cad4705788041371e2dccb7a9842c82dec4d337613e180e7cd8a3d7b38
-AUX tkimg-1.4.20100510-boolean.patch 373 SHA256 b68d29f6396bda665c5b11996a9f4c3b8295059a876ed7499509c6460e06fb97 SHA512 a8c99184ba88bffc60050dcaf8ec7ac28b7b0da44aaa3943ec4cf3bd501a2a4864d901a41c08b2931d05fc73152449feb37dec03ae97185849ff4200a411ff80 WHIRLPOOL 431b18927f64c43499acac22b765e97ca321bf9430c7e96ee2587758dcf753a659735683930cb34b193aec577ae5126c65219dab9a8c1721b54a195b511c79e3
-AUX tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch 6257 SHA256 b8b6eb2b2fe94fcb18fda0dd8d690abe963fd4e1422488942e8e9f770cafe718 SHA512 aaf5eb451b3363793f1176613480c36d5404d9e7ffd2b694ddf7e7e068936880bb9b9b6a6b7deee2339bd98651abccc62da771de1374d19b692bf30faac0aa4a WHIRLPOOL afe28fe601530debbed659d34dcb82791a78d95d1672ff7d4730cbfafa5c58c8223e57339865ef32bcaf180435f3a001ab860af56254a035829036429650b442
 DIST tkimg-1.4-gentoo+bundled-tiff.patch.xz 10960 SHA256 b95d57d02ef144d50565c482edcec97533683e433d845ea50f830c1359d60457 SHA512 77155964f7b11b8f0d5d20f36fa48c90b6b3b2e1bf261933b14c4f58306ca6c92d126ddbcaadcc55c72435f690431ef93ba9bef1a4975380f6dc019e50d8103a WHIRLPOOL 926d94c1e7ff344cb354d596bbf367f4d70b00f9341d40c6cbc2f9aa4940d4cf3bb975f9f32f7b75a789095d76076e19fa347f6a6c4c930dc00d4bdf3dc36532
 DIST tkimg1.4.tar.bz2 4912894 SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1 SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1 WHIRLPOOL 0ace52c074389c09de240922c95a40ff4b1ab01d5bc060fca168396abad11a845326d15e582b039da6062c1b2780cee572299d21902947edd90195d4b99e6089
-EBUILD tkimg-1.4-r4.ebuild 1718 SHA256 e650108e5fadc116b930f834e8002f5569a11fcdb3bf43ff90cc62595c985e56 SHA512 a8785da62264be314e34242d4ab9f4ea72cb3a24cfe700cdaae70165c5cce7256340cf3487b3678961532ec8566084f3d3851ee962d07e4a648b98c5b21953cf WHIRLPOOL 90ce2afbc875b1e58d92ea4b17b9b2f0878fa84cd3d4a9a8aa3fee2c68f960d949691e2b384f0bab98e99e661814a45c9ab6b57e53f5c8df61c4d4b87714ce41
-EBUILD tkimg-1.4-r5.ebuild 1769 SHA256 e033b9aa2b04338af48e12bd0f5ac29d8e6ff3cc8e34b3b7231a3381280fbe9f SHA512 6d88ac0d422bf036747b258f2c1d3bd892859cfec5acd9fe14408c5d91bad2bbeaf5f4e496f2d9b287ec0abfa15f2e89be8379583e5e23b975a3c4745975ce27 WHIRLPOOL 03e2c53fa77a9d2eb5823db51d45cf98b4a1d48faa13abb58b10c91f2dbd12d2792598b3e5f0092c61d5d3e29c6bf9fd06e82235f6ac81642a59839d6e124bd4
-EBUILD tkimg-1.4-r6.ebuild 1801 SHA256 8697cd8faedae20dba99c1fb64aa5f29cfd565f4b7dd7417e4d1c601c5832bd7 SHA512 0ae38fa856164a184fbe2681b65d87d4720ad225e4df1773ce245a69f80abb48343f38e7a0c2699f3df6b1c1b5501fdb0a6a69ffea73b76de2696b64ee81c30f WHIRLPOOL 8436c9520176e65c3cce499b64e02c384307055781a95e9f7481f4c1a0ce901ea72f6755cac9f19ce61aa71e1278932f8a23be8ae30433884da4eeb521cc11b2
 EBUILD tkimg-1.4-r7.ebuild 2007 SHA256 559b0b849a65662a35297914bd641679e0b998b3973b1fbaa11d0777d9fe2dd3 SHA512 63c3877f5e93215360b706cc064c3ca6174de304d2d921d21f61c69d514df4e1755d8edc20cc9e3d8d3c21db402daf2d0309202382f04cbf998035b6618b17fe WHIRLPOOL 12d3a7695a89d58fc3fb33c72415c0f10ec1ede60ecb0fd5deef8e522205eb7ccf08c821c2ad89e66ffca363bc2bcd46c9a82a6cf840b517aa4ad3a42cb0e123
-MISC ChangeLog 9388 SHA256 0ca938a8a4355452fd520637d786c3016548c5ace41f923afff8bcf0a46b9542 SHA512 5c74f0398bf9123f54011414815183aafc43fa9e0882c36abef29a262a6a1f84c6df6145f5535730d8531a37bb5ca693bbe4b22b182e2bc6a0fb4ca499e30eb9 WHIRLPOOL 37de035713bc018feaabbd789e4ea489911551b714231002e9abd734028c1bceac68ba9c04bd15c21ca3d48dc1fc28e2664da91cfe5ba48d75ac7a0f5de8767f
+MISC ChangeLog 9622 SHA256 8317f6d54f2bcb92f94d643b2ee280cb1fa2339dc2e73aaaf2a20d18b763c479 SHA512 6ea8e39dffae2ffcdc75ee3e5a0725160ecd56a62d699b7d78057f4f83291d8d33730ad23930b92b192bdd737b55735094c285606ec82ce8827638a5c2876eb5 WHIRLPOOL ca431558c102eac5eb8828f3328aa1d4c4a1fbdeaaf3128ecbbd6e9e09fbad82d1abbae8032b7f215a35ceb99e254477927bf8f9c3079c7bba536069e2d943df
 MISC metadata.xml 266 SHA256 fe07b2bee63764c9cb9e3aaeac927f511dd11d3ff45e40021def110ac46cebbe SHA512 5c39d5e104372129a084cdeb01a4e83c6c38892336deacb42e67a5cbfa7d16fd7b0d91409efcbcbccefdddb49b77b380ad8720335f126f3b592c0e99e1e2ba8e WHIRLPOOL 6ee7f4e916fb5ae931ca42d910e3e5c3055f87d98e1bcb92c64587788a95b200c3688e345e43918b6c5383185ef9f0860ef5174f3b344f4f13e8de91d24c3344
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC+9r4ACgkQgAnW8HDreRbmcgCglJRZBa2e9dYh7OglunYF3nLw
+9AwAoJP6tM7y5C1tFuJLL/uSKNxS1250
+=N+gj
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch
deleted file mode 100644
index 0ac51973a3a6..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/compat/libjpeg/jmorecfg.h b/compat/libjpeg/jmorecfg.h
-index 4196885..d1eb675 100644
---- a/compat/libjpeg/jmorecfg.h
-+++ b/compat/libjpeg/jmorecfg.h
-@@ -253,6 +253,7 @@ typedef unsigned int JDIMENSION;
- #endif
- 
- #ifndef HAVE_BOOLEAN
-+#define HAVE_BOOLEAN
- #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
- typedef unsigned char boolean;
- #else
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch
deleted file mode 100644
index f63b9bcaa2eb..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h
-index 834bd23..259e069 100644
---- a/libpng/pngtclDecls.h
-+++ b/libpng/pngtclDecls.h
-@@ -309,7 +309,7 @@ PNGTCLAPI void		png_data_freer(png_structp png_ptr,
- 				png_uint_32 mask);
- /* 98 */
- PNGTCLAPI png_voidp	png_malloc_default(png_structp png_ptr,
--				png_uint_32 size);
-+				png_alloc_size_t size);
- /* 99 */
- PNGTCLAPI void		png_free_default(png_structp png_ptr, png_voidp ptr);
- /* Slot 100 is reserved */
-@@ -1067,10 +1067,10 @@ typedef struct PngtclStubs {
-     void (*png_read_endPtr) (png_structp png_ptr, png_infop info_ptr); /* 59 */
-     void (*png_destroy_info_structPtr) (png_structp png_ptr, png_infopp info_ptr_ptr); /* 60 */
-     void (*png_destroy_read_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); /* 61 */
--    void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); /* 62 */
-+/*    void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); */ /* 62 */
-     void (*png_destroy_write_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr); /* 63 */
-     void *reserved64;
--    void (*png_write_destroyPtr) (png_structp png_ptr); /* 65 */
-+/*    void (*png_write_destroyPtr) (png_structp png_ptr); */ /* 65 */
-     void (*png_set_crc_actionPtr) (png_structp png_ptr, int crit_action, int ancil_action); /* 66 */
-     void (*png_set_filterPtr) (png_structp png_ptr, int method, int filters); /* 67 */
-     void (*png_set_filter_heuristicsPtr) (png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs); /* 68 */
-diff --git a/libpng/pngtclStubInit.c b/libpng/pngtclStubInit.c
-index f8d2d9b..3309ee9 100644
---- a/libpng/pngtclStubInit.c
-+++ b/libpng/pngtclStubInit.c
-@@ -197,10 +197,10 @@ const PngtclStubs pngtclStubs = {
-     png_read_end, /* 59 */
-     png_destroy_info_struct, /* 60 */
-     png_destroy_read_struct, /* 61 */
--    png_read_destroy, /* 62 */
-+/*    png_read_destroy, */ /* 62 */
-     png_destroy_write_struct, /* 63 */
-     NULL, /* 64 */
--    png_write_destroy, /* 65 */
-+/*    png_write_destroy, */ /* 65 */
-     png_set_crc_action, /* 66 */
-     png_set_filter, /* 67 */
- #if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED)
-diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
-index 4592093..e32f5d2 100644
---- a/libtiff/Makefile.in
-+++ b/libtiff/Makefile.in
-@@ -35,8 +35,8 @@
- 
- # tif_fax3sm is special. It is generated.
- 
--PKG_SOURCES	= @PKG_SOURCES@ tif_fax3sm.c
--PKG_OBJECTS	= @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
-+PKG_SOURCES	= tifftcl.c tifftclStubInit.c 
-+PKG_OBJECTS	= tifftcl.o tifftclStubInit.o 
- 
- PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
- PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
-@@ -109,7 +109,7 @@ RANLIB		= @RANLIB@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
- SHLIB_LD	= @SHLIB_LD@
--SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ltiff
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h
-index b30485d..7dd700b 100644
---- a/libtiff/tifftclDecls.h
-+++ b/libtiff/tifftclDecls.h
-@@ -24,8 +24,9 @@
- #undef INLINE
- 
- #include "tifftclDeclsMask.h"
--#include "../compat/libtiff/libtiff/tiffio.h"
- #include "../compat/libtiff/libtiff/tiffiop.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h"
- #include "../compat/libtiff/libtiff/tif_predict.h"
- #include "tifftclDeclsUnmask.h"
- 
-diff --git a/tiff/tiff.c b/tiff/tiff.c
-index a5d5949..826da9a 100644
---- a/tiff/tiff.c
-+++ b/tiff/tiff.c
-@@ -17,6 +17,7 @@
- #include "tcl.h"
- #include "tifftcl.h"
- #include "zlibtcl.h"
-+#include "init.c"
- 
- #ifdef HAVE_STDLIB_H
- #undef HAVE_STDLIB_H
-@@ -29,7 +30,6 @@ static int SetupTiffLibrary(Tcl_Interp *interp);
- #define MORE_INITIALIZATION \
-     if (SetupTiffLibrary (interp) != TCL_OK) { return TCL_ERROR; }
- 
--#include "init.c"
- 
- #include "tiffInt.h"
- 
-diff --git a/zlib/Makefile.in b/zlib/Makefile.in
-index cb71481..eb51145 100644
---- a/zlib/Makefile.in
-+++ b/zlib/Makefile.in
-@@ -33,8 +33,8 @@
- # $(srcdir) or in the generic, win or unix subdirectory.
- #========================================================================
- 
--PKG_SOURCES	= @PKG_SOURCES@
--PKG_OBJECTS	= @PKG_OBJECTS@
-+PKG_SOURCES	= zlibtcl.c zlibtclStubInit.c
-+PKG_OBJECTS	= zlibtcl.o zlibtclStubInit.o
- 
- PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
- PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
-@@ -107,7 +107,7 @@ RANLIB		= @RANLIB@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
- SHLIB_LD	= @SHLIB_LD@
--SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lz
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff --git a/zlib/configure.in b/zlib/configure.in
-index 292d3aa..bc045d6 100644
---- a/zlib/configure.in
-+++ b/zlib/configure.in
-@@ -51,17 +51,12 @@ TEA_SETUP_COMPILER
- #-----------------------------------------------------------------------
- 
- TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
--TEA_ADD_SOURCES([../compat/zlib/adler32.c	../compat/zlib/compress.c	../compat/zlib/crc32.c])
--TEA_ADD_SOURCES([../compat/zlib/deflate.c	../compat/zlib/gzclose.c	../compat/zlib/gzlib.c])
--TEA_ADD_SOURCES([../compat/zlib/gzread.c	../compat/zlib/gzwrite.c	../compat/zlib/infback.c])
--TEA_ADD_SOURCES([../compat/zlib/inffast.c	../compat/zlib/inflate.c	../compat/zlib/inftrees.c])
--TEA_ADD_SOURCES([../compat/zlib/trees.c	../compat/zlib/uncompr.c	../compat/zlib/zutil.c])
- 
- TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h])
- TEA_ADD_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.h])
- 
- TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
--TEA_ADD_LIBS([])
-+TEA_ADD_LIBS([-lz])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([zlibtclStubLib.c])
- TEA_ADD_SOURCES([zlibtclStubLib.c])
-diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h
-index c91496f..630abc7 100644
---- a/zlib/zlibtclDecls.h
-+++ b/zlib/zlibtclDecls.h
-@@ -16,7 +16,7 @@
- 
- #include "tcl.h"
- #include "zlibtclDeclsMask.h"
--#include "../compat/zlib/zlib.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h"
- #include "zlibtclDeclsUnmask.h"
- 
- /* !BEGIN!: Do not edit below this line. */
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild
deleted file mode 100644
index f5331813981f..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild,v 1.6 2012/06/07 20:46:43 zmedico Exp $
-
-EAPI=3
-
-VIRTUALX_USE=test
-
-inherit eutils multilib prefix virtualx
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz
-	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-IUSE="doc test"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-lang/tk
-	>=dev-tcltk/tcllib-1.11
-	media-libs/tiff:0
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	test? (
-		x11-apps/xhost
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-
-# Fails with jpeg-turbo silently, #386253
-RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \
-		"${FILESDIR}"/${P}-jbig.patch
-	find compat/{libjpeg,libpng,zlib} -delete
-	sed \
-		-e 's:-O2 -fomit-frame-pointer::g' \
-		-e 's: -pipe::g' \
-		-i */configure  || die
-	eprefixify */*.h
-}
-
-src_test() {
-	Xemake test || die "Xmake failed"
-}
-
-src_install() {
-	local l bl
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
-
-	# Make library links
-	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/* || die
-	fi
-}
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild
deleted file mode 100644
index 93f946a614bf..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild,v 1.3 2012/06/07 20:46:43 zmedico Exp $
-
-EAPI=3
-
-VIRTUALX_USE=test
-
-inherit eutils multilib prefix virtualx
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz
-	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-IUSE="doc test"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-lang/tk
-	>=dev-tcltk/tcllib-1.11
-	media-libs/tiff:0
-	media-libs/libpng:0
-	>=sys-libs/zlib-1.2.6
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	test? (
-		x11-apps/xhost
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-
-# Fails with jpeg-turbo silently, #386253
-RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \
-		"${FILESDIR}"/${P}-jbig.patch \
-		"${FILESDIR}"/${P}-zlib-1.2.6.patch
-	find compat/{libjpeg,libpng,zlib} -delete
-	sed \
-		-e 's:-O2 -fomit-frame-pointer::g' \
-		-e 's: -pipe::g' \
-		-i */configure  || die
-	eprefixify */*.h
-}
-
-src_test() {
-	Xemake test || die "Xmake failed"
-}
-
-src_install() {
-	local l bl
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
-
-	# Make library links
-	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/* || die
-	fi
-}
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild
deleted file mode 100644
index d1ca5f5640ae..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild,v 1.1 2012/07/07 14:05:46 jlec Exp $
-
-EAPI=4
-
-VIRTUALX_USE=test
-
-inherit eutils multilib prefix virtualx
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz
-	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-IUSE="doc test"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-lang/tk
-	>=dev-tcltk/tcllib-1.11
-	media-libs/tiff:0
-	media-libs/libpng:0
-	>=sys-libs/zlib-1.2.6
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	test? (
-		x11-apps/xhost
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-
-# Fails with jpeg-turbo silently, #386253
-RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \
-		"${FILESDIR}"/${P}-jbig.patch \
-		"${FILESDIR}"/${P}-zlib-1.2.6.patch \
-		"${FILESDIR}"/${P}-libtiff.patch \
-		"${FILESDIR}"/${P}-libtiff4.patch
-
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
-
-	sed \
-		-e 's:-O2 -fomit-frame-pointer::g' \
-		-e 's: -pipe::g' \
-		-i */configure  || die
-
-	eprefixify */*.h
-}
-
-src_test() {
-	Xemake test || die "Xmake failed"
-}
-
-src_install() {
-	local l bl
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install
-
-	# Make library links
-	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/*
-	fi
-}