Version bumped.

4 files changed, 131 insertions, 4 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index e07f64a009b7..75af4217ce53 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,10 +1,18 @@
 # 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.77 2004/07/21 13:39:47 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.78 2004/07/31 19:47:36 usata Exp $
+
+*ruby-1.8.2_pre2 (01 Aug 2004)
+
+  01 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> +ruby-1.8.2_pre2.ebuild:
+  Version bumped.
 
   21 Jul 2004; Ferris McCormick <fmccor@gentoo.org> ruby-1.8.1-r7.ebuild:
   Marked stable for sparc.
 
+  20 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.2_pre1.ebuild:
+  Added to ~macos.
+
 *ruby-1.8.2_pre1 (17 Jul 2004)
 
   17 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.0-r6.ebuild,
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 226c9cdd0bcd..cd8f8f398155 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,18 +1,20 @@
-MD5 ea52f3bd3f01b93a95a0c82ed56f85c1 ChangeLog 12331
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 1a30065f9208a5370becf95e0e829edf ruby-1.6.8-r10.ebuild 1825
 MD5 ff3e3aae8951139857c586aadaa24a39 ruby-1.6.8-r6.ebuild 1741
 MD5 d4c03bbdb7088b3463ec88e0ab435455 ruby-1.8.0-r6.ebuild 2611
-MD5 7349d965c15a11c98d0c95ffce75ecdc ruby-1.8.1-r7.ebuild 2777
 MD5 2a1eaeffe23ec950b79dc2f50ce6d16c ruby-1.8.1-r3.ebuild 2728
 MD5 6eca81d9bf6a841858edcccf9d8e11b5 ruby-1.8.1-r6.ebuild 2780
+MD5 b8e108d50a39ed882ba60d76d5f9db93 ChangeLog 12548
+MD5 7349d965c15a11c98d0c95ffce75ecdc ruby-1.8.1-r7.ebuild 2777
+MD5 6b1833b9adfb7afa621d637ad2169968 ruby-1.8.2_pre2.ebuild 2980
 MD5 1d37af330514e1fffbee2a7d0de7d035 ruby-1.8.2_pre1.ebuild 2710
 MD5 00d694f37ea1e1bb8af28217617df130 files/digest-ruby-1.6.8-r10 199
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
 MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
-MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
 MD5 e74e6ef0cfcafd538fe1a52f30cae316 files/digest-ruby-1.8.1-r3 200
 MD5 eb455e926861eef9381b885d1679711e files/digest-ruby-1.8.1-r6 199
+MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
 MD5 0987456776a134ced22f5ee4e39ab9cf files/digest-ruby-1.8.2_pre1 134
+MD5 cb7da9e01481e07b2cc8514dd60af9ba files/digest-ruby-1.8.2_pre2 134
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.2_pre2 b/dev-lang/ruby/files/digest-ruby-1.8.2_pre2
new file mode 100644
index 000000000000..be31f55c2446
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.2_pre2
@@ -0,0 +1,2 @@
+MD5 f40dae2bd20fd41d681197f1229f25e0 ruby-1.8.2-preview2.tar.gz 3440953
+MD5 3154a12abdbc3ece51b86b8b16c0d2c6 onigd2_3_1.tar.gz 203510
diff --git a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
new file mode 100644
index 000000000000..75375b062f57
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
@@ -0,0 +1,115 @@
+# 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_pre2.ebuild,v 1.1 2004/07/31 19:47:36 usata Exp $
+
+ONIGURUMA="onigd2_3_1"
+MY_P=${P/_pre/-preview}
+
+inherit flag-o-matic alternatives eutils gnuconfig
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${PV%.*}/${MY_P}.tar.gz"
+SRC_URI="${SRC_URI}
+	cjk? ( http://www.geocities.jp/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.8"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 -ia64 ~s390 macos"
+IUSE="socks5 tcltk cjk"
+
+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
+		econf --with-rubydir=${S} || die "econf failed"
+		make ${SLOT/./}
+		popd
+	fi
+
+	# Enable build on alpha EV67
+	if use alpha ; then
+		gnuconfig_update || die "gnuconfig_update failed"
+	fi
+}
+
+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` \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	if use 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 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 macos ; then
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+	fi
+}