diff options
author | Hans de Graaff <graaff@gentoo.org> | 2010-01-30 09:15:02 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2010-01-30 09:15:02 +0000 |
commit | 9e378b6fd5d3ac669e2ae5f31bda879d7dab0571 (patch) | |
tree | 92d2172ee0645f10090c961c440539ba9b9190cc /dev-ruby/sqlite-ruby | |
parent | Fixed automagic deps on libacl and libattr. (diff) | |
download | historical-9e378b6fd5d3ac669e2ae5f31bda879d7dab0571.tar.gz historical-9e378b6fd5d3ac669e2ae5f31bda879d7dab0571.tar.bz2 historical-9e378b6fd5d3ac669e2ae5f31bda879d7dab0571.zip |
Convert to ruby-fakegem. Apply ruby19 patch from ruby overlay.
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/sqlite-ruby')
-rw-r--r-- | dev-ruby/sqlite-ruby/ChangeLog | 10 | ||||
-rw-r--r-- | dev-ruby/sqlite-ruby/Manifest | 14 | ||||
-rw-r--r-- | dev-ruby/sqlite-ruby/files/sqlite-ruby-2.2.3-19compat.patch | 79 | ||||
-rw-r--r-- | dev-ruby/sqlite-ruby/sqlite-ruby-2.2.3-r2.ebuild | 46 |
4 files changed, 146 insertions, 3 deletions
diff --git a/dev-ruby/sqlite-ruby/ChangeLog b/dev-ruby/sqlite-ruby/ChangeLog index 01e8e5726fea..765437a32d5d 100644 --- a/dev-ruby/sqlite-ruby/ChangeLog +++ b/dev-ruby/sqlite-ruby/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/sqlite-ruby -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite-ruby/ChangeLog,v 1.41 2009/03/03 11:40:44 pva Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite-ruby/ChangeLog,v 1.42 2010/01/30 09:15:01 graaff Exp $ + +*sqlite-ruby-2.2.3-r2 (30 Jan 2010) + + 30 Jan 2010; Hans de Graaff <graaff@gentoo.org> + +sqlite-ruby-2.2.3-r2.ebuild, +files/sqlite-ruby-2.2.3-19compat.patch: + Convert to ruby-fakegem. Apply ruby19 patch from ruby overlay. 03 Mar 2009; Peter Volkov <pva@gentoo.org> sqlite-ruby-2.2.3-r1.ebuild: ~mips keyworded, bug #168601. diff --git a/dev-ruby/sqlite-ruby/Manifest b/dev-ruby/sqlite-ruby/Manifest index d1511e9f94a9..ca89fc5e02b5 100644 --- a/dev-ruby/sqlite-ruby/Manifest +++ b/dev-ruby/sqlite-ruby/Manifest @@ -1,4 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX sqlite-ruby-2.2.3-19compat.patch 2832 RMD160 5f186cc10a441f24ad4910ce6deefcc31bfa49dc SHA1 0d3bad152b2d9e5da2d142f66ccc97c447b06d8b SHA256 8c577b123992554aac0884bd802d08aabb9044b06e17f60a91ac7392aad95e0d DIST sqlite-ruby-2.2.3.gem 41472 RMD160 d83bfae2535f116faef6216ec94dcc1aba4f71bf SHA1 6f672af52910c4206697fb5cffc83407b97d4b63 SHA256 0a00ddc88f9daf1734ef58758dde00d98e2d37a208c3827785258ae7aa15014e EBUILD sqlite-ruby-2.2.3-r1.ebuild 714 RMD160 8da2e99d2e864f0463c08f57dcb637d91897e7a5 SHA1 42d3a0db599c2f6d66d6ea3571a6241e99b3843b SHA256 6b04d93123cd2472c52707ba077e7d90a4584f665f0c41e19a926dec765cb5cd -MISC ChangeLog 4656 RMD160 75786586ad24a78a9597dac6ba7e8a48b4e94494 SHA1 8bd0743e759b6b0366647c7449470a26888fa8ef SHA256 687be2e5d2516281827db7866a769ab7bb22347c759e3cfe56c2040eb6284aac +EBUILD sqlite-ruby-2.2.3-r2.ebuild 1019 RMD160 ccb66620c7ed4b539d807e55a1044153eafad6b8 SHA1 b4865a7d05d1e95764a56cef6e5af4dd4d52dd5e SHA256 76d9c77210bf2c93c376a2cc68c9a5beb6c29cdcb2bd4688e08581c002caef27 +MISC ChangeLog 4885 RMD160 d7309fecf0ad03de7b4a85f25ea7ee893b12438a SHA1 2e6b9718431c4d3c99871e12dc8babfa3a889e1c SHA256 624841f05a0dce8a60a9bcfe31395b9994dfcd659191d0e5f7dd1378d89062c7 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAktj+JsACgkQeM7EJeUH71PXAACfcNtg+ROYVIwz6Iyv8PUG931J +GqcAn02hTRzIy+9Ze9Or6yZzDvMNM3SW +=virY +-----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..1b49c9cae01d --- /dev/null +++ b/dev-ruby/sqlite-ruby/files/sqlite-ruby-2.2.3-19compat.patch @@ -0,0 +1,79 @@ +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 new file mode 100644 index 000000000000..905d9944dcc7 --- /dev/null +++ b/dev-ruby/sqlite-ruby/sqlite-ruby-2.2.3-r2.ebuild @@ -0,0 +1,46 @@ +# 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 $ + +EAPI="2" +USE_RUBY="ruby18 ruby19" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README" + +inherit ruby-fakegem + +DESCRIPTION="An extension library to access a SQLite database from Ruby" +HOMEPAGE="http://rubyforge.org/projects/sqlite-ruby/" +LICENSE="BSD" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +SLOT="0" +IUSE="" + +RUBY_PATCHES=( "${P}-19compat.patch" ) + +DEPEND="=dev-db/sqlite-2*" + +each_ruby_configure() { + pushd ext + ${RUBY} extconf.rb || die "Configuration failed." + popd +} + +each_ruby_compile() { + pushd ext + emake || die "Compilation failed." + popd + cp ext/sqlite_api.so lib || die "Unable to cp shared library." +} + +each_ruby_test() { + ${RUBY} test/tests.rb || die "Tests failed." +} + +all_ruby_install() { + all_fakegem_install + + dohtml -r doc/faq +} |