I hope I got the 1.6 deps cleared out now

Package-Manager: portage-2.0.53_rc4

4 files changed, 5 insertions, 93 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index de97d67af841..38cb1ea46dc0 100644
--- 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.163 2005/10/05 22:37:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.164 2005/10/07 15:40:52 caleb Exp $
+
+  07 Oct 2005; Caleb Tennis <caleb@gentoo.org> -ruby-1.6.8-r12.ebuild:
+  Hope I got the 1.6 deps cleared out now
 
   05 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
   +files/ruby-1.6.8-20040728-20041024.diff,
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index bb475d5b847f..56327f913ce5 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,8 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 644ff2763a9db9cd0fcbb5db842580e1 ChangeLog 23764
-MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
+MD5 cf6d5fc00c0ff68a7d902d3babb83823 ChangeLog 23874
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2 125
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125
@@ -16,15 +12,7 @@ MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822
 MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
 MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 29d32e55b5af0f171faf7fc85be425e6 ruby-1.6.8-r12.ebuild 1940
 MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753
 MD5 3c1c7073b75a7c7dc6e6fc48de2ebe64 ruby-1.8.2-r2.ebuild 3828
 MD5 67de00f5d7b9ced2530317f945d0ebc9 ruby-1.8.2.ebuild 3446
 MD5 19375fd590a74716c0cdf608cb6ce878 ruby-1.8.3.ebuild 3626
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDRJ4qgIKl8Uu19MoRAtGHAJ49tsa5UdgDsJ+NfVT/n3fkYMKOlQCfb+th
-krMRXAXbz4R010bO7c1X1ik=
-=4VAX
------END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r12 b/dev-lang/ruby/files/digest-ruby-1.6.8-r12
deleted file mode 100644
index 857a3f7f510b..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 19eae3f81026270a201004d0decd3bc8 ruby-1.6.8-2004.07.28.tar.gz 1056477
-MD5 a340ae6a721362338a8d8f5a79e470d5 onigd2_3_3.tar.gz 199191
diff --git a/dev-lang/ruby/ruby-1.6.8-r12.ebuild b/dev-lang/ruby/ruby-1.6.8-r12.ebuild
deleted file mode 100644
index 6a81eaab6d52..000000000000
--- a/dev-lang/ruby/ruby-1.6.8-r12.ebuild
+++ /dev/null
@@ -1,77 +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.6.8-r12.ebuild,v 1.9 2005/10/05 22:37:21 mr_bones_ Exp $
-
-IUSE="cjk"
-
-ONIGURUMA="onigd2_3_3"
-SNAP_DATE="2004.07.28"
-MY_P="${P}-${SNAP_DATE}"
-S="${WORKDIR}/${MY_P}"
-
-inherit flag-o-matic alternatives eutils
-
-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/snapshots/${MY_P}.tar.gz
-	cjk? ( http://www.geocities.jp/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.6"
-KEYWORDS="x86 alpha ppc sparc hppa amd64 -ia64 mips"
-
-DEPEND="virtual/libc
-	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2
-	>=dev-ruby/ruby-config-0.3"
-PROVIDE="virtual/ruby"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-${SNAP_DATE//./}-20041024.diff
-	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
-
-	if use cjk ; then
-		einfo "Applying ${ONIGURUMA}"
-		cd ${WORKDIR}/oniguruma
-		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
-		econf --with-rubydir=${S} || die "econf failed"
-		make ${SLOT/./}
-	fi
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-	econf --program-suffix=${SLOT/./} --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	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() {
-
-	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
-}