Fixed #96694

Package-Manager: portage-2.1.1_rc1

4 files changed, 37 insertions, 21 deletions

diff --git a/dev-ruby/ruby-sdl/ChangeLog b/dev-ruby/ruby-sdl/ChangeLog
index 4c2df1dcbf56..b4f70b901635 100644
--- a/dev-ruby/ruby-sdl/ChangeLog
+++ b/dev-ruby/ruby-sdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-sdl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-sdl/ChangeLog,v 1.11 2006/07/12 13:56:34 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-sdl/ChangeLog,v 1.12 2006/09/02 02:51:22 pclouds Exp $
+
+  02 Sep 2006; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
+  +files/ruby-sdl-1.1.0-sdl-mixer.patch, ruby-sdl-1.1.0.ebuild:
+  Fixed #96694
 
   12 Jul 2006; Danny van Dyk <kugelfang@gentoo.org>
   ruby-sdl-1.0.0-r1.ebuild:
diff --git a/dev-ruby/ruby-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
index 290ee13d8711..a7af3f768712 100644
--- a/dev-ruby/ruby-sdl/Manifest
+++ b/dev-ruby/ruby-sdl/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ruby-sdl-1.1.0-sdl-mixer.patch 284 RMD160 bc4422589a1ea672a6faa693b7388eb216dfb4ee SHA1 31cf65e2dec4f465d920dcc16c7074f8f827cd83 SHA256 d5e320617888e2fbdb8683be04631c8c3a1cddab79cc0991979c072ce811c04a
+MD5 56794da438cf48cfc5c65253916de3d6 files/ruby-sdl-1.1.0-sdl-mixer.patch 284
+RMD160 bc4422589a1ea672a6faa693b7388eb216dfb4ee files/ruby-sdl-1.1.0-sdl-mixer.patch 284
+SHA256 d5e320617888e2fbdb8683be04631c8c3a1cddab79cc0991979c072ce811c04a files/ruby-sdl-1.1.0-sdl-mixer.patch 284
 DIST rubysdl-0.9.1.tar.gz 82054
 DIST rubysdl-0.9.5.tar.gz 96942
 DIST rubysdl-1.0.0.tar.gz 97431 RMD160 5b328df23c32c519d4c03095b41df6cd0cbba9dc SHA256 7bc2d6573534948c9638e0737a2d0c8d1ca79d59d008dce860563073e4013bea
-DIST rubysdl-1.1.0.tar.gz 246530 RMD160 950b029fd86bc8b3e1b65b86500ae06614dc5df0 SHA256 308ef8d14c8395391e68491e87aaa1283292680e9032794543b9f6083019fc30
+DIST rubysdl-1.1.0.tar.gz 246530 RMD160 950b029fd86bc8b3e1b65b86500ae06614dc5df0 SHA1 e8f32804dd065442d0eddea95b24ad33f35e1a45 SHA256 308ef8d14c8395391e68491e87aaa1283292680e9032794543b9f6083019fc30
 EBUILD ruby-sdl-0.9.1.ebuild 1985 RMD160 ff29a36a5bfbf0340c3f896497c372ea4f476b3b SHA1 acba5a5fe27ee4b5e820c0bd4058bf3dcd73b5db SHA256 553846af92f2097f0035efbab71bd3d8b214a89c4fc537b7c0ec4e84e35aad9c
 MD5 7bf0f9d9372798a3d8bec08bf158a11b ruby-sdl-0.9.1.ebuild 1985
 RMD160 ff29a36a5bfbf0340c3f896497c372ea4f476b3b ruby-sdl-0.9.1.ebuild 1985
@@ -21,14 +22,14 @@ EBUILD ruby-sdl-1.0.0.ebuild 2013 RMD160 1d5be690c80d56c44becdabc6210f32b14f48c1
 MD5 320ee0aedad2213366b558a186807b29 ruby-sdl-1.0.0.ebuild 2013
 RMD160 1d5be690c80d56c44becdabc6210f32b14f48c1e ruby-sdl-1.0.0.ebuild 2013
 SHA256 b6eb6c95f1dc4bdd188624f99a8400337284e86f432651b2fcca4f469feeeda9 ruby-sdl-1.0.0.ebuild 2013
-EBUILD ruby-sdl-1.1.0.ebuild 2010 RMD160 f289059ad4d1d655328799d078d306f95243d36e SHA1 44414ab791b047f9820fdcd4d427c60f255c8a8d SHA256 21d34aeb1f4c6da4fae213c15cab6686144c68ac0ffeea8536e1882736c75baa
-MD5 8b6276eb2c4c4318d045888ba049f7ed ruby-sdl-1.1.0.ebuild 2010
-RMD160 f289059ad4d1d655328799d078d306f95243d36e ruby-sdl-1.1.0.ebuild 2010
-SHA256 21d34aeb1f4c6da4fae213c15cab6686144c68ac0ffeea8536e1882736c75baa ruby-sdl-1.1.0.ebuild 2010
-MISC ChangeLog 1407 RMD160 9f38fa93d56caf5b1bbfc0b3b482ed6852b2b9ab SHA1 fdfaf260b11cc308b81defb9efc9b2a0a07f549b SHA256 142f1b4ce7a95fce7b457f699a7b1d1ac83e15890d31c5c46c83a3e022094f51
-MD5 45065485626362cbfb4b393d6f9335cf ChangeLog 1407
-RMD160 9f38fa93d56caf5b1bbfc0b3b482ed6852b2b9ab ChangeLog 1407
-SHA256 142f1b4ce7a95fce7b457f699a7b1d1ac83e15890d31c5c46c83a3e022094f51 ChangeLog 1407
+EBUILD ruby-sdl-1.1.0.ebuild 2118 RMD160 bd6495dcf5b9a6a0e76e32b51c48e06ebd4fbace SHA1 d358d78b84a2df740c19b296d5057b82ccaa1d49 SHA256 45a994606c2fc98fd307d85fd40b3427bd2f6cf9876e245079b9a5a9c76d3244
+MD5 0ee6f03f89bdc8a9f6d3fac102373fde ruby-sdl-1.1.0.ebuild 2118
+RMD160 bd6495dcf5b9a6a0e76e32b51c48e06ebd4fbace ruby-sdl-1.1.0.ebuild 2118
+SHA256 45a994606c2fc98fd307d85fd40b3427bd2f6cf9876e245079b9a5a9c76d3244 ruby-sdl-1.1.0.ebuild 2118
+MISC ChangeLog 1547 RMD160 dd7a21b41569dd1a24bbe4839dd9534d82964e9b SHA1 f8320c81f20432a6621ec6e36651c059b3931a7c SHA256 aeec9173814c08f18f992260ffb6e60def4603af435756a2605ce63dbf6c2ca9
+MD5 c2ac50d8d52a848cedfb003e24681f1b ChangeLog 1547
+RMD160 dd7a21b41569dd1a24bbe4839dd9534d82964e9b ChangeLog 1547
+SHA256 aeec9173814c08f18f992260ffb6e60def4603af435756a2605ce63dbf6c2ca9 ChangeLog 1547
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -48,10 +49,3 @@ SHA256 cb2884eb55660f89891aa7a7e4da84bd78aa1fbd64862cd51ddb796acf4fbbe4 files/di
 MD5 7197ac6a6320b41bbebf3549d35fcbea files/digest-ruby-sdl-1.1.0 241
 RMD160 ccdd41cf3bf75f312f5dcb90e5f2015655cfd935 files/digest-ruby-sdl-1.1.0 241
 SHA256 475d520d79802cd2f2339f0b925147b4d98505c8eb7064ca12cfa8bae7be2e61 files/digest-ruby-sdl-1.1.0 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEtQIs5mJXAu5GbtIRAvYrAJ9Dt3N2kIhKFtUEONhJBzLEBp7SSwCeONDi
-d6c3NUbnjC6d+OK4weAWPr8=
-=pGkm
------END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-sdl/files/ruby-sdl-1.1.0-sdl-mixer.patch b/dev-ruby/ruby-sdl/files/ruby-sdl-1.1.0-sdl-mixer.patch
new file mode 100644
index 000000000000..8767d3ebae80
--- /dev/null
+++ b/dev-ruby/ruby-sdl/files/ruby-sdl-1.1.0-sdl-mixer.patch
@@ -0,0 +1,10 @@
+--- rubysdl_smpeg.c	2006-09-02 09:40:13.000000000 +0700
++++ rubysdl_smpeg.c.new	2006-09-02 09:39:54.000000000 +0700
+@@ -20,7 +20,6 @@
+ #ifdef HAVE_SMPEG
+ #include "rubysdl.h"
+ #include "smpeg/smpeg.h"
+-#include "SDL_mixer.h"
+ 
+ static SMPEG_Filter* filters[3];
+ #define NULL_FILTER 0
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-1.1.0.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-1.1.0.ebuild
index 1e702cc98450..1735d4f99eab 100644
--- a/dev-ruby/ruby-sdl/ruby-sdl-1.1.0.ebuild
+++ b/dev-ruby/ruby-sdl/ruby-sdl-1.1.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-sdl/ruby-sdl-1.1.0.ebuild,v 1.1 2006/05/12 19:59:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-sdl/ruby-sdl-1.1.0.ebuild,v 1.2 2006/09/02 02:51:22 pclouds Exp $
+
+inherit eutils
 
 MY_P="${P/-/}"
 S="${WORKDIR}/${MY_P}"
@@ -27,6 +29,12 @@ RDEPEND="virtual/ruby
 	mpeg? ( >=media-libs/smpeg-0.4.4-r1 )"
 #	sge? ( >=media-libs/sge )
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${PN}-1.1.0-sdl-mixer.patch"
+}
+
 src_compile() {
 	ruby extconf.rb || die "extconf.rb failed"
 	emake || die "emake failed"