Cleanup.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 9 insertions, 107 deletions

diff --git a/dev-ruby/rspec/ChangeLog b/dev-ruby/rspec/ChangeLog
index dd852fcaf002..55852a61f94d 100644
--- a/dev-ruby/rspec/ChangeLog
+++ b/dev-ruby/rspec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.127 2012/11/06 17:18:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.128 2012/11/13 19:19:23 graaff Exp $
+
+  13 Nov 2012; Hans de Graaff <graaff@gentoo.org> -rspec-1.3.1.ebuild,
+  -rspec-2.6.0.ebuild:
+  Cleanup.
 
   06 Nov 2012; Jeroen Roovers <jer@gentoo.org> rspec-2.6.0-r1.ebuild:
   Stable for HPPA (bug #426668).
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index fe6eae4fe563..49dc72d1b15d 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -7,18 +7,16 @@ DIST rspec-2.10.0.gem 4608 SHA256 b8aaf37b077c59ecfd865e76495e81fc8c88c1d2cfe7ba
 DIST rspec-2.11.0.gem 4608 SHA256 baeff07cee3c2f7f3972474b6d085e7e9bb2893ee305f4e7291a76a1f754a54c SHA512 b05fca062ca790dff7ba75513050f8b51afb9a8546c28999400e85a14208b5c0a8ab14fd10216d4304d26ef329de25ae240e2e48dae0f5dba0b15a8248535446 WHIRLPOOL 5372238c42826bae2fa697e092d3afc91520e5aec50219502b46813389a67c4b57189e2a095014c88caae932db8dbe54de9c8cc9ca13bdc76e2ab19b1e870920
 DIST rspec-2.6.0.gem 5632 SHA256 9638cad0d5a0c17ba7871e600df381ecf551dd3ab382d2032b35983803dc5ed4 SHA512 c356a149b341b019443b7fc4dfb463e916935b42178c06e5c6e5abbf3e847d305ca73251bd2f707b655297c264461643d682c259bdaff24621da03b7cd585e54 WHIRLPOOL 74e0f3bb53f586c6d33ea1328ddd6c140eadaded2fc90a53e7da7dfc34c8c5527e1129534c9edd0db91ab2ae577d9baa08b028670c154efe8184bf91030c757f
 EBUILD rspec-1.3.1-r1.ebuild 2140 SHA256 292433abd19b9c36239d91f287633d37c7c2a65b58bbc5f91d378e5e33495637 SHA512 c58e16c0fe5029ecb2f9c69517975aa312e044758d3158f2e956875f619190208b60c0eaacd30089d9d84178251b67ede5bdc6e7f98ef9d4144cd515ac438fbe WHIRLPOOL 6b2ca53dd90039c80920d555cbb9ae26cd07d0cd7447dd982d0a8b79c0e46c68eb2cf77511e20e232d6ed91df123bc7500cf6f68c8a1f7b60f992aa115506bfe
-EBUILD rspec-1.3.1.ebuild 2110 SHA256 cc8b0a399d84d945d4750bc0ead819ec2303c7c0c2b8c6bf8237eb6e7cdf68ff SHA512 6484b3c6d08f3513d0055ce62a2e201203cf5dfb810da72d53b90ed6bcb93efb5f74b0a5324821089783e4e68460b33e5420bc19f80a2858d793b78051abe0cc WHIRLPOOL 23b9cc6e297d0e7c45a22706223c162a60f2467d1f066ea720bc8de6cf7808f7d4e77a765d120f9340868f75445fb12a9bdea5f17f46ccf058f94775d7a6c53b
 EBUILD rspec-1.3.2.ebuild 2557 SHA256 3c9db107473f76566de8fceca844a921e9c85c072c2eb3adcb43d9cd4beb6a0c SHA512 94313db1989a39426e343e66ab389cd5a4754aa902cc14dd2c549e354139b83413d439e31c723758c30b9c0c51a0d960c1695533a4ce1a880c9c0b26122aa5a9 WHIRLPOOL 85ff5238c3c3b599392b0cfe8f92e3b2b15d5528d967fc621e4d7fbeb6c634911ebe5973f0220755cc73d229eeb632bfb74466bfc4f78f10544ccd9c3bf9d4b1
 EBUILD rspec-2.10.0.ebuild 901 SHA256 c5e946424fcc6b323f9a288b45b773bd2a886985b10d017a06daeddf6770760f SHA512 b1dd67ed91a40811e9774b51decf548aaa8a9d86f08706a857acbe16cbb7ad0e527e764b4f2532ae2870291b5aab3413e77847a48618d3bbebe3c737c6abffec WHIRLPOOL 9a8f5b0ddcf41e6daa7b2064527f1d3e5fd7f93f150960f321ab5d58cb3d7239f99108733761f144fb9c96040c37045a9340b7bc374e68d7dca73a38daf12d52
 EBUILD rspec-2.11.0.ebuild 896 SHA256 6cb6a8baf230c4914c97a22ac3c8ca36ff01afa18554a6f64329d2b1897e7819 SHA512 a3588172ab2b92be709101414fb6d41c89667c81a8e71e5ebd40c81c90453baef1f16d1ba4fefaf3b1dd5c991467140ee20478c6940315019106acfa506cacaf WHIRLPOOL 4354b1ecb24a797bbc744cfd1def474ab6ee7dd50e263a7e204f59b8087575091efa53aab1e6829d6fdd95e71042ef3a916b395b1a23d486e5e5bd77e1304a56
 EBUILD rspec-2.6.0-r1.ebuild 898 SHA256 8de73121b1827e75c5a448206add8ab839b05889d832e323c16f3596e2ab5ea5 SHA512 276b47cf81a817da3813e2f9872f12c964baec98a9f671808f2e929425a02722c66104d89bbe163b484fbe587379df801bb1a1ea7476293c2c238b2066a818a9 WHIRLPOOL 7bf87710a06880c4588cd793dcd86dff6d02875ca97a31a29fb34b469b1da4b633c1b877b8f2c16e2d320b760efa12a0382dcac365baf53ad3adf676dff5129f
-EBUILD rspec-2.6.0.ebuild 850 SHA256 3235395038b36a43bdc227752a76f8f5fd0fe9c638fc63dbc1126efb10444a60 SHA512 80b9231820d0a2bc549b299c7ea443b821ec40f3266e6afc330f29457da4da74977820f42ea6dbc995e62d7a279985f6d97454bf9f4f14c1e695f01fa5d165c7 WHIRLPOOL c864deccf7915ac2e17db9c2861db282ab5d2f5cc526b9de5f384c1508fe705a6da4969461090a4f21abf40367ee8af0ab57d5105f047ab40fdb5646201fbbba
-MISC ChangeLog 16392 SHA256 76e4e81cbaa58bebb55ab874e91743bcb5faf0776b8129f496fb5a6bc5ea5081 SHA512 3e881a6c37302112678cb859c25c3278d08d04c556b522133d2892ab796fc6c165c7439f2e114588637119f631b4afaed3986c257c0571702b132a9d46c575a7 WHIRLPOOL 9f8c8cda0181332fa63f49bf2009e52f0c58f024254c957c9af5257bb1b1d4e56b8ccae998d2eb3f72433cff9727a9002415cdeff43618ac751e63dee156b429
+MISC ChangeLog 16501 SHA256 6eb611dae2ac96fdc0149aa151fabb093a1de5299e776cf7971b9ce1412bb32c SHA512 fbd602684f7fe23866df436cb6afe0e9d35f2d37994293b6d38a771de3010e911f60cedb320ebfc18fbda1cef7c54fe931dcac7a7ba51f32eb50af7ff9c95b53 WHIRLPOOL 64e37f6bb8c735633e4fff8975df528bf52cdb14f6635521c83130560afe2d00eb5721152da80c4199e73168d0c52a97503c17796c42f07524d74dec273f7616
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCZRk8ACgkQVWmRsqeSphOJzACdEfEPJqVuJjIURKMGJK5Qkqix
-9DAAn13CMumijTOZie9e9Ce1NVBEIBXJ
-=2VcQ
+iF4EAREIAAYFAlCinTwACgkQiIP6VqMIqNcfVQEAjo9FAHEJeAaQJMGxx2nDE+7u
+O9p2EQ7LniG79mz1b90A/3m1T1IM7JPRuSdp5LSrU71MO/FlsSNRUAnmLB2Zxemv
+=WeKX
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec/rspec-1.3.1.ebuild b/dev-ruby/rspec/rspec-1.3.1.ebuild
deleted file mode 100644
index 5d5f4d783cb0..000000000000
--- a/dev-ruby/rspec/rspec-1.3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.1.ebuild,v 1.11 2012/10/28 17:20:12 armin76 Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc TODO.txt Ruby1.9.rdoc Upgrade.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-# it's actually optional, but tests fail if it's not installed and
-# some other package might fail tests, so require it anyway.
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.2"
-
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.0.0 )"
-
-RDEPEND="!<dev-ruby/rspec-rails-${PV}"
-
-# don't require test dependencies for jruby since we cannot run them
-# for now (fakefs doesn't work).
-#
-# We should add nokogiri here to make sure that we test as much as
-# possible, but since it's yet unported to 1.9 and the nokogiri-due
-# tests fail for sure, we'll be waiting on it.
-USE_RUBY="ruby18 ree18" \
-	ruby_add_bdepend "test? (
-		>=dev-ruby/hoe-2.0.0
-		dev-ruby/zentest
-		>=dev-ruby/syntax-1.0
-		>=dev-ruby/fakefs-0.2.1 )"
-
-# the testsuite skips over heckle for Ruby 1.9 so we only request it for 1.8
-USE_RUBY="ruby18 ree18" \
-	ruby_add_bdepend "test? ( >=dev-ruby/heckle-1.4.3 )"
-
-all_ruby_prepare() {
-	# Replace reference to /tmp to our temporary directory to avoid
-	# sandbox-related failure.
-	sed -i \
-		-e "s:/tmp:${T}:" \
-		spec/spec/runner/command_line_spec.rb || die
-}
-
-src_test() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-	ruby-ng_src_test
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			ewarn "Tests for JRuby are disabled because dev-ruby/fakefs does not currently support"
-			ewarn "JRuby properly and it's needed to run the tests."
-			;;
-		*)
-			each_fakegem_test
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec/rspec-2.6.0.ebuild b/dev-ruby/rspec/rspec-2.6.0.ebuild
deleted file mode 100644
index beb021adc5f0..000000000000
--- a/dev-ruby/rspec/rspec-2.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.6.0.ebuild,v 1.13 2012/10/28 17:20:12 armin76 Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"