Added cjk IUSE flag. Changed ruby18 IUSE flag to ruby16.

12 files changed, 251 insertions, 194 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index d0bdf50e5341..54678e79b962 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.42 2003/12/05 19:29:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.43 2003/12/10 23:03:04 usata Exp $
+
+*ruby-1.6.8-r4 (11 Dec 2003)
+
+  11 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r3.ebuild,
+  ruby-1.6.8-r4.ebuild, ruby-1.8.0-r1.ebuild, ruby-1.8.0-r2.ebuild,
+  ruby-1.8.0-r3.ebuild, ruby-1.8.1_pre2-r1.ebuild,
+  files/ruby-1.6.8-oniguruma-gentoo.diff:
+  Added cjk IUSE flag. Changed ruby18 local USE flag to ruby16.
+  (You need to set ruby16 USE flag manually to have /usr/bin/ruby
+  as a symlink to /usr/bin/ruby16, otherwise ruby18 is used.)
 
 *ruby-1.8.1_pre3 (06 Dec 2003)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index ddba465b9ee9..f2f4dcbce1ad 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,13 +1,11 @@
-MD5 0c5f8cb4c0eedb2de68ee33df15994d5 ChangeLog 6252
+MD5 6076ac917b1efe72bdcb39d2b710905d ChangeLog 6707
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 ae7ff53135c91911aa1bb8fb4015ce01 ruby-1.6.8-r3.ebuild 2148
-MD5 e333717056b541994a20b68949654060 ruby-1.6.8-r4.ebuild 2409
-MD5 ebf4e36cf9c4b1a09e317495d5a7ac7c ruby.diff 2317
-MD5 962f19a8b18be84c419788b5a0aed619 ruby-1.8.0-r2.ebuild 2976
-MD5 a9e6283b3408057552894e72c34ad9ce ruby-1.8.0-r3.ebuild 3176
-MD5 cee10b4325233011e3a4bdecdb8bcc3e ruby-1.8.0-r1.ebuild 2703
-MD5 dccc212e505b3ead1c6a6973ba98430a ruby-1.8.1_pre2-r1.ebuild 3822
-MD5 3890ce624a5341d025f2ebba780f08d1 ruby-1.8.1_pre3.ebuild 3819
+MD5 d8f0f1e2eec3c4ec31107cc3dbc2dd85 ruby-1.6.8-r3.ebuild 2134
+MD5 0b45d4b26301ad383c99dc8a7092aa99 ruby-1.6.8-r4.ebuild 2401
+MD5 cbaaf90adcfd34b3ea5b7ad536673778 ruby-1.8.0-r2.ebuild 2975
+MD5 1fcf8dad89fedfa322d116b5accbdff2 ruby-1.8.0-r3.ebuild 3175
+MD5 6c669e6e45fb864d765b9989efb815f8 ruby-1.8.0-r1.ebuild 2700
+MD5 921e69c697a9d274c2906000aa1a007e ruby-1.8.1_pre3.ebuild 3177
 MD5 3da42d1704918eca7ecf885c81661a30 files/digest-ruby-1.6.8-r4 128
 MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
 MD5 e1c6eac35da8ce7f11bab66795de0b80 files/digest-ruby-1.8.0-r1 63
@@ -15,6 +13,5 @@ MD5 1b04774d0056760ad9f57c4623a47946 files/digest-ruby-1.8.0-r3 128
 MD5 d2922d69e61de0bef77ed561b6107cca files/ruby-config 2863
 MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8-r3 63
 MD5 e1c6eac35da8ce7f11bab66795de0b80 files/digest-ruby-1.8.0-r2 63
-MD5 d003e00078f32c4b70af60291c2acef9 files/digest-ruby-1.8.1_pre2-r1 72
 MD5 23687a2214c992785f50deba577552fd files/digest-ruby-1.8.1_pre3 72
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r4 b/dev-lang/ruby/files/digest-ruby-1.6.8-r4
new file mode 100644
index 000000000000..9d5dd45b04c7
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r4
@@ -0,0 +1,2 @@
+MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
+MD5 e0eff399310ce45a8a449791d1141804 onigd20031112.tar.gz 165697
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r3 b/dev-lang/ruby/files/digest-ruby-1.8.0-r3
new file mode 100644
index 000000000000..5fa0fec13127
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.0-r3
@@ -0,0 +1,2 @@
+MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
+MD5 e0eff399310ce45a8a449791d1141804 onigd20031112.tar.gz 165697
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1_pre2-r1 b/dev-lang/ruby/files/digest-ruby-1.8.1_pre2-r1
deleted file mode 100644
index 9368af3be691..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.1_pre2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 067deb137b70d6ca046f6d7e9a84e198 ruby-1.8.1-preview2.tar.gz 2459891
diff --git a/dev-lang/ruby/files/ruby-1.6.8-oniguruma-gentoo.diff b/dev-lang/ruby/files/ruby-1.6.8-oniguruma-gentoo.diff
new file mode 100644
index 000000000000..330bbed9f66c
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.6.8-oniguruma-gentoo.diff
@@ -0,0 +1,42 @@
+--- jcode.rb.orig	2003-12-11 06:13:41.000000000 +0900
++++ jcode.rb	2003-12-11 06:35:19.000000000 +0900
+@@ -9,7 +9,7 @@
+   printf STDERR, "feel free for some warnings:\n" if $VERBOSE
+ 
+   def _regex_quote(str)
+-    str.gsub(/(\\[][\-\\])|\\(.)|([][\\])/) do
++    str.gsub(/(\\[\[\]\-\\])|\\(.)|([\[\]\\])/) do
+       $1 || $2 || '\\' + $3
+     end
+   end
+@@ -19,9 +19,9 @@
+   PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]'
+   PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]'
+ 
+-  RE_SJIS = Regexp.new(PATTERN_SJIS, 'n')
+-  RE_EUC = Regexp.new(PATTERN_EUC, 'n')
+-  RE_UTF8 = Regexp.new(PATTERN_UTF8, 'n')
++  RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n')
++  RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n')
++  RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n')
+ 
+   SUCC = {}
+   SUCC['s'] = Hash.new(1)
+@@ -59,13 +59,13 @@
+   def end_regexp
+     case $KCODE[0]
+     when ?s, ?S
+-      /#{PATTERN_SJIS}$/o
++      /#{PATTERN_SJIS}$/on
+     when ?e, ?E
+-      /#{PATTERN_EUC}$/o
++      /#{PATTERN_EUC}$/on
+     when ?u, ?U
+-      /#{PATTERN_UTF8}$/o
++      /#{PATTERN_UTF8}$/on
+     else
+-      /.$/o
++      /.$/on
+     end
+   end
+ 
diff --git a/dev-lang/ruby/ruby-1.6.8-r3.ebuild b/dev-lang/ruby/ruby-1.6.8-r3.ebuild
index 72715858c982..22f36eb98afa 100644
--- a/dev-lang/ruby/ruby-1.6.8-r3.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r3.ebuild,v 1.2 2003/12/05 19:29:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r3.ebuild,v 1.3 2003/12/10 23:03:05 usata Exp $
 
-IUSE="ruby18"
+IUSE="ruby16"
 
 inherit flag-o-matic alternatives eutils
 filter-flags -fomit-frame-pointer
@@ -22,34 +22,17 @@ DEPEND=">=sys-libs/glibc-2.1.3
 
 pkg_setup() {
 
-	ewarn
-	ewarn "If you have installed <dev-lang/ruby-1.6.8-r2 (ruby-1.6 branch) or"
-	ewarn "<dev-lang/ruby-1.8.0-r1 (ruby-1.8 branch) please unmerge them first."
-	ewarn "SLOT supports >=ruby-1.6.8-r2 and >=ruby-1.8.0-r1 only."
-	ewarn
 	einfo
-	einfo "Also if you want to use ruby-1.8 by default you need to set"
-	einfo "\tUSE=\"ruby18\""
-	einfo "otherwise ruby-1.6 will be used."
+	einfo "If you want to use ruby-1.6 by default you need to set"
+	einfo "\tUSE=\"ruby16\""
+	einfo "otherwise ruby-1.8 will be used."
 	einfo
-
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use amd64 && epatch ${FILESDIR}/ruby-1.6.8-fix-x86_64.patch
+	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
 }
 
 src_compile() {
@@ -71,29 +54,31 @@ src_install() {
 }
 
 ruby_alternatives() {
-	if [ -n "`use ruby18`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	else
+	if [ -n "`use ruby16`" ] ; then
 		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
 		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
 		alternatives_makesym /usr/lib/libruby.so \
 			/usr/lib/libruby{16,18}.so
 		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
 			/usr/share/man/man1/ruby{16,18}.1.gz
+	else
+		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
+		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
+		alternatives_makesym /usr/lib/libruby.so \
+			/usr/lib/libruby{18,16}.so
+		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
+			/usr/share/man/man1/ruby{18,16}.1.gz
 	fi
 }
 
 pkg_postinst() {
 	ruby_alternatives
+
+	if [ -x "/usr/bin/ruby-config" ] ; then
 	einfo
-	einfo "If you have both ruby 1.6 and 1.8 installed, you can switch"
-	einfo "default ruby by /usr/bin/ruby-config."
+	einfo "You can switch default ruby by /usr/bin/ruby-config."
 	einfo
+	fi
 }
 
 pkg_postrm() {
diff --git a/dev-lang/ruby/ruby-1.6.8-r4.ebuild b/dev-lang/ruby/ruby-1.6.8-r4.ebuild
new file mode 100644
index 000000000000..bcdf51c02d54
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.6.8-r4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r4.ebuild,v 1.1 2003/12/10 23:03:05 usata Exp $
+
+IUSE="ruby16 cjk"
+
+ONIGURUMA="onigd20031112"
+
+inherit flag-o-matic alternatives eutils
+filter-flags -fomit-frame-pointer
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
+	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.6"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~hppa ~amd64 -ia64"
+
+DEPEND=">=sys-libs/glibc-2.1.3
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2"
+
+pkg_setup() {
+
+	einfo
+	einfo "If you want to use ruby-1.6 by default you need to set"
+	einfo "\tUSE=\"ruby16\""
+	einfo "otherwise ruby-1.8 will be used."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	if [ -n "`use cjk`" ] ; then
+		pushd oniguruma
+		econf --with-rubydir=${S}
+		make 16
+		cd ${S}/lib
+		epatch ${FILESDIR}/${P}-oniguruma-gentoo.diff
+		popd
+	fi
+	cd ${S}
+	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
+}
+
+src_compile() {
+	econf --program-suffix=16 --enable-shared || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dosym /usr/lib/libruby16.so.${PV} /usr/lib/libruby.so.${PV%.*}
+	dosym /usr/lib/libruby16.so.${PV} /usr/lib/libruby.so.${PV}
+
+	if has_version '>=dev-lang/ruby-1.8.0-r1'; then
+		dobin ${FILESDIR}/ruby-config
+	fi
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+ruby_alternatives() {
+	if [ -n "`use ruby16`" ] ; then
+		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
+		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
+		alternatives_makesym /usr/lib/libruby.so \
+			/usr/lib/libruby{16,18}.so
+		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
+			/usr/share/man/man1/ruby{16,18}.1.gz
+	else
+		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
+		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
+		alternatives_makesym /usr/lib/libruby.so \
+			/usr/lib/libruby{18,16}.so
+		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
+			/usr/share/man/man1/ruby{18,16}.1.gz
+	fi
+}
+
+pkg_postinst() {
+	ruby_alternatives
+
+	if [ -x "/usr/bin/ruby-config" ] ; then
+	einfo
+	einfo "You can switch default ruby by /usr/bin/ruby-config."
+	einfo
+	fi
+}
+
+pkg_postrm() {
+	ruby_alternatives
+}
diff --git a/dev-lang/ruby/ruby-1.8.0-r1.ebuild b/dev-lang/ruby/ruby-1.8.0-r1.ebuild
index 9ef922c497fb..000257c8baaf 100644
--- a/dev-lang/ruby/ruby-1.8.0-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r1.ebuild,v 1.4 2003/11/12 18:05:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r1.ebuild,v 1.5 2003/12/10 23:03:05 usata Exp $
 
 inherit flag-o-matic alternatives eutils gnuconfig
 filter-flags -fomit-frame-pointer
@@ -13,7 +13,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
 LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="alpha arm hppa ia64 mips sparc x86"
-IUSE="socks5 tcltk ruby18"
+IUSE="socks5 tcltk ruby16"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
@@ -23,32 +23,6 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	tcltk?  ( dev-lang/tk )
 	sys-apps/findutils"
 
-pkg_setup() {
-
-	ewarn
-	ewarn "If you have installed <dev-lang/ruby-1.6.8-r2 (ruby-1.6 branch) or"
-	ewarn "<dev-lang/ruby-1.8.0-r1 (ruby-1.8 branch) please unmerge them first."
-	ewarn "SLOT supports >=ruby-1.6.8-r2 and >=ruby-1.8.0-r1 only."
-	ewarn
-	einfo
-	einfo "Also if you want to use ruby-1.8 by default you need to set"
-	einfo "\tUSE=\"ruby18\""
-	einfo "otherwise ruby-1.6 will be used."
-	einfo
-
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-}
-
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}
@@ -90,20 +64,20 @@ src_install() {
 }
 
 ruby_alternatives() {
-	if [ -n "`use ruby18`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	else
+	if [ -n "`use ruby16`" ] ; then
 		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
 		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
 		alternatives_makesym /usr/lib/libruby.so \
 			/usr/lib/libruby{16,18}.so
 		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
 			/usr/share/man/man1/ruby{16,18}.1.gz
+	else
+		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
+		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
+		alternatives_makesym /usr/lib/libruby.so \
+			/usr/lib/libruby{18,16}.so
+		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
+			/usr/share/man/man1/ruby{18,16}.1.gz
 	fi
 	alternatives_auto_makesym /usr/bin/erb /usr/bin/erb?*
 }
diff --git a/dev-lang/ruby/ruby-1.8.0-r2.ebuild b/dev-lang/ruby/ruby-1.8.0-r2.ebuild
index 15c9e4669195..e6d973ceef59 100644
--- a/dev-lang/ruby/ruby-1.8.0-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r2.ebuild,v 1.2 2003/12/05 19:29:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r2.ebuild,v 1.3 2003/12/10 23:03:05 usata Exp $
 
 inherit flag-o-matic alternatives eutils gnuconfig
 filter-flags -fomit-frame-pointer
@@ -13,7 +13,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
 LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="socks5 tcltk ruby18"
+IUSE="socks5 tcltk ruby16"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
@@ -23,32 +23,6 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	tcltk?  ( dev-lang/tk )
 	sys-apps/findutils"
 
-pkg_setup() {
-
-	ewarn
-	ewarn "If you have installed <dev-lang/ruby-1.6.8-r2 (ruby-1.6 branch) or"
-	ewarn "<dev-lang/ruby-1.8.0-r1 (ruby-1.8 branch) please unmerge them first."
-	ewarn "SLOT supports >=ruby-1.6.8-r2 and >=ruby-1.8.0-r1 only."
-	ewarn
-	einfo
-	einfo "Also if you want to use ruby-1.8 by default you need to set"
-	einfo "\tUSE=\"ruby18\""
-	einfo "otherwise ruby-1.6 will be used."
-	einfo
-
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-}
-
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}
@@ -94,15 +68,7 @@ src_install() {
 }
 
 ruby_alternatives() {
-	if [ -n "`use ruby18`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	else
+	if [ -n "`use ruby16`" ] ; then
 		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
 		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
 		alternatives_makesym /usr/bin/erb /usr/bin/erb{16,18}
@@ -110,6 +76,14 @@ ruby_alternatives() {
 			/usr/lib/libruby{16,18}.so
 		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
 			/usr/share/man/man1/ruby{16,18}.1.gz
+	else
+		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
+		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
+		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
+		alternatives_makesym /usr/lib/libruby.so \
+			/usr/lib/libruby{18,16}.so
+		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
+			/usr/share/man/man1/ruby{18,16}.1.gz
 	fi
 }
 
@@ -120,9 +94,12 @@ pkg_postinst() {
 	ewarn "1.6.8 to 1.8.0 due to the library version change."
 	ewarn "In that case, you will need to remerge vim."
 	ewarn
-	einfo "If you have both ruby 1.6 and 1.8 installed, you can switch"
-	einfo "default ruby by /usr/bin/ruby-config."
+
+	if [ -x "/usr/bin/ruby-config" ] ; then
+	einfo
+	einfo "You can switch default ruby by /usr/bin/ruby-config."
 	einfo
+	fi
 }
 
 pkg_postrm() {
diff --git a/dev-lang/ruby/ruby-1.8.1_pre2-r1.ebuild b/dev-lang/ruby/ruby-1.8.0-r3.ebuild
index ab3dbfcae948..7a454c8d7528 100644
--- a/dev-lang/ruby/ruby-1.8.1_pre2-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r3.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1_pre2-r1.ebuild,v 1.2 2003/12/05 19:29:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r3.ebuild,v 1.1 2003/12/10 23:03:05 usata Exp $
+
+IUSE="socks5 tcltk ruby16 cjk"
+
+ONIGURUMA="onigd20031112"
 
 inherit flag-o-matic alternatives eutils gnuconfig
 filter-flags -fomit-frame-pointer
@@ -8,12 +12,12 @@ filter-flags -fomit-frame-pointer
 S=${WORKDIR}/${P%_pre*}
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
+	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
-IUSE="socks5 tcltk ruby18"
+KEYWORDS="~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
@@ -23,38 +27,17 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	tcltk?  ( dev-lang/tk )
 	sys-apps/findutils"
 
-pkg_setup() {
-
-	ewarn
-	ewarn "If you have installed <dev-lang/ruby-1.6.8-r2 (ruby-1.6 branch) or"
-	ewarn "<dev-lang/ruby-1.8.0-r1 (ruby-1.8 branch) please unmerge them first."
-	ewarn "SLOT supports >=ruby-1.6.8-r2 and >=ruby-1.8.0-r1 only."
-	ewarn
-	einfo
-	einfo "Also if you want to use ruby-1.8 by default you need to set"
-	einfo "\tUSE=\"ruby18\""
-	einfo "otherwise ruby-1.6 will be used."
-	einfo
-
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-}
-
 src_unpack() {
 	unpack ${A}
-	cd ${WORKDIR}
+	if [ -n "`use cjk`" ] ; then
+		pushd oniguruma
+		econf --with-rubydir=${S}
+		make 18
+		popd
+	fi
 
 	# Enable build on alpha EV67
-	if use alpha; then
+	if [ "${ARCH}" = "alpha" ] ; then
 		gnuconfig_update || die "gnuconfig_update failed"
 	fi
 }
@@ -94,15 +77,7 @@ src_install() {
 }
 
 ruby_alternatives() {
-	if [ -n "`use ruby18`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	else
+	if [ -n "`use ruby16`" ] ; then
 		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
 		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
 		alternatives_makesym /usr/bin/erb /usr/bin/erb{16,18}
@@ -110,6 +85,14 @@ ruby_alternatives() {
 			/usr/lib/libruby{16,18}.so
 		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
 			/usr/share/man/man1/ruby{16,18}.1.gz
+	else
+		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
+		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
+		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
+		alternatives_makesym /usr/lib/libruby.so \
+			/usr/lib/libruby{18,16}.so
+		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
+			/usr/share/man/man1/ruby{18,16}.1.gz
 	fi
 }
 
@@ -120,9 +103,12 @@ pkg_postinst() {
 	ewarn "1.6.8 to 1.8.0 due to the library version change."
 	ewarn "In that case, you will need to remerge vim."
 	ewarn
-	einfo "If you have both ruby 1.6 and 1.8 installed, you can switch"
-	einfo "default ruby by /usr/bin/ruby-config."
+
+	if [ -x "/usr/bin/ruby-config" ] ; then
+	einfo
+	einfo "You can switch default ruby by /usr/bin/ruby-config."
 	einfo
+	fi
 }
 
 pkg_postrm() {
diff --git a/dev-lang/ruby/ruby-1.8.1_pre3.ebuild b/dev-lang/ruby/ruby-1.8.1_pre3.ebuild
index a49b50d2f925..02d53241ea59 100644
--- a/dev-lang/ruby/ruby-1.8.1_pre3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1_pre3.ebuild,v 1.1 2003/12/05 19:29:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1_pre3.ebuild,v 1.2 2003/12/10 23:03:05 usata Exp $
 
 inherit flag-o-matic alternatives eutils gnuconfig
 filter-flags -fomit-frame-pointer
@@ -13,7 +13,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
 LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
-IUSE="socks5 tcltk ruby18"
+IUSE="socks5 tcltk ruby16"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
@@ -25,28 +25,11 @@ DEPEND=">=sys-libs/glibc-2.1.3
 
 pkg_setup() {
 
-	ewarn
-	ewarn "If you have installed <dev-lang/ruby-1.6.8-r2 (ruby-1.6 branch) or"
-	ewarn "<dev-lang/ruby-1.8.0-r1 (ruby-1.8 branch) please unmerge them first."
-	ewarn "SLOT supports >=ruby-1.6.8-r2 and >=ruby-1.8.0-r1 only."
-	ewarn
 	einfo
-	einfo "Also if you want to use ruby-1.8 by default you need to set"
-	einfo "\tUSE=\"ruby18\""
-	einfo "otherwise ruby-1.6 will be used."
+	einfo "If you want to use ruby-1.6 by default you need to set"
+	einfo "\tUSE=\"ruby16\""
+	einfo "otherwise ruby-1.8 will be used."
 	einfo
-
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
 }
 
 src_unpack() {
@@ -94,15 +77,7 @@ src_install() {
 }
 
 ruby_alternatives() {
-	if [ -n "`use ruby18`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	else
+	if [ -n "`use ruby16`" ] ; then
 		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
 		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
 		alternatives_makesym /usr/bin/erb /usr/bin/erb{16,18}
@@ -110,6 +85,14 @@ ruby_alternatives() {
 			/usr/lib/libruby{16,18}.so
 		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
 			/usr/share/man/man1/ruby{16,18}.1.gz
+	else
+		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
+		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
+		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
+		alternatives_makesym /usr/lib/libruby.so \
+			/usr/lib/libruby{18,16}.so
+		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
+			/usr/share/man/man1/ruby{18,16}.1.gz
 	fi
 }
 
@@ -120,9 +103,12 @@ pkg_postinst() {
 	ewarn "1.6.8 to 1.8.0 due to the library version change."
 	ewarn "In that case, you will need to remerge vim."
 	ewarn
+
+	if [ -x "/usr/bin/ruby-config" ] ; then
 	einfo "If you have both ruby 1.6 and 1.8 installed, you can switch"
 	einfo "default ruby by /usr/bin/ruby-config."
 	einfo
+	fi
 }
 
 pkg_postrm() {