Version bumped. Block dev-lang/ruby-cvs-1.8

8 files changed, 140 insertions, 19 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index e66bc1d88bc4..148d41b18b56 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # 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.75 2004/06/24 22:55:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.76 2004/07/17 09:54:45 usata Exp $
+
+*ruby-1.8.2_pre1 (17 Jul 2004)
+
+  17 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.0-r6.ebuild,
+  ruby-1.8.1-r3.ebuild, ruby-1.8.1-r6.ebuild, ruby-1.8.1-r7.ebuild,
+  +ruby-1.8.2_pre1.ebuild:
+  Version bumped. Block dev-lang/ruby-cvs-1.8
 
   19 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.1-r7.ebuild:
   Fixed non-existent S
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4440a6cf53c6..c4eea4f592f8 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,16 +1,18 @@
-MD5 b6a4a8d007d40e2a1030a8bd378faedf ruby-1.8.1-r6.ebuild 2757
-MD5 56bdc7bab26dad2359de98ecf82b161e ruby-1.8.1-r3.ebuild 2705
-MD5 be5843292958e8f97bbcdc75a6798e4b ruby-1.8.0-r6.ebuild 2588
-MD5 9071bcd05e0ce0e535efbcd23bac4726 ruby-1.8.1-r7.ebuild 2757
-MD5 ff3e3aae8951139857c586aadaa24a39 ruby-1.6.8-r6.ebuild 1741
-MD5 7f2347267440ac5719f4b6fcce38e375 ChangeLog 11986
+MD5 6eca81d9bf6a841858edcccf9d8e11b5 ruby-1.8.1-r6.ebuild 2780
+MD5 c6ab54640bd3640a0780272c1ffb64c6 ruby-1.8.1-r7.ebuild 2777
+MD5 bdb0a6919c0bfe8823a8172f51af8dce ChangeLog 12228
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 1d37af330514e1fffbee2a7d0de7d035 ruby-1.8.2_pre1.ebuild 2710
+MD5 ff3e3aae8951139857c586aadaa24a39 ruby-1.6.8-r6.ebuild 1741
+MD5 d4c03bbdb7088b3463ec88e0ab435455 ruby-1.8.0-r6.ebuild 2611
+MD5 2a1eaeffe23ec950b79dc2f50ce6d16c ruby-1.8.1-r3.ebuild 2728
 MD5 1a30065f9208a5370becf95e0e829edf ruby-1.6.8-r10.ebuild 1825
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 00d694f37ea1e1bb8af28217617df130 files/digest-ruby-1.6.8-r10 199
+MD5 eb455e926861eef9381b885d1679711e files/digest-ruby-1.8.1-r6 199
 MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
+MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
+MD5 0987456776a134ced22f5ee4e39ab9cf files/digest-ruby-1.8.2_pre1 134
+MD5 00d694f37ea1e1bb8af28217617df130 files/digest-ruby-1.6.8-r10 199
 MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
 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
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.2_pre1 b/dev-lang/ruby/files/digest-ruby-1.8.2_pre1
new file mode 100644
index 000000000000..553d03559e4d
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.2_pre1
@@ -0,0 +1,2 @@
+MD5 6cc070a768996f784fc7480d1c61bc85 ruby-1.8.2-preview1.tar.gz 3433145
+MD5 3154a12abdbc3ece51b86b8b16c0d2c6 onigd2_3_1.tar.gz 203510
diff --git a/dev-lang/ruby/ruby-1.8.0-r6.ebuild b/dev-lang/ruby/ruby-1.8.0-r6.ebuild
index c9e34c8db4a1..2bae61ea8dc7 100644
--- a/dev-lang/ruby/ruby-1.8.0-r6.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r6.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r6.ebuild,v 1.7 2004/06/24 22:55:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r6.ebuild,v 1.8 2004/07/17 09:54:45 usata Exp $
 
 IUSE="socks5 tcltk cjk"
 
@@ -25,7 +25,8 @@ RDEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/ncurses-5.2
 	socks5? ( >=net-misc/dante-1.1.13 )
 	tcltk?  ( dev-lang/tk )
-	>=dev-ruby/ruby-config-0.2"
+	>=dev-ruby/ruby-config-0.2
+	!=dev-lang/ruby-cvs-1.8*"
 DEPEND="sys-devel/autoconf
 	sys-apps/findutils
 	${RDEPEND}"
diff --git a/dev-lang/ruby/ruby-1.8.1-r3.ebuild b/dev-lang/ruby/ruby-1.8.1-r3.ebuild
index 5d8b0f3e0a07..062292e99347 100644
--- a/dev-lang/ruby/ruby-1.8.1-r3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r3.ebuild,v 1.10 2004/06/24 22:55:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r3.ebuild,v 1.11 2004/07/17 09:54:45 usata Exp $
 
 IUSE="socks5 tcltk cjk"
 
@@ -26,7 +26,8 @@ RDEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/ncurses-5.2
 	socks5? ( >=net-misc/dante-1.1.13 )
 	tcltk?  ( dev-lang/tk )
-	>=dev-ruby/ruby-config-0.2"
+	>=dev-ruby/ruby-config-0.2
+	!=dev-lang/ruby-cvs-1.8*"
 DEPEND="sys-devel/autoconf
 	sys-apps/findutils
 	${RDEPEND}"
diff --git a/dev-lang/ruby/ruby-1.8.1-r6.ebuild b/dev-lang/ruby/ruby-1.8.1-r6.ebuild
index 04b93451bebd..ff1a1409afb3 100644
--- a/dev-lang/ruby/ruby-1.8.1-r6.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r6.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r6.ebuild,v 1.7 2004/06/24 22:55:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r6.ebuild,v 1.8 2004/07/17 09:54:45 usata Exp $
 
 ONIGURUMA="onigd2_2_8"
 SNAP_DATE="20040424-1"
@@ -24,7 +24,8 @@ RDEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/ncurses-5.2
 	socks5? ( >=net-misc/dante-1.1.13 )
 	tcltk? ( dev-lang/tk )
-	>=dev-ruby/ruby-config-0.2"
+	>=dev-ruby/ruby-config-0.2
+	!=dev-lang/ruby-cvs-1.8*"
 DEPEND="sys-devel/autoconf
 	sys-apps/findutils
 	${RDEPEND}"
diff --git a/dev-lang/ruby/ruby-1.8.1-r7.ebuild b/dev-lang/ruby/ruby-1.8.1-r7.ebuild
index 67ea7951ad7b..881ce50c729f 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
 # 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.3 2004/06/24 22:55:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r7.ebuild,v 1.4 2004/07/17 09:54:45 usata Exp $
 
 ONIGURUMA="onigd2_2_8"
 SNAP_DATE="2004.05.02"
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 -ia64 ~s390"
+KEYWORDS="x86 ppc ~sparc ~mips alpha ~arm ~hppa ~amd64 -ia64 ~s390"
 IUSE="socks5 tcltk cjk"
 
 RDEPEND=">=sys-libs/glibc-2.1.3
@@ -25,7 +25,8 @@ RDEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/ncurses-5.2
 	socks5? ( >=net-misc/dante-1.1.13 )
 	tcltk? ( dev-lang/tk )
-	>=dev-ruby/ruby-config-0.2"
+	>=dev-ruby/ruby-config-0.2
+	!=dev-lang/ruby-cvs-1.8*"
 DEPEND="sys-devel/autoconf
 	sys-apps/findutils
 	${RDEPEND}"
diff --git a/dev-lang/ruby/ruby-1.8.2_pre1.ebuild b/dev-lang/ruby/ruby-1.8.2_pre1.ebuild
new file mode 100644
index 000000000000..e5ea059ce02b
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.2_pre1.ebuild
@@ -0,0 +1,106 @@
+# 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_pre1.ebuild,v 1.1 2004/07/17 09:54:45 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"
+IUSE="socks5 tcltk cjk"
+
+RDEPEND=">=sys-libs/glibc-2.1.3
+	>=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.2
+	!=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"
+
+	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV%.*}
+	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV}
+
+	dodoc COPYING* ChangeLog MANIFEST 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
+
+	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
+}
+
+pkg_postrm() {
+	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+	fi
+}