diff options
| author |   Richard Brown <rbrown@gentoo.org> | 2007-09-18 17:14:18 +0000 |
|---|---|---|
| committer | Richard Brown <rbrown@gentoo.org> | 2007-09-18 17:14:18 +0000 |
| commit | e35d6d0a48cacbe5a90d6aefeed042dd68257837 (patch) | |
| tree | 41acdf4ce383ed14c61cc3dcb34171b9ecc6ce1b /dev-ruby/ruby-mmap | |
| parent | Initial ebuild based upon bug 86017. Thanks to Serhij S. Stasyuk. (diff) | |
| download | gentoo-2-e35d6d0a48cacbe5a90d6aefeed042dd68257837.tar.gz gentoo-2-e35d6d0a48cacbe5a90d6aefeed042dd68257837.tar.bz2 gentoo-2-e35d6d0a48cacbe5a90d6aefeed042dd68257837.zip | |
Fix compile when ruby has USE="cjk". Bug #191203 thanks to : Brenden Matthews. Keyword ~amd64
(Portage version: 2.1.3.9)
Diffstat (limited to 'dev-ruby/ruby-mmap')
| -rw-r--r-- | dev-ruby/ruby-mmap/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-ruby/ruby-mmap/files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch | 20 | ||||
| -rw-r--r-- | dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild | 16 |
3 files changed, 38 insertions, 6 deletions
diff --git a/dev-ruby/ruby-mmap/ChangeLog b/dev-ruby/ruby-mmap/ChangeLog index 444bd13dd7c3..4b5633843053 100644 --- a/dev-ruby/ruby-mmap/ChangeLog +++ b/dev-ruby/ruby-mmap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/ruby-mmap # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ChangeLog,v 1.11 2007/09/04 19:59:25 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ChangeLog,v 1.12 2007/09/18 17:14:18 rbrown Exp $ + + 18 Sep 2007; Richard Brown <rbrown@gentoo.org> + +files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch, + ruby-mmap-0.2.6.ebuild: + Fix compile when ruby has USE="cjk". Bug #191203 thanks to : Brenden + Matthews. Keyword ~amd64 04 Sep 2007; Hans de Graaff <graaff@gentoo.org> -ruby-mmap-0.2.4.ebuild: Remove in-between version that will never become stable diff --git a/dev-ruby/ruby-mmap/files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch b/dev-ruby/ruby-mmap/files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch new file mode 100644 index 000000000000..6b5160b4fc62 --- /dev/null +++ b/dev-ruby/ruby-mmap/files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch @@ -0,0 +1,20 @@ +--- mmap.c.orig Thu Feb 1 14:52:50 2007 ++++ mmap.c Thu Feb 1 14:55:16 2007 +@@ -1113,7 +1113,7 @@ + } + else { + RSTRING(str)->ptr += start; +- repl = rb_reg_regsub(repl, str, regs); ++ repl = rb_reg_regsub(repl, str, regs, pat); + RSTRING(str)->ptr -= start; + } + if (OBJ_TAINTED(repl)) tainted = 1; +@@ -1211,7 +1211,7 @@ + } + else { + RSTRING(str)->ptr += start; +- val = rb_reg_regsub(repl, str, regs); ++ val = rb_reg_regsub(repl, str, regs, pat); + RSTRING(str)->ptr -= start; + } + if (OBJ_TAINTED(repl)) tainted = 1; diff --git a/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild b/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild index 10a71be20d3b..104b8f029064 100644 --- a/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild +++ b/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild,v 1.1 2007/01/08 21:44:26 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild,v 1.2 2007/09/18 17:14:18 rbrown Exp $ inherit ruby @@ -15,13 +15,19 @@ SRC_URI="ftp://moulon.inra.fr/pub/ruby/${MY_P}.tar.gz" SLOT="0" USE_RUBY="ruby18 ruby19" LICENSE="Ruby" -KEYWORDS="~alpha ~ia64 ~ppc ~sparc ~x86" - -DEPEND=">=dev-lang/ruby-1.8" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" S=${WORKDIR}/${MY_P} -src_compile() { +src_unpack() { + unpack ${A} + if built_with_use dev-lang/ruby cjk; then + cd "${S}" + epatch "${FILESDIR}/${P}-oniguruma_rb_reg_regsub.patch" + fi +} + +src_compile() { ruby_src_compile all rdoc || die } |