diff options
author | Hans de Graaff <hans@degraaff.org> | 2009-12-27 17:15:55 +0100 |
---|---|---|
committer | Hans de Graaff <hans@degraaff.org> | 2009-12-27 17:15:55 +0100 |
commit | 96dc09f174b3b490ffbbaffe28108ef51e5b39af (patch) | |
tree | f9fadd618a9c6a5c42efb9710ca0a4bdc9047628 | |
parent | Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/ruby-scripts (diff) | |
parent | Racc committed to main tree. (diff) | |
download | ruby-scripts-96dc09f174b3b490ffbbaffe28108ef51e5b39af.tar.gz ruby-scripts-96dc09f174b3b490ffbbaffe28108ef51e5b39af.tar.bz2 ruby-scripts-96dc09f174b3b490ffbbaffe28108ef51e5b39af.zip |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/ruby-scripts
-rw-r--r-- | eselect-ruby/ruby.eselect | 5 | ||||
-rw-r--r-- | patchsets/distfiles/ruby-patches-1.8.7_p248.tar.bz2 | bin | 0 -> 1257 bytes | |||
-rw-r--r-- | patchsets/patches-1.8.7_p248/001_memory_leak.patch | 60 | ||||
-rw-r--r-- | patchsets/patches-1.8.7_p248/002_mkconfig.patch | 14 | ||||
-rw-r--r-- | patchsets/patches-1.8.7_p248/003_mkmf-parallel-install.patch | 14 | ||||
-rw-r--r-- | ruby-ng-testbed/dev-ruby/racc/Manifest | 2 | ||||
-rw-r--r-- | ruby-ng-testbed/dev-ruby/racc/racc-1.4.6.ebuild | 57 | ||||
-rw-r--r-- | ruby-ng-testbed/dev-ruby/tzinfo/Manifest | 2 | ||||
-rw-r--r-- | ruby-ng-testbed/dev-ruby/tzinfo/tzinfo-0.3.15.ebuild | 41 |
9 files changed, 90 insertions, 105 deletions
diff --git a/eselect-ruby/ruby.eselect b/eselect-ruby/ruby.eselect index b0a3d54..017f892 100644 --- a/eselect-ruby/ruby.eselect +++ b/eselect-ruby/ruby.eselect @@ -1,11 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ DESCRIPTION="Manage ruby symlinks" MAINTAINER="a3li@gentoo.org" -SVN_DATE='$Date: $' -VERSION="GIT" +SVN_DATE="20091225" +VERSION="20091225" bindir=/usr/bin man1dir=/usr/share/man/man1 diff --git a/patchsets/distfiles/ruby-patches-1.8.7_p248.tar.bz2 b/patchsets/distfiles/ruby-patches-1.8.7_p248.tar.bz2 Binary files differnew file mode 100644 index 0000000..ecf7fb6 --- /dev/null +++ b/patchsets/distfiles/ruby-patches-1.8.7_p248.tar.bz2 diff --git a/patchsets/patches-1.8.7_p248/001_memory_leak.patch b/patchsets/patches-1.8.7_p248/001_memory_leak.patch new file mode 100644 index 0000000..5be0314 --- /dev/null +++ b/patchsets/patches-1.8.7_p248/001_memory_leak.patch @@ -0,0 +1,60 @@ +Index: ptr.c +=================================================================== +--- ext/dl/ptr.c (revision 12047) ++++ ext/dl/ptr.c (working copy) +@@ -53,6 +53,8 @@ + void + dlptr_free(struct ptr_data *data) + { ++ if (!data) ++ return; + if (data->ptr) { + DEBUG_CODE({ + printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n", +@@ -69,4 +71,5 @@ + if (data->stype) dlfree(data->stype); + if (data->ssize) dlfree(data->ssize); + if (data->ids) dlfree(data->ids); ++ dlfree(data); + } + + void +Index: sym.c +=================================================================== +--- ext/dl/sym.c (revision 12047) ++++ ext/dl/sym.c (working copy) +@@ -57,6 +57,8 @@ + void + dlsym_free(struct sym_data *data) + { ++ if(!data) ++ return; + if( data->name ){ + DEBUG_CODE({ + printf("dlsym_free(): free(data->name:%s)\n",data->name); +@@ -69,4 +71,5 @@ + }); + free(data->type); + } ++ dlfree(data); + } + + VALUE +Index: handle.c +=================================================================== +--- ext/dl/handle.c (revision 12047) ++++ ext/dl/handle.c (working copy) +@@ -10,7 +10,10 @@ + void + dlhandle_free(struct dl_handle *dlhandle) + { ++ if (!dlhandle) ++ return; + if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) { +- dlclose(dlhandle->ptr); ++ dlclose(dlhandle->ptr); + } ++ dlfree(dlhandle); + } + + VALUE diff --git a/patchsets/patches-1.8.7_p248/002_mkconfig.patch b/patchsets/patches-1.8.7_p248/002_mkconfig.patch new file mode 100644 index 0000000..4426ef9 --- /dev/null +++ b/patchsets/patches-1.8.7_p248/002_mkconfig.patch @@ -0,0 +1,14 @@ +Fix for mkconfig to be able to handle empty continued lines. +Patch from [ruby-core:20420] via bug 234877. + +--- mkconfig.rb.orig 2008-06-08 01:37:10.000000000 +0900 ++++ mkconfig.rb 2009-02-12 13:39:02.000000000 +0900 +@@ -54,7 +54,7 @@ + continued_name = name + next + end +- when /^"(.+)"\s*(\\)?$/ ++ when /^"(.*)"\s*(\\)?$/ + if continued_line + continued_line << $1 + unless $2 diff --git a/patchsets/patches-1.8.7_p248/003_mkmf-parallel-install.patch b/patchsets/patches-1.8.7_p248/003_mkmf-parallel-install.patch new file mode 100644 index 0000000..26c05bb --- /dev/null +++ b/patchsets/patches-1.8.7_p248/003_mkmf-parallel-install.patch @@ -0,0 +1,14 @@ + Patch for bug 239101 by Matsuu Takuto, via Redmine issue 1337 (yes, really). + Backported for 1.8.* by Alex Legler. + +--- lib/mkmf.orig 2009-04-03 13:04:17.000000000 +0200 ++++ lib/mkmf.rb 2009-04-03 13:04:30.000000000 +0200 +@@ -1500,7 +1500,7 @@ + dest = "#{dir}/#{f}" + mfile.puts dir, "install-so: #{dest}" + unless $extout +- mfile.print "#{dest}: #{f}\n" ++ mfile.print "#{dest}: #{dir} #{f}\n" + if (sep = config_string('BUILD_FILE_SEPARATOR')) + f.gsub!("/", sep) + dir.gsub!("/", sep) diff --git a/ruby-ng-testbed/dev-ruby/racc/Manifest b/ruby-ng-testbed/dev-ruby/racc/Manifest deleted file mode 100644 index a494a2d..0000000 --- a/ruby-ng-testbed/dev-ruby/racc/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST racc-1.4.6.tgz 106588 RMD160 43dc4829c83bea69956dd0d78ce0965711734b7c SHA1 c32fc77c003f7ea54e00e03cba4445ea2b592739 SHA256 cdf8e6a588e82a16f3356375b3fbe6b3a720cc9e919fd429110ecf668331d2cb -EBUILD racc-1.4.6.ebuild 1258 RMD160 fc237d54a6f107931def3ba9f33688837bc578bf SHA1 a9254dd0a617411d003d27b14f781d9abe51a805 SHA256 7d56f0102c188b90e370569ab2d078d91e6234a2bbd28b393e29f76f62abd0bd diff --git a/ruby-ng-testbed/dev-ruby/racc/racc-1.4.6.ebuild b/ruby-ng-testbed/dev-ruby/racc/racc-1.4.6.ebuild deleted file mode 100644 index a8ba7b7..0000000 --- a/ruby-ng-testbed/dev-ruby/racc/racc-1.4.6.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.5.ebuild,v 1.13 2008/03/10 00:05:02 ricmm Exp $ - -EAPI=2 -USE_RUBY="ruby18 ruby19" - -inherit ruby-fakegem - -DESCRIPTION="A LALR(1) parser generator for Ruby" -HOMEPAGE="http://www.loveruby.net/en/racc.html" -SRC_URI="mirror://rubyforge/${PN}/${P}.tgz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="" -DEPEND="test? ( ruby_targets_ruby19? ( dev-ruby/test-unit[ruby_targets_ruby19] ) )" - -all_ruby_prepare() { - sed -i -e '/email/d' Rakefile || die - sed -i -e '/build/d' tasks/test.rb || die -} - -each_ruby_prepare() { - if [[ $(basename ${RUBY}) == "ruby18" ]]; then - sed -i -e 's:ruby/ruby.h:ruby.h:' \ - ext/racc/cparse/cparse.c || die - fi -} - -each_ruby_compile() { - pushd ext/racc/cparse - ${RUBY} extconf.rb || die "extconf failed" - emake || die "emake extension failed" -} - -each_ruby_install() { - each_fakegem_install - - ruby_fakegem_newins ext/racc/cparse/cparse.so lib/racc/cparse.so -} - -all_ruby_install() { - for bin in racc racc2y y2racc; do - ruby_fakegem_binwrapper ${bin} - done - - pushd sample - docinto examples - dodoc * - popd - - dodoc README.{en,ja}.rdoc TODO ChangeLog || die -} diff --git a/ruby-ng-testbed/dev-ruby/tzinfo/Manifest b/ruby-ng-testbed/dev-ruby/tzinfo/Manifest deleted file mode 100644 index d7b2913..0000000 --- a/ruby-ng-testbed/dev-ruby/tzinfo/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST tzinfo-0.3.15.tar.gz 292507 RMD160 3449de21bcf61574598323d595543180be9a4cc9 SHA1 e0ea1e8cce25d5cccdd8ce151fd1055f546c1974 SHA256 3ff73889c25598c3fc05eb4ff3218550341c6b08c09b3beb7965b2677bf0f4e5 -EBUILD tzinfo-0.3.15.ebuild 1093 RMD160 6a1d7eefcb2277bbf01b7e937fd42780ac4a38c7 SHA1 c3ef9fbba2d8da45e3f34efa90911f8614cd8291 SHA256 f20f3aff9b6cd7333e45f99042cdc348e370999117213871238615d71ea89368 diff --git a/ruby-ng-testbed/dev-ruby/tzinfo/tzinfo-0.3.15.ebuild b/ruby-ng-testbed/dev-ruby/tzinfo/tzinfo-0.3.15.ebuild deleted file mode 100644 index d700779..0000000 --- a/ruby-ng-testbed/dev-ruby/tzinfo/tzinfo-0.3.15.ebuild +++ /dev/null @@ -1,41 +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/tzinfo/tzinfo-0.3.13.ebuild,v 1.4 2009/05/19 21:05:02 ranger Exp $ - -EAPI=2 -USE_RUBY="ruby18 ruby19 jruby" - -inherit ruby-fakegem - -DESCRIPTION="Daylight-savings aware timezone library" -HOMEPAGE="http://tzinfo.rubyforge.org/" -SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc test" - -RDEPEND="" -DEPEND="" - -all_ruby_unpack() { - unpack ${A} - - # The package has all the files executable, probably coming from - # Windows. - find "${S}" -type f -perm +111 -exec chmod -x {} + - - # With rubygems 1.3.1 we get the following warning - # warning: Insecure world writable dir /var/tmp in LOAD_PATH, mode 041777 - # when running the test_get_tainted_not_loaded test. - sed -i -e '138,146s:^:#:' "${S}"/test/tc_timezone.rb || die "unable to sed out the test" -} - -all_ruby_install() { - if use doc; then - dohtml -r "${S}"/doc/* || die "dohtml failed" - fi - - dodoc "${S}"/CHANGES "${S}"/README || die "dodoc failed" -} |