From a2f74c529bb6ca5b64a0c08948c2ee8c98f78172 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Wed, 5 Mar 2008 11:35:25 +0000 Subject: [PATCH] Version bump for #212264. Remove old ebuilds. Package-Manager: portage-2.1.4.4 --- dev-lang/ruby/ChangeLog | 10 +- dev-lang/ruby/Manifest | 13 +- .../files/ruby-1.8.4-glibc24-eaccess.diff | 73 --------- dev-lang/ruby/files/ruby-1.8.4-yaml.diff | 12 -- .../files/ruby-1.8.5_p113-net-http-p114.patch | 125 --------------- dev-lang/ruby/ruby-1.8.4-r3.ebuild | 145 ------------------ ...8.5_p113.ebuild => ruby-1.8.6_p114.ebuild} | 36 +++-- 7 files changed, 33 insertions(+), 381 deletions(-) delete mode 100644 dev-lang/ruby/files/ruby-1.8.4-glibc24-eaccess.diff delete mode 100644 dev-lang/ruby/files/ruby-1.8.4-yaml.diff delete mode 100644 dev-lang/ruby/files/ruby-1.8.5_p113-net-http-p114.patch delete mode 100644 dev-lang/ruby/ruby-1.8.4-r3.ebuild rename dev-lang/ruby/{ruby-1.8.5_p113.ebuild => ruby-1.8.6_p114.ebuild} (83%) diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 37f4030f1e4e..3c62b1babe7f 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.324 2008/02/17 12:19:21 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.325 2008/03/05 11:35:24 rbrown Exp $ + +*ruby-1.8.6_p114 (05 Mar 2008) + + 05 Mar 2008; Richard Brown + -files/ruby-1.8.4-glibc24-eaccess.diff, -files/ruby-1.8.4-yaml.diff, + -files/ruby-1.8.5_p113-net-http-p114.patch, -ruby-1.8.4-r3.ebuild, + -ruby-1.8.5_p113.ebuild, +ruby-1.8.6_p114.ebuild: + Version bump for #212264. Remove old ebuilds. 17 Feb 2008; Raúl Porcel ruby-1.8.6_p111-r1.ebuild: alpha/ia64 stable wrt #208916 diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index e95179b59857..36ac35b6f334 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,18 +1,11 @@ -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-memory-leak.diff 1351 RMD160 cba1335fcd52df26b4b2884dea14e0c74852b67a SHA1 184c1743592684abfc1cce8ffa38ae749fe0a1b1 SHA256 90dbc7b444ed936ed8a1fadb443240ec494a6c748d38ff089af423e50bdd9528 AUX ruby-1.8.6_p111-r13657.patch 1915 RMD160 9c135a4e779095127bf7e5d47d2ae3b703e8b41e SHA1 47428434aaa61b5fd11684d8faa8c7db4886b680 SHA256 0856f5987b74be29562e16b3dafc62cb6b874e5536bd73ba2c7fb1e4a4630e24 -DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b -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.6-p111.tar.bz2 3919396 RMD160 8ff9b8592a80062742be61b2b4e1158282b61c4b SHA1 d85d25786e0ce30f8f54f5cfa36968ec0f6b9a5f SHA256 85c694678313818a5083bcfd66ae389fc053b506d93b5ad46f3764981c120fbb +DIST ruby-1.8.6-p114.tar.bz2 3920921 RMD160 332d6e98ef79ad8175ce699ed5293407763f769f SHA1 9929782935ebb77d040593a010b8d65b03ce6e23 SHA256 4ac0d0271324c54525210f775e5fcc9a37e3d8a10b96d68cdfeeb361c6f64a63 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.6_p111-r1.ebuild 5025 RMD160 0b8b8d252ee486386a42b5b4ff239f15c392ec26 SHA1 1051a2cf6185b0162ef87b0e1d8d22ab5e412bfa SHA256 13b7a3e6e74fe37c2e1d8965e85b3c9d23ba3bf06b4b4cf17d828719f2591359 EBUILD ruby-1.8.6_p111.ebuild 4981 RMD160 a348a5aa534ea01b0a1dd8bba1c9d6b14e07642e SHA1 f7695b286891594eb9e7658e8ba3e1ebb3d6e73f SHA256 b1fc4edaf3001027c3f1a8dfc75ee470687b76db32f233080287c99f9c51be90 -MISC ChangeLog 47411 RMD160 c369680e204f70dcf4a879cc7953153a501d3404 SHA1 556925e08defd12556d1c345cb9f7529a8cddbc6 SHA256 04c581b6d969de27373e0a13574940be159b71f6cebca6b9b5ba369bf274db1c +EBUILD ruby-1.8.6_p114.ebuild 4960 RMD160 9034a021daa472cc2a6b7435df7f7cf8277c2401 SHA1 4e078b7fa4d07b3ee23a7274224118c40a0b0083 SHA256 850678601e61ae122ea2a57a740907808b52cea9e49c50347c6686f721d7d819 +MISC ChangeLog 47732 RMD160 be68a98ba9c070e3e2422bfd383164625f1f4522 SHA1 f601e91dc17eaec259063020c1f419b303d4a0b6 SHA256 cfacedf8b780b315ecaf9fb2f799a14d8cf0de34f1d32a49e294e3066467f8fe MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c diff --git a/dev-lang/ruby/files/ruby-1.8.4-glibc24-eaccess.diff b/dev-lang/ruby/files/ruby-1.8.4-glibc24-eaccess.diff deleted file mode 100644 index 2e917183c65d..000000000000 --- a/dev-lang/ruby/files/ruby-1.8.4-glibc24-eaccess.diff +++ /dev/null @@ -1,73 +0,0 @@ -diff -ur ruby-1.8.4/configure.in ruby-1.8.4-glibc24-eaccess/configure.in ---- ruby-1.8.4/configure.in 2005-11-24 07:07:18.000000000 -0500 -+++ ruby-1.8.4-glibc24-eaccess/configure.in 2006-03-19 20:37:19.000000000 -0500 -@@ -437,7 +437,7 @@ - AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\ - strchr strstr strtoul crypt flock vsnprintf\ - isnan finite isinf hypot acosh erf) --AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd\ -+AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\ - truncate chsize times utimes fcntl lockf lstat symlink link\ - readlink setitimer setruid seteuid setreuid setresuid\ - setproctitle setrgid setegid setregid setresgid issetugid pause\ -Only in ruby-1.8.4-glibc24-eaccess/: configure.in~ -diff -ur ruby-1.8.4/dln.c ruby-1.8.4-glibc24-eaccess/dln.c ---- ruby-1.8.4/dln.c 2005-11-26 06:01:01.000000000 -0500 -+++ ruby-1.8.4-glibc24-eaccess/dln.c 2006-03-19 20:39:19.000000000 -0500 -@@ -89,7 +89,7 @@ - # include - #endif - --int eaccess(); -+int eaccess(const char *, int); - - #ifndef NO_DLN_LOAD - -Only in ruby-1.8.4-glibc24-eaccess/: dln.c~ -diff -ur ruby-1.8.4/file.c ruby-1.8.4-glibc24-eaccess/file.c ---- ruby-1.8.4/file.c 2005-12-21 04:20:15.000000000 -0500 -+++ ruby-1.8.4-glibc24-eaccess/file.c 2006-03-19 20:40:27.000000000 -0500 -@@ -849,6 +849,7 @@ - # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) - #endif - -+#ifndef HAVE_EACCESS - int - eaccess(path, mode) - const char *path; -@@ -887,6 +888,7 @@ - return access(path, mode); - #endif - } -+#endif - - - /* -Only in ruby-1.8.4-glibc24-eaccess/: file.c~ -diff -ur ruby-1.8.4/intern.h ruby-1.8.4-glibc24-eaccess/intern.h ---- ruby-1.8.4/intern.h 2005-11-22 21:06:00.000000000 -0500 -+++ ruby-1.8.4-glibc24-eaccess/intern.h 2006-03-19 20:37:49.000000000 -0500 -@@ -221,7 +221,6 @@ - void rb_thread_atfork _((void)); - VALUE rb_funcall_rescue __((VALUE, ID, int, ...)); - /* file.c */ --int eaccess _((const char*, int)); - VALUE rb_file_s_expand_path _((int, VALUE *)); - VALUE rb_file_expand_path _((VALUE, VALUE)); - void rb_file_const _((const char*, VALUE)); -Only in ruby-1.8.4-glibc24-eaccess/: intern.h~ -diff -ur ruby-1.8.4/missing.h ruby-1.8.4-glibc24-eaccess/missing.h ---- ruby-1.8.4/missing.h 2005-06-12 12:58:41.000000000 -0400 -+++ ruby-1.8.4-glibc24-eaccess/missing.h 2006-03-19 20:38:24.000000000 -0500 -@@ -39,6 +39,10 @@ - extern int dup2 _((int, int)); - #endif - -+#ifndef HAVE_EACCESS -+extern int eaccess(const char*, int); -+#endif -+ - #ifndef HAVE_FINITE - extern int finite _((double)); - #endif -Only in ruby-1.8.4-glibc24-eaccess/: missing.h~ diff --git a/dev-lang/ruby/files/ruby-1.8.4-yaml.diff b/dev-lang/ruby/files/ruby-1.8.4-yaml.diff deleted file mode 100644 index 35cd1602cbe0..000000000000 --- a/dev-lang/ruby/files/ruby-1.8.4-yaml.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- ext/syck/rubyext.c 27 Sep 2005 22:57:52 -0000 1.30.2.15 -+++ ext/syck/rubyext.c 5 Oct 2005 10:24:16 -0000 -@@ -1142,6 +1142,9 @@ - } - else if ( !NIL_P( target_class ) ) - { -+ if (subclass == rb_cBignum) -+ obj = rb_str2inum(val, 10); -+ else - obj = rb_obj_alloc( subclass ); - if ( rb_respond_to( obj, s_yaml_initialize ) ) - { diff --git a/dev-lang/ruby/files/ruby-1.8.5_p113-net-http-p114.patch b/dev-lang/ruby/files/ruby-1.8.5_p113-net-http-p114.patch deleted file mode 100644 index 88246a10c457..000000000000 --- a/dev-lang/ruby/files/ruby-1.8.5_p113-net-http-p114.patch +++ /dev/null @@ -1,125 +0,0 @@ -Index: ext/openssl/lib/openssl/ssl.rb -=================================================================== ---- ext/openssl/lib/openssl/ssl.rb (revision 13501) -+++ ext/openssl/lib/openssl/ssl.rb (revision 13502) -@@ -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 13501) -+++ ChangeLog (revision 13502) -@@ -1,3 +1,17 @@ -+Sun Sep 23 21:57:25 2007 GOTOU Yuuzou -+ -+ * 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 -+ -+ * 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 06:08:38 2007 Nobuyoshi Nakada - - * ext/stringio/stringio.c (strio_init): separate from strio_initialize -Index: version.h -=================================================================== ---- version.h (revision 13501) -+++ version.h (revision 13502) -@@ -1,15 +1,15 @@ - #define RUBY_VERSION "1.8.5" --#define RUBY_RELEASE_DATE "2007-09-23" -+#define RUBY_RELEASE_DATE "2007-09-24" - #define RUBY_VERSION_CODE 185 --#define RUBY_RELEASE_CODE 20070923 --#define RUBY_PATCHLEVEL 113 -+#define RUBY_RELEASE_CODE 20070924 -+#define RUBY_PATCHLEVEL 114 - - #define RUBY_VERSION_MAJOR 1 - #define RUBY_VERSION_MINOR 8 - #define RUBY_VERSION_TEENY 5 - #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 13501) -+++ lib/open-uri.rb (revision 13502) -@@ -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 13501) -+++ lib/net/http.rb (revision 13502) -@@ -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/ruby-1.8.4-r3.ebuild b/dev-lang/ruby/ruby-1.8.4-r3.ebuild deleted file mode 100644 index 3021943af38d..000000000000 --- a/dev-lang/ruby/ruby-1.8.4-r3.ebuild +++ /dev/null @@ -1,145 +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.4-r3.ebuild,v 1.22 2007/08/17 19:37:18 graaff Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -ONIGURUMA="onigd2_5_4" - -inherit flag-o-matic alternatives eutils multilib autotools - -DESCRIPTION="An object-oriented scripting language" -HOMEPAGE="http://www.ruby-lang.org/" -SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.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 x86" -IUSE="socks5 tk cjk doc threads examples ipv6 debug" -RESTRICT="test" - -RDEPEND="virtual/libc - >=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 - !=dev-lang/ruby-cvs-1.8* - !dev-ruby/rdoc - !dev-ruby/rexml" - -DEPEND="sys-apps/findutils - ${RDEPEND}" -PROVIDE="virtual/ruby" - -S=${WORKDIR}/${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" - make ${PV/./} - popd - fi - - cd ${S} - - epatch ${FILESDIR}/ruby-1.8.4-glibc24-eaccess.diff - epatch ${FILESDIR}/ruby-1.8.4-yaml.diff - - # 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() { - 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 - - # On ia64 we need to build without optimization #48824 - if use ia64; then - replace-flags '-O*' -O0 - 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) \ - --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 COPYING* 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.5_p113.ebuild b/dev-lang/ruby/ruby-1.8.6_p114.ebuild similarity index 83% rename from dev-lang/ruby/ruby-1.8.5_p113.ebuild rename to dev-lang/ruby/ruby-1.8.6_p114.ebuild index eb8e54a8825a..6afcee70c10a 100644 --- a/dev-lang/ruby/ruby-1.8.5_p113.ebuild +++ b/dev-lang/ruby/ruby-1.8.6_p114.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 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_p113.ebuild,v 1.6 2007/12/11 09:45:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p114.ebuild,v 1.1 2008/03/05 11:35:24 rbrown Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" -ONIGURUMA="onigd2_5_8" +ONIGURUMA="onigd2_5_9" inherit autotools eutils flag-o-matic multilib versionator @@ -17,16 +17,17 @@ 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 +SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.bz2 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="berkdb cjk debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs" -RDEPEND=">=sys-libs/gdbm-1.8.0 - >=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 +RDEPEND=" + berkdb? ( sys-libs/db ) + gdbm? ( sys-libs/gdbm ) + ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk ) >=dev-ruby/ruby-config-0.3.1 @@ -34,6 +35,9 @@ RDEPEND=">=sys-libs/gdbm-1.8.0 !dev-ruby/rdoc !dev-ruby/rexml" DEPEND="${RDEPEND}" +PDEPEND="emacs? ( app-emacs/ruby-mode ) + xemacs? ( app-xemacs/ruby-modes )" + PROVIDE="virtual/ruby" src_unpack() { @@ -41,14 +45,17 @@ src_unpack() { if use cjk ; then einfo "Applying ${ONIGURUMA}" - pushd ${WORKDIR}/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-p114.patch" + + epatch "${FILESDIR}/${PN}-1.8.6_p111-r13657.patch" # Fix a hardcoded lib path in configure script sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ @@ -83,6 +90,9 @@ src_compile() { $(use_enable threads pthread) \ $(use_enable ipv6) \ $(use_enable debug) \ + $(use_with berkdb dbm) \ + $(use_with gdbm) \ + $(use_with ssl openssl) \ $(use_with tk) \ ${myconf} \ --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ @@ -145,10 +155,6 @@ src_install() { 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 -- 2.26.2