Convert to ruby-ng. Removed old revision.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-ruby/sary-ruby/ChangeLog b/dev-ruby/sary-ruby/ChangeLog
index a191b38203f2c6644b341642c5d22e60b5fec817..05fe1dcdac565c38c1ec3e7f95254720ffd16e41 100644 (file)
--- a/dev-ruby/sary-ruby/ChangeLog
+++ b/dev-ruby/sary-ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/sary-ruby
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/ChangeLog,v 1.40 2009/09/27 15:50:38 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/ChangeLog,v 1.41 2010/05/27 15:54:34 matsuu Exp $
+
+*sary-ruby-1.2.0-r2 (27 May 2010)
+
+  27 May 2010; MATSUU Takuto <matsuu@gentoo.org> -sary-ruby-1.2.0.ebuild,
+  +sary-ruby-1.2.0-r2.ebuild, +files/sary-ruby-1.2.0-ruby19.patch:
+  Convert to ruby-ng. Removed old revision.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> sary-ruby-1.2.0-r1.ebuild:
   ppc stable #282716

diff --git a/dev-ruby/sary-ruby/Manifest b/dev-ruby/sary-ruby/Manifest
index 0fb46fcdc1ca3d3069f58d9c07ddeb4fa1def2c0..dd3470ec792b8e28f31d769a4f2ecbddbca0c8b0 100644 (file)
--- a/dev-ruby/sary-ruby/Manifest
+++ b/dev-ruby/sary-ruby/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sary-ruby-1.2.0-gentoo.patch 928 RMD160 b8cf1a0617e5f1781e3addd91e97e80da588322e SHA1 35d1459a0d1c9374ff24d739ee8e3b7f28881288 SHA256 cd5a71bb3c2aec2655884db2204352689249230411731a5ef8ae4e87ee21eeb6
+AUX sary-ruby-1.2.0-ruby19.patch 4173 RMD160 cdc8041d389651d4bacd4410a2e4fca7949ea3e0 SHA1 ec2c1fd785ea40f4e43f84a8b51f5598e21e25fb SHA256 aa4df33095300d76b657db513cc1400e161fbac874a2a9abc5c20a2877ccd950
 DIST sary-ruby-1.2.0.tar.gz 9155 RMD160 f35602bea532138b87c6d77b08dbc71f7ebddc41 SHA1 18ad1c8a1d095dbaa99efbb4a040e77a58b9df08 SHA256 32e493313b44e6d23fbda583c9aa13d7c2fa398fc717ec17cd8c3e9e9a62a30d
 EBUILD sary-ruby-1.2.0-r1.ebuild 676 RMD160 d02ed724add3ab8ca440f18738965915cda421c9 SHA1 09bbe16d080167a983956a7c807ef276ed71a87d SHA256 0a297f61a0d46616b01e65d53211e2badb6fef5e33699da3a6093acce67fa39b
-EBUILD sary-ruby-1.2.0.ebuild 651 RMD160 89e4bc0829a3997d2ccf7109aca722fbdda6b0bb SHA1 224318b35e4a478f861070dac0a4884d6c7a1376 SHA256 549013a1de6705aa75ecb55c35cec1310038880a767ae074f557410414bb6530
-MISC ChangeLog 5001 RMD160 4364e5be4fcb32dbee45bbb1ecfe420e3e0d693d SHA1 efcdfef3db6fa12e18f05f3dde9372798eb2280b SHA256 ff164b88df49f957bd82f460b1a9fcdd559d14fe40cdfb0f5ab130d21c3fffc4
+EBUILD sary-ruby-1.2.0-r2.ebuild 1248 RMD160 6877ca44ea22a7ae829fe91821d1c33ba6de9bdf SHA1 61f976662a7fa3f28fb6655d16f0b90a30ab72fe SHA256 e7c4c6fe97741e5bcc188fd0feaa031f2eb747d55f1f95cfd08e80b8e29708aa
+MISC ChangeLog 5222 RMD160 b7f0212c9c71dd03da1307572c0965c0f20f4a39 SHA1 25cb3cd14ea61770e47d6f19ec366ce439b4ac7b SHA256 78381fbe181d7df9f412c22db29b28063ecff5ab43a4b5aa238593553ec78262
 MISC metadata.xml 176 RMD160 db9b69edcd6f6a79e5780649d9193c40c01f0eb1 SHA1 fb5800821637eaaa88491e8555c672f9fb654763 SHA256 2945dd4648e9ad39a0d7075277a8417550d609756572eaa0e199d2ca1890e315
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBAgAGBQJL/pXAAAoJECaGw+YFKA1p7AsP/1h3ahRZvgjEwotcSvOtpRV3
+DFuOlK+TAU3vVYYUki03t06I2vVWo0zlFyxYAvcSUz9mKatJ87MMqRc8wTzxAXgR
+VW2ktttdCcWcj0kYPrQeYD0koi0vAW7vwvti6t25FiBOUZBMpoVcSd0O0IQXoHBy
+jRV56N4GMekuUWW+1iyV48nS4CKaruwYtw9c9lNht13MwFdSuTJPTNk1TrDDHU9U
+rWDXu2KdcO79/ivNFxxYu+PEirLRi6S8sZz487ypTF9DdTEixVqqcGgFq6NSHcBv
+f6wX4uU1zVqtRLjVZIZsskwlvjmfR0bECsFniYTOP/T3B1JmNeO/v2bFDO7XIj+n
+uq8U683mW78n7y69CLKyikSMFDPCMZkokoHcN+NftgvQ66NXOTLw8zWDirWyo6lx
+3rOYYHgSUr83KdnrDlfbAGnZIzL5EZC60IuXrFjulYOczrwvdmmIZxML+ADh4iTY
+SHj1K5gp6YMttrN/CaJOpRSwVJMlzfYyvgP5Ysf9oJfXj1MhIF0HDQwEDoz7VDbI
+aLT53aRybabWg3chjTtkozWYDk6PQs0TDLPR0hWJH01q+stBJPY9K/pY1bd1bmwi
+MgxZFgeKpU/awwe6mWnE5UDsupGy8Xx5jggKNNoiqKG8XDlo1XDpN9feIoXFfaN7
++TQCGASmKOSaOadfD47M
+=WLVs
+-----END PGP SIGNATURE-----

diff --git a/dev-ruby/sary-ruby/files/sary-ruby-1.2.0-ruby19.patch b/dev-ruby/sary-ruby/files/sary-ruby-1.2.0-ruby19.patch
new file mode 100644 (file)
index 0000000..8eea0cc
--- /dev/null
+++ b/dev-ruby/sary-ruby/files/sary-ruby-1.2.0-ruby19.patch
@@ -0,0 +1,152 @@
+diff -Naur sary-ruby-1.2.0.orig//builder.c sary-ruby-1.2.0//builder.c
+--- sary-ruby-1.2.0.orig//builder.c    2005-03-30 07:48:09.000000000 +0900
++++ sary-ruby-1.2.0//builder.c 2010-05-27 20:08:33.000000000 +0900
+@@ -26,7 +26,6 @@
+ #include <errno.h>
+ #include "sary.h"
+ #include "ruby.h"
+-#include "version.h"
+ 
+ #define GET_Builder(obj, dat) Data_Get_Struct(obj, SaryBuilder, dat)
+ 
+@@ -63,21 +62,13 @@
+     rb_scan_args(argc, argv, "11", &file_name, &array_name);
+ 
+     Check_SafeStr(file_name);
+-#if RUBY_VERSION_CODE >= 180
+     file_name_ptr = StringValuePtr(file_name);
+-#else
+-    file_name_ptr = STR2CSTR(file_name);
+-#endif
+ 
+     if (array_name == Qnil)
+         builder = sary_builder_new(file_name_ptr);
+     else {
+         Check_SafeStr(array_name);
+-#if RUBY_VERSION_CODE >= 180
+         array_name_ptr = StringValuePtr(array_name);
+-#else
+-        array_name_ptr = STR2CSTR(array_name);
+-#endif
+         builder = sary_builder_new2(file_name_ptr, array_name_ptr);
+     }
+     if (builder == NULL)
+diff -Naur sary-ruby-1.2.0.orig//searcher.c sary-ruby-1.2.0//searcher.c
+--- sary-ruby-1.2.0.orig//searcher.c   2005-03-30 07:48:09.000000000 +0900
++++ sary-ruby-1.2.0//searcher.c        2010-05-27 20:13:17.000000000 +0900
+@@ -27,7 +27,13 @@
+ #include <errno.h>
+ #include "sary.h"
+ #include "ruby.h"
+-#include "version.h"
++
++#ifndef RARRAY_LEN
++#define RARRAY_LEN(a) RARRAY(a)->len
++#endif
++#ifndef RSTRING_LEN
++#define RSTRING_LEN(str) RSTRING(str)->len
++#endif
+ 
+ #define GET_Searcher(obj, dat) Data_Get_Struct(obj, SarySearcher, dat)
+ 
+@@ -82,21 +88,13 @@
+     rb_scan_args(argc, argv, "11", &file_name, &array_name);
+ 
+     Check_SafeStr(file_name);
+-#if RUBY_VERSION_CODE >= 180
+     file_name_ptr = StringValuePtr(file_name);
+-#else
+-    file_name_ptr = STR2CSTR(file_name);
+-#endif  
+ 
+     if (array_name == Qnil)
+         searcher = sary_searcher_new(file_name_ptr);
+     else {
+         Check_SafeStr(array_name);
+-#if RUBY_VERSION_CODE >= 180
+         array_name_ptr = StringValuePtr(array_name);
+-#else
+-        array_name_ptr = STR2CSTR(array_name);
+-#endif  
+         searcher = sary_searcher_new2(file_name_ptr, array_name_ptr);
+     }
+     if (searcher == NULL)
+@@ -133,12 +131,8 @@
+     GET_Searcher(klass, searcher);
+ 
+     Check_SafeStr(pattern);
+-#if RUBY_VERSION_CODE >= 180
+     pat = StringValuePtr(pattern);
+-    len = RSTRING(pattern)->len;
+-#else
+-    pat = str2cstr(pattern, &len);
+-#endif
++    len = RSTRING_LEN(pattern);
+ 
+     if (sary_searcher_search2(searcher, pat, len))
+       return Qtrue;
+@@ -157,7 +151,7 @@
+ 
+     GET_Searcher(klass, searcher);
+ 
+-    len = RARRAY(pattern_array)->len;
++    len = RARRAY_LEN(pattern_array);
+     if (len == 0) {
+       return Qfalse;
+     }
+@@ -166,11 +160,7 @@
+     for (i = 0; i < len; i++) {
+       pattern = rb_ary_entry(pattern_array, (long)i);
+       Check_SafeStr(pattern);
+-#if RUBY_VERSION_CODE >= 180
+         pat[i] = StringValuePtr(pattern);
+-#else
+-      pat[i] = STR2CSTR(pattern);
+-#endif  
+     }
+ 
+     if (sary_searcher_multi_search(searcher, pat, len))
+@@ -189,11 +179,7 @@
+     GET_Searcher(klass, searcher);
+ 
+     Check_SafeStr(pattern);
+-#if RUBY_VERSION_CODE >= 180
+     pat = StringValuePtr(pattern);
+-#else
+-    pat = STR2CSTR(pattern);
+-#endif  
+ 
+     if (sary_searcher_isearch(searcher, pat, NUM2INT(len)))
+       return Qtrue;
+@@ -224,12 +210,8 @@
+     GET_Searcher(klass, searcher);
+ 
+     Check_SafeStr(pattern);
+-#if RUBY_VERSION_CODE >= 180
+     pat = StringValuePtr(pattern);
+-    len = RSTRING(pattern)->len;
+-#else
+-    pat = str2cstr(pattern, &len);
+-#endif
++    len = RSTRING_LEN(pattern);
+ 
+     if (sary_searcher_icase_search2(searcher, pat, len))
+       return Qtrue;
+@@ -275,15 +257,10 @@
+ 
+     Check_SafeStr(start_tag);
+     Check_SafeStr(end_tag);
+-#if RUBY_VERSION_CODE >= 180
+     stag = StringValuePtr(start_tag);
+     etag = StringValuePtr(end_tag);
+-    slen = RSTRING(stag)->len;
+-    elen = RSTRING(etag)->len;
+-#else
+-    stag = rb_str2cstr(start_tag, &slen);
+-    etag = rb_str2cstr(end_tag, &elen);
+-#endif
++    slen = RSTRING_LEN(stag);
++    elen = RSTRING_LEN(etag);
+ 
+     region = sary_searcher_get_next_tagged_region2(searcher, stag, slen,
+                                           etag, elen, &rlen);

diff --git a/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild b/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild
new file mode 100644 (file)
index 0000000..99733b0
--- /dev/null
+++ b/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild,v 1.1 2010/05/27 15:54:34 matsuu Exp $
+
+EAPI="2"
+# jruby: mkmf issue
+USE_RUBY="ruby18 ree18 ruby19"
+inherit ruby-ng
+
+DESCRIPTION="Ruby Binding of Sary"
+HOMEPAGE="http://sary.sourceforge.net/"
+SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/sary-1.2.0"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+RUBY_PATCHES=(
+       "${P}-gentoo.patch"
+       "${P}-ruby19.patch"
+)
+
+each_ruby_configure() {
+       ${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+       # We have injected --no-undefined in Ruby as a safety precaution
+       # against broken ebuilds, but the Ruby-Gnome bindings
+       # unfortunately rely on the lazy load of other extensions; see bug
+       # #320545.
+       find . -name Makefile -print0 | xargs -0 \
+               sed -i -e 's:-Wl,--no-undefined ::' || die "--no-undefined removal failed"
+
+       emake || die "emake failed"
+}
+
+each_ruby_install() {
+       emake DESTDIR="${D}" install || die "make install failed"
+}
+
+all_ruby_install() {
+       dodoc ChangeLog *.rd || die
+}

diff --git a/dev-ruby/sary-ruby/sary-ruby-1.2.0.ebuild b/dev-ruby/sary-ruby/sary-ruby-1.2.0.ebuild
deleted file mode 100644 (file)
index e8de74c..0000000
--- a/dev-ruby/sary-ruby/sary-ruby-1.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/sary-ruby-1.2.0.ebuild,v 1.15 2009/08/22 22:32:29 a3li Exp $
-
-inherit ruby
-
-IUSE=""
-
-DESCRIPTION="Ruby Binding of Sary"
-HOMEPAGE="http://sary.sourceforge.net/
-       http://taiyaki.org/prime/"
-SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-SLOT="0"
-USE_RUBY="ruby18"
-
-DEPEND=">=app-text/sary-1.2.0"
-
-src_unpack() {
-       unpack ${A}
-       rm -rf "${S}"/debian    # workaround for ruby19
-}
-
-src_compile() {
-       ruby_src_compile || die
-}