Removed old patches

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 7 insertions, 313 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index de23f0f0934a..38a740336528 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.17 2010/06/28 19:19:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.18 2010/07/04 11:47:53 jlec Exp $
+
+  04 Jul 2010; Justin Lecher <jlec@gentoo.org>
+  -files/tkimg-1.3.20081202-prefix.patch,
+  -files/tkimg-1.3.20081202-systemlibs.patch,
+  -files/tkimg-1.3.20081202-tests.patch:
+  Removed old patches
 
   28 Jun 2010; Justin Lecher <jlec@gentoo.org> -tkimg-1.3.20081202.ebuild,
   -tkimg-1.3.20081202-r1.ebuild:
diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch
deleted file mode 100644
index aa9cf460e578..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-prefix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/libjpeg/tcl/jpegtclDecls.h b/libjpeg/tcl/jpegtclDecls.h
-index 49aa75f..2a22ce4 100644
---- a/libjpeg/tcl/jpegtclDecls.h
-+++ b/libjpeg/tcl/jpegtclDecls.h
-@@ -20,8 +20,8 @@
- #undef EXTERN
- 
- #include "jpegtclDeclsMask.h"
--#include </usr/include/jpeglib.h>
--#include </usr/include/jerror.h>
-+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jpeglib.h>
-+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jerror.h>
- #include "jpegtclDeclsUnmask.h"
- 
- /*
-diff --git a/libpng/tcl/pngtclDecls.h b/libpng/tcl/pngtclDecls.h
-index a50bbc3..06ed339 100644
---- a/libpng/tcl/pngtclDecls.h
-+++ b/libpng/tcl/pngtclDecls.h
-@@ -16,7 +16,7 @@
- 
- #include <tcl.h>
- #include <pngtclDeclsMask.h>
--#include </usr/include/libpng12/png.h>
-+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/libpng12/png.h>
- #include <pngtclDeclsUnmask.h>
- 
- /* !BEGIN!: Do not edit below this line. */
-diff --git a/libtiff/tcl/tifftclDecls.h b/libtiff/tcl/tifftclDecls.h
-index 0e85387..a158604 100644
---- a/libtiff/tcl/tifftclDecls.h
-+++ b/libtiff/tcl/tifftclDecls.h
-@@ -25,8 +25,8 @@
- 
- #include <tifftclDeclsMask.h>
- #include "../libtiff/tiffiop.h"
--#include </usr/include/tiff.h>
--#include </usr/include/tiffio.h>
-+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h>
-+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h>
- #include "../libtiff/tiffiop.h"
- #include "../libtiff/tif_predict.h"
- #include <tifftclDeclsUnmask.h>
-diff --git a/libz/tcl/zlibtclDecls.h b/libz/tcl/zlibtclDecls.h
-index 73171b1..81a5613 100644
---- a/libz/tcl/zlibtclDecls.h
-+++ b/libz/tcl/zlibtclDecls.h
-@@ -17,7 +17,7 @@
- 
- #include <tcl.h>
- #include <zlibtclDeclsMask.h>
--#include </usr/include/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/files/tkimg-1.3.20081202-systemlibs.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch
deleted file mode 100644
index 183ce94fb442..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-diff -Nur tkimg-1.3.20081202.orig/libjpeg/tcl/jpegtclDecls.h tkimg-1.3.20081202/libjpeg/tcl/jpegtclDecls.h
---- tkimg-1.3.20081202.orig/libjpeg/tcl/jpegtclDecls.h	2008-10-22 11:55:37.933226000 +0100
-+++ tkimg-1.3.20081202/libjpeg/tcl/jpegtclDecls.h	2008-12-02 19:54:15.180187733 +0000
-@@ -19,10 +19,10 @@
- /* undef Tcl macros that conflict with libjpeg stuff (sigh) */
- #undef EXTERN
- 
--#include <jpegtclDeclsMask.h>
--#include <../jpeglib.h>
--#include <../jerror.h>
--#include <jpegtclDeclsUnmask.h>
-+#include "jpegtclDeclsMask.h"
-+#include </usr/include/jpeglib.h>
-+#include </usr/include/jerror.h>
-+#include "jpegtclDeclsUnmask.h"
- 
- /*
-  * And recreate the definition of "tcl.h", we need it below.
-diff -Nur tkimg-1.3.20081202.orig/libjpeg/tcl/Makefile.in tkimg-1.3.20081202/libjpeg/tcl/Makefile.in
---- tkimg-1.3.20081202.orig/libjpeg/tcl/Makefile.in	2008-10-23 17:09:37.830043000 +0100
-+++ tkimg-1.3.20081202/libjpeg/tcl/Makefile.in	2008-12-02 19:54:15.180187733 +0000
-@@ -33,8 +33,8 @@
- # $(srcdir) or in the generic, win or unix subdirectory.
- #========================================================================
- 
--PKG_SOURCES	= @PKG_SOURCES@
--PKG_OBJECTS	= @PKG_OBJECTS@
-+PKG_SOURCES	= jpegtcl.c jpegtclStubInit.c
-+PKG_OBJECTS	= jpegtcl.o jpegtclStubInit.o
- 
- PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
- PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
-@@ -106,7 +106,7 @@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
- SHLIB_LD	= @SHLIB_LD@
--SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ljpeg
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/Makefile.in tkimg-1.3.20081202/libpng/tcl/Makefile.in
---- tkimg-1.3.20081202.orig/libpng/tcl/Makefile.in	2008-10-23 17:09:37.830043000 +0100
-+++ tkimg-1.3.20081202/libpng/tcl/Makefile.in	2008-12-02 19:54:19.759763931 +0000
-@@ -37,8 +37,8 @@
- # $(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@
-@@ -110,7 +110,7 @@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
- SHLIB_LD	= @SHLIB_LD@
--SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lpng12
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/pngtclDecls.h tkimg-1.3.20081202/libpng/tcl/pngtclDecls.h
---- tkimg-1.3.20081202.orig/libpng/tcl/pngtclDecls.h	2008-10-22 11:55:37.933226000 +0100
-+++ tkimg-1.3.20081202/libpng/tcl/pngtclDecls.h	2008-12-02 19:54:19.763764769 +0000
-@@ -16,7 +16,7 @@
- 
- #include <tcl.h>
- #include <pngtclDeclsMask.h>
--#include <../png.h>
-+#include </usr/include/libpng12/png.h>
- #include <pngtclDeclsUnmask.h>
- 
- /* !BEGIN!: Do not edit below this line. */
-@@ -221,15 +221,15 @@
- 				png_infopp info_ptr_ptr,
- 				png_infopp end_info_ptr_ptr));
- /* 62 */
--EXTERN void		png_read_destroy _ANSI_ARGS_((png_structp png_ptr,
--				png_infop info_ptr, png_infop end_info_ptr));
-+/*EXTERN void		png_read_destroy _ANSI_ARGS_((png_structp png_ptr,
-+				png_infop info_ptr, png_infop end_info_ptr));*/
- /* 63 */
- EXTERN void		png_destroy_write_struct _ANSI_ARGS_((
- 				png_structpp png_ptr_ptr,
- 				png_infopp info_ptr_ptr));
- /* Slot 64 is reserved */
- /* 65 */
--EXTERN void		png_write_destroy _ANSI_ARGS_((png_structp png_ptr));
-+/*EXTERN void		png_write_destroy _ANSI_ARGS_((png_structp png_ptr));*/
- /* 66 */
- EXTERN void		png_set_crc_action _ANSI_ARGS_((png_structp png_ptr,
- 				int crit_action, int ancil_action));
-@@ -1171,10 +1171,10 @@
-     void (*png_read_end) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr)); /* 59 */
-     void (*png_destroy_info_struct) _ANSI_ARGS_((png_structp png_ptr, png_infopp info_ptr_ptr)); /* 60 */
-     void (*png_destroy_read_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr)); /* 61 */
--    void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); /* 62 */
-+/*    void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); */ /* 62 */
-     void (*png_destroy_write_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)); /* 63 */
-     void *reserved64;
--    void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); /* 65 */
-+/*    void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); */ /* 65 */
-     void (*png_set_crc_action) _ANSI_ARGS_((png_structp png_ptr, int crit_action, int ancil_action)); /* 66 */
-     void (*png_set_filter) _ANSI_ARGS_((png_structp png_ptr, int method, int filters)); /* 67 */
-     void (*png_set_filter_heuristics) _ANSI_ARGS_((png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs)); /* 68 */
-diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/pngtclStubInit.c tkimg-1.3.20081202/libpng/tcl/pngtclStubInit.c
---- tkimg-1.3.20081202.orig/libpng/tcl/pngtclStubInit.c	2008-10-22 13:06:38.458408000 +0100
-+++ tkimg-1.3.20081202/libpng/tcl/pngtclStubInit.c	2008-12-02 19:54:19.763764769 +0000
-@@ -205,10 +205,10 @@
-     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 -Nur tkimg-1.3.20081202.orig/libtiff/tcl/Makefile.in tkimg-1.3.20081202/libtiff/tcl/Makefile.in
---- tkimg-1.3.20081202.orig/libtiff/tcl/Makefile.in	2008-10-23 17:09:37.830043000 +0100
-+++ tkimg-1.3.20081202/libtiff/tcl/Makefile.in	2008-12-02 19:54:28.771023604 +0000
-@@ -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@
-@@ -108,7 +108,7 @@
- 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 -Nur tkimg-1.3.20081202.orig/libtiff/tcl/tifftclDecls.h tkimg-1.3.20081202/libtiff/tcl/tifftclDecls.h
---- tkimg-1.3.20081202.orig/libtiff/tcl/tifftclDecls.h	2008-10-22 11:55:37.933226000 +0100
-+++ tkimg-1.3.20081202/libtiff/tcl/tifftclDecls.h	2008-12-02 19:54:28.775023325 +0000
-@@ -24,9 +24,11 @@
- #undef INLINE
- 
- #include <tifftclDeclsMask.h>
--#include <../libtiff/tiffio.h>
--#include <../libtiff/tiffiop.h>
--#include <../libtiff/tif_predict.h>
-+#include "../libtiff/tiffiop.h"
-+#include </usr/include/tiff.h>
-+#include </usr/include/tiffio.h>
-+#include "../libtiff/tiffiop.h"
-+#include "../libtiff/tif_predict.h"
- #include <tifftclDeclsUnmask.h>
- 
- /* !BEGIN!: Do not edit below this line. */
-diff -Nur tkimg-1.3.20081202.orig/libz/tcl/configure.in tkimg-1.3.20081202/libz/tcl/configure.in
---- tkimg-1.3.20081202.orig/libz/tcl/configure.in	2007-10-13 00:39:51.771426000 +0100
-+++ tkimg-1.3.20081202/libz/tcl/configure.in	2008-12-02 19:54:25.307377006 +0000
-@@ -47,16 +47,12 @@
- #-----------------------------------------------------------------------
- 
- TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
--TEA_ADD_SOURCES([../adler32.c	../compress.c	../crc32.c])
--TEA_ADD_SOURCES([../deflate.c	../gzio.c	../infback.c])
--TEA_ADD_SOURCES([../inffast.c	../inflate.c	../inftrees.c])
--TEA_ADD_SOURCES([../trees.c	../uncompr.c	../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 -Nur tkimg-1.3.20081202.orig/libz/tcl/Makefile.in tkimg-1.3.20081202/libz/tcl/Makefile.in
---- tkimg-1.3.20081202.orig/libz/tcl/Makefile.in	2008-10-23 17:09:37.830043000 +0100
-+++ tkimg-1.3.20081202/libz/tcl/Makefile.in	2008-12-02 19:54:25.307377006 +0000
-@@ -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@
-@@ -106,7 +106,7 @@
- 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 -Nur tkimg-1.3.20081202.orig/libz/tcl/zlibtclDecls.h tkimg-1.3.20081202/libz/tcl/zlibtclDecls.h
---- tkimg-1.3.20081202.orig/libz/tcl/zlibtclDecls.h	2008-10-22 11:55:37.933226000 +0100
-+++ tkimg-1.3.20081202/libz/tcl/zlibtclDecls.h	2008-12-02 19:54:25.307377006 +0000
-@@ -17,7 +17,7 @@
- 
- #include <tcl.h>
- #include <zlibtclDeclsMask.h>
--#include <../zlib.h>
-+#include </usr/include/zlib.h>
- #include <zlibtclDeclsUnmask.h>
- 
- /* !BEGIN!: Do not edit below this line. */
diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-tests.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-tests.patch
deleted file mode 100644
index 3e5a1b412516..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Source: http://sourceforge.net/tracker/index.php?func=detail&aid=2669482&group_id=52039&atid=465492
-$OpenBSD$
---- Makefile.in.orig	Mon Feb 23 01:03:15 2009
-+++ Makefile.in	Thu Feb 26 10:53:51 2009
-@@ -103,12 +103,20 @@ all:
- test:	all
- 	for sub in $(SUBDIRS) ; \
- 	do	\
-+		test -d $(srcdir)/$$sub/tests || continue ; \
- 		here=`pwd` && \
- 		cd $$sub && \
--		$(MAKE) test || exit $$? && \
-+		$(MAKE) top_builddir=$$here test || exit $$? && \
- 		cd $$here ; \
- 	done
- 
-+install-man:
-+	mkdir -p $(MAN_INSTALL_DIR)/mann
-+	for i in $(srcdir)/doc/*.man ; \
-+	do	\
-+		dtplite -ext n -o $(MAN_INSTALL_DIR)/mann nroff $$i ; \
-+	done
-+
- collate: all
- 	rm -f pkgIndex.tcl
- 	touch pkgIndex.tcl
-@@ -133,7 +141,7 @@ collate: all
- 			$$p > $$p.1 && mv -f $$p.1 $$p ; \
- 	done
- 
--install: collate
-+install: collate install-man
- 	mkdir -p    $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)
- 	for p in Img/exec_prefix/lib/Img/* ; do \
- 		$(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)/`basename $$p` ; \