Version bump.

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

4 files changed, 81 insertions, 7 deletions

diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog
index 3449e8952b85..980406f7c6fa 100644
--- a/dev-ruby/bundler/ChangeLog
+++ b/dev-ruby/bundler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/bundler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.5 2010/06/30 12:05:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.6 2010/10/16 08:29:47 graaff Exp $
+
+*bundler-1.0.3 (16 Oct 2010)
+
+  16 Oct 2010; Hans de Graaff <graaff@gentoo.org> +bundler-1.0.3.ebuild,
+  +files/bundler-1.0.3-gentoo.patch:
+  Version bump.
 
   30 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   bundler-0.9.26.ebuild:
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 3de81b5e58cc..d19bddb8c060 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX bundler-0.9.26-gentoo.patch 2227 RMD160 d3df1628921499a9237d66afbfb83dc35e1c63a6 SHA1 bf61fe9ef235dd9c054dd50b9d7586a8ed254453 SHA256 cfeb392734886cf8325b3bb73e644f6bd2f44703d05debe87e805a8fa5861cba
+AUX bundler-1.0.3-gentoo.patch 604 RMD160 3f673efb4913679a0f925f2d446de246e0b6b3ea SHA1 9edbc0f114120577785f4f13ce2f827df81edc6d SHA256 a21e789e1c8268673aaab471567b83e187475fd23a2303756488b75d2f3df9a0
+DIST bundler-1.0.3.gem 154112 RMD160 1cd6ab0c2d654a3b79b7f559de0cd7af51681b8f SHA1 2cb868d873f43897dcaf1126958c086980400671 SHA256 2ad0c0bca6a74de182279768ebf54c0cd8584b0841077f8ae884d0e64e9f2dd6
 DIST bundler-git-0.8.1.tgz 37199 RMD160 e71626e8e497d6e523a35ef871ddac21a051e0cf SHA1 0dd30a1b23ebf17ef3aac5de6c65248114dfd286 SHA256 caae41d8b6f722e164e1120faba6d366ca4bb857120e1a4d3a28b22d53db2c70
 DIST bundler-git-0.9.26.tgz 70159 RMD160 4d23c32337597645d29b8b7a47920eb9de21a989 SHA1 6fd5c1e323d90b73943a70b72bbae5854358f573 SHA256 74aa8c73700cb2e496cf904de45085d7613819675ef80af280da832c6e00babb
 EBUILD bundler-0.8.1.ebuild 993 RMD160 85425f86d42fd82c4955cf733f61b3bd0832081d SHA1 875b22abd9e2dbc698545387e128b24b8ed84aa8 SHA256 3c9b85ae5eb5f90f2ea1f65b7b0629f8b634d0ae530481a2c07d806ad213c6f8
 EBUILD bundler-0.9.26.ebuild 1079 RMD160 69690d99b660e3dc3302a1dfa8d11c8ba66f2a3f SHA1 2e170127f78d35b77417cf2a3aee33e7d6a0eeb6 SHA256 cee8b53f650ab62634460b101710206563ea4f80d0e33be89162778ed92f7fef
-MISC ChangeLog 1090 RMD160 490856186168fd7cb74e12b30e7bf6d869ffb99d SHA1 e4e01abc8631d6c531f0433459e3f68c363dcd7b SHA256 20c543759c2324428a7ad8b0314ebaefb0fc3d0d277f6c8e05a643127d6cf747
+EBUILD bundler-1.0.3.ebuild 1415 RMD160 37fa04526042f431a77632df54e8e58a59192fd2 SHA1 2be2267fb697f909f4a457e5e46dece611acbd3e SHA256 e09fe8153581b25c283fedf8b941a940122a8191843240be83652434c5c160c6
+MISC ChangeLog 1244 RMD160 13b1a4cc38c4e05a79585d5fc7f9906683739a99 SHA1 10960d70b52e59b7fefd7cfd1d114f49ccd7a1c6 SHA256 2f7e8b4b1dfe309330432b5ec3e6367e7d952b406dacfe4da9238fafecaf396f
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwrMx4ACgkQAiZjviIA2XjZ1wCgst6ngTIbNE9XfOpf1/W3tdSi
-Hd8AoNdUI+lqgAEQbSzuz0C3KXAhA1wx
-=gYxO
+iF4EAREIAAYFAky5YocACgkQZihJkut28SvJNQEAp7bf8qksOX17exy8+tGgzZJ8
+zsI5WhkL/Swa1mXxBnUA/1zxgznmn5sZxVbEqS5RHDZvPaLfDFAG43wG70Zv2rnH
+=Npcm
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/bundler/bundler-1.0.3.ebuild b/dev-ruby/bundler/bundler-1.0.3.ebuild
new file mode 100644
index 000000000000..e768747851fc
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.0.3.ebuild,v 1.1 2010/10/16 08:29:47 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 ~x86"
+IUSE=""
+
+ruby_add_rdepend dev-ruby/rubygems
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+
+RDEPEND="${RDEPEND}
+	dev-vcs/git"
+DEPEND="${DEPEND}
+	test? ( dev-vcs/git )"
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+all_ruby_prepare() {
+	# Reported upstream: http://github.com/carlhuda/bundler/issues#issue/771
+	sed -i -e 's:Your bundle was installed to `vendor`:It was installed into ./vendor:' -e 's:Your bundle was installed to `vendor/bundle`:It was installed into ./vendor/bundle:' spec/install/gems/simple_case_spec.rb || die
+
+	# Reported upstream: http://github.com/carlhuda/bundler/issues/issue/738
+	sed -i -e '159s/should/should_not/' spec/runtime/environment_rb_spec.rb || die
+}
diff --git a/dev-ruby/bundler/files/bundler-1.0.3-gentoo.patch b/dev-ruby/bundler/files/bundler-1.0.3-gentoo.patch
new file mode 100644
index 000000000000..5667e87628ff
--- /dev/null
+++ b/dev-ruby/bundler/files/bundler-1.0.3-gentoo.patch
@@ -0,0 +1,20 @@
+diff --git a/bin/bundle b/bin/bundle
+index d2e5081..17db3f0 100755
+--- a/bin/bundle
++++ b/bin/bundle
+@@ -1,9 +1,14 @@
+ #!/usr/bin/env ruby
+ 
+ # Check if an older version of bundler is installed
++mybasedir = __FILE__.gsub(/\/bin\/bundle/, '')
++
+ require 'bundler'
+ $:.each do |path|
+-  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
++  # ignore the directory we're running from, in the tests
++  path = path.gsub(%r"^#{mybasedir}", '')
++
++  if path =~ %r'/bundler-0\.(\d+)' && $1.to_i < 9
+     abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
+   end
+ end