Remove Ruby 1.9 patch and Ruby 1.9 support as it was always just partial (fails with --no-undefined).

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 14 insertions, 90 deletions

diff --git a/dev-ruby/sqlite-ruby/ChangeLog b/dev-ruby/sqlite-ruby/ChangeLog
index 4110f0ffd985..290e392f5bc4 100644
--- a/dev-ruby/sqlite-ruby/ChangeLog
+++ b/dev-ruby/sqlite-ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/sqlite-ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite-ruby/ChangeLog,v 1.43 2010/05/22 15:59:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite-ruby/ChangeLog,v 1.44 2010/08/16 11:34:16 flameeyes Exp $
+
+  16 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  sqlite-ruby-2.2.3-r2.ebuild, -files/sqlite-ruby-2.2.3-19compat.patch:
+  Remove Ruby 1.9 patch and Ruby 1.9 support as it was always just partial
+  (fails with --no-undefined).
 
   22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   sqlite-ruby-2.2.3-r1.ebuild:
diff --git a/dev-ruby/sqlite-ruby/files/sqlite-ruby-2.2.3-19compat.patch b/dev-ruby/sqlite-ruby/files/sqlite-ruby-2.2.3-19compat.patch
deleted file mode 100644
index 1b49c9cae01d..000000000000
--- a/dev-ruby/sqlite-ruby/files/sqlite-ruby-2.2.3-19compat.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ru a/ext/sqlite-api.c b/ext/sqlite-api.c
---- a/ext/sqlite-api.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/ext/sqlite-api.c	2008-10-01 14:23:25.000000000 +0200
-@@ -67,6 +67,12 @@
- /* special macro for helping RDoc to ignore "section"-level comments. */
- #define NO_RDOC
- 
-+/* Ruby 1.9 compatiblity */
-+#ifndef RSTRING_LEN
-+#define RSTRING_LEN(str)	RSTRING(str)->len
-+#define RSTRING_PTR(str)	RSTRING(str)->ptr
-+#endif
-+
- /*>=-----------------------------------------------------------------------=<*
-  * CONSTANTS
-  * ------------------------------------------------------------------------
-@@ -780,8 +786,8 @@
-   {
-     case T_STRING:
-       sqlite_set_result_string( func_ptr,
--        RSTRING(result)->ptr,
--        RSTRING(result)->len );
-+        RSTRING_PTR(result),
-+        RSTRING_LEN(result) );
-       break;
- 
-     case T_FIXNUM:
-@@ -817,8 +823,8 @@
-   GetFunc( func_ptr, func );
-   Check_Type( string, T_STRING );
- 
--  sqlite_set_result_error( func_ptr, RSTRING(string)->ptr,
--    RSTRING(string)->len );
-+  sqlite_set_result_error( func_ptr, RSTRING_PTR(string),
-+    RSTRING_LEN(string) );
- 
-   return string;
- }
-diff -ru a/lib/sqlite/database.rb b/lib/sqlite/database.rb
---- a/lib/sqlite/database.rb	1970-01-01 01:00:00.000000000 +0100
-+++ b/lib/sqlite/database.rb	2008-10-01 16:42:34.000000000 +0200
-@@ -30,7 +30,6 @@
- # =============================================================================
- #++
- 
--require 'base64'
- require 'sqlite_api'
- require 'sqlite/pragmas'
- require 'sqlite/statement'
-@@ -85,13 +84,13 @@
-     # Returns a string that represents the serialization of the given object.
-     # The string may safely be used in an SQL statement.
-     def self.encode( object )
--      Base64.encode64( Marshal.dump( object ) ).strip
-+      [Marshal.dump(object)].pack('m').strip
-     end
- 
-     # Unserializes the object contained in the given string. The string must be
-     # one that was returned by #encode.
-     def self.decode( string )
--      Marshal.load( Base64.decode64( string ) )
-+      Marshal.load( string.unpack('m').first )
-     end
- 
-     # Return +true+ if the string is a valid (ie, parsable) SQL statement, and
-diff -ru a/lib/sqlite/pragmas.rb b/lib/sqlite/pragmas.rb
---- a/lib/sqlite/pragmas.rb	1970-01-01 01:00:00.000000000 +0100
-+++ b/lib/sqlite/pragmas.rb	2008-10-01 16:46:45.000000000 +0200
-@@ -60,8 +60,8 @@
-       case mode
-         when String
-           case mode.downcase
--            when "on", "yes", "true", "y", "t": mode = "'ON'"
--            when "off", "no", "false", "n", "f": mode = "'OFF'"
-+            when "on", "yes", "true", "y", "t" then mode = "'ON'"
-+            when "off", "no", "false", "n", "f" then mode = "'OFF'"
-             else
-               raise Exceptions::DatabaseException,
-                 "unrecognized pragma parameter #{mode.inspect}"
diff --git a/dev-ruby/sqlite-ruby/sqlite-ruby-2.2.3-r2.ebuild b/dev-ruby/sqlite-ruby/sqlite-ruby-2.2.3-r2.ebuild
index 905d9944dcc7..5b0b387ec71e 100644
--- a/dev-ruby/sqlite-ruby/sqlite-ruby-2.2.3-r2.ebuild
+++ b/dev-ruby/sqlite-ruby/sqlite-ruby-2.2.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite-ruby/sqlite-ruby-2.2.3-r2.ebuild,v 1.1 2010/01/30 09:15:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite-ruby/sqlite-ruby-2.2.3-r2.ebuild,v 1.2 2010/08/16 11:34:16 flameeyes Exp $
 
 EAPI="2"
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README"
@@ -18,20 +18,18 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
 
-RUBY_PATCHES=( "${P}-19compat.patch" )
+DEPEND="${DEPEND}
+	=dev-db/sqlite-2*"
 
-DEPEND="=dev-db/sqlite-2*"
+RDEPEND="${RDEPEND}
+	=dev-db/sqlite-2*"
 
 each_ruby_configure() {
-	pushd ext
-	${RUBY} extconf.rb || die "Configuration failed."
-	popd
+	${RUBY} -Cext extconf.rb || die "Configuration failed."
 }
 
 each_ruby_compile() {
-	pushd ext
-	emake || die "Compilation failed."
-	popd
+	emake -Cext || die "Compilation failed."
 	cp ext/sqlite_api.so lib || die "Unable to cp shared library."
 }