Version bumped.

4 files changed, 144 insertions, 20 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 5a02d1efd4b6..0c5ae5dd95e0 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.99 2004/11/04 16:25:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.100 2004/11/08 04:31:16 agriffis Exp $
+
+*ruby-1.8.2_pre3 (09 Nov 2004)
+
+  09 Nov 2004; Aron Griffis <agriffis@gentoo.org> +ruby-1.8.2_pre3.ebuild:
+  Version bumped.
 
 *ruby-1.6.8-r12 (05 Nov 2004)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 738cbbedce89..3ca5f845a7ed 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 da9d9fb525a457779b786044fc56bcaa ChangeLog 15946
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 4b89f50a9cbac9ffab8b388d96574ff9 ruby-1.8.1-r7.ebuild 2870
 MD5 11ecace5202cab15511d50309f13b118 ruby-1.6.8-r12.ebuild 1993
-MD5 8f0fe45b59ec7a1bf9d07cf6e42828ed ruby-1.6.8-r11.ebuild 2014
-MD5 f5f52fddda233f187521a2543738cc59 ruby-1.8.2_pre2.ebuild 3419
+MD5 a673ae2ad11598ddd4b60c9af51ddcc4 ruby-1.8.2_pre3.ebuild 3407
+MD5 4b89f50a9cbac9ffab8b388d96574ff9 ruby-1.8.1-r7.ebuild 2870
 MD5 a3c17148005564e47795b4928b35c61a ruby-1.8.0-r7.ebuild 2817
-MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
-MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
+MD5 f5f52fddda233f187521a2543738cc59 ruby-1.8.2_pre2.ebuild 3419
+MD5 8f0fe45b59ec7a1bf9d07cf6e42828ed ruby-1.6.8-r11.ebuild 2014
+MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-fix-ppc.patch 593
+MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
+MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
+MD5 d3cbd264b66bd70c262aaf9e4a79aa4b files/digest-ruby-1.8.2_pre3 134
+MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
 MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
-MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
+MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
 MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
-MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
-MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBiliEVWNWqTUmv+0RAlzvAJ9DxcUSyb97jLbo7nCxFkud/Bz4UQCgkXhU
-9Sa6qCqkKTu0NNKHd1q5z5c=
-=+OlM
------END PGP SIGNATURE-----
+MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.2_pre3 b/dev-lang/ruby/files/digest-ruby-1.8.2_pre3
new file mode 100644
index 000000000000..3e366ac08337
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.2_pre3
@@ -0,0 +1,2 @@
+MD5 64478c70a44a48af1a1c256a43e5dc61 ruby-1.8.2-preview3.tar.gz 3550092
+MD5 d7bd9315973b64aa2e7c6eb58ea3f483 onigd2_3_2.tar.gz 198680
diff --git a/dev-lang/ruby/ruby-1.8.2_pre3.ebuild b/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
new file mode 100644
index 000000000000..9ebf61954539
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2004 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.1 2004/11/08 04:31:16 agriffis Exp $
+
+ONIGURUMA="onigd2_3_2"
+
+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/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.8"
+# please keep sorted
+KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~ppc ~ppc-macos ~s390 ~sparc ~x86 ~ppc64"
+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
+		if use ppc || use ppc64 || use alpha ; then
+			epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
+		fi
+		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
+
+	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
+}