Drop old ebuilds and drop ruby 1.8 support from 2.0.5: installed as a gem does not override the old one and causes problems.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

5 files changed, 22 insertions, 111 deletions

diff --git a/dev-ruby/test-unit/ChangeLog b/dev-ruby/test-unit/ChangeLog
index 21a3faaa22aa..5c664b3e25f0 100644
--- a/dev-ruby/test-unit/ChangeLog
+++ b/dev-ruby/test-unit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/test-unit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.12 2009/12/16 18:15:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.13 2009/12/20 22:28:28 flameeyes Exp $
+
+  20 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -test-unit-2.0.2-r1.ebuild, -test-unit-2.0.3.ebuild,
+  test-unit-2.0.5.ebuild:
+  Drop old ebuilds and drop ruby 1.8 support from 2.0.5: installed as a gem
+  does not override the old one and causes problems.
 
   16 Dec 2009; Jeroen Roovers <jer@gentoo.org> test-unit-2.0.5.ebuild:
   Marked ~hppa (bug #297046).
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index a2cc44d76bf4..3f917a9ca9d7 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,8 +1,14 @@
-DIST test-unit-2.0.2.tgz 71079 RMD160 61a3179f5476987d85a49439dbae9c9e88242435 SHA1 eeee8beee7ba455a0a4bf16626131903214f7789 SHA256 1d49aa31603679424fa84313b6f3ddfebca61770af6f93deba7dd3dcf1c07949
-DIST test-unit-2.0.3.tgz 73619 RMD160 ec3d9954c1b79d248476ffcbf6fe19f1f1fd2d93 SHA1 637ba87bac354cf1b365762c3286b6121b6a3bb6 SHA256 4fdf8a44a06852f256f411a0941763680a5281abae26601bbc358ea8a9100e91
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST test-unit-2.0.5.tgz 131079 RMD160 60a1e9cd26622f862d1bf19ae14fb217a3dd34ef SHA1 6f3284f402f2eaacd04608c2a3e003ddb3fb81c0 SHA256 2a57ca7b1452efa11281a7f6d26248c38b562f8b7092f478374f147f59eb2a5e
-EBUILD test-unit-2.0.2-r1.ebuild 1206 RMD160 d6770908be25f7a30b19b4fbae6fdd41e06e728e SHA1 fb650b0c6cec7575186cf4ad221c82c3efa8aa65 SHA256 6f4fc494122b99c31163b5f13fc2958fd4ce54cac0fe065fd9591583427a728f
-EBUILD test-unit-2.0.3.ebuild 1216 RMD160 baf958f4754d0ee516101cd3cf3524fbc065c799 SHA1 97ea53732201142b302d420f49a5a5a1b7523a14 SHA256 6b62ba4f16d258cc74e390aff0d04307bcab5393d9d6401f896ad28d63b43771
-EBUILD test-unit-2.0.5.ebuild 1083 RMD160 d76ae538f8941b8e0a3cb42eda1e142595b432de SHA1 62466d7063418dd1db3211056206336db5df215a SHA256 273a3ad35040a0f0a8a70914943990173efad16d143c9866213869a7ca9804d9
-MISC ChangeLog 1950 RMD160 d3ef8a0692f1df1a0b38f5d4cf61ad8f7f4ac38a SHA1 e4b61c809428fbffcbf1d408d5bf4eac24e5aac4 SHA256 ed8b5f2012b52ef0d780dc98ca84b70a8535fb2ec672c339c5a43174635a9fc9
+EBUILD test-unit-2.0.5.ebuild 1171 RMD160 cc7af0e60881d364e8cbd9d57dfa5f53d2d72706 SHA1 27a61dd74db1bb8e958194f3b611c56f48e2feef SHA256 50e686cfbae706f540c7beb403b0d1464e48de8df587fd46c6a8f23d3ed5f788
+MISC ChangeLog 2223 RMD160 d8420494b23f2987bfdb39e8f20442a48de7a4a7 SHA1 33f363b91bfb5b78ca9aae8ee8377f8efa3e4314 SHA256 5b76d668059141dd8c8136612618092f7657393a3421007ee343eaecbe08ad80
 MISC metadata.xml 313 RMD160 64f35fe17cb231f17c18f4ace1656b2389eebd07 SHA1 b2de46ec2cf3be4a04d73fa7a43a704408e0d2be SHA256 70c196238b5e24846ee90d328200906af70156308716e4ec568ae3e148e43813
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksupQgACgkQAiZjviIA2XiIugCfSu+berjg3JxmF+qrxjhyWy9p
+oysAoMuCvjWG6l3yICA/kVhIf1n2H+7A
+=pQNX
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/test-unit/test-unit-2.0.2-r1.ebuild b/dev-ruby/test-unit/test-unit-2.0.2-r1.ebuild
deleted file mode 100644
index 2b0a2980c7e9..000000000000
--- a/dev-ruby/test-unit/test-unit-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.0.2-r1.ebuild,v 1.4 2009/10/31 21:42:00 volkmar Exp $
-
-inherit ruby
-
-DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
-HOMEPAGE="http://test-unit.rubyforge.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="
-	doc? ( dev-ruby/rake
-		dev-ruby/hoe )"
-#	test? ( dev-ruby/rake
-#		dev-ruby/hoe
-#		dev-ruby/zentest )"
-RDEPEND=""
-
-USE_RUBY="ruby18 ruby19"
-
-src_compile() {
-	if use doc; then
-		rake doc || die "rake doc failed"
-	fi
-}
-
-src_test() {
-	for ruby in $USE_RUBY; do
-		[[ -n `type -p $ruby` ]] || continue
-		# the rake audit using dev-ruby/zentest currently fails, and we
-		# just need to call the testsuite directly.
-		# rake audit || die "rake audit failed"
-		$ruby test/run-test.rb || die "testsuite failed"
-	done
-}
-
-src_install() {
-	cd "${S}"/lib
-	doruby -r * || die "doruby failed"
-
-	if use doc; then
-		dohtml -r "${S}"/doc/* || die "dohtml failed"
-	fi
-
-	dodoc "${S}"/{TODO,README.txt,History.txt} || die "dodoc failed"
-}
diff --git a/dev-ruby/test-unit/test-unit-2.0.3.ebuild b/dev-ruby/test-unit/test-unit-2.0.3.ebuild
deleted file mode 100644
index cf8d46ef19c1..000000000000
--- a/dev-ruby/test-unit/test-unit-2.0.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.0.3.ebuild,v 1.3 2009/10/31 21:42:00 volkmar Exp $
-
-inherit ruby
-
-DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
-HOMEPAGE="http://test-unit.rubyforge.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="
-	doc? ( dev-ruby/rake
-		dev-ruby/hoe )"
-#	test? ( dev-ruby/rake
-#		dev-ruby/hoe
-#		dev-ruby/zentest )"
-RDEPEND=""
-
-USE_RUBY="ruby18 ruby19"
-
-src_compile() {
-	if use doc; then
-		rake doc || die "rake doc failed"
-	fi
-}
-
-src_test() {
-	for ruby in $USE_RUBY; do
-		[[ -n `type -p $ruby` ]] || continue
-		# the rake audit using dev-ruby/zentest currently fails, and we
-		# just need to call the testsuite directly.
-		# rake audit || die "rake audit failed"
-		$ruby test/run-test.rb || die "testsuite failed"
-	done
-}
-
-src_install() {
-	cd "${S}"/lib
-	doruby -r * || die "doruby failed"
-
-	if use doc; then
-		dohtml -r "${S}"/doc/* || die "dohtml failed"
-	fi
-
-	dodoc "${S}"/{TODO,README.txt,History.txt} || die "dodoc failed"
-}
diff --git a/dev-ruby/test-unit/test-unit-2.0.5.ebuild b/dev-ruby/test-unit/test-unit-2.0.5.ebuild
index 7b2117dc3f85..87253602943e 100644
--- a/dev-ruby/test-unit/test-unit-2.0.5.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.0.5.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.0.5.ebuild,v 1.2 2009/12/16 18:15:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.0.5.ebuild,v 1.3 2009/12/20 22:28:28 flameeyes Exp $
 
 EAPI=2
 # One test fails on jruby, might be a jruby bug
-USE_RUBY="ruby18 ruby19"
+# When enabled on ruby18 it breaks too many things, so don't enable it for that just yet
+USE_RUBY="ruby19"
 
 # Don't enable docs yet since this requires hoe
 RUBY_FAKEGEM_TASK_DOC="" # doc