more clean up

8 files changed, 13 insertions, 114 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 6b1711bf85a0..fa055a41731c 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,9 +1,10 @@
 # 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.90 2004/10/03 13:32:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.91 2004/10/03 15:11:28 usata Exp $
 
   03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-1.8.1-r3.ebuild,
-  -ruby-1.8.1-r6.ebuild, ruby-1.8.1-r7.ebuild, ruby-1.8.2_pre2.ebuild:
+  -ruby-1.8.1-r6.ebuild, -ruby-1.8.0-r6.ebuild, ruby-1.6.8-r11.ebuild,
+  ruby-1.8.1-r7.ebuild, ruby-1.8.2_pre2.ebuild:
   Removed old ebuilds. Updated oniguruma patch.
 
   21 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> ruby-1.8.2_pre2.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index b99bfd4a41de..b308b88f7fff 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -2,15 +2,15 @@ MD5 6248f42ed2d7380988eaabe43eef65fa ChangeLog 14663
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 d05526a7c6693f88fd5339de15984f99 ruby-1.8.1-r7.ebuild 2778
 MD5 ff3e3aae8951139857c586aadaa24a39 ruby-1.6.8-r6.ebuild 1741
-MD5 6f2176a52ac68b75fac16434a5ffee6b ruby-1.6.8-r11.ebuild 1934
+MD5 0bbdc67278f45c0f562b13c48ccad3c8 ruby-1.6.8-r11.ebuild 1934
 MD5 13500da59aa0ae027f33946d6168cec9 ruby-1.8.2_pre2.ebuild 3508
-MD5 b2f540a1319fdc9457624f55ddb122d5 ruby-1.8.0-r7.ebuild 2729
+MD5 41e530a1ce79b4833252ff99b94de4be ruby-1.8.0-r7.ebuild 2729
 MD5 d4c03bbdb7088b3463ec88e0ab435455 ruby-1.8.0-r6.ebuild 2611
-MD5 7f71fa1db8bbbeb93b08628870ddfe85 files/digest-ruby-1.8.0-r7 125
+MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
 MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 cc29fb12a2f12f94d88ed90706907e9c files/digest-ruby-1.6.8-r11 136
+MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
 MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
 MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
 MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r11 b/dev-lang/ruby/files/digest-ruby-1.6.8-r11
index b8c59e0911cf..42604e50ef89 100644
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r11
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r11
@@ -1,2 +1,2 @@
 MD5 19eae3f81026270a201004d0decd3bc8 ruby-1.6.8-2004.07.28.tar.gz 1056477
-MD5 3154a12abdbc3ece51b86b8b16c0d2c6 onigd2_3_1.tar.gz 203510
+MD5 d7bd9315973b64aa2e7c6eb58ea3f483 onigd2_3_2.tar.gz 198680
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r6 b/dev-lang/ruby/files/digest-ruby-1.8.0-r6
deleted file mode 100644
index 311698ad7628..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.0-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
-MD5 3b4aa9689c3e92dd10432eec5ad513ca onigd20040316.tar.gz 196326
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r7 b/dev-lang/ruby/files/digest-ruby-1.8.0-r7
index a14b5813ff67..a41f582af764 100644
--- a/dev-lang/ruby/files/digest-ruby-1.8.0-r7
+++ b/dev-lang/ruby/files/digest-ruby-1.8.0-r7
@@ -1,2 +1,2 @@
 MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
-MD5 3154a12abdbc3ece51b86b8b16c0d2c6 onigd2_3_1.tar.gz 203510
+MD5 d7bd9315973b64aa2e7c6eb58ea3f483 onigd2_3_2.tar.gz 198680
diff --git a/dev-lang/ruby/ruby-1.6.8-r11.ebuild b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
index 60ad1418fe96..dedaf2a7e6e1 100644
--- a/dev-lang/ruby/ruby-1.6.8-r11.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
@@ -1,10 +1,10 @@
 # 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.6.8-r11.ebuild,v 1.7 2004/08/30 17:35:16 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r11.ebuild,v 1.8 2004/10/03 15:11:28 usata Exp $
 
 IUSE="cjk"
 
-ONIGURUMA="onigd2_3_1"
+ONIGURUMA="onigd2_3_2"
 SNAP_DATE="2004.07.28"
 MY_P="${P}-${SNAP_DATE}"
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/ruby/ruby-1.8.0-r6.ebuild b/dev-lang/ruby/ruby-1.8.0-r6.ebuild
deleted file mode 100644
index 2bae61ea8dc7..000000000000
--- a/dev-lang/ruby/ruby-1.8.0-r6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.8 2004/07/17 09:54:45 usata Exp $
-
-IUSE="socks5 tcltk cjk"
-
-ONIGURUMA="onigd20040316"
-
-inherit flag-o-matic alternatives eutils gnuconfig
-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
-	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.8"
-KEYWORDS="alpha hppa ia64 mips ppc sparc x86"
-
-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"
-
-src_unpack() {
-	unpack ${A}
-	if use cjk ; then
-		pushd oniguruma
-		econf --with-rubydir=${S} || die "econf failed"
-		make ${SLOT/./}
-		popd
-	fi
-
-	# Enable build on alpha EV67
-	if [ "${ARCH}" = "alpha" ] ; then
-		gnuconfig_update || die "gnuconfig_update failed"
-	fi
-}
-
-src_compile() {
-	# 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
-}
diff --git a/dev-lang/ruby/ruby-1.8.0-r7.ebuild b/dev-lang/ruby/ruby-1.8.0-r7.ebuild
index 93a7eb2b5697..f5d853b1f4da 100644
--- a/dev-lang/ruby/ruby-1.8.0-r7.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r7.ebuild
@@ -1,8 +1,8 @@
 # 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-r7.ebuild,v 1.4 2004/09/23 13:07:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r7.ebuild,v 1.5 2004/10/03 15:11:28 usata Exp $
 
-ONIGURUMA="onigd2_3_1"
+ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
 
 inherit flag-o-matic alternatives eutils gnuconfig