Cleanup

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

4 files changed, 5 insertions, 146 deletions

diff --git a/dev-perl/sdl-perl/ChangeLog b/dev-perl/sdl-perl/ChangeLog
index 57b134ff8362..028784643bcf 100644
--- a/dev-perl/sdl-perl/ChangeLog
+++ b/dev-perl/sdl-perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/sdl-perl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.53 2009/12/02 16:36:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.54 2009/12/07 08:42:07 tove Exp $
+
+  07 Dec 2009; Torsten Veller <tove@gentoo.org> -sdl-perl-2.1.3-r3.ebuild,
+  -files/sdl-perl-2.1.3-gfxPie.patch, -files/sdl-2.1.3.build.patch:
+  Cleanup
 
   02 Dec 2009; Raúl Porcel <armin76@gentoo.org> sdl-perl-2.2.2.7.ebuild:
   alpha/ia64/sparc stable wrt #291230
diff --git a/dev-perl/sdl-perl/files/sdl-2.1.3.build.patch b/dev-perl/sdl-perl/files/sdl-2.1.3.build.patch
deleted file mode 100644
index 5f20bebd1b04..000000000000
--- a/dev-perl/sdl-perl/files/sdl-2.1.3.build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naurp SDL_Perl-2.1.3/Build.PL SDL_Perl-2.1.3-new/Build.PL
---- SDL_Perl-2.1.3/Build.PL	2005-10-05 05:25:49.000000000 -0400
-+++ SDL_Perl-2.1.3-new/Build.PL	2006-05-25 19:00:23.000000000 -0400
-@@ -35,7 +35,7 @@ my %subsystems =
- 	SDL => {
- 		file      => {
- 			from  => 'src/SDL.xs',
--			to    => 'src/SDL_perl.xs',
-+			to    => './SDL_perl.xs',
- 		},
- 		libraries => [qw( SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx
- 		                  png jpeg smpeg )],
-@@ -43,14 +43,14 @@ my %subsystems =
- 	OpenGL => {
- 		file      => {
- 			from => 'src/OpenGL.xs',
--			to   => 'src/SDL/OpenGL.xs', 
-+			to   => 'SDL/OpenGL.xs', 
- 		},
- 		libraries => [qw( SDL GL GLU )],
- 	},
- 	SFont => {
- 		file	=> {
- 			from => 'src/SFont.xs',
--			to   =>	'src/SDL/SFont.xs',
-+			to   =>	'SDL/SFont.xs',
- 		},
- 		libraries => [qw( SDL SDL_image )],
- 	},	
-diff -Naurp SDL_Perl-2.1.3/src/OpenGL.xs SDL_Perl-2.1.3-new/src/OpenGL.xs
---- SDL_Perl-2.1.3/src/OpenGL.xs	2005-10-05 05:25:49.000000000 -0400
-+++ SDL_Perl-2.1.3-new/src/OpenGL.xs	2006-05-25 18:59:04.000000000 -0400
-@@ -23,7 +23,7 @@
- #define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFF
- #endif /* GL_ALL_CLIENT_BITS */  
- 
--#include "../defines.h"
-+#include "../src/defines.h"
- 
- SV* sdl_perl_nurbs_error_hook;
- void
-diff -Naurp SDL_Perl-2.1.3/src/SDL.xs SDL_Perl-2.1.3-new/src/SDL.xs
---- SDL_Perl-2.1.3/src/SDL.xs	2005-10-05 05:25:49.000000000 -0400
-+++ SDL_Perl-2.1.3-new/src/SDL.xs	2006-05-25 19:04:00.000000000 -0400
-@@ -69,7 +69,7 @@ static int sdl_perl_use_smpeg_audio = 0;
- #define HAVE_TLS_CONTEXT
- #endif
- 
--#include "defines.h"
-+#include "src/defines.h"
- 
- Uint32 
- sdl_perl_timer_callback ( Uint32 interval, void* param )
-diff -Naurp SDL_Perl-2.1.3/src/SFont.xs SDL_Perl-2.1.3-new/src/SFont.xs
---- SDL_Perl-2.1.3/src/SFont.xs	2005-10-05 05:25:49.000000000 -0400
-+++ SDL_Perl-2.1.3-new/src/SFont.xs	2006-05-25 18:59:04.000000000 -0400
-@@ -23,8 +23,8 @@
- #define HAVE_TLS_CONTEXT
- #endif
- 
--#include "../defines.h"
--#include "../SFont.h"
-+#include "../src/defines.h"
-+#include "../src/SFont.h"
- 
- #ifdef HAVE_SDL_IMAGE
- #include <SDL_image.h>
diff --git a/dev-perl/sdl-perl/files/sdl-perl-2.1.3-gfxPie.patch b/dev-perl/sdl-perl/files/sdl-perl-2.1.3-gfxPie.patch
deleted file mode 100644
index 461eccd9ed38..000000000000
--- a/dev-perl/sdl-perl/files/sdl-perl-2.1.3-gfxPie.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/SDL.xs~	2003-03-27 12:17:23.000000000 +0200
-+++ src/SDL.xs	2005-02-25 20:32:07.353170226 +0200
-@@ -71,6 +71,7 @@
- #include <SDL_gfxPrimitives.h>
- #include <SDL_framerate.h>
- #include <SDL_imageFilter.h>
-+#define PERL_SDL_GFXVERSION SDL_VERSIONNUM(SDL_GFXPRIMITIVES_MAJOR,SDL_GFXPRIMITIVES_MINOR,SDL_GFXPRIMITIVES_MICRO)
- #endif
- 
- #ifdef USE_THREADS
-@@ -3742,7 +3743,11 @@
-     Sint16 end;
-     Uint32 color;
- CODE:
-+#if PERL_SDL_GFXVERSION >= 2012
-+     RETVAL = filledPieColor( dst, x, y, rad, start, end, color );
-+#else
-      RETVAL = filledpieColor( dst, x, y, rad, start, end, color );
-+#endif
- OUTPUT:
-      RETVAL
- 
-@@ -3759,7 +3764,11 @@
-     Uint8 b;
-     Uint8 a;
- CODE:
-+#if PERL_SDL_GFXVERSION >= 2012
-+     RETVAL = filledPieRGBA( dst, x, y, rad, start, end, r, g, b, a );
-+#else
-      RETVAL = filledpieRGBA( dst, x, y, rad, start, end, r, g, b, a );
-+#endif
- OUTPUT:
-      RETVAL
diff --git a/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild b/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild
deleted file mode 100644
index e1cac5d56ad4..000000000000
--- a/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild,v 1.10 2008/11/18 15:51:42 tove Exp $
-
-MODULE_AUTHOR=DGOEHRIG
-MY_P=SDL_Perl-${PV}
-inherit perl-module eutils
-
-DESCRIPTION="SDL binding for perl"
-HOMEPAGE="http://sdl.perl.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="truetype mpeg"
-
-# Only enable this if you are confirming a bug in this module. The testsrequire
-# access to your /dev/{snd,sound} devices.
-#SRC_TEST="do"
-
-RDEPEND="virtual/opengl
-	>=media-libs/libsdl-1.2.6
-	>=media-libs/sdl-mixer-1.2.5
-	>=media-libs/sdl-image-1.2.2
-	>=media-libs/sdl-gfx-2.0.3
-	>=media-libs/sdl-net-1.2.4
-	mpeg? ( media-libs/smpeg )
-	truetype? ( >=media-libs/sdl-ttf-2.0.5 )
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-CBuilder
-	>=virtual/perl-Module-Build-0.28"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}"/sdl-2.1.3.build.patch
-	"${FILESDIR}"/sdl-perl-2.1.3-gfxPie.patch )
-
-src_install() {
-	perl-module_src_install
-	# The build doesnt properly abort when there is an error
-	if [[ -z $(find "${D}" -name SDL.pm) ]] ; then
-		die "failed to install properly"
-	fi
-}