Remove vulnerable copies bundling all of zlib, tiff, jpeg and png. Revert back to ~arch only.

Package-Manager: portage-2.2.0_alpha61/cvs/Linux x86_64

7 files changed, 15 insertions, 413 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 9ea074742ee0..cda9473a88cd 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.30 2011/10/03 20:04:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.31 2011/10/08 08:13:20 ssuominen Exp $
+
+  08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -tkimg-1.4.ebuild,
+  -tkimg-1.4-r1.ebuild, -tkimg-1.4.20100510.ebuild,
+  -files/tkimg-1.4.20100510-gentoo.patch, -files/tkimg-1.4-nojbig.patch:
+  Remove vulnerable copies bundling all of zlib, tiff, jpeg and png. Revert
+  back to ~arch only.
 
 *tkimg-1.4.20100510-r1 (03 Oct 2011)
 
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 985ef2e12706..3b801e885fc1 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,30 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX tkimg-1.4-nojbig.patch 918 RMD160 7a1e3c7bf844b25b4cc888cdf379d2995adb741c SHA1 ab90e94d863d6deb7ceecc06a33e4e47e23b3e86 SHA256 dc47d9e352c99c8ef762c658dc0460f6990d723adb11bfe4ccc0e8cb99914369
 AUX tkimg-1.4.20100510-boolean.patch 373 RMD160 ff69fb2a48110947f38e30a0fe01c8827628bef8 SHA1 e9b12c418d87e7933fa64f6b183ec8802a1c9b37 SHA256 b68d29f6396bda665c5b11996a9f4c3b8295059a876ed7499509c6460e06fb97
 AUX tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch 6257 RMD160 c326a3fb052747c1494805f922a75b8f9cab455a SHA1 51b7f03a5095bcc7bd1443b9b64b4daffe4dc528 SHA256 b8b6eb2b2fe94fcb18fda0dd8d690abe963fd4e1422488942e8e9f770cafe718
-AUX tkimg-1.4.20100510-gentoo.patch 7306 RMD160 3f985a98b8cdbf8c485e573aff42b9ee6a94c271 SHA1 4d590b309fa19ebf73a0e377ab4a7ebfda34309e SHA256 d85a72bc293c8b2abe15381edba28ad29649a72bf2fa647f11ff8a1db583df40
 AUX tkimg-1.5_pre324-unbundle.patch 9950 RMD160 ceda455ef2abc0417eab3b5cee9473937a071f9f SHA1 c894acae64e0f408b12cb6b92048b057c2e4413a SHA256 6a83f1490ab55635cdf9d48255ad7a2910914b908ca164645afa0ed02c90a1f3
 DIST tkimg-1.4.20100510.tar.bz2 4625881 RMD160 3d5a6e4186afd4487333e6b069a756810560147d SHA1 42befa7cf86c5c6271fe86bdbad2f0e0953acee1 SHA256 74b60431d6ae3767132d7f334af1a208b978d99e7b2710db84dc3da95b5ff0ae
 DIST tkimg-1.5_pre324.tar.xz 2663020 RMD160 76956a458aa9211a4e085a879e2b495c8b5c0500 SHA1 8dfa1081dac8cdd528eca4af88483a377979cd94 SHA256 e351f8f658fd82f8639a664ef32390ff143315419ce4f0eb1213d860c8be5214
-DIST tkimg1.4.tar.bz2 4912894 RMD160 a05adf3e911ce7ab9304bddd89cf53c55c27b8fc SHA1 aa519474e3eb9640977a0ea7c61da6ba5129220b SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1
-EBUILD tkimg-1.4-r1.ebuild 1304 RMD160 f32fa9907f22e067545d6ff7f245a379e6fb11a4 SHA1 7d50d5e1a72f4820d71e8273ffb8e14989eaeadc SHA256 855e5b337a898f7f08c9ffec9a44d442140a699a95a41b6df376491ea8c01a89
 EBUILD tkimg-1.4.20100510-r1.ebuild 1543 RMD160 d1e3841fc2acda9a40dc3ad0ca6d5bca562172ce SHA1 68f40c83365fe075c0ce6ded0b7e4ab788b5caf8 SHA256 cbf46837c60ff33af43597d3cde1d7c266193d98dd6c1fbd7fdd5708b26c976e
-EBUILD tkimg-1.4.20100510.ebuild 1686 RMD160 661b408a80d5b3f53bcf0da1a5f66acb99b6f537 SHA1 954fc03a02f41c1d35c86aac02f944b178e4e2eb SHA256 d2f85644699f27e93211ab144f3644815355c25f64084ce588859c8d08b7b58b
-EBUILD tkimg-1.4.ebuild 1238 RMD160 9e596742a9abe7156b45a1800be371db4751b900 SHA1 cf0d068b5cf1fa57d50fbf7cc56a5fa240ae9e57 SHA256 c3d9346f6878b6e90ac49d7bc7dcdd46a20f23954612de2d69915fd212fe10fc
 EBUILD tkimg-1.5_pre324-r1.ebuild 1967 RMD160 342cbc8318901c5b6f2ad28325c8978bfe7c8bcb SHA1 7697abd1df92a83e171c90a6a67c39653ccdb7f0 SHA256 7f0d8205242ea303c782324053aa3ce6e4ffb6eea7052eee614f36f910a3756b
 EBUILD tkimg-1.5_pre324.ebuild 1228 RMD160 0ed0c18b0ec7f49a05bb3c766e9f0e2972179692 SHA1 a8aafb9c3e0f2a7b48a45af7790fe5f593a80bef SHA256 97ee4ebaae30295a0bebc9e0ec8c6060aba5ceb44224bcf72abc2bf24d920986
-MISC ChangeLog 5721 RMD160 6531a95657ea943634c574eb08d1c2bb5f019788 SHA1 bd8095f1c1471b1d48553d14d42973ad51f03ee9 SHA256 a25d6bfe22c5c2f9d1d6aff6dd66a24d4ee290a10d7c3548f3bc673c4102393c
+MISC ChangeLog 6018 RMD160 faad3ddc506e584f230389df3662eec59d497fbb SHA1 556a9ec06136503977f785a97c266f85995ef415 SHA256 621f4502fd96752faf3d96a993676adfc046f93d4afa21761be1a7cc9e0e6406
 MISC metadata.xml 266 RMD160 d7c5f086c7291a9ac127633d31c5f78b0dbf6297 SHA1 88e958c8725427b9ce9156c4457703914a19992c SHA256 fe07b2bee63764c9cb9e3aaeac927f511dd11d3ff45e40021def110ac46cebbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOihWOAAoJEEdUh39IaPFN8mkH/08QVxGMqDdx81P3nXenOSNn
-ekQ0GvlCpEb9t37Z2OBOoRLprv57PqwcucPMUUXfBEmgrwjWInVAzokKrLNFcLDA
-kMidhe4IN1f00JKczHXwQUtoyJl408ZJCe+Qs58bdw7AFsrmteGFPKoeM9t40fl7
-4RQh/4/L6slafJSp1w4IWabYMcZrI3mE5GZK2QmQJyBhNUrn0cKwmhjgDm7PiVZ9
-LTEMlBql7qwvXhXupmjJfYKCYZd3eoJE4Q0HOGmHQ0gabPTTGC98fzuy/E0DbsUu
-mYwJjzRfe/rlE6ZmsZ7sOigp23Cbiruu2bLR1QlYyDMu8KMTMGJqHilrsKqy8o8=
-=dKHI
+iQEcBAEBAgAGBQJOkAY9AAoJEEdUh39IaPFN0yIIAIQJXN1JcYbJm+xo2/SDCxjg
+cRLZ0rmKFrDc9aS/3qtHUKm1b+V2nmIe0UlzeWayfAH8VuKCIIHsOjy5oTjDcfUk
+mh4X+fqcDEyyDsw7cA9rDKVuS6OGFOnIngzx9Za8vqYxKiprVGUl2V8A0TA6nIEq
+Ff/0nONMN5wdZ7daPZobnQ+PBstJOWq8M4neSbzchCSiOFkXq3FcHyyW7MFrIbWV
+/ThRHGO/QGEUOW6kaO9PRmXdR/vPCw6BFNau3lROSmK20v5QSUCAQKq+CQKm1gBo
+vG+HR5b0evNSPzlLElTG3jYu2hB4rbV62t6Gm/VKR1WWcGVfUKfFytRAaA0xas8=
+=LbU+
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch b/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch
deleted file mode 100644
index 8ac8969cdcd0..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tkimg1.4/libtiff/configure.in	2010-07-06 15:48:46.000000000 +0200
-+++ tkimg1.4.new/libtiff/configure.in	2011-02-28 23:24:18.471259943 +0100
-@@ -67,7 +67,7 @@
- else
-     TIFFHOST="$host"
- fi
--${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
-+${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
- 	"--with-CC=$TIFFCC" $TIFFHOST
- mv -f tifftcl_confdefs.h confdefs.h
- 
---- tkimg1.4/libtiff/configure	2010-07-07 10:09:46.000000000 +0200
-+++ tkimg1.4.new/libtiff/configure	2011-02-28 23:25:53.529824614 +0100
-@@ -5133,7 +5133,7 @@
- else
-     TIFFHOST="$host"
- fi
--${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
-+${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
- 	"--with-CC=$TIFFCC" $TIFFHOST
- mv -f tifftcl_confdefs.h confdefs.h
- 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch
deleted file mode 100644
index 7c7dcadede92..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff --git a/libpng/Makefile.in b/libpng/Makefile.in
-index b84c3c5..9078062 100644
---- a/libpng/Makefile.in
-+++ b/libpng/Makefile.in
-@@ -37,8 +37,8 @@ zlibtcl_VERSION		= @zlibtcl_VERSION@
- # $(srcdir) or in the generic, win or unix subdirectory.
- #========================================================================
- 
--PKG_SOURCES	= @PKG_SOURCES@
--PKG_OBJECTS	= @PKG_OBJECTS@
-+PKG_SOURCES	= pngtcl.c pngtclStubInit.c
-+PKG_OBJECTS	= pngtcl.o pngtclStubInit.o
- 
- PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
- PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
-@@ -111,7 +111,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@ -lpng
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h
-index 834bd23..259e069 100644
---- a/libpng/pngtclDecls.h
-+++ b/libpng/pngtclDecls.h
-@@ -16,7 +16,7 @@
- 
- #include "tcl.h"
- #include "pngtclDeclsMask.h"
--#include "../compat/libpng/png.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/png.h"
- #include "pngtclDeclsUnmask.h"
- 
- /* !BEGIN!: Do not edit below this line. */
-@@ -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-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild
deleted file mode 100644
index 7fd0b3e882a3..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild,v 1.4 2011/09/19 16:18:00 jlec Exp $
-
-EAPI=3
-
-VIRTUALX_USE=test
-
-inherit eutils virtualx autotools
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-IUSE="doc test"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-lang/tk
-	>=dev-tcltk/tcllib-1.11"
-DEPEND="${RDEPEND}
-	test? (
-		x11-apps/xhost
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nojbig.patch
-}
-
-src_test() {
-	Xmake test || die "Xmake failed"
-}
-
-src_install() {
-	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.20100510.ebuild b/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
deleted file mode 100644
index 277f53e741bc..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild,v 1.7 2011/09/17 17:32:28 ssuominen Exp $
-
-EAPI="3"
-
-inherit eutils prefix virtualx
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://sourceforge.net/projects/tkimg/"
-# src built with:
-# svn export https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-1.4.YYYYMMDD
-# tar cvfj tkimg-1.4.YYYYMMDD.tar.bz2  tkimg-1.4.YYYYMMDD
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-IUSE="doc"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-lang/tk
-	>=dev-tcltk/tcllib-1.11
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if has_version ">=media-libs/libpng-1.5"; then
-		local msg="Sorry, but libpng 1.5 is not yet supported. See bug 378261"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-boolean.patch
-
-	eprefixify \
-		libjpeg/jpegtclDecls.h \
-		libpng/pngtclDecls.h \
-		libtiff/tifftclDecls.h \
-		zlib/zlibtclDecls.h
-}
-
-src_test() {
-	Xemake test || die
-}
-
-src_install() {
-	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.ebuild b/dev-tcltk/tkimg/tkimg-1.4.ebuild
deleted file mode 100644
index 537815cb0cf6..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.ebuild,v 1.7 2011/09/19 16:18:00 jlec Exp $
-
-EAPI="3"
-VIRTUALX_USE=test
-inherit eutils virtualx autotools
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-IUSE="doc test"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-lang/tk
-	>=dev-tcltk/tcllib-1.11"
-DEPEND="${RDEPEND}
-	test? ( x11-apps/xhost
-			media-fonts/font-misc-misc
-			media-fonts/font-cursor-misc )"
-
-S="${WORKDIR}/${MYP}"
-
-src_test() {
-	Xmake test || die "Xmake failed"
-}
-
-src_install() {
-	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
-}