Fix bug #200859 (anti-aliased fonts) and bug #238079 (mouse wheel problem). Add jpeg and png dependencies.

(Portage version: 2.2_rc23/cvs/Linux i686)

5 files changed, 105 insertions, 2 deletions

diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog
index c27d3fe498dc..6911ed0dfaa4 100644
--- a/dev-perl/perl-tk/ChangeLog
+++ b/dev-perl/perl-tk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-perl/perl-tk
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.43 2008/12/23 18:54:48 robbat2 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.44 2009/02/21 14:18:01 tove Exp $
+
+*perl-tk-804.028-r1 (21 Feb 2009)
+
+  21 Feb 2009; Torsten Veller <tove@gentoo.org> +files/804.028-FBox.patch,
+  +files/804.028-MouseWheel.patch, +files/804.028-path.patch,
+  +perl-tk-804.028-r1.ebuild:
+  Fix bug #200859 (anti-aliased fonts) and bug #238079 (mouse wheel
+  problem). Add jpeg and png dependencies.
 
 *perl-tk-804.028 (23 Dec 2008)
 
diff --git a/dev-perl/perl-tk/files/804.028-FBox.patch b/dev-perl/perl-tk/files/804.028-FBox.patch
new file mode 100644
index 000000000000..02b77aad281b
--- /dev/null
+++ b/dev-perl/perl-tk/files/804.028-FBox.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..6dabacb264f6
--- /dev/null
+++ b/dev-perl/perl-tk/files/804.028-MouseWheel.patch
@@ -0,0 +1,25 @@
+--- 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/804.028-path.patch b/dev-perl/perl-tk/files/804.028-path.patch
new file mode 100644
index 000000000000..8a3689c09a4f
--- /dev/null
+++ b/dev-perl/perl-tk/files/804.028-path.patch
@@ -0,0 +1,24 @@
+--- perl-tk-804.028/pTk/Tcl-pTk
++++ perl-tk-804.028/pTk/Tcl-pTk
+@@ -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;
+--- perl-tk-804.028.orig/pTk/mkVFunc
++++ perl-tk-804.028/pTk/mkVFunc
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use strict;
+ 
+ 
+--- perl-tk-804.028/TextList/reindex.pl
++++ perl-tk-804.028/TextList/reindex.pl
+@@ -1,4 +1,4 @@
+-#!/bin/perl
++#!/usr/bin/perl
+ 
+ use lib qw(/home1/gbartels/textlist);
+ use Tk;
diff --git a/dev-perl/perl-tk/perl-tk-804.028-r1.ebuild b/dev-perl/perl-tk/perl-tk-804.028-r1.ebuild
new file mode 100644
index 000000000000..1ad4b1fb285e
--- /dev/null
+++ b/dev-perl/perl-tk/perl-tk-804.028-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/02/21 14:18:01 tove Exp $
+
+MODULE_AUTHOR="SREZIC"
+MY_PN=Tk
+MY_P=${MY_PN}-${PV}
+inherit eutils multilib perl-module
+
+DESCRIPTION="A Perl Module for Tk"
+
+LICENSE="Artistic"
+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
+	media-libs/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 )
+
+myconf="X11ROOT=/usr XFT=1 -I/usr/include/ -l/usr/$(get_libdir)"
+mydoc="ToDo VERSIONS"