Version bump

(Portage version: 2.0.52-r1)

7 files changed, 12 insertions, 137 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index ab9fd0b96504..10ed53d0e408 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # 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.146 2005/09/17 17:48:30 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.147 2005/09/23 01:04:19 caleb Exp $
+
+*ruby-1.8.3 (23 Sep 2005)
+
+  23 Sep 2005; Caleb Tennis <caleb@gentoo.org> -ruby-1.8.3_pre1.ebuild,
+  -ruby-1.8.3_pre2.ebuild, +ruby-1.8.3.ebuild:
+  Verison bump
 
 *ruby-1.8.3_pre2 (17 Sep 2005)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index ae5bd1f6723e..08ed036045a1 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,5 +1,6 @@
 MD5 5c6eba6633365e3d738ba6e3a3b6b5b1 ruby-1.8.3_pre1.ebuild 3653
 MD5 a63962eec3291eb3762c7462570b39bc ruby-1.6.8-r12.ebuild 1937
+MD5 84100272e19b41c08c66967855fe35b0 ruby-1.8.3.ebuild 3658
 MD5 d2234d03c37129677ed7c35c38be1bcd ruby-1.8.2-r2.ebuild 3813
 MD5 84100272e19b41c08c66967855fe35b0 ruby-1.8.3_pre2.ebuild 3658
 MD5 67de00f5d7b9ced2530317f945d0ebc9 ruby-1.8.2.ebuild 3446
@@ -11,6 +12,7 @@ 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 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 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
 MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.3 b/dev-lang/ruby/files/digest-ruby-1.8.3
new file mode 100644
index 000000000000..dcca42a6318f
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.3
@@ -0,0 +1,2 @@
+MD5 63d6c2bddd6af86664e338b31f3189a6 ruby-1.8.3.tar.gz 4227276
+MD5 271d3d39201b3a049fa5bbed417c3f0a onigd2_4_2.tar.gz 203684
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.3_pre1 b/dev-lang/ruby/files/digest-ruby-1.8.3_pre1
deleted file mode 100644
index cabf224ea2bd..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.3_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a5ae008de3332dc831244ac63289b761 ruby-1.8.3-preview1.tar.gz 4142554
-MD5 271d3d39201b3a049fa5bbed417c3f0a onigd2_4_2.tar.gz 203684
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.3_pre2 b/dev-lang/ruby/files/digest-ruby-1.8.3_pre2
deleted file mode 100644
index 427156848e86..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.3_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 536b18046c1d51731953fd32de3df26e ruby-1.8.3-preview2.tar.gz 4202512
-MD5 271d3d39201b3a049fa5bbed417c3f0a onigd2_4_2.tar.gz 203684
diff --git a/dev-lang/ruby/ruby-1.8.3_pre2.ebuild b/dev-lang/ruby/ruby-1.8.3.ebuild
index 5e89a18545ba..fa2d9ff7b31d 100644
--- a/dev-lang/ruby/ruby-1.8.3_pre2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # 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_pre2.ebuild,v 1.1 2005/09/17 17:48:30 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.3.ebuild,v 1.1 2005/09/23 01:04:19 caleb Exp $
 
 ONIGURUMA="onigd2_4_2"
 
diff --git a/dev-lang/ruby/ruby-1.8.3_pre1.ebuild b/dev-lang/ruby/ruby-1.8.3_pre1.ebuild
deleted file mode 100644
index dabaa1525c89..000000000000
--- a/dev-lang/ruby/ruby-1.8.3_pre1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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_pre1.ebuild,v 1.4 2005/07/01 13:53:12 kugelfang Exp $
-
-ONIGURUMA="onigd2_4_2"
-
-inherit flag-o-matic alternatives eutils gnuconfig
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-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 ~ppc64 ~s390 ~sparc ~x86"
-IUSE="socks5 tcltk cjk doc threads"
-
-RDEPEND="virtual/libc
-	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2
-	socks5? ( >=net-proxy/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
-		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
-
-	# Enable build on alpha EV67 (but run gnuconfig_update everywhere)
-	gnuconfig_update || die "gnuconfig_update failed"
-
-	cd ${S}
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-}
-
-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
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	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) \
-		$(use_enable threads pthread) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	LD_LIBRARY_PATH=${D}/usr/$(get_libdir)
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
-	for d in $(find ${S}/ext -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	if use ppc-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/$(get_libdir)/libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
-		dosym /usr/$(get_libdir)/libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
-	fi
-
-	dodoc COPYING* ChangeLog MANIFEST README* ToDo
-}
-
-pkg_postinst() {
-	if ! use ppc-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 ppc-macos ; then
-		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
-			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
-		fi
-	fi
-}