Remove broken version

Package-Manager: portage-2.1.4.4

4 files changed, 9 insertions, 291 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 210968a2d2ca..84d94b0f4cc6 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.342 2008/08/10 14:10:34 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.343 2008/08/10 14:21:09 graaff Exp $
+
+  10 Aug 2008; Hans de Graaff <graaff@gentoo.org>
+  -files/ruby-1.8.6-revert-r15856.patch, -ruby-1.8.6_p230.ebuild:
+  Remove broken version in favor of the just-added 1.8.6_p286
 
 *ruby-1.8.6_p286 (10 Aug 2008)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 1efa7bf1f5e3..3229ac113bfb 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -2,27 +2,24 @@
 Hash: SHA1
 
 AUX ruby-1.8.6-memory-leak.diff 1351 RMD160 cba1335fcd52df26b4b2884dea14e0c74852b67a SHA1 184c1743592684abfc1cce8ffa38ae749fe0a1b1 SHA256 90dbc7b444ed936ed8a1fadb443240ec494a6c748d38ff089af423e50bdd9528
-AUX ruby-1.8.6-revert-r15856.patch 3389 RMD160 06cb82094586a1d893b1da5245063bd6f4beb9e1 SHA1 74fa9b4c2485c953ad791516806a75ba70ce5368 SHA256 16394b4e748996ef92419909f49fc59aa5938f76691eb5d7188b056d2b725efc
 AUX ruby-1.8.6_p111-r13657.patch 1915 RMD160 9c135a4e779095127bf7e5d47d2ae3b703e8b41e SHA1 47428434aaa61b5fd11684d8faa8c7db4886b680 SHA256 0856f5987b74be29562e16b3dafc62cb6b874e5536bd73ba2c7fb1e4a4630e24
 DIST onigd2_5_9.tar.gz 221355 RMD160 ceeee9a0221d431d6576a566621ba9badab6423d SHA1 41ca5b916ae1d3b1675fcc45181a0ed04e8726b7 SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0
 DIST ruby-1.8.6-p111.tar.bz2 3919396 RMD160 8ff9b8592a80062742be61b2b4e1158282b61c4b SHA1 d85d25786e0ce30f8f54f5cfa36968ec0f6b9a5f SHA256 85c694678313818a5083bcfd66ae389fc053b506d93b5ad46f3764981c120fbb
 DIST ruby-1.8.6-p114.tar.bz2 3920921 RMD160 332d6e98ef79ad8175ce699ed5293407763f769f SHA1 9929782935ebb77d040593a010b8d65b03ce6e23 SHA256 4ac0d0271324c54525210f775e5fcc9a37e3d8a10b96d68cdfeeb361c6f64a63
-DIST ruby-1.8.6-p230.tar.bz2 3948498 RMD160 cdf3ea33c3fd2258c685aea634aca7e9624036ec SHA1 c630222fd6b4272db84f54e68879f81e2014cd51 SHA256 603708301fc3fd7ef1c47bb4a24d7799c26e28db08d69cda240adcbdbff514d7
 DIST ruby-1.8.6-p286.tar.bz2 3957979 RMD160 7a58ee2a1643d9e8efc9ac9c16f72128d7291329 SHA1 7396c70302aa4c76c98f90349114ce4627749f41 SHA256 d800552900e1157bbeaae39a4c253683b2444820a5d1ba0a207a13cc469168b7
 DIST ruby-1.8.6_p111-to-p113.patch.bz2 5823 RMD160 bee2dedd786450fb8008ced74af95c8e2401fa3b SHA1 0ed730d65593c828b1122c909900402f4d3d8f74 SHA256 cfe2d2e95ad708c5e00c274b9547e20076d31ccf7655860f7661be531dcdacc4
 DIST ruby-1.8.7-p22.tar.bz2 4121532 RMD160 249253406204151d9448ec43ddc61712556ae023 SHA1 a54e59393f0ca8fcc39f9e23e63a04b1cd4e3b7a SHA256 477968408e27d067ef56f552d7fc2a9e6f5cae2d1a72f17cd838ebf5e0d30149
 EBUILD ruby-1.8.6_p111-r1.ebuild 5025 RMD160 0b8b8d252ee486386a42b5b4ff239f15c392ec26 SHA1 1051a2cf6185b0162ef87b0e1d8d22ab5e412bfa SHA256 13b7a3e6e74fe37c2e1d8965e85b3c9d23ba3bf06b4b4cf17d828719f2591359
 EBUILD ruby-1.8.6_p111.ebuild 4981 RMD160 a348a5aa534ea01b0a1dd8bba1c9d6b14e07642e SHA1 f7695b286891594eb9e7658e8ba3e1ebb3d6e73f SHA256 b1fc4edaf3001027c3f1a8dfc75ee470687b76db32f233080287c99f9c51be90
 EBUILD ruby-1.8.6_p114.ebuild 4953 RMD160 6d2ad78573307e2cae18468153882ba9cc905de0 SHA1 cdecf63a4da8228558e7814aa7c28ef83033d835 SHA256 30e3fba77636ad3affa17c8b3e9ea4ddef32f7b910187bae6656cfa9e9b57d1c
-EBUILD ruby-1.8.6_p230.ebuild 4969 RMD160 dfa1119984f71ce9a5d77abc6d84499b5f6c3393 SHA1 6b633160b84e415ad95c0e7b5b7aa466845d4d43 SHA256 2eb9f39fb1c26bbcfda8fd23181fc91222052e560a98255ff90a3ea53cc6657d
 EBUILD ruby-1.8.6_p286.ebuild 4616 RMD160 3ea44cc9a14233f72bd7c30444dda6c99e9a9f4a SHA1 784065fe4d98894cabf4915be6edd232e0cab163 SHA256 e782422da356cc3d9d34348656f8fcf7b6929795472870f0e2ccc9160130245e
 EBUILD ruby-1.8.7_p22.ebuild 4932 RMD160 b828a9697b7117e008132b5531734647a0060ca9 SHA1 087d5c4a54eb768c19cb8846257ebb744b1c2038 SHA256 3f314a39f924730c5c05424d38ae6ed76034d2d1b77fa43140bf00c890e6859c
-MISC ChangeLog 50373 RMD160 8bc511b27f764c210bc691f4bcefa03570c704ae SHA1 974e72907a92fade360427b4656174c492883a5f SHA256 6b79680bc100207acd322ba91ed5452c48e5d65efce834a42a523f100c1689a0
+MISC ChangeLog 50552 RMD160 1e4bf0a75d5f9c421585ed3c2db4f666aa8f824d SHA1 64fea7e565b4929cabdb59affbd50ce67ed73345 SHA256 c9935e6307fe232bb8141df2a9fcb6900f7366e0b545bcb23dcfd4d3c01ed4c0
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkie9ucACgkQCzgcb6sPj4/QcACdHjXwLBvtm8RhE3VopJsQTupP
-t5MAn09AfkDH09u1gon+BLjYLNDpQ3SJ
-=omFv
+iEYEARECAAYFAkie+VwACgkQCzgcb6sPj4/eYwCeL34gfP28Fo58mkG50WvZBKmG
+wXQAninL5CgeawRqz1uHmm/dgpZ4cd52
+=BUMs
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/ruby-1.8.6-revert-r15856.patch b/dev-lang/ruby/files/ruby-1.8.6-revert-r15856.patch
deleted file mode 100644
index dfc2bf3abf21..000000000000
--- a/dev-lang/ruby/files/ruby-1.8.6-revert-r15856.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-$ svn diff -c -15856  http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8
-
-Revert the following commit since it breaks Rails 2.0
-------------------------------------------------------------------------
-r15856 | matz | 2008-03-30 00:47:54 +0900 (Sun, 30 Mar 2008) | 2 lines
-Changed paths:
-   M /branches/ruby_1_8/ChangeLog
-   M /branches/ruby_1_8/class.c
-
-* class.c (clone_method): should copy cref as well.
-  [ruby-core:15833]
-
-
-
-$ svn diff -c -15856  http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8
-
-Revert the following commit since it breaks Rails 2.0
-------------------------------------------------------------------------
-r15856 | matz | 2008-03-30 00:47:54 +0900 (Sun, 30 Mar 2008) | 2 lines
-Changed paths:
-   M /branches/ruby_1_8/ChangeLog
-   M /branches/ruby_1_8/class.c
-
-* class.c (clone_method): should copy cref as well.
-  [ruby-core:15833]
-
-
-
-Index: ruby-1.8.6-p230/class.c
-===================================================================
---- ruby-1.8.6-p230.orig/class.c
-+++ ruby-1.8.6-p230/class.c
-@@ -48,26 +48,13 @@ rb_class_new(super)
-     return rb_class_boot(super);
- }
- 
--struct clone_method_data {
--    st_table *tbl;
--    VALUE klass;
--};
--
- static int
--clone_method(mid, body, data)
-+clone_method(mid, body, tbl)
-     ID mid;
-     NODE *body;
--    struct clone_method_data *data;
-+    st_table *tbl;
- {
--    NODE *fbody = body->nd_body;
--
--    if (fbody && nd_type(fbody) == NODE_SCOPE) {
--	VALUE cref = data->klass ?
--	    (VALUE)NEW_NODE(NODE_CREF,data->klass,0,fbody->nd_rval) :
--	    fbody->nd_rval;
--	fbody = NEW_NODE(NODE_SCOPE, fbody->nd_tbl, cref, fbody->nd_next);
--    }
--    st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
-+    st_insert(tbl, mid, (st_data_t)NEW_METHOD(body->nd_body, body->nd_noex));
-     return ST_CONTINUE;
- }
- 
-@@ -78,8 +65,7 @@ rb_mod_init_copy(clone, orig)
- {
-     rb_obj_init_copy(clone, orig);
-     if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
--	RBASIC(clone)->klass = RBASIC(orig)->klass;
--	RBASIC(clone)->klass = rb_singleton_class_clone(clone);
-+	RBASIC(clone)->klass = rb_singleton_class_clone(orig);
-     }
-     RCLASS(clone)->super = RCLASS(orig)->super;
-     if (RCLASS(orig)->iv_tbl) {
-@@ -92,12 +78,9 @@ rb_mod_init_copy(clone, orig)
- 	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
-     }
-     if (RCLASS(orig)->m_tbl) {
--	struct clone_method_data data;
--
--	data.tbl = RCLASS(clone)->m_tbl = st_init_numtable();
--	data.klass = (VALUE)clone;
--
--	st_foreach(RCLASS(orig)->m_tbl, clone_method, (st_data_t)&data);
-+	RCLASS(clone)->m_tbl = st_init_numtable();
-+	st_foreach(RCLASS(orig)->m_tbl, clone_method,
-+	  (st_data_t)RCLASS(clone)->m_tbl);
-     }
- 
-     return clone;
-@@ -143,22 +126,9 @@ rb_singleton_class_clone(obj)
- 	if (RCLASS(klass)->iv_tbl) {
- 	    clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
- 	}
--	{
--	    struct clone_method_data data;
--
--	    data.tbl = clone->m_tbl = st_init_numtable();
--	    switch (TYPE(obj)) {
--	      case T_CLASS:
--	      case T_MODULE:
--		data.klass = obj;
--		break;
--	      default:
--		data.klass = 0;
--		break;
--	    }
--
--	    st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
--	}
-+	clone->m_tbl = st_init_numtable();
-+	st_foreach(RCLASS(klass)->m_tbl, clone_method,
-+	  (st_data_t)clone->m_tbl);
- 	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
- 	FL_SET(clone, FL_SINGLETON);
- 	return (VALUE)clone;
diff --git a/dev-lang/ruby/ruby-1.8.6_p230.ebuild b/dev-lang/ruby/ruby-1.8.6_p230.ebuild
deleted file mode 100644
index 8cffa05fc377..000000000000
--- a/dev-lang/ruby/ruby-1.8.6_p230.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p230.ebuild,v 1.5 2008/07/25 19:13:43 mr_bones_ Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-ONIGURUMA="onigd2_5_9"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.bz2"
-	#cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="berkdb debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk )
-	>=dev-ruby/ruby-config-0.3.1
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!dev-ruby/rdoc
-	!dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PDEPEND="emacs? ( app-emacs/ruby-mode )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-PROVIDE="virtual/ruby"
-
-src_unpack() {
-	unpack ${A}
-
-#	if use cjk ; then
-#		einfo "Applying ${ONIGURUMA}"
-#		pushd "${WORKDIR}/oniguruma"
-#		econf --with-rubydir="${S}" || die "oniguruma econf failed"
-#		emake $MY_SUFFIX || die "oniguruma emake failed"
-#		popd
-#	fi
-
-	cd "${S}/ext/dl"
-	epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff"
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.8.6-revert-r15856.patch"
-
-	# 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"
-
-	eautoreconf
-}
-
-src_compile() {
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# 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
-
-	econf --program-suffix=$MY_SUFFIX --enable-shared \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
-		|| die "econf failed"
-
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-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
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}
-		cp -pPR sample "${D}/usr/share/doc/${PF}"
-	fi
-
-	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
-	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
-
-	dodoc ChangeLog NEWS README* ToDo
-
-	if use rubytests; then
-		dodir /usr/share/${PN}-${SLOT}
-		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
-	fi
-	elog
-	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
-	elog
-}
-
-pkg_postrm() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
-	fi
-}