Had to update the patch. Really all fixed now

(Portage version: 2.1_rc2)

4 files changed, 95 insertions, 36 deletions

diff --git a/dev-perl/sdl-perl/ChangeLog b/dev-perl/sdl-perl/ChangeLog
index 2941cc7828a9..b67aeeac37be 100644
--- a/dev-perl/sdl-perl/ChangeLog
+++ b/dev-perl/sdl-perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/sdl-perl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.24 2006/05/24 22:28:34 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.25 2006/05/25 23:20:24 mcummings Exp $
+
+*sdl-perl-2.1.3-r2 (25 May 2006)
+
+  25 May 2006; <mcummings@gentoo.org> files/sdl-2.1.3.build.patch,
+  +sdl-perl-2.1.3-r2.ebuild:
+  Had to update the patch. Really all fixed now
 
 *sdl-perl-2.1.3-r1 (24 May 2006)
 
diff --git a/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r2 b/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r2
new file mode 100644
index 000000000000..8f50e1ed9e03
--- /dev/null
+++ b/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r2
@@ -0,0 +1,3 @@
+MD5 6ce26e1b710ce52def4ec22637cd5176 SDL_Perl-2.1.3.tar.gz 782794
+RMD160 26a4d317d9a5761fc893b732f2236eaad8d12b88 SDL_Perl-2.1.3.tar.gz 782794
+SHA256 055e4eee85089cf9f7305e68580082fabb624c28199840cf91838b673539b082 SDL_Perl-2.1.3.tar.gz 782794
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
index b77e5949b765..5f20bebd1b04 100644
--- a/dev-perl/sdl-perl/files/sdl-2.1.3.build.patch
+++ b/dev-perl/sdl-perl/files/sdl-2.1.3.build.patch
@@ -1,5 +1,35 @@
---- src/OpenGL.xs.orig	2006-05-24 16:33:05.000000000 -0400
-+++ src/OpenGL.xs	2006-05-24 16:33:40.000000000 -0400
+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 */  
@@ -9,19 +39,21 @@
  
  SV* sdl_perl_nurbs_error_hook;
  void
---- src/SDL.xs.orig	2006-05-24 16:33:10.000000000 -0400
-+++ src/SDL.xs	2006-05-24 16:33:59.000000000 -0400
+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"
++#include "src/defines.h"
  
  Uint32 
  sdl_perl_timer_callback ( Uint32 interval, void* param )
---- src/SFont.xs.orig	2006-05-24 16:33:17.000000000 -0400
-+++ src/SFont.xs	2006-05-24 16:36:40.000000000 -0400
+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
@@ -33,31 +65,3 @@
  
  #ifdef HAVE_SDL_IMAGE
  #include <SDL_image.h>
---- Build.PL.orig	2006-05-24 17:10:37.000000000 -0400
-+++ Build.PL	2006-05-24 17:09:25.000000000 -0400
-@@ -35,7 +35,7 @@ my %subsystems =
- 	SDL => {
- 		file      => {
- 			from  => 'src/SDL.xs',
--			to    => 'src/SDL_perl.xs',
-+			to    => 'SDL/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 --git a/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild b/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild
new file mode 100644
index 000000000000..9ce375fdce47
--- /dev/null
+++ b/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/05/25 23:20:24 mcummings Exp $
+
+inherit perl-module eutils
+
+DESCRIPTION="SDL binding for perl"
+HOMEPAGE="http://sdl.perl.org/"
+SRC_URI="http://search.cpan.org/CPAN/authors/id/D/DG/DGOEHRIG/SDL_Perl-${PV}.tar.gz"
+
+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"
+
+DEPEND="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
+	dev-perl/module-build
+	mpeg? ( media-libs/smpeg )
+	truetype? ( >=media-libs/sdl-ttf-2.0.5 )"
+
+S=${WORKDIR}/SDL_Perl-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if has_version '>=dev-perl/module-build-0.28' ; then
+		epatch ${FILESDIR}/sdl-2.1.3.build.patch
+	fi
+}
+
+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
+}