Import the Ruby 1.9 patch from overlay, and move to fakegem (with support for Ruby 1.9).

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 179 insertions, 7 deletions

diff --git a/dev-ruby/ruby-shout/ChangeLog b/dev-ruby/ruby-shout/ChangeLog
index 5730cf415e26..8d662108bf27 100644
--- a/dev-ruby/ruby-shout/ChangeLog
+++ b/dev-ruby/ruby-shout/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ruby-shout
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ChangeLog,v 1.10 2009/12/24 17:12:49 graaff Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ChangeLog,v 1.11 2010/01/29 11:58:04 flameeyes Exp $
+
+*ruby-shout-2.1-r2 (29 Jan 2010)
+
+  29 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +ruby-shout-2.1-r2.ebuild, +files/ruby-shout-2.1+ruby-1.9.patch:
+  Import the Ruby 1.9 patch from overlay, and move to fakegem (with support
+  for Ruby 1.9).
 
   24 Dec 2009; Hans de Graaff <graaff@gentoo.org> ruby-shout-2.1-r1.ebuild:
   Remove obsolete virtual/ruby dependency.
diff --git a/dev-ruby/ruby-shout/Manifest b/dev-ruby/ruby-shout/Manifest
index b5669bb33137..172916960b87 100644
--- a/dev-ruby/ruby-shout/Manifest
+++ b/dev-ruby/ruby-shout/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ruby-shout-2.1+ruby-1.9.patch 4098 RMD160 ab8dbc6202f6369ec3ab65ba70672faa3223e085 SHA1 a73976485b3f1f4926c8f4103812c253982b5285 SHA256 0219a34f202bef876fea0375b21bd79df851d8b7a44da4c651e6e8e50d359d28
 DIST ruby-shout-2.1.gem 8704 RMD160 ace90c08b65eb1bd0aaa00d67d2a42e68f342cc3 SHA1 e026ce685b8c1f3748fedf544467f37bc21ec08e SHA256 624d38989105e39dbb3000df5d16e6b96ac5b8e6b24454b5d5e14d4d5d097399
 EBUILD ruby-shout-2.1-r1.ebuild 465 RMD160 1c80c675d6ad3dda1221dc34bf56775adfac5140 SHA1 2abb387ded91846caf32a80847738b0337148767 SHA256 01b65f0ea24fbd71a52959d52d42e12ef3430fff35cd5f0304487c7d491376f9
-MISC ChangeLog 1457 RMD160 d8a6bd1dc979152e19746ddaea9e2bf7970cfdd7 SHA1 5757f986bd21eca9d4d648855ecb9f530ff1cadd SHA256 abc69395a3298b502d042e9b80ceab6beb44e9822bb7bdf5a6ab50acd0c2b1b2
+EBUILD ruby-shout-2.1-r2.ebuild 968 RMD160 987199ee07f239835003963a8b31f729566f31b9 SHA1 1928fba0964ea86f5e39aafb2cec053e1a8780f4 SHA256 16c258ab9cacceffb4cd078364b04accccf7ff3dec4d4de3d79de1c5f8783a2d
+MISC ChangeLog 1711 RMD160 7acacde4f1ae8800e3ff5eb18ee09d477476296a SHA1 733108f91cb3d88feeb18623f0c155aaed996418 SHA256 794056710fcf5182bd0afe92204b0f06a1936044f6591973deeb9f745dee3c9c
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkszoRYACgkQeM7EJeUH71NgCACfZimfjz1YU7QMCFv7Jl96bIuM
-wOMAniR6vHLQ5gYWkxIQpyeBhts6zVt3
-=ng/P
+iEYEARECAAYFAktizP4ACgkQAiZjviIA2Xh2XwCgwi+Ga8/4aoC9sBYOZY5nN2G9
+SUgAn0keK40elCsuFlXkYReK/9HwTwuT
+=ksaG
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-shout/files/ruby-shout-2.1+ruby-1.9.patch b/dev-ruby/ruby-shout/files/ruby-shout-2.1+ruby-1.9.patch
new file mode 100644
index 000000000000..f2e98a029aef
--- /dev/null
+++ b/dev-ruby/ruby-shout/files/ruby-shout-2.1+ruby-1.9.patch
@@ -0,0 +1,116 @@
+diff -ru a/ext/shout.c b/ext/shout.c
+--- a/ext/shout.c	1970-01-01 01:00:00.000000000 +0100
++++ b/ext/shout.c	2008-10-06 12:28:08.000000000 +0200
+@@ -40,6 +40,11 @@
+ 
+ #define DEFAULT_MOUNTPOINT "/default"
+ 
++#ifndef RSTRING_LEN
++#define RSTRING_LEN(str)	RSTRING(str)->len
++#define RSTRING_PTR(str)	RSTRING(str)->ptr
++#endif
++
+ /*
+ ----------------- ShoutError --------------------
+  */
+@@ -233,8 +238,8 @@
+         GET_SC(self, s);
+ 
+         Check_SafeStr(to_send);
+-        err = shout_send(s->conn, (unsigned char *) (RSTRING(to_send)->ptr),
+-                                  RSTRING(to_send)->len);
++        err = shout_send(s->conn, (unsigned char *) (RSTRING_PTR(to_send)),
++                                  RSTRING_LEN(to_send));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -409,7 +414,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_host(s->conn, RSTRING(value)->ptr);
++        err = shout_set_host(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -435,7 +440,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_user(s->conn, RSTRING(value)->ptr);
++        err = shout_set_user(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -448,7 +453,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_password(s->conn, RSTRING(value)->ptr);
++        err = shout_set_password(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -495,7 +500,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_mount(s->conn, RSTRING(value)->ptr);
++        err = shout_set_mount(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -509,7 +514,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_dumpfile(s->conn, RSTRING(value)->ptr);
++        err = shout_set_dumpfile(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -523,7 +528,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_agent(s->conn, RSTRING(value)->ptr);
++        err = shout_set_agent(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -554,7 +559,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_name(s->conn, RSTRING(value)->ptr);
++        err = shout_set_name(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -567,7 +572,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_url(s->conn, RSTRING(value)->ptr);
++        err = shout_set_url(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -580,7 +585,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_genre(s->conn, RSTRING(value)->ptr);
++        err = shout_set_genre(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
+@@ -593,7 +598,7 @@
+         shout_connection *s; GET_SC(self, s);
+ 
+         Check_Type(value, T_STRING);
+-        err = shout_set_description(s->conn, RSTRING(value)->ptr);
++        err = shout_set_description(s->conn, RSTRING_PTR(value));
+         if(err != SHOUTERR_SUCCESS) {
+                 raise_shout_error(s->conn);
+         }
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.1-r2.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.1-r2.ebuild
new file mode 100644
index 000000000000..e981e39a2efc
--- /dev/null
+++ b/dev-ruby/ruby-shout/ruby-shout-2.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-shout/ruby-shout-2.1-r2.ebuild,v 1.1 2010/01/29 11:58:04 flameeyes Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README example.rb"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A Ruby interface to libshout2"
+HOMEPAGE="http://ruby-shout.rubyforge.org/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libshout-2.0"
+DEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}+ruby-1.9.patch
+}
+
+each_ruby_configure() {
+	pushd ext &>/dev/null
+	${RUBY} extconf.rb || die "extconf failed"
+	popd &>/dev/null
+}
+
+each_ruby_compile() {
+	pushd ext &>/dev/null
+	emake || die "emake failed"
+	popd &>/dev/null
+}
+
+each_ruby_install() {
+	pushd ext &>/dev/null
+	ruby_fakegem_doins ${PN#ruby-}.so
+	popd &>/dev/null
+}