Added cjk USE flag back. This closes bug #106293.

Package-Manager: portage-2.0.52-r1

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 012e404ce0d5500caea544a3e2234b98867be29f..32389db365e88e17e3f443f7e3a4fcd515421816 100644 (file)
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.165 2005/10/08 15:02:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.166 2005/10/29 02:36:27 usata Exp $
+
+  29 Oct 2005; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.3.ebuild:
+  Added cjk USE flag back. This closes bug #106293.
 
   08 Oct 2005; Fabian Groffen <grobian@gentoo.org> ruby-1.8.2.ebuild:
   Dropping ppc-macos keyword to ~ppc-macos for bug #106996

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 2aef35045f4a15b7b21d18dd72235fd5d9aa6328..85920702fec1bc23635babfcf90331540b913f97 100644 (file)
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,16 +1,16 @@
-MD5 19375fd590a74716c0cdf608cb6ce878 ruby-1.8.3.ebuild 3626
+MD5 13cad589a4ecc4950aa0e7e4c7ea4547 ChangeLog 24125
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 3c1c7073b75a7c7dc6e6fc48de2ebe64 ruby-1.8.2-r2.ebuild 3828
 MD5 e847e0e7a41e6a1492eb66edab66a10d ruby-1.8.2.ebuild 3449
 MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753
-MD5 fd45084788c61bff11711e680167066a ChangeLog 24006
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
-MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
-MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822
+MD5 c9adcdf56af525e9be7d3c44bf9f8cda ruby-1.8.3.ebuild 3616
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2 125
-MD5 65c0fa57dea7939af268a53a2e50b173 files/digest-ruby-1.8.3 125
 MD5 d4b55b8964955655827a50afba707a69 files/re.c.182.patch 2472
-MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
-MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125
+MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
+MD5 e496eaf8c6af0debd1c74f8e66746a0c files/digest-ruby-1.8.3 125
+MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
+MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125
+MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
+MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822

diff --git a/dev-lang/ruby/files/digest-ruby-1.8.3 b/dev-lang/ruby/files/digest-ruby-1.8.3
index dcca42a6318f9dd3858fad65d90f6bb899d23109..b0e17045f250fa33066233ec309c803c9f6418bc 100644 (file)
--- a/dev-lang/ruby/files/digest-ruby-1.8.3
+++ b/dev-lang/ruby/files/digest-ruby-1.8.3
@@ -1,2 +1,2 @@
 MD5 63d6c2bddd6af86664e338b31f3189a6 ruby-1.8.3.tar.gz 4227276
-MD5 271d3d39201b3a049fa5bbed417c3f0a onigd2_4_2.tar.gz 203684
+MD5 40cb52605c7292373d8dfd11015cb687 onigd2_5_0.tar.gz 210448

diff --git a/dev-lang/ruby/ruby-1.8.3.ebuild b/dev-lang/ruby/ruby-1.8.3.ebuild
index c7b52111f1e74d72047878923f9be3ed3ddefebe..560f4abe60bae603d99845c9ad1780755cb5918a 100644 (file)
--- a/dev-lang/ruby/ruby-1.8.3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.3.ebuild
@@ -1,8 +1,8 @@
 # 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.3.ebuild,v 1.15 2005/10/06 03:45:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.3.ebuild,v 1.16 2005/10/29 02:36:27 usata Exp $
 
-ONIGURUMA="onigd2_4_2"
+ONIGURUMA="onigd2_5_0"
 
 inherit flag-o-matic alternatives eutils gnuconfig
 
@@ -37,15 +37,15 @@ 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
-#              cp ${FILESDIR}/re.c.182.patch .
-#              econf --with-rubydir=${S} || die "econf failed"
-#              make ${SLOT/./}
-#              popd
-#      fi
+       if use cjk ; then
+               einfo "Applying ${ONIGURUMA}"
+               pushd ${WORKDIR}/oniguruma
+               epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
+               cp ${FILESDIR}/re.c.183.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"