3 files changed, 9 insertions, 46 deletions
diff --git a/perl/perl-tk/patches/804.029-X11_XLIB_H.patch b/perl/perl-tk/patches/804.029-X11_XLIB_H.patch
deleted file mode 100644
index 7a43a7ade8..0000000000
--- a/perl/perl-tk/patches/804.029-X11_XLIB_H.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=345987
---- Tk-804.029/pTk/Xlib.h
-+++ Tk-804.029/pTk/Xlib.h
-@@ -1,6 +1,7 @@
- #ifndef _XLIB
- #define _XLIB
- #ifndef _XLIB_H_
-+#ifndef _X11_XLIB_H_
- extern XFontStruct *XLoadQueryFont  _ANSI_ARGS_((Display *, const char *));
- extern XModifierKeymap *XGetModifierMapping  _ANSI_ARGS_((Display *));
- extern XImage *XCreateImage  _ANSI_ARGS_((Display *, Visual *, unsigned int, int, int, char *, unsigned int, unsigned int, int, int));
-@@ -143,6 +144,7 @@
- extern Window XGetSelectionOwner _ANSI_ARGS_((Display *, Atom));
- extern int XRectInRegion _ANSI_ARGS_((Region,int,int,unsigned,unsigned));
- extern int XSubtractRegion _ANSI_ARGS_((Region, Region, Region));
-+#endif /* _X11_XLIB_H_ */
- #endif /* _XLIB_H_ */
- extern int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
- #endif /* _XLIB */
diff --git a/perl/perl-tk/patches/perl-tk-804.029.diff b/perl/perl-tk/patches/perl-tk-804.029.diff
deleted file mode 100644
index 0aab9659ed..0000000000
--- a/perl/perl-tk/patches/perl-tk-804.029.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru Tk-804.029.org//TextList/reindex.pl Tk-804.029/TextList/reindex.pl
---- Tk-804.029.org//TextList/reindex.pl	2007-02-10 05:54:45.000000000 -0300
-+++ Tk-804.029/TextList/reindex.pl	2010-08-05 13:53:36.447371174 -0300
-@@ -1,4 +1,4 @@
--#!/bin/perl
-+#!/usr/bin/perl
- 
- use lib qw(/home1/gbartels/textlist);
- use Tk;
-diff -ru Tk-804.029.org//pTk/Tcl-pTk Tk-804.029/pTk/Tcl-pTk
---- Tk-804.029.org//pTk/Tcl-pTk	2007-02-10 05:55:23.000000000 -0300
-+++ Tk-804.029/pTk/Tcl-pTk	2010-08-05 13:54:06.527369253 -0300
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- use open IO => ':bytes'; # Avoid UTF-8 issues with some perl5.8.0 (RedHat)
- use Carp;
- my $verbose = 0;
-diff -ru Tk-804.029.org//pTk/mkVFunc Tk-804.029/pTk/mkVFunc
---- Tk-804.029.org//pTk/mkVFunc	2008-11-04 20:06:50.000000000 -0200
-+++ Tk-804.029/pTk/mkVFunc	2010-08-05 13:54:20.074244152 -0300
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- use strict;
- 
- 
diff --git a/perl/perl-tk/patches/perl-tk-804.031.diff b/perl/perl-tk/patches/perl-tk-804.031.diff
new file mode 100644
index 0000000000..1e595c009a
--- /dev/null
+++ b/perl/perl-tk/patches/perl-tk-804.031.diff
@@ -0,0 +1,9 @@
+diff -ru Tk-804.031.org/TextList/reindex.pl Tk-804.031/TextList/reindex.pl
+--- Tk-804.031.org/TextList/reindex.pl	2007-02-10 05:54:45.000000000 -0300
++++ Tk-804.031/TextList/reindex.pl	2010-08-05 13:53:36.447371174 -0300
+@@ -1,4 +1,4 @@
+-#!/bin/perl
++#!/usr/bin/perl
+ 
+ use lib qw(/home1/gbartels/textlist);
+ use Tk;