From 6a042dce4d2131e01861e0c98d2b1ccd51e7c01f Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Wed, 5 Oct 2005 15:14:48 +0000 Subject: [PATCH] Removing ruby 1.6 Package-Manager: portage-2.0.53_rc3 --- dev-lang/ruby-cvs/Manifest | 14 +-- dev-lang/ruby/ChangeLog | 7 +- dev-lang/ruby/Manifest | 28 +++--- dev-lang/ruby/files/digest-ruby-1.6.8-r12 | 2 - .../files/ruby-1.6.8-20040728-20041024.diff | 92 ------------------- .../ruby/files/ruby-1.6.8-fix-x86_64.patch | 21 ----- dev-lang/ruby/ruby-1.6.8-r12.ebuild | 77 ---------------- 7 files changed, 19 insertions(+), 222 deletions(-) delete mode 100644 dev-lang/ruby/files/digest-ruby-1.6.8-r12 delete mode 100644 dev-lang/ruby/files/ruby-1.6.8-20040728-20041024.diff delete mode 100644 dev-lang/ruby/files/ruby-1.6.8-fix-x86_64.patch delete mode 100644 dev-lang/ruby/ruby-1.6.8-r12.ebuild diff --git a/dev-lang/ruby-cvs/Manifest b/dev-lang/ruby-cvs/Manifest index 850b937d3a33..2d3f8261a28c 100644 --- a/dev-lang/ruby-cvs/Manifest +++ b/dev-lang/ruby-cvs/Manifest @@ -1,17 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 089b382779f0bd215d790e5e7e40204f ChangeLog 3251 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ruby-cvs-1.8.2-r1 0 +MD5 0d431d8e2b36e5e750eb7c3af438fda9 ChangeLog 3366 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ruby-cvs-1.9.0-r2 0 MD5 999d392f0a17f7643659081973e99def files/ruby-rdoc-gentoo.diff 432 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 -MD5 d2de32ee271324dcc1bd0fe906f1a3a0 ruby-cvs-1.8.2-r1.ebuild 2655 MD5 3c3a7c05c5098a3e455a2a7d97caf235 ruby-cvs-1.9.0-r2.ebuild 2538 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC0ZGDI1lqEGTUzyQRAszFAJ9KNaWApEKHb663F5liQX9jt8hIDACghxJ5 -rDKsDDBloKfXVMCvEjXC9+8= -=YnDv ------END PGP SIGNATURE----- diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 8013aaa04f9f..540f658674e5 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/ruby # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.161 2005/10/02 10:35:57 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.162 2005/10/05 15:14:48 caleb Exp $ + + 05 Oct 2005; Caleb Tennis + -files/ruby-1.6.8-20040728-20041024.diff, + -files/ruby-1.6.8-fix-x86_64.patch, -ruby-1.6.8-r12.ebuild: + Removing ruby 1.6 02 Oct 2005; MATSUU Takuto ruby-1.8.3.ebuild: Stable on sh. diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 5065fc91fe17..c062b7a2f65c 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,20 +1,16 @@ -MD5 a63962eec3291eb3762c7462570b39bc ruby-1.6.8-r12.ebuild 1937 -MD5 538b1bae6a7bf09a16412a9d2f76e6ef ruby-1.8.3.ebuild 3628 -MD5 3c1c7073b75a7c7dc6e6fc48de2ebe64 ruby-1.8.2-r2.ebuild 3828 -MD5 67de00f5d7b9ced2530317f945d0ebc9 ruby-1.8.2.ebuild 3446 -MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753 -MD5 104ec78a1d17f01addbfcc6190f18058 ChangeLog 23367 -MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 -MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431 -MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596 -MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455 -MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822 +MD5 0e6137cec1cc1c03969c6656111a15c5 ChangeLog 23540 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2 125 +MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125 +MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125 MD5 65c0fa57dea7939af268a53a2e50b173 files/digest-ruby-1.8.3 125 +MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593 MD5 d4b55b8964955655827a50afba707a69 files/re.c.182.patch 2472 -MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136 +MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596 +MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822 MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441 -MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593 -MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125 -MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125 -MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094 +MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455 +MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 +MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753 +MD5 3c1c7073b75a7c7dc6e6fc48de2ebe64 ruby-1.8.2-r2.ebuild 3828 +MD5 67de00f5d7b9ced2530317f945d0ebc9 ruby-1.8.2.ebuild 3446 +MD5 538b1bae6a7bf09a16412a9d2f76e6ef ruby-1.8.3.ebuild 3628 diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r12 b/dev-lang/ruby/files/digest-ruby-1.6.8-r12 deleted file mode 100644 index 857a3f7f510b..000000000000 --- a/dev-lang/ruby/files/digest-ruby-1.6.8-r12 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 19eae3f81026270a201004d0decd3bc8 ruby-1.6.8-2004.07.28.tar.gz 1056477 -MD5 a340ae6a721362338a8d8f5a79e470d5 onigd2_3_3.tar.gz 199191 diff --git a/dev-lang/ruby/files/ruby-1.6.8-20040728-20041024.diff b/dev-lang/ruby/files/ruby-1.6.8-20040728-20041024.diff deleted file mode 100644 index 2edf362414a1..000000000000 --- a/dev-lang/ruby/files/ruby-1.6.8-20040728-20041024.diff +++ /dev/null @@ -1,92 +0,0 @@ -diff --exclude=CVS -urN ruby-1.6.8-20040728/ChangeLog ruby-1.6.8-20041024/ChangeLog ---- ruby-1.6.8-20040728/ChangeLog 2004-11-04 23:18:54.000000000 +0900 -+++ ruby-1.6.8-20041024/ChangeLog 2004-11-05 00:09:04.000000000 +0900 -@@ -54,6 +54,11 @@ - - * gc.c (Init_stack): add safety margin. - -+Sat Jun 14 17:59:59 2003 Guy Decoux -+ -+ * eval.c (method_arity): should handle NODE_BMETHOD and -+ NODE_DMETHOD. [ruby-core:01138] -+ - Fri May 30 11:25:58 2003 WATANABE Hirofumi - - * lib/irb/xmp.rb: sync with 1.8 ("irb/irb" -> "irb"). -diff --exclude=CVS -urN ruby-1.6.8-20040728/eval.c ruby-1.6.8-20041024/eval.c ---- ruby-1.6.8-20040728/eval.c 2004-11-04 23:18:56.000000000 +0900 -+++ ruby-1.6.8-20041024/eval.c 2004-11-05 00:09:05.000000000 +0900 -@@ -3,7 +3,7 @@ - eval.c - - - $Author: matz $ -- $Date: 2003/05/19 16:19:21 $ -+ $Date: 2004/10/24 23:37:20 $ - created at: Thu Jun 10 14:22:17 JST 1993 - - Copyright (C) 1993-2001 Yukihiro Matsumoto -@@ -6827,6 +6827,9 @@ - return INT2FIX(1); - case NODE_IVAR: - return INT2FIX(0); -+ case NODE_BMETHOD: -+ case NODE_DMETHOD: -+ return proc_arity(method); - default: - body = body->nd_next; /* skip NODE_SCOPE */ - if (nd_type(body) == NODE_BLOCK) -diff --exclude=CVS -urN ruby-1.6.8-20040728/io.c ruby-1.6.8-20041024/io.c ---- ruby-1.6.8-20040728/io.c 2004-11-04 23:18:56.000000000 +0900 -+++ ruby-1.6.8-20041024/io.c 2004-11-05 00:09:06.000000000 +0900 -@@ -2,8 +2,8 @@ - - io.c - - -- $Author: nobu $ -- $Date: 2003/07/26 18:10:41 $ -+ $Author: matz $ -+ $Date: 2004/10/24 23:37:20 $ - created at: Fri Oct 15 18:08:59 JST 1993 - - Copyright (C) 1993-2000 Yukihiro Matsumoto -@@ -2184,7 +2184,8 @@ - line = rb_obj_as_string(argv[i]); - } - rb_io_write(out, line); -- if (RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') { -+ if (RSTRING(line)->len == 0 || -+ RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') { - rb_io_write(out, rb_default_rs); - } - } -diff --exclude=CVS -urN ruby-1.6.8-20040728/lib/cgi.rb ruby-1.6.8-20041024/lib/cgi.rb ---- ruby-1.6.8-20040728/lib/cgi.rb 2004-11-04 23:18:57.000000000 +0900 -+++ ruby-1.6.8-20041024/lib/cgi.rb 2004-11-05 00:09:07.000000000 +0900 -@@ -182,7 +182,7 @@ - CR = "\015" - LF = "\012" - EOL = CR + LF -- REVISION = '$Id: cgi.rb,v 1.23.2.17 2002/08/25 20:15:54 wakou Exp $' -+ REVISION = '$Id: cgi.rb,v 1.23.2.18 2004/10/24 23:37:19 matz Exp $' - - NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM) - PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'} -@@ -823,13 +823,15 @@ - end - - c = if bufsize < content_length -- stdinput.read(bufsize) or '' -+ stdinput.read(bufsize) - else -- stdinput.read(content_length) or '' -+ stdinput.read(content_length) - end -+ if c.nil? -+ raise EOFError, "bad content body" -+ end - buf += c - content_length -= c.size -- - end - - buf = buf.sub(/\A((?:.|\n)*?)(?:#{EOL})?#{boundary}(#{EOL}|--)/n) do diff --git a/dev-lang/ruby/files/ruby-1.6.8-fix-x86_64.patch b/dev-lang/ruby/files/ruby-1.6.8-fix-x86_64.patch deleted file mode 100644 index ed573f3b8bd3..000000000000 --- a/dev-lang/ruby/files/ruby-1.6.8-fix-x86_64.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN ruby-1.6.8.orig/node.h ruby-1.6.8/node.h ---- ruby-1.6.8.orig/node.h 2003-07-04 21:41:55.000000000 +0900 -+++ ruby-1.6.8/node.h 2003-07-04 21:42:15.000000000 +0900 -@@ -137,7 +137,7 @@ - union { - struct RNode *node; - ID id; -- long argc; -+ int argc; - VALUE value; - } u2; - union { -@@ -145,7 +145,7 @@ - ID id; - long state; - struct global_entry *entry; -- long cnt; -+ int cnt; - VALUE value; - } u3; - } NODE; diff --git a/dev-lang/ruby/ruby-1.6.8-r12.ebuild b/dev-lang/ruby/ruby-1.6.8-r12.ebuild deleted file mode 100644 index bc65c917f659..000000000000 --- a/dev-lang/ruby/ruby-1.6.8-r12.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r12.ebuild,v 1.7 2005/05/19 10:52:36 gmsoft Exp $ - -IUSE="cjk" - -ONIGURUMA="onigd2_3_3" -SNAP_DATE="2004.07.28" -MY_P="${P}-${SNAP_DATE}" -S="${WORKDIR}/${MY_P}" - -inherit flag-o-matic alternatives eutils - -DESCRIPTION="An object-oriented scripting language" -HOMEPAGE="http://www.ruby-lang.org/" -#SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz" -SRC_URI="mirror://ruby/snapshots/${MY_P}.tar.gz - cjk? ( http://www.geocities.jp/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )" - -LICENSE="Ruby" -SLOT="1.6" -KEYWORDS="x86 alpha ppc sparc hppa amd64 -ia64 mips" - -DEPEND="virtual/libc - >=sys-libs/gdbm-1.8.0 - >=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - >=dev-ruby/ruby-config-0.3" -PROVIDE="virtual/ruby" - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-${SNAP_DATE//./}-20041024.diff - use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch - - if use cjk ; then - einfo "Applying ${ONIGURUMA}" - cd ${WORKDIR}/oniguruma - epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch - econf --with-rubydir=${S} || die "econf failed" - make ${SLOT/./} - fi -} - -src_compile() { - filter-flags -fomit-frame-pointer - econf --program-suffix=${SLOT/./} --enable-shared || die - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV%.*} - dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV} - - dodoc COPYING* ChangeLog MANIFEST README* ToDo -} - -pkg_postinst() { - - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi - einfo - einfo "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" - einfo -} - -pkg_postrm() { - - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi -} -- 2.26.2