Version bump for a patch that handles eaccess with new glibc2.4 (bug #126886)

(Portage version: 2.1_pre6-r5)

5 files changed, 244 insertions, 1 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 8d5c05a352b4..6d4813a1e5b0 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.188 2006/02/27 14:34:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.189 2006/03/21 13:33:53 caleb Exp $
+
+*ruby-1.8.4-r2 (21 Mar 2006)
+
+  21 Mar 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/ruby-1.8.4-glibc24-eaccess.diff, +ruby-1.8.4-r2.ebuild:
+  Version bump for a patch that handles eaccess with new glibc2.4 (bug #126886)
 
 *ruby-1.8.4.20060226 (27 Feb 2006)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 378d3629c9db..1aba9ae38ae4 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -13,6 +13,9 @@ SHA256 69cae7d6d6f7512668861867fc1111f21e7998be5247a6d7bf1d3f5e27fca42d files/di
 MD5 abf0468a972fff8b129ec750fd804ab5 files/digest-ruby-1.8.4-r1 125
 RMD160 ef877a22b2f8b30abec9064a141ac23b1be73e76 files/digest-ruby-1.8.4-r1 125
 SHA256 69cae7d6d6f7512668861867fc1111f21e7998be5247a6d7bf1d3f5e27fca42d files/digest-ruby-1.8.4-r1 125
+MD5 a32bc6bfd54d82552c10f1c2d08036c9 files/digest-ruby-1.8.4-r2 467
+RMD160 fcb0337314f008813b4d06b081f652e1207a5117 files/digest-ruby-1.8.4-r2 467
+SHA256 cf0613bb6cfc3faba67afc36c8e1a4731b8b471b41942d48d7265c037c50ca78 files/digest-ruby-1.8.4-r2 467
 MD5 16c628d57fa38e629d61513a047e8d00 files/digest-ruby-1.8.4.20060226 494
 RMD160 db28b122ba200ec9ed8d3f74845c1eea0984c269 files/digest-ruby-1.8.4.20060226 494
 SHA256 f9a6752fcf1b41547deb13bd7c99d5c6f2b5879dcae64965f20c5a9f5cbe7492 files/digest-ruby-1.8.4.20060226 494
@@ -31,6 +34,9 @@ SHA256 7dace5f8ba88c4ca51125524dbbe1d07a7e8509817d8a9dc6066f7402b691a55 files/ru
 MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
 RMD160 8a91c7039af3e1cd65582fa0673950a129d8ca47 files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
 SHA256 d2e0ae291d0e6f5c2690fd620a4dc75de5d8cb629513f81b0be6402a8f59f75f files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
+MD5 bb134d27fc11d3ac2f6ca0526e2ee5a1 files/ruby-1.8.4-glibc24-eaccess.diff 2619
+RMD160 8ec70e117b01a53917b47c829455f77023d393b9 files/ruby-1.8.4-glibc24-eaccess.diff 2619
+SHA256 bde0e69a78528560c574df8e53bce25a243e86a4cdbb6b33bdc9310f15f861a7 files/ruby-1.8.4-glibc24-eaccess.diff 2619
 MD5 2fade36ba9727ddc61257d1588b5db16 files/ruby-1.8.4-yaml.diff 457
 RMD160 6bb5d1700c877d5dc4192da6eaae9bc6712f78b0 files/ruby-1.8.4-yaml.diff 457
 SHA256 425847a21b2c794c4cf910bcd7d6603951bc20c55f39e768dd6befd99ea1a0bb files/ruby-1.8.4-yaml.diff 457
@@ -49,6 +55,9 @@ SHA256 04351cbf664e212c69729fc095946594d48a0add6ee17348013da9d13e1a0e32 ruby-1.8
 MD5 b661b758b11d050928e4bb863892bc59 ruby-1.8.4-r1.ebuild 3918
 RMD160 e658e7852523aef7b9d99ba0a61b39f5add40546 ruby-1.8.4-r1.ebuild 3918
 SHA256 48aa73ecf2a7de187b6c21277a805934d8fba70c028774b3bfcd1cba31eca652 ruby-1.8.4-r1.ebuild 3918
+MD5 a7ad5781df4b3c7d47bb88809ed80dba ruby-1.8.4-r2.ebuild 3994
+RMD160 b147e9b7690fee87d4e9bc5a089f00db37cfd1b8 ruby-1.8.4-r2.ebuild 3994
+SHA256 0de7b794f1fb263c84aad4ebf6aecd16b09add13eef5f28f99593db6071b313d ruby-1.8.4-r2.ebuild 3994
 MD5 f1c5de92b15fa6a9db0beac3ba1e05fd ruby-1.8.4.20060226.ebuild 3888
 RMD160 e302c4933f0dc697851f963f4da904cab9ab4c38 ruby-1.8.4.20060226.ebuild 3888
 SHA256 58e4200f525e7dcb8fce6c5f03d9ad8c4be7e5a362c68264ef96b70e380510bb ruby-1.8.4.20060226.ebuild 3888
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.4-r2 b/dev-lang/ruby/files/digest-ruby-1.8.4-r2
new file mode 100644
index 000000000000..190f3748a2c1
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.4-r2
@@ -0,0 +1,6 @@
+MD5 40cb52605c7292373d8dfd11015cb687 onigd2_5_0.tar.gz 210448
+RMD160 2b3638e6300f8b994f334a064381b8013b286db0 onigd2_5_0.tar.gz 210448
+SHA256 83d379f48a9ddb469883e5d78cb06de1ae7b9102e7cebd88a132aad6996163df onigd2_5_0.tar.gz 210448
+MD5 bd8c2e593e1fa4b01fd98eaf016329bb ruby-1.8.4.tar.gz 4312965
+RMD160 1c0572a4ee369af57a3db68027b2566052eac944 ruby-1.8.4.tar.gz 4312965
+SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930 ruby-1.8.4.tar.gz 4312965
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
new file mode 100644
index 000000000000..2e917183c65d
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.4-glibc24-eaccess.diff
@@ -0,0 +1,73 @@
+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 <image.h>
+ #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/ruby-1.8.4-r2.ebuild b/dev-lang/ruby/ruby-1.8.4-r2.ebuild
new file mode 100644
index 000000000000..6175496c6f67
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.4-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/03/21 13:33:53 caleb Exp $
+
+ONIGURUMA="onigd2_5_0"
+
+inherit flag-o-matic alternatives eutils gnuconfig 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="socks5 tcltk cjk doc threads examples"
+RESTRICT="confcache"
+
+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 )
+	tcltk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3
+	!=dev-lang/ruby-cvs-1.8*
+	!dev-ruby/rdoc
+	!dev-ruby/rexml"
+
+DEPEND="sys-devel/autoconf
+	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 ${SLOT/./}
+		popd
+	fi
+
+	# Enable build on alpha EV67 (but run gnuconfig_update everywhere)
+	gnuconfig_update || die "gnuconfig_update failed"
+
+	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) \
+		--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 ${ROOT}usr/share/doc/${PF}
+		cp -pPR sample ${D}/${ROOT}usr/share/doc/${PF}
+	fi
+
+	if use ppc-macos ; then
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%.*}.dylib
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%_*}.dylib
+	else
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
+	fi
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+pkg_postinst() {
+	if ! use ppc-macos ; then
+		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
+
+		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
+	fi
+}
+
+pkg_postrm() {
+	if ! use ppc-macos ; then
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+	fi
+}