Bug 95051, patch from Mark

Package-Manager: portage-2.1.2_rc1-r7

6 files changed, 127 insertions, 10 deletions

diff --git a/dev-perl/sdl-perl/ChangeLog b/dev-perl/sdl-perl/ChangeLog
index 930be64524f9..d067262d7a72 100644
--- a/dev-perl/sdl-perl/ChangeLog
+++ b/dev-perl/sdl-perl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.36 2006/10/20 20:27:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.37 2006/11/18 16:05:07 mcummings Exp $
+
+*sdl-perl-2.1.3-r3 (18 Nov 2006)
+
+  18 Nov 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/sdl-perl-2.1.3-gfxPie.patch, sdl-perl-2.1.3-r2.ebuild,
+  +sdl-perl-2.1.3-r3.ebuild:
+  Bug 95051, patch from Mark
 
   20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   sdl-perl-2.1.3-r2.ebuild:
diff --git a/dev-perl/sdl-perl/Manifest b/dev-perl/sdl-perl/Manifest
index 2e0a058a27a8..99b1d8f4fffb 100644
--- a/dev-perl/sdl-perl/Manifest
+++ b/dev-perl/sdl-perl/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -6,20 +9,28 @@ AUX sdl-perl-1.20.3-pie-typo.patch 578 RMD160 9a5c6588df1f91c7468a98276e280762d9
 MD5 72ae0cc47c5672c970fa5aa9557fe555 files/sdl-perl-1.20.3-pie-typo.patch 578
 RMD160 9a5c6588df1f91c7468a98276e280762d9e41f13 files/sdl-perl-1.20.3-pie-typo.patch 578
 SHA256 0588e6171c66c26e9afb45144fbaa9c46e06ee94a7e264ee52b81dbb2655e775 files/sdl-perl-1.20.3-pie-typo.patch 578
+AUX sdl-perl-2.1.3-gfxPie.patch 904 RMD160 830397ac2812496d2918ba7c0cbd342cb9ac6b04 SHA1 80cb7ddb31c4cf455d74c15655c11fe16a94a1b9 SHA256 8fb866ebc5f2e6e8daabaa77c3ab1d36afea920f95cdf29ab103e9036ff93dea
+MD5 5542ca6e0cc12e2663efca7e76839106 files/sdl-perl-2.1.3-gfxPie.patch 904
+RMD160 830397ac2812496d2918ba7c0cbd342cb9ac6b04 files/sdl-perl-2.1.3-gfxPie.patch 904
+SHA256 8fb866ebc5f2e6e8daabaa77c3ab1d36afea920f95cdf29ab103e9036ff93dea files/sdl-perl-2.1.3-gfxPie.patch 904
 DIST SDL_Perl-2.1.3.tar.gz 782794 RMD160 26a4d317d9a5761fc893b732f2236eaad8d12b88 SHA1 9c11cd7e4356f9b254cd9e3a2f993b1751a21552 SHA256 055e4eee85089cf9f7305e68580082fabb624c28199840cf91838b673539b082
 DIST SDL_perl-1.20.3.tar.gz 798385 RMD160 0378f87295e7ae8525773a5e28e6a33f5a22c5e6 SHA1 a818b98ecbe4273cbb2295e306a50418b5a2f766 SHA256 ac6f511404457592b88fd57c4c77f7feba8e3b55d62c3c45c117fe84f1e07a7d
 EBUILD sdl-perl-1.20.3-r1.ebuild 791 RMD160 132cd51be32952e5e2056fd51b85602bf617966b SHA1 5e23976c4f69bd210c329b2fc7b81302cb460548 SHA256 25efc4c1a34747355c9d84899540b3d975bee56102cf80630f87589922a6b071
 MD5 067bda6d934ce992588823491cb371be sdl-perl-1.20.3-r1.ebuild 791
 RMD160 132cd51be32952e5e2056fd51b85602bf617966b sdl-perl-1.20.3-r1.ebuild 791
 SHA256 25efc4c1a34747355c9d84899540b3d975bee56102cf80630f87589922a6b071 sdl-perl-1.20.3-r1.ebuild 791
-EBUILD sdl-perl-2.1.3-r2.ebuild 1331 RMD160 78cc6e95273d3d14d1c2ab99267e6de8c4bbb6d5 SHA1 b2754f693b8aabeeef7e58ea9a6c4b98b919bb5a SHA256 4cb4c1eb0541c2031db23ef8bffb3fc3e45b38f4e3ea7068fe5fbc81d0aa88e9
-MD5 bcb2f6a5e05498922faa8b9e5b863a3f sdl-perl-2.1.3-r2.ebuild 1331
-RMD160 78cc6e95273d3d14d1c2ab99267e6de8c4bbb6d5 sdl-perl-2.1.3-r2.ebuild 1331
-SHA256 4cb4c1eb0541c2031db23ef8bffb3fc3e45b38f4e3ea7068fe5fbc81d0aa88e9 sdl-perl-2.1.3-r2.ebuild 1331
-MISC ChangeLog 7727 RMD160 406cc80af1bab443867e37782ca1aa789d527e1f SHA1 7ac9f74517e04a927ae0cde1d3f8bf80848375b0 SHA256 ee581d21c75b42a607b6856ef687661645b51548550f16a7e5d5bdfbe3e78db3
-MD5 904849e5442a7dba8f615983272394e9 ChangeLog 7727
-RMD160 406cc80af1bab443867e37782ca1aa789d527e1f ChangeLog 7727
-SHA256 ee581d21c75b42a607b6856ef687661645b51548550f16a7e5d5bdfbe3e78db3 ChangeLog 7727
+EBUILD sdl-perl-2.1.3-r2.ebuild 1382 RMD160 24d6ca78020c9269f6a190422769d6e9f8e64447 SHA1 982b2b8ec42624fbc3047aa820c13262ea99b336 SHA256 7800e2f51a74b245b398ef60781274a67b8c9546741e018cabb6e5a67454bb6c
+MD5 7cc194f8b2db5b11d28af4f974e68e2a sdl-perl-2.1.3-r2.ebuild 1382
+RMD160 24d6ca78020c9269f6a190422769d6e9f8e64447 sdl-perl-2.1.3-r2.ebuild 1382
+SHA256 7800e2f51a74b245b398ef60781274a67b8c9546741e018cabb6e5a67454bb6c sdl-perl-2.1.3-r2.ebuild 1382
+EBUILD sdl-perl-2.1.3-r3.ebuild 1388 RMD160 4f424b508fd616e9a98e86068f17f827108af9cd SHA1 6531f5f4f7a3bdc72bc15dbc70dd33bac279aee7 SHA256 9ec5a2a2b7dc11b6f452a48eb909ce1c9b3356d4a2da31d78ed94ae5ec4a524a
+MD5 4a96ebad7634426ab16b35392c384ed0 sdl-perl-2.1.3-r3.ebuild 1388
+RMD160 4f424b508fd616e9a98e86068f17f827108af9cd sdl-perl-2.1.3-r3.ebuild 1388
+SHA256 9ec5a2a2b7dc11b6f452a48eb909ce1c9b3356d4a2da31d78ed94ae5ec4a524a sdl-perl-2.1.3-r3.ebuild 1388
+MISC ChangeLog 7942 RMD160 c7db31d7ad2cd45b6e2404f0bba6ae061a223166 SHA1 ff6342d74a721be4f4350ac104449b64891fcd4e SHA256 e17138069c4ac78936a85b35f0bb7a76b330b2e8c5a496d088ac6f9414fd8a4a
+MD5 e4fc5d50afb56912e39b85ece24e41bf ChangeLog 7942
+RMD160 c7db31d7ad2cd45b6e2404f0bba6ae061a223166 ChangeLog 7942
+SHA256 e17138069c4ac78936a85b35f0bb7a76b330b2e8c5a496d088ac6f9414fd8a4a ChangeLog 7942
 MISC metadata.xml 176 RMD160 6d22ba5c38a8537a03e3632242e221e39c83ca8f SHA1 89ea0fe2e9fb563246d0a32623df8163c26161d2 SHA256 9e404811e052c7911d6e0b81d5831bdd93ed36fd5b2d85dc0d22e21f34804a27
 MD5 709cd2696c593abb0a2090e0640315f6 metadata.xml 176
 RMD160 6d22ba5c38a8537a03e3632242e221e39c83ca8f metadata.xml 176
@@ -30,3 +41,13 @@ SHA256 0696c4bae24f376cdd9229483d977dd1304f10ac1573372cc49344e933907aeb files/di
 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
+MD5 48418818e59b5d0fe162fb48c734cf6a files/digest-sdl-perl-2.1.3-r3 244
+RMD160 45eb8bd6f340217df82896dbbc9410123ed8822e files/digest-sdl-perl-2.1.3-r3 244
+SHA256 2ec0b1d2c1e894d9131d9fddd86d35ac043c193ee9fa84209d14027cc31d0913 files/digest-sdl-perl-2.1.3-r3 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFXy87tG5z4I8BtQoRApMuAJ9v60InFGvZz1DEMU5sgU0I8oYtZwCfexAD
+M1gqlBN6PJsnTS3GeJShjaU=
+=xNdh
+-----END PGP SIGNATURE-----
diff --git a/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r3 b/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r3
new file mode 100644
index 000000000000..8f50e1ed9e03
--- /dev/null
+++ b/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r3
@@ -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-perl-2.1.3-gfxPie.patch b/dev-perl/sdl-perl/files/sdl-perl-2.1.3-gfxPie.patch
new file mode 100644
index 000000000000..461eccd9ed38
--- /dev/null
+++ b/dev-perl/sdl-perl/files/sdl-perl-2.1.3-gfxPie.patch
@@ -0,0 +1,33 @@
+--- 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-r2.ebuild b/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild
index 46851677673a..3f20c0e97b44 100644
--- a/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild
+++ b/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2006/10/20 20:27:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild,v 1.13 2006/11/18 16:05:07 mcummings Exp $
 
 inherit perl-module eutils
 
@@ -38,6 +38,7 @@ src_unpack() {
 	if has_version '>=dev-perl/module-build-0.28' ; then
 		epatch ${FILESDIR}/sdl-2.1.3.build.patch
 	fi
+	epatch ${FILESDIR}/sdl-perl-2.1.3-gfxPie.patch
 }
 
 src_install() {
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
new file mode 100644
index 000000000000..5c0ad95cca08
--- /dev/null
+++ b/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild
@@ -0,0 +1,52 @@
+# 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-r3.ebuild,v 1.1 2006/11/18 16:05:07 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-0.28
+	dev-perl/ExtUtils-CBuilder
+	mpeg? ( media-libs/smpeg )
+	truetype? ( >=media-libs/sdl-ttf-2.0.5 )
+	dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+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
+	epatch ${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
+}
+
+