Version bump.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 60 insertions, 5 deletions

diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog
index 2eef288dd2ba..166ba875ad7c 100644
--- a/dev-ruby/bundler/ChangeLog
+++ b/dev-ruby/bundler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/bundler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.26 2011/08/20 08:14:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.27 2011/08/20 08:24:22 graaff Exp $
+
+*bundler-1.0.18 (20 Aug 2011)
+
+  20 Aug 2011; Hans de Graaff <graaff@gentoo.org> +bundler-1.0.18.ebuild:
+  Version bump.
 
   20 Aug 2011; Hans de Graaff <graaff@gentoo.org>
   -files/bundler-0.9.26-gentoo.patch:
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 13ae6b008896..d3ac597458d7 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX bundler-1.0.3-gentoo.patch 604 RMD160 3f673efb4913679a0f925f2d446de246e0b6b3ea SHA1 9edbc0f114120577785f4f13ce2f827df81edc6d SHA256 a21e789e1c8268673aaab471567b83e187475fd23a2303756488b75d2f3df9a0
 DIST bundler-1.0.15.gem 164864 RMD160 f1eecbcfa34053dfd2df40cc64ff47023b0fa2df SHA1 a82410b2c06732aaa7bb66c84533500d472649a5 SHA256 37f36b76cb19463738616f098c53610f654b0b246c8b72b3f9694cb28013d11f
 DIST bundler-1.0.17.gem 175104 RMD160 85695544c986b502faad8400d061a7debce3a72e SHA1 8e19ec7fb7723d086534901a02be7b7cc1fb2ea7 SHA256 c2351609c768eb981fbb748eddd3e7d1b9ab01e150941430f366f741a327ccb0
+DIST bundler-1.0.18.gem 172544 RMD160 42e3a2462bb4f927c923d4e159da8ad2935877c9 SHA1 a98b654e2c29c074acbdd55c200d0f36bfcff8f8 SHA256 abace9e70731ac1d3be808f6160a9540b80d23cd27e1a94077b3f95d57c4e167
 EBUILD bundler-1.0.15.ebuild 1442 RMD160 50b435982ecb9a9a0a661e0e7bfc5d1812c3f26e SHA1 4c5c51378e119baccd828bde21473b08250826c7 SHA256 da72e49796f7b6312a0647780f89a114e97478794c655f2c1fa9eeeae9b3378d
 EBUILD bundler-1.0.17.ebuild 1441 RMD160 4faa838dcf34b93a37e90c3e0b08c484448eb914 SHA1 690f3162bb04d97f025604ce74f599672fccbd71 SHA256 beff08b6dd51ce06a293486097f9777d8e6630808171be39a8d155701d2fea20
-MISC ChangeLog 3766 RMD160 aef46cf9ae773b7f50ffb6233333dce4ae3529fb SHA1 28db40f0ef4d285c6b05fb7799cbc4577e5f4086 SHA256 24982e972cc6fc7cecc94b20fa027c5e7d68c28b461863fcdf0a495443c631bd
+EBUILD bundler-1.0.18.ebuild 1441 RMD160 a98125845312b1d8d406417814b88e178c41401d SHA1 37a51bbcb9d11f4e1f4ce5a227788ef7329bc880 SHA256 7c00c67dd109ad318eaefeb9188fb5211a1dbaffc9724b3bac404801ff193e3c
+MISC ChangeLog 3888 RMD160 c49b138b60bd8fb6163c0a975429eaf8776671ff SHA1 88bfbdaefbba579cb1867639690c7c0e8e7977c2 SHA256 354290b8f0005b4b8ac6d6b393ebf874d16eb25500ea26a6fe09ce5fe26f347c
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5PbPMACgkQiIP6VqMIqNdKFwD/Vq4wGShsR+y4vJLhysp96YdN
-ZanzfQFycmEli/N/hcEA/RQat+y6rik97z2K7IoRC0IfHbMqXuIqJ+46uSYPg3P4
-=9hkO
+iF4EAREIAAYFAk5PbzsACgkQiIP6VqMIqNcoagD+PLZSw+JJ8jtqEVFPW9JB8cvT
+x96XinZnW/LRHyyJ8lYA/jD7czBx3tkZHG7flqlvyK3XSdwjTdpDwKiIKx4c+KaD
+=O6Ev
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/bundler/bundler-1.0.18.ebuild b/dev-ruby/bundler/bundler-1.0.18.ebuild
new file mode 100644
index 000000000000..acd90dd160d2
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.0.18.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.0.18.ebuild,v 1.1 2011/08/20 08:24:22 graaff Exp $
+
+EAPI=2
+
+# ruby19 → uncountable number of test failures
+# jruby → needs to be tested because jruby-1.5.1 fails in multiple
+# ways unrelated to this package.
+USE_RUBY="ruby18 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend dev-ruby/rubygems
+
+ruby_add_bdepend "test? ( app-text/ronn dev-ruby/rspec:2 )"
+
+RDEPEND="${RDEPEND}
+	dev-vcs/git"
+DEPEND="${DEPEND}
+	test? ( dev-vcs/git )"
+
+RUBY_PATCHES=( "${FILESDIR}"/${PN}-1.0.3-gentoo.patch )
+
+all_ruby_prepare() {
+	# Reported upstream: http://github.com/carlhuda/bundler/issues/issue/738
+	sed -i -e '707s/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
+}