diff options
author | Richard Brown <rbrown@gentoo.org> | 2008-02-15 23:25:01 +0000 |
---|---|---|
committer | Richard Brown <rbrown@gentoo.org> | 2008-02-15 23:25:01 +0000 |
commit | 1ee955689e5fc1d43508e151331f20ea3da75466 (patch) | |
tree | 398c99093cccc9bd554e5fc0d66da79fa58d1d03 /dev-lang/ruby | |
parent | Version bump (diff) | |
download | historical-1ee955689e5fc1d43508e151331f20ea3da75466.tar.gz historical-1ee955689e5fc1d43508e151331f20ea3da75466.tar.bz2 historical-1ee955689e5fc1d43508e151331f20ea3da75466.zip |
Remove old versions
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'dev-lang/ruby')
-rw-r--r-- | dev-lang/ruby/ChangeLog | 10 | ||||
-rw-r--r-- | dev-lang/ruby/Manifest | 13 | ||||
-rw-r--r-- | dev-lang/ruby/files/ruby-1.8.6-exit-status.patch | 80 | ||||
-rw-r--r-- | dev-lang/ruby/files/ruby-1.8.6_p110-net-http-p111.patch | 125 | ||||
-rw-r--r-- | dev-lang/ruby/files/ruby-1.8.6_p36-rb_thread_status_prototype.patch | 25 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-1.8.5_p2-r1.ebuild | 138 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-1.8.6-r1.ebuild | 167 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild | 167 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-1.8.6_p110-r2.ebuild | 170 |
9 files changed, 10 insertions, 885 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 45d637a2d77e..ed983521a143 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-lang/ruby # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.319 2008/02/05 10:06:24 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.320 2008/02/15 23:25:00 rbrown Exp $ + + 15 Feb 2008; Richard Brown <rbrown@gentoo.org> + -files/ruby-1.8.6-exit-status.patch, + -files/ruby-1.8.6_p110-net-http-p111.patch, + -files/ruby-1.8.6_p36-rb_thread_status_prototype.patch, + -ruby-1.8.5_p2-r1.ebuild, -ruby-1.8.6-r1.ebuild, + -ruby-1.8.6_p110-r1.ebuild, -ruby-1.8.6_p110-r2.ebuild: + Remove old versions 05 Feb 2008; Markus Rothe <corsair@gentoo.org> ruby-1.8.6_p111-r1.ebuild: Stable on ppc64 diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index c17f6dbb5012..60121e1e789d 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,29 +1,18 @@ AUX ruby-1.8.4-glibc24-eaccess.diff 2619 RMD160 8ec70e117b01a53917b47c829455f77023d393b9 SHA1 bd3600fc8e22ef083663b6b90bb1ec748aa87cce SHA256 bde0e69a78528560c574df8e53bce25a243e86a4cdbb6b33bdc9310f15f861a7 AUX ruby-1.8.4-yaml.diff 457 RMD160 6bb5d1700c877d5dc4192da6eaae9bc6712f78b0 SHA1 2b2099e41dee8a277ef78307b3b19ec468c6cf88 SHA256 425847a21b2c794c4cf910bcd7d6603951bc20c55f39e768dd6befd99ea1a0bb AUX ruby-1.8.5_p113-net-http-p114.patch 4095 RMD160 bbe5be91bc1ce597f0ada3b80054a545f313ee61 SHA1 7b1bd5be7ddeb8b9250333e40c2a061b52ec952b SHA256 58f894e7823c68d4aac80a50a73018e51cc61afb171a39514c6a85d78ddaf287 -AUX ruby-1.8.6-exit-status.patch 2284 RMD160 09d777250a298848cff9d11fee5f00551cbab2a4 SHA1 7f3b4b4eba17ef8bf934e6c0d75c823bd0587a62 SHA256 41e7cd46b654e60b29333da68a70c110fac6a0794e35ec10cc13bbd35b150176 AUX ruby-1.8.6-memory-leak.diff 1351 RMD160 cba1335fcd52df26b4b2884dea14e0c74852b67a SHA1 184c1743592684abfc1cce8ffa38ae749fe0a1b1 SHA256 90dbc7b444ed936ed8a1fadb443240ec494a6c748d38ff089af423e50bdd9528 -AUX ruby-1.8.6_p110-net-http-p111.patch 4093 RMD160 9a6242acde9681ceecd98968311507f72884dbe4 SHA1 0ae43c4c8d38b248de05da58945bc963288d07f5 SHA256 4514390d024a227bcd7c1cff275d4f0ab8e6030d374302b71887063d8e110999 AUX ruby-1.8.6_p111-r13657.patch 1915 RMD160 9c135a4e779095127bf7e5d47d2ae3b703e8b41e SHA1 47428434aaa61b5fd11684d8faa8c7db4886b680 SHA256 0856f5987b74be29562e16b3dafc62cb6b874e5536bd73ba2c7fb1e4a4630e24 -AUX ruby-1.8.6_p36-rb_thread_status_prototype.patch 814 RMD160 6d7a11a01635fd25c869ebf7c1b7a0bc16b7170d SHA1 9d5f562b9051d0d50e867dfcd94425bba7406f18 SHA256 13fbd5854117e96f7cb20f9951da92ec72673dd89e59e1f8b4a75f7fa4f3c196 DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b -DIST onigd2_5_7.tar.gz 215529 RMD160 43cf52af1243acf21932690307ed7b0c81ff2771 SHA1 041cac9ce58f3002228a98db3c4c6934f5682593 SHA256 205b2857d77efc4caa3b98eaf91fd1cc8b8722b497df933d1fbd23f7a5186549 DIST onigd2_5_8.tar.gz 218187 RMD160 82d10299ebac0d5ffe94e89f965d84f2f085c6d4 SHA1 8bf30b64c993a00a3d2febe1b2d8662916e49325 SHA256 11aa092d7cb1c21b7fb60980e9c5a9b931e670c29553ea9444927a8a468e526b DIST onigd2_5_9.tar.gz 221355 RMD160 ceeee9a0221d431d6576a566621ba9badab6423d SHA1 41ca5b916ae1d3b1675fcc45181a0ed04e8726b7 SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0 DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA1 93999577c7fc4decc6b2fe8fefa96e743f278fbf SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930 DIST ruby-1.8.5-p113.tar.gz 4484645 RMD160 3c83d411f5fea1b7656050ea8461bba320eaad5e SHA1 66a9d8d0974f30aa693215ceb29f2645025d1f30 SHA256 5df5d21f7414e2191dc73d4d388b1d95d14ddf689eb5fc0d16e04ba01ecf866e -DIST ruby-1.8.5-p2.tar.gz 4519151 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b SHA1 f614bba73f447ddf35f8a4beb71ccc3df87831a5 SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30 -DIST ruby-1.8.6-p110.tar.gz 4546509 RMD160 6495c22a94149e4dbc3608f0bf2f0c75683060e0 SHA1 0954a9d308d12393e2a6880743f752eb171bbe81 SHA256 d3f11ecaf2b0bd7bd3f0bc24007b1c7c12640c55cd40e8e4cc396ba835186fbe DIST ruby-1.8.6-p111.tar.bz2 3919396 RMD160 8ff9b8592a80062742be61b2b4e1158282b61c4b SHA1 d85d25786e0ce30f8f54f5cfa36968ec0f6b9a5f SHA256 85c694678313818a5083bcfd66ae389fc053b506d93b5ad46f3764981c120fbb -DIST ruby-1.8.6.tar.gz 4589394 RMD160 a1ad902bb1311233cd3cf9db52ab2ec076a709f5 SHA1 c915f65e1e42dbedc43acabcbef2bbe03233bf20 SHA256 3ef37fb961d04471a1aef2c8079d6fab09932e3281d79859d5cd5d426bde0868 DIST ruby-1.8.6_p111-to-p113.patch.bz2 5823 RMD160 bee2dedd786450fb8008ced74af95c8e2401fa3b SHA1 0ed730d65593c828b1122c909900402f4d3d8f74 SHA256 cfe2d2e95ad708c5e00c274b9547e20076d31ccf7655860f7661be531dcdacc4 EBUILD ruby-1.8.4-r3.ebuild 3771 RMD160 ec30e7108ca305568d6a435944eee43d198c5b8d SHA1 862eb815f09e6bfbee4dbfb45f2b9b9249cb28e4 SHA256 819b09c7279d9fbbd588236ad0a7bb98dc73d220b191007406cfc80adab77237 EBUILD ruby-1.8.5_p113.ebuild 4830 RMD160 e9c926766b28afc97ad6600ba6ad3466b9bcd659 SHA1 7ea3df62b4e24fbacd4977be209eae78fb5b0a71 SHA256 ecc6e8cf76a7f06a0b070bbe496b6a9a725fc2e9e74e8ea2e7efc4951c93c695 -EBUILD ruby-1.8.5_p2-r1.ebuild 3705 RMD160 3e63db3982accac72314c52eb63f1d61baaf7755 SHA1 87163b26eb53b1221fcb736c97906eecc30555d7 SHA256 3acc443bf52df1245d4003e682d78d8b8dc83891a5b33971865570a433025cfa -EBUILD ruby-1.8.6-r1.ebuild 4975 RMD160 964430cf71c984bea135e322ac8f24d394e764c5 SHA1 219394847d15609115e415888bcaa7837e49c49c SHA256 08216d3a86d9782643943f661d7d9e55ce5e34a42ee1101971810e0cccd6f63a -EBUILD ruby-1.8.6_p110-r1.ebuild 4897 RMD160 a6be5eda4004cc5e562aec6182376861d97fd7db SHA1 13f8b6e2bc45d6214d1b4b84e65afff3a9d69439 SHA256 13b63e0f3965bbe96435f5fded149374a5abdbdb6dbade96193a6ef6b7bc73d9 -EBUILD ruby-1.8.6_p110-r2.ebuild 4960 RMD160 b2db20834f7d3b0ba66b07c8832c0000670664ca SHA1 3fb5da9e10e8a174ecff7b010a72667016477282 SHA256 a1798ef423bbef7186ab0b96d0d4be02fa182037ff7d54346ef60fc37fe84dd1 EBUILD ruby-1.8.6_p111-r1.ebuild 5030 RMD160 3cd76ff6ea3795db7d65eed81ac2e6d56d327e56 SHA1 21b5a56157a3dbe36f7ad68df7de840740bcc33d SHA256 fac3d0aa7c3632078ff706a8c8e44ce16f8b4d7c66ac20e2d1526654ba370836 EBUILD ruby-1.8.6_p111.ebuild 4981 RMD160 a348a5aa534ea01b0a1dd8bba1c9d6b14e07642e SHA1 f7695b286891594eb9e7658e8ba3e1ebb3d6e73f SHA256 b1fc4edaf3001027c3f1a8dfc75ee470687b76db32f233080287c99f9c51be90 -MISC ChangeLog 46626 RMD160 301e034b04d4e688339ef02b4016e04a1d8b8fb6 SHA1 35a1af46b8239a9611058adca866a9b2eb3a5b17 SHA256 7475e039255599a7b442399e0e45ecff79d7e72f4e59398bdd7b885f83394d8a +MISC ChangeLog 46949 RMD160 08f3bc0f38753fca7ad0385fe938b372df8d9e64 SHA1 6c660e8a5314b53fa7e0c7eabe35ee2383f65d91 SHA256 e9403415a5390b561e4bc7b8a20a2b5ff617bd995b841a34a58da04ce11170dc MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c diff --git a/dev-lang/ruby/files/ruby-1.8.6-exit-status.patch b/dev-lang/ruby/files/ruby-1.8.6-exit-status.patch deleted file mode 100644 index a86587f7a7be..000000000000 --- a/dev-lang/ruby/files/ruby-1.8.6-exit-status.patch +++ /dev/null @@ -1,80 +0,0 @@ -Index: test/ruby/test_beginendblock.rb -=================================================================== ---- test/ruby/test_beginendblock.rb (revision 12125) -+++ test/ruby/test_beginendblock.rb (revision 12126) -@@ -54,4 +54,34 @@ - assert_equal(expected, File.read(erroutpath)) - # expecting Tempfile to unlink launcher and errout file. - end -+ -+ def test_raise_in_at_exit -+ # [ruby-core:09675] -+ ruby = EnvUtil.rubybin -+ out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \ -+ "at_exit{raise %[SomethingBad]};" \ -+ "raise %[SomethingElse]'") {|f| -+ f.read -+ } -+ assert_match /SomethingBad/, out -+ assert_match /SomethingElse/, out -+ end -+ -+ def test_should_propagate_exit_code -+ ruby = EnvUtil.rubybin -+ assert_equal false, system("#{q(ruby)} -e 'at_exit{exit 2}'") -+ assert_equal 2, $?.exitstatus -+ assert_nil $?.termsig -+ end -+ -+ def test_should_propagate_signaled -+ ruby = EnvUtil.rubybin -+ out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \ -+ "at_exit{Process.kill(:INT, $$)}'"){|f| -+ f.read -+ } -+ assert_match /Interrupt$/, out -+ assert_nil $?.exitstatus -+ assert_equal Signal.list["INT"], $?.termsig -+ end - end -Index: eval.c -=================================================================== ---- eval.c (revision 12125) -+++ eval.c (revision 12126) -@@ -1562,11 +1562,15 @@ - int ex; - { - int state; -- volatile VALUE err = ruby_errinfo; -+ VALUE err; -+ volatile VALUE errs[2]; -+ int nerr; - -+ errs[0] = ruby_errinfo; - ruby_safe_level = 0; - Init_stack((void*)&state); - ruby_finalize_0(); -+ errs[1] = ruby_errinfo; - PUSH_TAG(PROT_NONE); - PUSH_ITER(ITER_NOT); - if ((state = EXEC_TAG()) == 0) { -@@ -1577,15 +1581,15 @@ - ex = state; - } - POP_ITER(); -- ruby_errinfo = err; -+ ruby_errinfo = errs[0]; - ex = error_handle(ex); - ruby_finalize_1(); - POP_TAG(); - -- if (err) { -+ for (nerr = sizeof(errs) / sizeof(errs[0]); nerr;) { -+ if (!(err = errs[--nerr])) continue; - if (rb_obj_is_kind_of(err, rb_eSystemExit)) { -- VALUE st = rb_iv_get(err, "status"); -- return NUM2INT(st); -+ return sysexit_status(err); - } - else if (rb_obj_is_kind_of(err, rb_eSignal)) { - VALUE sig = rb_iv_get(err, "signo"); diff --git a/dev-lang/ruby/files/ruby-1.8.6_p110-net-http-p111.patch b/dev-lang/ruby/files/ruby-1.8.6_p110-net-http-p111.patch deleted file mode 100644 index 82bc32d36824..000000000000 --- a/dev-lang/ruby/files/ruby-1.8.6_p110-net-http-p111.patch +++ /dev/null @@ -1,125 +0,0 @@ -Index: ext/openssl/lib/openssl/ssl.rb -=================================================================== ---- ext/openssl/lib/openssl/ssl.rb (revision 13503) -+++ ext/openssl/lib/openssl/ssl.rb (revision 13504) -@@ -88,7 +88,7 @@ - end - } - end -- raise SSLError, "hostname not match" -+ raise SSLError, "hostname was not match with the server certificate" - end - end - -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 13503) -+++ ChangeLog (revision 13504) -@@ -1,3 +1,17 @@ -+Sun Sep 23 21:57:25 2007 GOTOU Yuuzou <gotoyuzo@notwork.org> -+ -+ * lib/net/http.rb: an SSL verification (the server hostname should -+ be matched with its certificate's commonName) is added. -+ this verification can be skipped by -+ "Net::HTTP#enable_post_connection_check=(false)". -+ suggested by Chris Clark <cclark at isecpartners.com> -+ -+ * lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to -+ perform SSL post connection check. -+ -+ * ext/openssl/lib/openssl/ssl.c -+ (OpenSSL::SSL::SSLSocket#post_connection_check): refine error message. -+ - Sun Sep 23 07:49:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * eval.c, intern.h, ext/thread/thread.c: should not free queue while -Index: version.h -=================================================================== ---- version.h (revision 13503) -+++ version.h (revision 13504) -@@ -1,15 +1,15 @@ - #define RUBY_VERSION "1.8.6" --#define RUBY_RELEASE_DATE "2007-09-23" -+#define RUBY_RELEASE_DATE "2007-09-24" - #define RUBY_VERSION_CODE 186 --#define RUBY_RELEASE_CODE 20070923 --#define RUBY_PATCHLEVEL 110 -+#define RUBY_RELEASE_CODE 20070924 -+#define RUBY_PATCHLEVEL 111 - - #define RUBY_VERSION_MAJOR 1 - #define RUBY_VERSION_MINOR 8 - #define RUBY_VERSION_TEENY 6 - #define RUBY_RELEASE_YEAR 2007 - #define RUBY_RELEASE_MONTH 9 --#define RUBY_RELEASE_DAY 23 -+#define RUBY_RELEASE_DAY 24 - - #ifdef RUBY_EXTERN - RUBY_EXTERN const char ruby_version[]; -Index: lib/open-uri.rb -=================================================================== ---- lib/open-uri.rb (revision 13503) -+++ lib/open-uri.rb (revision 13504) -@@ -229,6 +229,7 @@ - if target.class == URI::HTTPS - require 'net/https' - http.use_ssl = true -+ http.enable_post_connection_check = true - http.verify_mode = OpenSSL::SSL::VERIFY_PEER - store = OpenSSL::X509::Store.new - store.set_default_paths -@@ -240,16 +241,6 @@ - - resp = nil - http.start { -- if target.class == URI::HTTPS -- # xxx: information hiding violation -- sock = http.instance_variable_get(:@socket) -- if sock.respond_to?(:io) -- sock = sock.io # 1.9 -- else -- sock = sock.instance_variable_get(:@socket) # 1.8 -- end -- sock.post_connection_check(target_host) -- end - req = Net::HTTP::Get.new(request_uri, header) - if options.include? :http_basic_authentication - user, pass = options[:http_basic_authentication] -Index: lib/net/http.rb -=================================================================== ---- lib/net/http.rb (revision 13503) -+++ lib/net/http.rb (revision 13504) -@@ -470,6 +470,7 @@ - @debug_output = nil - @use_ssl = false - @ssl_context = nil -+ @enable_post_connection_check = false - end - - def inspect -@@ -526,6 +527,9 @@ - false # redefined in net/https - end - -+ # specify enabling SSL server certificate and hostname checking. -+ attr_accessor :enable_post_connection_check -+ - # Opens TCP connection and HTTP session. - # - # When this method is called with block, gives a HTTP object -@@ -584,6 +588,14 @@ - HTTPResponse.read_new(@socket).value - end - s.connect -+ if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE -+ begin -+ s.post_connection_check(@address) -+ rescue OpenSSL::SSL::SSLError => ex -+ raise ex if @enable_post_connection_check -+ warn ex.message -+ end -+ end - end - on_connect - end diff --git a/dev-lang/ruby/files/ruby-1.8.6_p36-rb_thread_status_prototype.patch b/dev-lang/ruby/files/ruby-1.8.6_p36-rb_thread_status_prototype.patch deleted file mode 100644 index 2cf9bf4740e9..000000000000 --- a/dev-lang/ruby/files/ruby-1.8.6_p36-rb_thread_status_prototype.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: intern.h -=================================================================== ---- intern.h (revision 12566) -+++ intern.h (revision 12567) -@@ -204,7 +204,6 @@ - void rb_thread_polling _((void)); - void rb_thread_sleep _((int)); - void rb_thread_sleep_forever _((void)); --enum rb_thread_status rb_thread_status _((VALUE)); - VALUE rb_thread_stop _((void)); - VALUE rb_thread_wakeup _((VALUE)); - VALUE rb_thread_wakeup_alive _((VALUE)); -Index: ext/thread/thread.c -=================================================================== ---- ext/thread/thread.c (revision 12566) -+++ ext/thread/thread.c (revision 12567) -@@ -14,6 +14,8 @@ - #include <rubysig.h> - #include <node.h> - -+enum rb_thread_status rb_thread_status _((VALUE)); -+ - static VALUE rb_cMutex; - static VALUE rb_cConditionVariable; - static VALUE rb_cQueue; diff --git a/dev-lang/ruby/ruby-1.8.5_p2-r1.ebuild b/dev-lang/ruby/ruby-1.8.5_p2-r1.ebuild deleted file mode 100644 index bdb9779fe8cc..000000000000 --- a/dev-lang/ruby/ruby-1.8.5_p2-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p2-r1.ebuild,v 1.12 2007/08/25 22:58:16 vapier Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -ONIGURUMA="onigd2_5_7" - -inherit flag-o-matic alternatives eutils multilib autotools versionator - -MY_P="${P/_p/-p}" - -DESCRIPTION="An object-oriented scripting language" -HOMEPAGE="http://www.ruby-lang.org/" -SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${MY_P}.tar.gz - cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" - -LICENSE="Ruby" -SLOT="1.8" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="debug socks5 tk cjk doc threads examples ipv6" -RESTRICT="test" - -RDEPEND=">=sys-libs/gdbm-1.8.0 - >=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - socks5? ( >=net-proxy/dante-1.1.13 ) - tk? ( dev-lang/tk ) - >=dev-ruby/ruby-config-0.3.1 - !=dev-lang/ruby-cvs-1.8* - !dev-ruby/rdoc - !dev-ruby/rexml" -DEPEND="${RDEPEND}" -PROVIDE="virtual/ruby" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - - if use cjk ; then - einfo "Applying ${ONIGURUMA}" - pushd ${WORKDIR}/oniguruma -# epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch - econf --with-rubydir=${S} || die "econf failed" - MY_PV=$(get_version_component_range 1-2) - make ${MY_PV/./} - popd - fi - - cd "${S}" - - # Fix a hardcoded lib path in configure script - sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ - configure.in || die "sed failed" - - eautoreconf -} - -src_compile() { - # -fomit-frame-pointer makes ruby segfault, see bug #150413. - filter-flags -fomit-frame-pointer - - # Socks support via dante - if use socks5 ; then - # Socks support can't be disabled as long as SOCKS_SERVER is - # set and socks library is present, so need to unset - # SOCKS_SERVER in that case. - unset SOCKS_SERVER - fi - - # Increase GC_MALLOC_LIMIT if set (default is 8000000) - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" - fi - - econf --program-suffix=${SLOT/./} --enable-shared \ - $(use_enable socks5 socks) \ - $(use_enable doc install-doc) \ - $(use_enable threads pthread) \ - $(use_enable ipv6 ipv6) \ - $(use_enable debug debug) \ - --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - LD_LIBRARY_PATH=${D}/usr/$(get_libdir) - RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" - for d in $(find ${S}/ext -type d) ; do - RUBYLIB="${RUBYLIB}:$d" - done - export LD_LIBRARY_PATH RUBYLIB - - make DESTDIR="${D}" install || die "make install failed" - - if use doc; then - make DESTDIR="${D}" install-doc || die "make install-doc failed" - fi - - if use examples; then - dodir /usr/share/doc/${PF} - cp -pPR sample ${D}/usr/share/doc/${PF} - fi - - dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*} - dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*} - - dodoc ChangeLog README* ToDo -} - -pkg_postinst() { - ewarn - ewarn "Warning: Vim won't work if you've just updated ruby from" - ewarn "1.6.x to 1.8.x due to the library version change." - ewarn "In that case, you will need to remerge vim." - ewarn - - ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1," - ewarn "you should re-emerge ruby again." - ewarn "See bug #159922 for details" - ewarn - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi - elog - elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" - elog -} - -pkg_postrm() { - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi -} diff --git a/dev-lang/ruby/ruby-1.8.6-r1.ebuild b/dev-lang/ruby/ruby-1.8.6-r1.ebuild deleted file mode 100644 index cb4c6f9877c1..000000000000 --- a/dev-lang/ruby/ruby-1.8.6-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6-r1.ebuild,v 1.15 2007/10/09 02:11:14 beandog Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -# A new version is needed for 1.8.6, currently disabled. -ONIGURUMA="onigd2_5_8" - -inherit flag-o-matic alternatives eutils multilib autotools versionator - -DESCRIPTION="An object-oriented scripting language" -HOMEPAGE="http://www.ruby-lang.org/" -SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/$(get_version_component_range 1-2)/${P}.tar.gz" -# cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" - -LICENSE="Ruby" -SLOT="1.8" -KEYWORDS="alpha amd64 arm hppa ~ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="debug doc examples ipv6 rubytests socks5 threads tk" # cjk - -RDEPEND=">=sys-libs/gdbm-1.8.0 - >=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - socks5? ( >=net-proxy/dante-1.1.13 ) - tk? ( dev-lang/tk ) - >=dev-ruby/ruby-config-0.3.1 - !=dev-lang/ruby-cvs-1.8* - !dev-ruby/rdoc - !dev-ruby/rexml" -DEPEND="${RDEPEND}" -PROVIDE="virtual/ruby" - -src_unpack() { - unpack ${A} - -# if use cjk ; then -# einfo "Applying ${ONIGURUMA}" -# pushd ${WORKDIR}/oniguruma -## epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch -# econf --with-rubydir=${S} || die "econf failed" -# MY_PV=$(get_version_component_range 1-2) -# make ${MY_PV/./} -# popd -# fi - - cd "${S}" - - # Fix a hardcoded lib path in configure script - sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ - configure.in || die "sed failed" - - eautoreconf - - epatch ${FILESDIR}/${P}-exit-status.patch -} - -src_compile() { - # -fomit-frame-pointer makes ruby segfault, see bug #150413. - filter-flags -fomit-frame-pointer - # In many places aliasing rules are broken; play it safe - # as it's risky with newer compilers to leave it as it is. - append-flags -fno-strict-aliasing - - # Socks support via dante - if use socks5 ; then - # Socks support can't be disabled as long as SOCKS_SERVER is - # set and socks library is present, so need to unset - # SOCKS_SERVER in that case. - unset SOCKS_SERVER - fi - - # Increase GC_MALLOC_LIMIT if set (default is 8000000) - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" - fi - - econf --program-suffix=${SLOT/./} --enable-shared \ - $(use_enable socks5 socks) \ - $(use_enable doc install-doc) \ - $(use_enable threads pthread) \ - $(use_enable ipv6 ipv6) \ - $(use_enable debug debug) \ - $(use_with tk) \ - --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ - || die "econf failed" - - emake || die "emake failed" -} - -src_test() { - emake -j1 test || die "make test failed" - - elog "Ruby's make test has been run. Ruby also ships with a make check" - elog "that cannot be run until after ruby has been installed." - elog - if use rubytests; then - elog "You have enabled rubytests, so they will be installed to" - elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" - elog "than root, and you must place them into a writeable directory." - elog "Then call: " - elog - elog "ruby -C /location/of/tests runner.rb" - else - elog "Enable the rubytests USE flag to install the make check tests" - fi -} - -src_install() { - LD_LIBRARY_PATH=${D}/usr/$(get_libdir) - RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" - for d in $(find ${S}/ext -type d) ; do - RUBYLIB="${RUBYLIB}:$d" - done - export LD_LIBRARY_PATH RUBYLIB - - make DESTDIR="${D}" install || die "make install failed" - - MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) - keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']") - keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']") - - if use doc; then - make DESTDIR="${D}" install-doc || die "make install-doc failed" - fi - - if use examples; then - dodir /usr/share/doc/${PF} - cp -pPR sample ${D}/usr/share/doc/${PF} - fi - - dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) - dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) - - dodoc ChangeLog NEWS README* ToDo - - if use rubytests; then - dodir /usr/share/${PN}-${SLOT} - cp -pPR test ${D}/usr/share/${PN}-${SLOT} - fi -} - -pkg_postinst() { - ewarn - ewarn "Warning: Vim won't work if you've just updated ruby from" - ewarn "1.6.x to 1.8.x due to the library version change." - ewarn "In that case, you will need to remerge vim." - ewarn - - ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1," - ewarn "you should re-emerge ruby again." - ewarn "See bug #159922 for details" - ewarn - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi - elog - elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" - elog -} - -pkg_postrm() { - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi -} diff --git a/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild b/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild deleted file mode 100644 index f353aeda5460..000000000000 --- a/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild,v 1.9 2007/12/11 09:45:42 vapier Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -ONIGURUMA="onigd2_5_9" - -inherit autotools eutils flag-o-matic multilib versionator - -MY_P="${PN}-$(replace_version_separator 3 '-')" -S=${WORKDIR}/${MY_P} - -SLOT=$(get_version_component_range 1-2) -MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) - -DESCRIPTION="An object-oriented scripting language" -HOMEPAGE="http://www.ruby-lang.org/" -SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.gz - cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" - -LICENSE="Ruby" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="cjk debug doc examples ipv6 rubytests socks5 threads tk" - -RDEPEND=">=sys-libs/gdbm-1.8.0 - >=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - socks5? ( >=net-proxy/dante-1.1.13 ) - tk? ( dev-lang/tk ) - >=dev-ruby/ruby-config-0.3.1 - !=dev-lang/ruby-cvs-${SLOT}* - !dev-ruby/rdoc - !dev-ruby/rexml" -DEPEND="${RDEPEND}" -PROVIDE="virtual/ruby" - -src_unpack() { - unpack ${A} - - if use cjk ; then - einfo "Applying ${ONIGURUMA}" - pushd ${WORKDIR}/oniguruma - econf --with-rubydir="${S}" || die "oniguruma econf failed" - emake $MY_SUFFIX || die "oniguruma emake failed" - popd - fi - - cd "${S}/ext/dl" - epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff" - cd "${S}" - - epatch "${FILESDIR}/${P}-net-http-p111.patch" - - # Fix a hardcoded lib path in configure script - sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ - configure.in || die "sed failed" - - eautoreconf -} - -src_compile() { - # -fomit-frame-pointer makes ruby segfault, see bug #150413. - filter-flags -fomit-frame-pointer - # In many places aliasing rules are broken; play it safe - # as it's risky with newer compilers to leave it as it is. - append-flags -fno-strict-aliasing - - # Socks support via dante - if use socks5 ; then - # Socks support can't be disabled as long as SOCKS_SERVER is - # set and socks library is present, so need to unset - # SOCKS_SERVER in that case. - unset SOCKS_SERVER - fi - - # Increase GC_MALLOC_LIMIT if set (default is 8000000) - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" - fi - - econf --program-suffix=$MY_SUFFIX --enable-shared \ - $(use_enable socks5 socks) \ - $(use_enable doc install-doc) \ - $(use_enable threads pthread) \ - $(use_enable ipv6) \ - $(use_enable debug) \ - $(use_with tk) \ - ${myconf} \ - --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ - || die "econf failed" - - emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed" -} - -src_test() { - emake -j1 test || die "make test failed" - - elog "Ruby's make test has been run. Ruby also ships with a make check" - elog "that cannot be run until after ruby has been installed." - elog - if use rubytests; then - elog "You have enabled rubytests, so they will be installed to" - elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" - elog "than root, and you must place them into a writeable directory." - elog "Then call: " - elog - elog "ruby -C /location/of/tests runner.rb" - else - elog "Enable the rubytests USE flag to install the make check tests" - fi -} - -src_install() { - LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" - RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" - for d in $(find "${S}/ext" -type d) ; do - RUBYLIB="${RUBYLIB}:$d" - done - export LD_LIBRARY_PATH RUBYLIB - - emake DESTDIR="${D}" install || die "make install failed" - - MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) - keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']") - keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']") - - if use doc; then - make DESTDIR="${D}" install-doc || die "make install-doc failed" - fi - - if use examples; then - dodir /usr/share/doc/${PF} - cp -pPR sample "${D}/usr/share/doc/${PF}" - fi - - dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) - dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) - - dodoc ChangeLog NEWS README* ToDo - - if use rubytests; then - dodir /usr/share/${PN}-${SLOT} - cp -pPR test "${D}/usr/share/${PN}-${SLOT}" - fi -} - -pkg_postinst() { - - ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1," - ewarn "you should re-emerge ruby again." - ewarn "See bug #159922 for details" - ewarn - if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then - "${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX - fi - elog - elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" - elog -} - -pkg_postrm() { - if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then - "${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX - fi -} diff --git a/dev-lang/ruby/ruby-1.8.6_p110-r2.ebuild b/dev-lang/ruby/ruby-1.8.6_p110-r2.ebuild deleted file mode 100644 index 498de7507ba8..000000000000 --- a/dev-lang/ruby/ruby-1.8.6_p110-r2.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r2.ebuild,v 1.3 2007/12/14 10:38:29 ulm Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -ONIGURUMA="onigd2_5_9" - -inherit autotools eutils flag-o-matic multilib versionator - -MY_P="${PN}-$(replace_version_separator 3 '-')" -S=${WORKDIR}/${MY_P} - -SLOT=$(get_version_component_range 1-2) -MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) - -DESCRIPTION="An object-oriented scripting language" -HOMEPAGE="http://www.ruby-lang.org/" -SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.gz - cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" - -LICENSE="Ruby" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="cjk debug doc emacs examples ipv6 rubytests socks5 threads tk xemacs" - -RDEPEND=">=sys-libs/gdbm-1.8.0 - >=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - socks5? ( >=net-proxy/dante-1.1.13 ) - tk? ( dev-lang/tk ) - >=dev-ruby/ruby-config-0.3.1 - !=dev-lang/ruby-cvs-${SLOT}* - !dev-ruby/rdoc - !dev-ruby/rexml" -DEPEND="${RDEPEND}" -PDEPEND="emacs? ( app-emacs/ruby-mode ) - xemacs? ( app-xemacs/ruby-modes )" - -PROVIDE="virtual/ruby" - -src_unpack() { - unpack ${A} - - if use cjk ; then - einfo "Applying ${ONIGURUMA}" - pushd "${WORKDIR}/oniguruma" - econf --with-rubydir="${S}" || die "oniguruma econf failed" - emake $MY_SUFFIX || die "oniguruma emake failed" - popd - fi - - cd "${S}/ext/dl" - epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff" - cd "${S}" - - epatch "${FILESDIR}/${P}-net-http-p111.patch" - - # Fix a hardcoded lib path in configure script - sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ - configure.in || die "sed failed" - - eautoreconf -} - -src_compile() { - # -fomit-frame-pointer makes ruby segfault, see bug #150413. - filter-flags -fomit-frame-pointer - # In many places aliasing rules are broken; play it safe - # as it's risky with newer compilers to leave it as it is. - append-flags -fno-strict-aliasing - - # Socks support via dante - if use socks5 ; then - # Socks support can't be disabled as long as SOCKS_SERVER is - # set and socks library is present, so need to unset - # SOCKS_SERVER in that case. - unset SOCKS_SERVER - fi - - # Increase GC_MALLOC_LIMIT if set (default is 8000000) - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" - fi - - econf --program-suffix=$MY_SUFFIX --enable-shared \ - $(use_enable socks5 socks) \ - $(use_enable doc install-doc) \ - $(use_enable threads pthread) \ - $(use_enable ipv6) \ - $(use_enable debug) \ - $(use_with tk) \ - ${myconf} \ - --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ - || die "econf failed" - - emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed" -} - -src_test() { - emake -j1 test || die "make test failed" - - elog "Ruby's make test has been run. Ruby also ships with a make check" - elog "that cannot be run until after ruby has been installed." - elog - if use rubytests; then - elog "You have enabled rubytests, so they will be installed to" - elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" - elog "than root, and you must place them into a writeable directory." - elog "Then call: " - elog - elog "ruby -C /location/of/tests runner.rb" - else - elog "Enable the rubytests USE flag to install the make check tests" - fi -} - -src_install() { - LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" - RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" - for d in $(find "${S}/ext" -type d) ; do - RUBYLIB="${RUBYLIB}:$d" - done - export LD_LIBRARY_PATH RUBYLIB - - emake DESTDIR="${D}" install || die "make install failed" - - MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) - keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']") - keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']") - - if use doc; then - make DESTDIR="${D}" install-doc || die "make install-doc failed" - fi - - if use examples; then - dodir /usr/share/doc/${PF} - cp -pPR sample "${D}/usr/share/doc/${PF}" - fi - - dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) - dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) - - dodoc ChangeLog NEWS README* ToDo - - if use rubytests; then - dodir /usr/share/${PN}-${SLOT} - cp -pPR test "${D}/usr/share/${PN}-${SLOT}" - fi -} - -pkg_postinst() { - - ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1," - ewarn "you should re-emerge ruby again." - ewarn "See bug #159922 for details" - ewarn - if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then - "${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX - fi - elog - elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" - elog -} - -pkg_postrm() { - if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then - "${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX - fi -} |