Had to update the patch. Really all fixed now

Package-Manager: portage-2.1_rc2

5 files changed, 120 insertions, 51 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/Manifest b/dev-perl/sdl-perl/Manifest
index e07824b3edcd..f95411052cd8 100644
--- a/dev-perl/sdl-perl/Manifest
+++ b/dev-perl/sdl-perl/Manifest
@@ -1,7 +1,10 @@
-AUX sdl-2.1.3.build.patch 1694 RMD160 70c0c72cb47683cbe2da9d3d1c8b28a1235eb4f4 SHA1 aad685bcb0dd8a55d14706bce4901bbf0c2a8178 SHA256 fef78fecc88a7c9f83327d253ef162ecc1cc8a13950ada3233b0a29ab71b1bdf
-MD5 2b0509cdf14b7803d599b0ba77905484 files/sdl-2.1.3.build.patch 1694
-RMD160 70c0c72cb47683cbe2da9d3d1c8b28a1235eb4f4 files/sdl-2.1.3.build.patch 1694
-SHA256 fef78fecc88a7c9f83327d253ef162ecc1cc8a13950ada3233b0a29ab71b1bdf files/sdl-2.1.3.build.patch 1694
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sdl-2.1.3.build.patch 2083 RMD160 815213a58ca0ad4b2f6458074c457ea7ad75648c SHA1 6d9a4535798eab2469527f81eb8bba0e171df9ef SHA256 24392f38c0a5dca45c9a8ddc9f0877e76e492c30d609ecc041e8c9136409d7d0
+MD5 29704004e730dd001d8ca1c18440c074 files/sdl-2.1.3.build.patch 2083
+RMD160 815213a58ca0ad4b2f6458074c457ea7ad75648c files/sdl-2.1.3.build.patch 2083
+SHA256 24392f38c0a5dca45c9a8ddc9f0877e76e492c30d609ecc041e8c9136409d7d0 files/sdl-2.1.3.build.patch 2083
 AUX sdl-perl-1.20.3-pie-typo.patch 578 RMD160 9a5c6588df1f91c7468a98276e280762d9e41f13 SHA1 227b82073ae6ed8fabce959a0c6eb8ae916c8f7d SHA256 0588e6171c66c26e9afb45144fbaa9c46e06ee94a7e264ee52b81dbb2655e775
 MD5 72ae0cc47c5672c970fa5aa9557fe555 files/sdl-perl-1.20.3-pie-typo.patch 578
 RMD160 9a5c6588df1f91c7468a98276e280762d9e41f13 files/sdl-perl-1.20.3-pie-typo.patch 578
@@ -21,18 +24,18 @@ EBUILD sdl-perl-2.1.2-r1.ebuild 1210 RMD160 76c535ec7def21a50572e8c3f88deb933adb
 MD5 097686a60897e207eb3e66515e19ee2d sdl-perl-2.1.2-r1.ebuild 1210
 RMD160 76c535ec7def21a50572e8c3f88deb933adb6d75 sdl-perl-2.1.2-r1.ebuild 1210
 SHA256 c997c716b5fcc2a4207c6f5d5b05fff3e4dc861ff58890ad270c2a5dd30c322a sdl-perl-2.1.2-r1.ebuild 1210
-EBUILD sdl-perl-2.1.3-r1.ebuild 1316 RMD160 62c92b250eb0681ff3ff80051e4a7b9f275fe084 SHA1 ad4a83ab0eb6edb4f26d78329bfaa8fc76997623 SHA256 52ce494560114b8950750c9855fe4a6e720b3862de52638ae4633f42469f670a
-MD5 7b995e2c5875d55f31be1ddb99f4affb sdl-perl-2.1.3-r1.ebuild 1316
-RMD160 62c92b250eb0681ff3ff80051e4a7b9f275fe084 sdl-perl-2.1.3-r1.ebuild 1316
-SHA256 52ce494560114b8950750c9855fe4a6e720b3862de52638ae4633f42469f670a sdl-perl-2.1.3-r1.ebuild 1316
+EBUILD sdl-perl-2.1.3-r2.ebuild 1268 RMD160 7937f811b061671310e56cbf6f2d1fb6d91db246 SHA1 c65486ff56bb0fd37157f300284167382a773258 SHA256 146c5e65752e70a36d3411ee7459e0625cf1cc992a2b6dc7399833d1cde71023
+MD5 f5a9a890c57c6314bce7f01575ac783f sdl-perl-2.1.3-r2.ebuild 1268
+RMD160 7937f811b061671310e56cbf6f2d1fb6d91db246 sdl-perl-2.1.3-r2.ebuild 1268
+SHA256 146c5e65752e70a36d3411ee7459e0625cf1cc992a2b6dc7399833d1cde71023 sdl-perl-2.1.3-r2.ebuild 1268
 EBUILD sdl-perl-2.1.3.ebuild 1123 RMD160 81e8c36e0a358139fc366f33ca90cda66a78a4d2 SHA1 bf9fa1076edfd35eb6198a9e15c554e6c972f715 SHA256 e5f339b03e8aac9b0d6ba9da274387c96d2df0bc7a91a00c1f202e38cbfd11d3
 MD5 8e3fb029633ea55fe42435fde53d8d83 sdl-perl-2.1.3.ebuild 1123
 RMD160 81e8c36e0a358139fc366f33ca90cda66a78a4d2 sdl-perl-2.1.3.ebuild 1123
 SHA256 e5f339b03e8aac9b0d6ba9da274387c96d2df0bc7a91a00c1f202e38cbfd11d3 sdl-perl-2.1.3.ebuild 1123
-MISC ChangeLog 6041 RMD160 2aae820b8060138d8926d7c409ca82bfdc7e9e2a SHA1 e7fc418c69bf851c56987dbc75deca8c4a909ba0 SHA256 4ccbb4fa044d410cb542dad53da4fde2f021af8a1e85e8808e262162e7753fbc
-MD5 21c0298f38ad4daccc9fafa1d4fa73ca ChangeLog 6041
-RMD160 2aae820b8060138d8926d7c409ca82bfdc7e9e2a ChangeLog 6041
-SHA256 4ccbb4fa044d410cb542dad53da4fde2f021af8a1e85e8808e262162e7753fbc ChangeLog 6041
+MISC ChangeLog 6220 RMD160 e95ea55db74bfe54c677f6b0e3d4943114c983d1 SHA1 976a7f7680f82ae77fd1cddaf523ee98f48c7ab8 SHA256 c02c3e47ada9aac099d5ff224065ebe9f43c93df86504e768c944ce4f453fea1
+MD5 892d8b2f62d7f3d0b7bc562eb34fbc7f ChangeLog 6220
+RMD160 e95ea55db74bfe54c677f6b0e3d4943114c983d1 ChangeLog 6220
+SHA256 c02c3e47ada9aac099d5ff224065ebe9f43c93df86504e768c944ce4f453fea1 ChangeLog 6220
 MISC metadata.xml 176 RMD160 6d22ba5c38a8537a03e3632242e221e39c83ca8f SHA1 89ea0fe2e9fb563246d0a32623df8163c26161d2 SHA256 9e404811e052c7911d6e0b81d5831bdd93ed36fd5b2d85dc0d22e21f34804a27
 MD5 709cd2696c593abb0a2090e0640315f6 metadata.xml 176
 RMD160 6d22ba5c38a8537a03e3632242e221e39c83ca8f metadata.xml 176
@@ -46,6 +49,13 @@ SHA256 013f00cacbfb7a38011a49f0eaa93ce69f8847c21a64dab111b5f6ff5d3a8240 files/di
 MD5 48418818e59b5d0fe162fb48c734cf6a files/digest-sdl-perl-2.1.3 244
 RMD160 45eb8bd6f340217df82896dbbc9410123ed8822e files/digest-sdl-perl-2.1.3 244
 SHA256 2ec0b1d2c1e894d9131d9fddd86d35ac043c193ee9fa84209d14027cc31d0913 files/digest-sdl-perl-2.1.3 244
-MD5 48418818e59b5d0fe162fb48c734cf6a files/digest-sdl-perl-2.1.3-r1 244
-RMD160 45eb8bd6f340217df82896dbbc9410123ed8822e files/digest-sdl-perl-2.1.3-r1 244
-SHA256 2ec0b1d2c1e894d9131d9fddd86d35ac043c193ee9fa84209d14027cc31d0913 files/digest-sdl-perl-2.1.3-r1 244
+MD5 48418818e59b5d0fe162fb48c734cf6a files/digest-sdl-perl-2.1.3-r2 244
+RMD160 45eb8bd6f340217df82896dbbc9410123ed8822e files/digest-sdl-perl-2.1.3-r2 244
+SHA256 2ec0b1d2c1e894d9131d9fddd86d35ac043c193ee9fa84209d14027cc31d0913 files/digest-sdl-perl-2.1.3-r2 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEdjvBtG5z4I8BtQoRAkxkAKCIV18qC91Qbnhq4dJtkfIvCIssUQCdG1w4
+T6dtlX3WQ/NPRH4HywXkMt0=
+=kEkD
+-----END PGP SIGNATURE-----
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
+}