Cleanup.

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

3 files changed, 8 insertions, 50 deletions

diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog
index e51d346d3135..1ababefb4844 100644
--- a/dev-ruby/bundler/ChangeLog
+++ b/dev-ruby/bundler/ChangeLog
@@ -1,6 +1,9 @@
 # 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.59 2013/11/23 16:13:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.60 2013/12/25 07:48:05 graaff Exp $
+
+  25 Dec 2013; Hans de Graaff <graaff@gentoo.org> -bundler-1.2.5.ebuild:
+  Cleanup.
 
   23 Nov 2013; Hans de Graaff <graaff@gentoo.org> bundler-1.3.5-r1.ebuild:
   Fix building with LANG=C by using the ruby gemspec, fixing bug 491826.
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 2affdd1805e1..49913eacb175 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -3,17 +3,15 @@ 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.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.2.5.ebuild 1476 SHA256 c5a9ad6f2b9f9e9e449be334f152869fd9e96b25718ba66a224c7b79792c70ac SHA512 dac70c6826820e65cf3c32a527d5088d2d529294f84ddda21dde71354f2225d38109ffec43b110db2cca604bec81c208f670c35bab2b40e353fece045ebd188e WHIRLPOOL 70ff336f29201fccbc74d77e8a8f89898ea55f5cb7f03f5972e9715a06ada1cc262371dfd2b31c13229ea2151c0ef98314ec95cd5355e1fb718544bd767afdca
 EBUILD bundler-1.3.5-r1.ebuild 1650 SHA256 09915fded4d652baf50d0c35ad9ecfcbeb2d0af0189d81b3b5d3172559af55bd SHA512 a0575409082dacc3f5b5fe8cac2e543f3e1b9e0771009634029ccc51421b834bc93305d7532fdedb532c6c8798da2659f7637244a776f6f91480bffe466cffcf WHIRLPOOL 2f4c2517d848f1567a7609edd3f82f5aa899a663104511fd8b5fb282926d436dd60d8ab64c319da1153f29ee93ca9f08b6e772dc403f033f4b3fba86085869c6
 EBUILD bundler-1.3.5.ebuild 1450 SHA256 8133fb880af6989483df86eb3f957fc2127165e0f7433af583e17d2fc6248be2 SHA512 505aee6752ddfe8d9d6285f5467e00d7bafbb1723279ba07fb12f748c14f628fab22952baee5f62fb840803a64a4965a626c7072e361019cf6a016bf4b111188 WHIRLPOOL 141fdb2feb729d94b9dbffe6ed087291784d9c437a42105951ced4b6311297a91d3a22a367f92b2b4d2551d8396a4932c64e853cde01be5b15eef853ecffbbc8
-MISC ChangeLog 7788 SHA256 ff624b19a617c76eb7f4f80a3a9cdaac0bb3dae416905578aa01f12aabf5c504 SHA512 ec2c5d3a33baed73e94e68b6e5f7b620f845d4fae0b7189ea30a0783d67040566b6192c35f45276b9965db0694ba8a779e7113289b699bb40cf3c876bf95b7d1 WHIRLPOOL 385686304ec653c94810ed2604273b81b5be6695eb21ca936df2b4547dfef30e66fb85c00dbc16db5211a025c8d3739439ff93d70423e30181a6e5bb40a9c8f9
+MISC ChangeLog 7873 SHA256 7338c68174bdf19824b837c4fd7385e76704e65dbd808c70f276a7d0b70d11cb SHA512 86fa1c031530956353f8a370d900911ecbe5361c3b641a7e1f402874ab7737a63eae6dd04850df885c49298e1edf58ba4a83f28d57aa71ead6f68dffc3cf522e WHIRLPOOL 867dab81a51521918a407ac5b41e968e229f4bf0f23d5fd7e830bc28d8c8f466e71013b9cbcdf997970765896d2b86e0ddf88d1ff552ceb0ea83e5b7b293bd4c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKQ1DMACgkQiIP6VqMIqNeA6AD+KhdJa34Y8Yi27xjIpFD4BMn2
-/ougrFSXTA2OYWH+EwMBAJMy+e6B1kgntfzXPT0Ho/WPjIIwxXmHcAWTX/RN+gXs
-=iJJ/
+iF4EAREIAAYFAlK6jbYACgkQiIP6VqMIqNfXAAD/WMjDeCCSDI5SmUKw0uADkCPs
+m68Lw9HRicXfWmBEmhAA/RRF91Vwv6aS4iQ1F/Tv1CMhB5fVdcrC90X0OM9ptezU
+=GMeF
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/bundler/bundler-1.2.5.ebuild b/dev-ruby/bundler/bundler-1.2.5.ebuild
deleted file mode 100644
index c47cf203afff..000000000000
--- a/dev-ruby/bundler/bundler-1.2.5.ebuild
+++ /dev/null
@@ -1,43 +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.2.5.ebuild,v 1.4 2013/09/10 05:52:13 graaff Exp $
-
-EAPI=5
-
-# jruby → Many tests fail and test suite hangs.
-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 <dev-ruby/rubygems-2"
-
-ruby_add_bdepend "test? ( app-text/ronn )"
-
-RDEPEND+=" dev-vcs/git"
-DEPEND+=" test? ( dev-vcs/git )"
-
-all_ruby_prepare() {
-	# Bundler only supports running the specs from git:
-	# http://github.com/carlhuda/bundler/issues/issue/738
-	sed -i -e '/when Bundler is bundled/,/^  end/ s:^:#:' 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
-}