Version bumped.

5 files changed, 35 insertions, 28 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 8b13f4513e87..e4823ad42314 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # 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.113 2004/11/15 07:20:56 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.114 2004/12/22 10:36:55 usata Exp $
+
+*ruby-1.8.2_pre4 (22 Dec 2004)
+
+  22 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-1.8.2_pre2.ebuild,
+  +ruby-1.8.2_pre4.ebuild:
+  Version bumped.
 
   15 Nov 2004; Hardave Riar <hardave@gentoo.org> ruby-1.6.8-r12.ebuild:
   Stable on mips, bug #69985.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index edba58a9987f..dbefffaa3fae 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c83e931cd5b8914526359009e44140ba ChangeLog 17836
+MD5 8e22ec6f369af123d1d48535a7e580ac ChangeLog 17986
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 4ff0d64ae0b5553a20e403ccebac1a46 ruby-1.6.8-r11.ebuild 1973
+MD5 058e9207055f949fa2f86ed07133c2cc ruby-1.8.1-r7.ebuild 2830
 MD5 d7203d2f790bf0adaed20a0e28230bf7 ruby-1.6.8-r12.ebuild 1939
+MD5 4ff0d64ae0b5553a20e403ccebac1a46 ruby-1.6.8-r11.ebuild 1973
 MD5 4f420e12003a91bd479563bef413fe88 ruby-1.8.0-r7.ebuild 2777
 MD5 082dcf3f0fb5485c1e7c79478bd6c345 ruby-1.8.2_pre3.ebuild 3453
-MD5 058e9207055f949fa2f86ed07133c2cc ruby-1.8.1-r7.ebuild 2830
-MD5 23275105da1c807eb72ac2be9cd10f01 ruby-1.8.2_pre2.ebuild 3368
-MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
-MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
+MD5 fe242a30b324c16d382f81621e3fef03 ruby-1.8.2_pre4.ebuild 3461
 MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
-MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
 MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
-MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
+MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 d3cbd264b66bd70c262aaf9e4a79aa4b files/digest-ruby-1.8.2_pre3 134
+MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
+MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
 MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
+MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
+MD5 ecca7af5d1073dc5dee4a74861d1db6f files/digest-ruby-1.8.2_pre4 134
 MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
-MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
+MD5 d3cbd264b66bd70c262aaf9e4a79aa4b files/digest-ruby-1.8.2_pre3 134
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBsAGMroRuSHgZdywRAhOUAJwLDP2yOfcFgXqaNBHyvM0MZs6KCwCfZI/v
-phQSlozjBq/n5Gq0RnbshAE=
-=iiIu
+iD8DBQFByUyYVWNWqTUmv+0RAiNAAJ9pDtKwXXoCf+iHQWR+PH3OvogipgCgseTt
+2XabEwdhFm6sTMukeS6agl4=
+=ARGm
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.2_pre2 b/dev-lang/ruby/files/digest-ruby-1.8.2_pre2
deleted file mode 100644
index 885bf1bfe43a..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.2_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f40dae2bd20fd41d681197f1229f25e0 ruby-1.8.2-preview2.tar.gz 3440953
-MD5 d7bd9315973b64aa2e7c6eb58ea3f483 onigd2_3_2.tar.gz 198680
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.2_pre4 b/dev-lang/ruby/files/digest-ruby-1.8.2_pre4
new file mode 100644
index 000000000000..4e014e65fd31
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.2_pre4
@@ -0,0 +1,2 @@
+MD5 2f53d4dc4b24e37799143645772aabd0 ruby-1.8.2-preview4.tar.gz 3602003
+MD5 f64bad67181b02fbd67fac16710537f3 onigd2_4_0.tar.gz 202285
diff --git a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild b/dev-lang/ruby/ruby-1.8.2_pre4.ebuild
index 976c0a641288..4eba2ccfca8a 100644
--- a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre4.ebuild
@@ -1,22 +1,20 @@
 # 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.21 2004/11/12 16:53:56 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre4.ebuild,v 1.1 2004/12/22 10:36:55 usata Exp $
 
-ONIGURUMA="onigd2_3_2"
-MY_P=${P/_pre/-preview}
+ONIGURUMA="onigd2_4_0"
 
 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 )"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako3/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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
 IUSE="socks5 tcltk cjk doc threads"
 
 RDEPEND="virtual/libc
@@ -46,10 +44,8 @@ src_unpack() {
 		popd
 	fi
 
-	# Enable build on alpha EV67
-	if use alpha ; then
-		gnuconfig_update || die "gnuconfig_update failed"
-	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
@@ -72,6 +68,11 @@ src_compile() {
 		export CFLAGS
 	fi
 
+	# On ia64 we need to build without optimization #48824
+	if use ia64; then
+		replace-flags '-O*' -O0
+	fi
+
 	econf --program-suffix=${SLOT/./} --enable-shared \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \