Cleanup

(Portage version: 2.2.0_alpha5/cvs/Linux x86_64)

5 files changed, 6 insertions, 91 deletions

diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog
index 74d7370385ad..409540a204f8 100644
--- a/dev-perl/perl-tk/ChangeLog
+++ b/dev-perl/perl-tk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/perl-tk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.78 2010/11/27 07:09:07 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.79 2010/11/27 07:23:49 tove Exp $
+
+  27 Nov 2010; Torsten Veller <tove@gentoo.org> -files/804.028-FBox.patch,
+  -files/804.028-MouseWheel.patch, -perl-tk-804.028-r2.ebuild,
+  -files/perl-tk-CVE-2008-0553.patch:
+  Cleanup
 
   27 Nov 2010; Torsten Veller <tove@gentoo.org>
   +files/804.029-X11_XLIB_H.patch, perl-tk-804.029.ebuild:
diff --git a/dev-perl/perl-tk/files/804.028-FBox.patch b/dev-perl/perl-tk/files/804.028-FBox.patch
deleted file mode 100644
index 02b77aad281b..000000000000
--- a/dev-perl/perl-tk/files/804.028-FBox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- perl-tk-804.028/Tk/FBox.pm
-+++ perl-tk-804.028/Tk/FBox.pm
-@@ -906,7 +906,7 @@
- 	if ($w->cget('-multiple')) {
- 	    $selectFilePath = [];
- 	    for my $f (@{ $w->{'selectFile'} }) {
--		push @$selectFilePath, JoinFile($w->_get_select_Path, $f);
-+		push @$selectFilePath, JoinFile($w->_get_select_path, $f);
- 	    }
- 	} else {
- 	    $selectFilePath = JoinFile($w->_get_select_path,
diff --git a/dev-perl/perl-tk/files/804.028-MouseWheel.patch b/dev-perl/perl-tk/files/804.028-MouseWheel.patch
deleted file mode 100644
index 6dabacb264f6..000000000000
--- a/dev-perl/perl-tk/files/804.028-MouseWheel.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- perl-tk-804.028/pTk/mTk/generic/tk.h
-+++ perl-tk-804.028/pTk/mTk/generic/tk.h
-@@ -677,17 +677,15 @@
-  *
-  *---------------------------------------------------------------------------
-  */
--#define VirtualEvent        (LASTEvent)
--#define ActivateNotify      (LASTEvent + 1)
--#define DeactivateNotify    (LASTEvent + 2)
--#define MouseWheelEvent     (LASTEvent + 3)
--#define TK_LASTEVENT        (LASTEvent + 4)
-+#define VirtualEvent        (MappingNotify + 1)
-+#define ActivateNotify      (MappingNotify + 2)
-+#define DeactivateNotify    (MappingNotify + 3)
-+#define MouseWheelEvent     (MappingNotify + 4)
-+#define TK_LASTEVENT        (MappingNotify + 5)
- 
- #define MouseWheelMask      (1L << 28)
--
- #define ActivateMask        (1L << 29)
- #define VirtualEventMask    (1L << 30)
--#define TK_LASTEVENT        (LASTEvent + 4)
- 
- 
- /*
diff --git a/dev-perl/perl-tk/files/perl-tk-CVE-2008-0553.patch b/dev-perl/perl-tk/files/perl-tk-CVE-2008-0553.patch
deleted file mode 100644
index e0436b803fec..000000000000
--- a/dev-perl/perl-tk/files/perl-tk-CVE-2008-0553.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch for bug 208464 as backported by the Pardus people.
-
---- pTk/mTk/generic/tkImgGIF.c.orig	2008-02-05 11:38:58.000000000 +0100
-+++ pTk/mTk/generic/tkImgGIF.c	2008-02-05 11:42:46.000000000 +0100
-@@ -831,6 +831,12 @@
- 		Tcl_PosixError(interp), (char *) NULL);
- 	return TCL_ERROR;
-     }
-+
-+    if (initialCodeSize > MAX_LWZ_BITS) {
-+	Tcl_SetResult(interp, "malformed image", TCL_STATIC);
-+	return TCL_ERROR;
-+    }
-+
-     if (transparent != -1) {
- 	cmap[transparent][CM_RED] = 0;
- 	cmap[transparent][CM_GREEN] = 0;
diff --git a/dev-perl/perl-tk/perl-tk-804.028-r2.ebuild b/dev-perl/perl-tk/perl-tk-804.028-r2.ebuild
deleted file mode 100644
index e1740ece5246..000000000000
--- a/dev-perl/perl-tk/perl-tk-804.028-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.028-r2.ebuild,v 1.12 2010/11/07 21:25:51 ssuominen Exp $
-
-MODULE_AUTHOR="SREZIC"
-MY_PN=Tk
-MY_P=${MY_PN}-${PV}
-inherit eutils multilib perl-module
-
-DESCRIPTION="A Perl Module for Tk"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXft
-	media-libs/freetype
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	dev-lang/perl"
-
-S=${WORKDIR}/${MY_P}
-
-# No test running here, requires an X server, and fails lots anyway.
-SRC_TEST="skip"
-
-PATCHES=( "${FILESDIR}"/xorg.patch
-	"${FILESDIR}"/${PV}-MouseWheel.patch
-	"${FILESDIR}"/${PV}-FBox.patch
-	"${FILESDIR}"/${PV}-path.patch
-	"${FILESDIR}"/${PN}-CVE-2008-0553.patch )
-
-myconf="X11ROOT=/usr XFT=1 -I/usr/include/ -l/usr/$(get_libdir)"
-mydoc="ToDo VERSIONS"
-
-MAKEOPTS+=" -j1" #333049