Version bumped.

10 files changed, 176 insertions, 29 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 6322922ede3d..7020b9614f41 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.115 2004/12/29 22:05:39 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.116 2005/01/01 15:47:09 usata Exp $
+
+*ruby-1.8.2 (02 Jan 2005)
+
+  02 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> +ruby-1.8.2.ebuild:
+  Version bumped.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 9b569240f605..d8b6d85758b0 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,19 +1,31 @@
-MD5 058e9207055f949fa2f86ed07133c2cc ruby-1.8.1-r7.ebuild 2830
-MD5 082dcf3f0fb5485c1e7c79478bd6c345 ruby-1.8.2_pre3.ebuild 3453
-MD5 7002b27df0b44a0fa648991f6966c8df ChangeLog 18093
-MD5 4ff0d64ae0b5553a20e403ccebac1a46 ruby-1.6.8-r11.ebuild 1973
-MD5 d7203d2f790bf0adaed20a0e28230bf7 ruby-1.6.8-r12.ebuild 1939
-MD5 4f420e12003a91bd479563bef413fe88 ruby-1.8.0-r7.ebuild 2777
-MD5 fe242a30b324c16d382f81621e3fef03 ruby-1.8.2_pre4.ebuild 3461
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 006a162474a87c5ce7629b4460717375 ChangeLog 18206
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 ecca7af5d1073dc5dee4a74861d1db6f files/digest-ruby-1.8.2_pre4 134
-MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
-MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
-MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
+MD5 c78ef36e30c653e256e75d1520743740 ruby-1.8.1-r7.ebuild 2830
+MD5 51f40e71a9f226fb4fd79369afe87ad4 ruby-1.6.8-r12.ebuild 1937
+MD5 7dceb8f0b4d14a4b1f5180450371812f ruby-1.8.2.ebuild 3456
+MD5 56ec59d6a7e76f2523f4e3367af3403d ruby-1.6.8-r11.ebuild 1973
+MD5 309e8bf1bcec18881381827907381d90 ruby-1.8.0-r7.ebuild 2777
+MD5 cb33fbf31e58ede53503f978c3b4b56a ruby-1.8.2_pre3.ebuild 3452
+MD5 81be05292ee0ca64d09fe3e4f3b81c20 ruby-1.8.2_pre4.ebuild 3461
 MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
-MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
+MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2 125
 MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
-MD5 d3cbd264b66bd70c262aaf9e4a79aa4b files/digest-ruby-1.8.2_pre3 134
-MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
+MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
 MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
+MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
+MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
+MD5 ecca7af5d1073dc5dee4a74861d1db6f files/digest-ruby-1.8.2_pre4 134
+MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
+MD5 d3cbd264b66bd70c262aaf9e4a79aa4b files/digest-ruby-1.8.2_pre3 134
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB1sQrVWNWqTUmv+0RAsAYAKCAY5UMkIdW7mD/HTLTTP1jgqJYbgCeJWFt
+sAfKK/XjzQ40YgFQmAXnnTo=
+=WTsV
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.2 b/dev-lang/ruby/files/digest-ruby-1.8.2
new file mode 100644
index 000000000000..8d52d012ead8
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.2
@@ -0,0 +1,2 @@
+MD5 8ffc79d96f336b80f2690a17601dea9b ruby-1.8.2.tar.gz 3627349
+MD5 f64bad67181b02fbd67fac16710537f3 onigd2_4_0.tar.gz 202285
diff --git a/dev-lang/ruby/ruby-1.6.8-r11.ebuild b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
index 17db79bdfcdf..10194638df6c 100644
--- a/dev-lang/ruby/ruby-1.6.8-r11.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r11.ebuild,v 1.12 2004/11/09 20:22:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r11.ebuild,v 1.13 2005/01/01 15:47:09 usata Exp $
 
 IUSE="cjk"
 
diff --git a/dev-lang/ruby/ruby-1.6.8-r12.ebuild b/dev-lang/ruby/ruby-1.6.8-r12.ebuild
index 77d9911bc0aa..802944f69285 100644
--- a/dev-lang/ruby/ruby-1.6.8-r12.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.5 2004/11/15 07:20:56 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r12.ebuild,v 1.6 2005/01/01 15:47:09 usata Exp $
 
 IUSE="cjk"
 
diff --git a/dev-lang/ruby/ruby-1.8.0-r7.ebuild b/dev-lang/ruby/ruby-1.8.0-r7.ebuild
index 72eff4e31008..736a1a6d8015 100644
--- a/dev-lang/ruby/ruby-1.8.0-r7.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.8.0-r7.ebuild,v 1.7 2004/11/09 20:22:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r7.ebuild,v 1.8 2005/01/01 15:47:09 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
diff --git a/dev-lang/ruby/ruby-1.8.1-r7.ebuild b/dev-lang/ruby/ruby-1.8.1-r7.ebuild
index b1493d86abff..9f0ae834a94c 100644
--- a/dev-lang/ruby/ruby-1.8.1-r7.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.8.1-r7.ebuild,v 1.11 2004/11/09 20:22:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r7.ebuild,v 1.12 2005/01/01 15:47:09 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 SNAP_DATE="2004.05.02"
diff --git a/dev-lang/ruby/ruby-1.8.2.ebuild b/dev-lang/ruby/ruby-1.8.2.ebuild
new file mode 100644
index 000000000000..bdc52bb2cb4b
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.2.ebuild
@@ -0,0 +1,128 @@
+# 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.8.2.ebuild,v 1.1 2005/01/01 15:47:09 usata Exp $
+
+ONIGURUMA="onigd2_4_0"
+
+inherit flag-o-matic alternatives eutils gnuconfig
+
+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"
+# please keep sorted
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="socks5 tcltk cjk doc threads"
+
+RDEPEND="virtual/libc
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-misc/dante-1.1.13 )
+	tcltk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3
+	!=dev-lang/ruby-cvs-1.8*"
+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-rdoc-gentoo.diff
+}
+
+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
+		CFLAGS="${CFLAGS} -DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+		export CFLAGS
+	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) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	LD_LIBRARY_PATH=${D}/usr/lib
+	RUBYLIB="${S}:${D}/usr/lib/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 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 /usr/lib/libruby${SLOT/./}.so.${PV%_*} /usr/lib/libruby.so.${PV%.*}
+		dosym /usr/lib/libruby${SLOT/./}.so.${PV%_*} /usr/lib/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
+}
diff --git a/dev-lang/ruby/ruby-1.8.2_pre3.ebuild b/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
index 3f853dc28cfc..545e2c0fbd2d 100644
--- a/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.8.2_pre3.ebuild,v 1.13 2004/12/03 06:02:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre3.ebuild,v 1.14 2005/01/01 15:47:09 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 
diff --git a/dev-lang/ruby/ruby-1.8.2_pre4.ebuild b/dev-lang/ruby/ruby-1.8.2_pre4.ebuild
index 4eba2ccfca8a..89f5080ea99c 100644
--- a/dev-lang/ruby/ruby-1.8.2_pre4.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.8.2_pre4.ebuild,v 1.1 2004/12/22 10:36:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre4.ebuild,v 1.2 2005/01/01 15:47:09 usata Exp $
 
 ONIGURUMA="onigd2_4_0"