Cleanup.

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

4 files changed, 10 insertions, 112 deletions

diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog
index 1071dc37eda4..67cd0ad411a2 100644
--- a/dev-ruby/bundler/ChangeLog
+++ b/dev-ruby/bundler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/bundler
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.53 2013/05/28 13:12:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.54 2013/09/10 05:47:41 graaff Exp $
+
+  10 Sep 2013; Hans de Graaff <graaff@gentoo.org> -bundler-1.0.22.ebuild,
+  -bundler-1.1.5.ebuild:
+  Cleanup.
 
   28 May 2013; Jeroen Roovers <jer@gentoo.org> bundler-1.3.5.ebuild:
   Marked ~hppa (bug #471306).
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 7cfc5e7d869e..72211eead8d8 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -3,20 +3,16 @@ Hash: SHA256
 
 AUX bundler-1.0.3-gentoo.patch 604 SHA256 a21e789e1c8268673aaab471567b83e187475fd23a2303756488b75d2f3df9a0 SHA512 008cc11f0e20363b5df2bc154b6c2fe0117070cf93e6ea5a33601d3de2b02c2dd3fbd84c3e2200e9a355a6540e575fd53f805b5ed3015616e331cee4d87c8376 WHIRLPOOL 6f022a85511f6a341f413addf158bdf03e49e989118ab3b54720c7227f0251b633d2053e64e04a559e45788f1acaf359452617abb4b66dbace551734f94733a9
 AUX bundler-1.1.5-nouserpriv.patch 1317 SHA256 8eb59df7b2db4486a7b9e254cd37bff68e4e539b0b6ac8431c0b572d2e70fffd SHA512 456116b5f3f5a8908e4dac83b5bb3fb754a9cbd7e00472cd11a592bb8ff226319c81eda7d3a691e3a1e37422b63d8f0fa15c7b5157f24e842a6cf4e961db8726 WHIRLPOOL 9ac092c1f429b396050a03020546b75c2010572f7014f9772692aa28ea2180356d0838fd1cfc80b120e803fa6cef74ddcc3fb7f4aabf1360ef1a4c16ecd6b1ba
-DIST bundler-1.0.22.gem 175104 SHA256 c0e7285aa312240747b3a3b1de59786a04950a4240ec6c96b9d0efdd58d4ec43 SHA512 49b72751e093efa5a1a6965463a226c1f5d85596b6c26541d21b65176221f6d6393600e2db660a648cd5da0247b236a682fc1c9a2f91277259ed02bcbc3a30a3 WHIRLPOOL 11dcee6206e02d005c7f422527da66be7ecd865d75ad789de99dada15e737e9d427ca8d8a0c9f1dbc6715dec9a757b2fefb648e3fc2eefe6d03a11e441688902
-DIST bundler-1.1.5.gem 205312 SHA256 627270b2c18ff6747ea15427aaa5aec30c15718a3db27693d929fdbd431679bf SHA512 f62363222a8b8c8b3a80fa9bc92ef1a325dbb42c9ccfb5750abbd9a9d6144753cbf5105062c17dfef2dfb6978150b4a79ed5cde25234c336e4295effbc772c24 WHIRLPOOL b3f7e749a3280e2d1416a8ac0bcde9fa1f0419edf95e1c2bf7f3a7233a6c872ae5e647d8fcefb97234e543d0c4ec6c5e3ff1ec9a1662164eb557a34974806c40
 DIST bundler-1.2.5.gem 225792 SHA256 7efe3e651e89ed092cb9178925e124af2300e8c8f778eaedb423a9f583bc8923 SHA512 09c426c8650dcef8cecdc01a0e3befd2920e617f9e0a80fa9c1af828b03361e0867a7d3ffb1a9fbdd8b042364347eca307e17df60e870af1af5fdb3ecf2c15c1 WHIRLPOOL b8ee4e49dd1a105f5f7193af552783889319dc007e5db3a1d227fcaa7ef86a3ae8371aa58ff98db39e22166f8423197040d5d23bf2dd591636621d2460b41b66
 DIST bundler-1.3.5.gem 268800 SHA256 08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4 SHA512 ea3ca89b50692c575e342b695e72aaca536af9e37d2e9740017aa55dcb999759ee5c0cfba71d90ba3baf9da2ba580a3813cdfebe428f20bbb7a86f1158409236 WHIRLPOOL 0b0660919a7f842b830f452242774e33c797e144c55b48af408fc04faa002eb3fe6309675538b0c44020dfc5609b33cc39e2999df6e7363373b48815b5231f61
-EBUILD bundler-1.0.22.ebuild 1702 SHA256 08f10d9ba4a6da874f045631ea9b62a08acb666003d2218075ebcb73a5098487 SHA512 47bc57f8116941d7d05252e62de6c510a220065ccca2aa768a89ea6d83c15f70aea33257af4650d09e5ce4b303ed5e721849a5d9371958add66e8c94f0c63594 WHIRLPOOL 9d60e2f1e5facb80e6db4a7d7a5b2e88ddad77407bb4fc912b5f14aecb23686e5ade14254c91dad6001613e4c09d43a1450227588b86e33ae6d990c439f48d4e
-EBUILD bundler-1.1.5.ebuild 1535 SHA256 3082a52c2de1a7a0f66e99c9e0a08c74116889392249e353576a578ed41a977c SHA512 0a57259afaaff64eabc7c5fffc5d491f13805e6736d9c1443606be142bf9cba860dd9b8e36b43ce3a363181b4ecf561b734a3e019135dd8aa9934a3d468ecd8a WHIRLPOOL c21ce381899c519f41716b4f94d9934a0eac64c2f3418bcf2fb3dd875cd93682dd78bf4efed6790c6f36f7498afe71c6444e11b6225de05f541b6862a8eeca85
 EBUILD bundler-1.2.5.ebuild 1450 SHA256 4b28d653bf7952a75c6de140de1a5b77987cd50f90f538b77c4d01ddf772fad9 SHA512 2f8f607ba3bacedb2247880f0febf59345e44f396a38febb261d8bbb564b8750eed042fcff2b371ec4dd34ea7f6c579eb655210186c73e0e24d461ed6eae4f08 WHIRLPOOL 937fef54dade56175914dbdda3c3cc3cdd0fd24e76ef5897514113e7d5a791297ff63e4c07da7db18668e08999b8ea74407874af122e99a235f74f5b8b20a09c
 EBUILD bundler-1.3.5.ebuild 1452 SHA256 b6c1665f220eb07398fd7faab80a10824d0f3d3ece532cef05b45953246fbf9b SHA512 e1547d178b098c0bb97b1363f36732c0b74e0469158d025e97c896de3afa260a8f762c536d3745745fdef513a6a9c4bb2bf5c03022cf44016d6b97dd52005a09 WHIRLPOOL aa997b4c213641aee6d7f98d27f38e9750874c313e4f0bde5c92825592ba205b9ea44528deeddc30a095af7811fe7b10f7747b0e1aeed1858863f9bc8feebea8
-MISC ChangeLog 7034 SHA256 d249829cd5d30f2646b270488dea9a33cd87c3ff28555c5b1c139241a8455ac8 SHA512 e2d094281c3c5692f5c6e73b4680c30e87aa8eb3cff3c9e633b2f978826a3a6455c2487a4255a12ce51e3da0cab6167b20a87a7ba879ca63a77140ae4e5ad514 WHIRLPOOL bf14b340cc0c0389eb31c6ef4149f233bc4d1dd8c5ba2a4e9010fe373608a67256010fd595de4b05425765e5f221edfe67b922524a8d4cb3b29e68a7e9797d8b
+MISC ChangeLog 7148 SHA256 20b1ad2bce9a6da887157b04eca1233d9d51eaf3464be850383986db97401100 SHA512 39bd4475ed8befef7ed1b2be4384a5202972d4043f9e7ef410ed38b450f5ff4a026c0e7708cb02ed97d373e091b4309f66310960087bc58e30f34e1e6f0603c5 WHIRLPOOL d93d505b09e5bf8688b87a70c50e3cd8d3d2b0334247331fb78838a4e1a995fc1177d5212ec9544f499cb5d2038dbae235ef23e2319d14d6f3923da9f0a8d670
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGkrVgACgkQVWmRsqeSphMKowCbBpXmAmHvdl7Ij98NybLcBkp7
-RwcAmwbfiEXcVp78mm/avVZxL9BbV0Uk
-=YP9J
+iF4EAREIAAYFAlIusoUACgkQiIP6VqMIqNcL1QD+Nah7WVDuSieSB2CGn/KMHORS
+rZ9OjcHNAWpFVDG1Jm4A/3Jm/rSHcfLXqvpkLesBswMb9r2aihZVTDFE5QcOI+vQ
+=b0N0
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/bundler/bundler-1.0.22.ebuild b/dev-ruby/bundler/bundler-1.0.22.ebuild
deleted file mode 100644
index 748a37722803..000000000000
--- a/dev-ruby/bundler/bundler-1.0.22.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.0.22.ebuild,v 1.6 2013/01/16 00:28:32 zerochaos Exp $
-
-EAPI=2
-
-# jruby → needs to be tested because jruby-1.5.1 fails in multiple
-# ways unrelated to this package.
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md UPGRADING.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="http://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend virtual/rubygems
-
-ruby_add_bdepend "test? ( app-text/ronn dev-ruby/rspec:2 )"
-
-RDEPEND="${RDEPEND}
-	dev-vcs/git"
-DEPEND="${DEPEND}
-	test? ( dev-vcs/git )"
-
-all_ruby_prepare() {
-	# Reported upstream: http://github.com/carlhuda/bundler/issues/issue/738
-	sed -i -e '726s/should/should_not/' spec/runtime/setup_spec.rb || die
-
-	# Fails randomly and no clear cause can be found. Might be related
-	# to bug 346357. This was broken in previous releases without a
-	# failing spec, so patch out this spec for now since it is not a
-	# regression.
-	sed -i -e '49,54d' spec/install/deploy_spec.rb || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby19)
-			# Account for different wording in ruby 1.9.3.
-			sed -i -e 's/no such file to load/cannot load such file/' spec/runtime/require_spec.rb spec/install/gems/groups_spec.rb || die
-			;;
-		*)
-			;;
-	esac
-}
diff --git a/dev-ruby/bundler/bundler-1.1.5.ebuild b/dev-ruby/bundler/bundler-1.1.5.ebuild
deleted file mode 100644
index 7101d427d558..000000000000
--- a/dev-ruby/bundler/bundler-1.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.1.5.ebuild,v 1.3 2013/01/16 00:28:32 zerochaos Exp $
-
-EAPI=4
-
-# jruby → needs to be tested because jruby-1.5.1 fails in multiple
-# ways unrelated to this package.
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md UPGRADING.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="http://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend virtual/rubygems
-
-ruby_add_bdepend "test? ( app-text/ronn )"
-
-RDEPEND+=" dev-vcs/git"
-DEPEND+=" test? ( dev-vcs/git )"
-
-RUBY_PATCHES=( "${P}-nouserpriv.patch" )
-
-all_ruby_prepare() {
-	# Bundler only supports running the specs from git:
-	# http://github.com/carlhuda/bundler/issues/issue/738
-	sed -i -e '751s/should/should_not/' spec/runtime/setup_spec.rb || die
-
-	# Fails randomly and no clear cause can be found. Might be related
-	# to bug 346357. This was broken in previous releases without a
-	# failing spec, so patch out this spec for now since it is not a
-	# regression.
-	sed -i -e '/works when you bundle exec bundle/,/^  end/ s:^:#:' spec/install/deploy_spec.rb || die
-}