Bump to EAPI 4; use the compact syntax to add dependencies; add a patch to not fail tests when running them without userpriv; remove each_ruby_prepare that is pointless right now.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 56 insertions, 24 deletions

diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog
index 6b4fc724b583..7a99b8f6f3f7 100644
--- a/dev-ruby/bundler/ChangeLog
+++ b/dev-ruby/bundler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/bundler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.40 2012/07/30 19:38:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.41 2012/08/14 03:10:38 flameeyes Exp $
+
+  14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/bundler-1.1.5-nouserpriv.patch, bundler-1.1.5.ebuild:
+  Bump to EAPI 4; use the compact syntax to add dependencies; add a patch to not
+  fail tests when running them without userpriv; remove each_ruby_prepare that
+  is pointless right now.
 
 *bundler-1.1.5 (30 Jul 2012)
 
@@ -172,4 +178,3 @@
   +bundler-0.8.1.ebuild, +metadata.xml:
   Initial import of bundler, that might not be too nice for us but it's
   still a decent tool for developers.
-
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 3c375c7034e8..83cfb5b44035 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -2,18 +2,23 @@
 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.18.gem 172544 SHA256 abace9e70731ac1d3be808f6160a9540b80d23cd27e1a94077b3f95d57c4e167 SHA512 975cf14689b483eca7eb150fb208b66ca10a223b6f7f8d6bcee50663bcdf92a17c3f8c4c315df12c075f658dc18648705c90521de506705b1103d26d0a491082 WHIRLPOOL 96696ba60113ddf4e9bea5a889373278a84d2deb72df3ad54c337a4c1e946c6845d196915ff2180329c5389366d8c80b5df2b3bd9f334a6420b58e8ab1e92216
 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
 EBUILD bundler-1.0.18.ebuild 1441 SHA256 8f2da0b17ccb6d2c587036d32b5d84eb339dbee3b8d5a602d44f373edbd05503 SHA512 0edc83ac821b5f6f7dda0a81b0eacecb4670775a3aa88d8571a1102acb4c313ada8ef32bb4a8e0c636923c39c820526574ccaca86d1fa2a7e3613490e76b9500 WHIRLPOOL 9b51e9ad840229bf9804766df031071f5542d2a95fb2397bff37701b509dc0a462325600a94fc934e80566faa052fbe30ea71bd2ad77c71363208fcc8d691450
 EBUILD bundler-1.0.22.ebuild 1697 SHA256 3d06bbfda1c0e1e0cbf09d3e7c5b062eae633bfd9294d3f7ffba42e63d65dd79 SHA512 66590c453931d75ef2333cbbe0ef1ffe6a8a9c9b794506e108e949933221893c40f4cdf77b845bf97aedf30f3e5fed8dfd24a570de3c8f723541772e9244722e WHIRLPOOL 8aa20130ff20952855e6b1bd7ce993167bd3464834c53bacbf3185004aa3cc07112204c3e370f07244fd31eb3bd4a6528d8aa49505e91576ad940de1e5bbdc05
-EBUILD bundler-1.1.5.ebuild 1761 SHA256 cc1d3dec2ba0c95a52d9ac1cfd34713e9b5f6a337060ef5d2464c5aa87710dcb SHA512 ebacc8d4c60b17753df4e4af115ff330e1752d61c801b1558f9189c703fa41df1be536f212b0c50da454f72f6f9dbdbde7249ba8d9f6eb0a18af8b2ef0c103d6 WHIRLPOOL ca04ecdf57012538e464070cfe4911b86088c029f2ee1aee4d3330fc1f76d112e6cfa472ff11c690c7b0ca3dbbe1798d8edc5be2916696c5f0d696b56e0a29b6
-MISC ChangeLog 5359 SHA256 c3d306a0ddcf323e01abbde1dfcd8ca6178a33ceeaa65ff28cd6e4b934717c5d SHA512 dafb9d91375dfded3cde8367e8b8afdd8e7132d4f293e4615b7e561607da3f240c0782bbc8d215ab5b94b4d14b2055fa626982b06e3b0fe279088af1334e0ed6 WHIRLPOOL b2b3575ee31cf25e9ff4c8e5ad6bfda418ee1b7198997cc9d5c542857807995c78c0811095316907f30fbe1ca6d26e0e6dce0ee9348220fc74b6bcfe333036f0
+EBUILD bundler-1.1.5.ebuild 1530 SHA256 2f94b5e2e50a6bd8b6de0020359ef3b934b20e683cb3dd63086f325b4150c89f SHA512 d8185961bde6219b7b5cf1ee3faa2d1043f61d17d1943b07d7a8d3ee4b3710b7fcc4039bdf85ed15856709a86914e9ce9a449a562e3837078ce5ab7c55e707e3 WHIRLPOOL 191aeb9327756e52b8618ae3e2265157445f23e780dc25474f2a8f7b2e6c9de361d3a7a38e02c7f62a33dc1a07de127fbb307355a46737a0bf7641ca9de8666d
+MISC ChangeLog 5667 SHA256 b1d73adb9e7996f13bfeed6fbfde2733389e7bbae7e180bcd3ad89df2ab801db SHA512 d590378a9da595a0210f61c5c3196a5ff0e371cac463353c793efe7cc7a6bd1dad75af4e2b4400e264a5d0ce5fbbce8d19f9639cab3906266861855731a8a99c WHIRLPOOL c179d79b8f05eeff7d7472c109f2ee5b0b68c02358472637b77ee20b0de8779b74d76cc0871f2945d55483936dbc315635298e4860aeca9f2bec7c4dec8e373f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAW4sIACgkQiIP6VqMIqNeSwwD/W3optHxBieCN5O7nORPIr8rN
-l8jExqyOUiwP3R7rARMA/RM1jWf5jUtkEtlvYHEir6j7zNKUTfs0z3je8mdHfUcP
-=AgtO
+iQEcBAEBCAAGBQJQKcG5AAoJEBzRPIrUMBNCqc4H/jr0nGTiAyi9lMA83D1S3jOP
+rbzMvSgaTawEdbwnELQdbzxsXci5T++9icceR8ci/RFJV2gaVDnZ9XK2QKo1VPmG
+R2bJoKG1lXAd/qKJMyWoPlHQwJKimXcjJYflNNaO1NvqglG/ZRs44pvm3JyEG6Ib
+dmJJitPC+wPZtoa5FdPxAufAXMVv0/xy0KWno6E9uwNn5ALJYQZMhuqw7WFLqRbg
+eaoxnHMJuHjFzFXMZdicTeSUYEbSrZn1OVGet4uEyCm7SQmGReCHZAak3OMEX3Ih
+fIN8leAPWJJfZ8kz6kTYDpc9xC8W7kZ79ZNUYOgkUutH9iZ1RitagHBU6rIjKuk=
+=PfAd
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/bundler/bundler-1.1.5.ebuild b/dev-ruby/bundler/bundler-1.1.5.ebuild
index d8be8f79e501..d89f821f0ca3 100644
--- a/dev-ruby/bundler/bundler-1.1.5.ebuild
+++ b/dev-ruby/bundler/bundler-1.1.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.1 2012/07/30 19:38:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.1.5.ebuild,v 1.2 2012/08/14 03:10:38 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 
 # jruby → needs to be tested because jruby-1.5.1 fails in multiple
 # ways unrelated to this package.
@@ -28,10 +28,10 @@ ruby_add_rdepend virtual/rubygems
 
 ruby_add_bdepend "test? ( app-text/ronn )"
 
-RDEPEND="${RDEPEND}
-	dev-vcs/git"
-DEPEND="${DEPEND}
-	test? ( dev-vcs/git )"
+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:
@@ -44,14 +44,3 @@ all_ruby_prepare() {
 	# regression.
 	sed -i -e '/works when you bundle exec bundle/,/^  end/ s:^:#:' 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/files/bundler-1.1.5-nouserpriv.patch b/dev-ruby/bundler/files/bundler-1.1.5-nouserpriv.patch
new file mode 100644
index 000000000000..c5538e1284b8
--- /dev/null
+++ b/dev-ruby/bundler/files/bundler-1.1.5-nouserpriv.patch
@@ -0,0 +1,33 @@
+From 58b5cf9444c0dbe8374557539bbcd6c58341323d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Mon, 13 Aug 2012 19:16:09 -0700
+Subject: [PATCH] spec: do not check for /usr/bin not to be writable when
+ running as root.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This test would fail on default GEntoo installs as the package is
+executed as root.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ spec/install/gems/simple_case_spec.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/spec/install/gems/simple_case_spec.rb b/spec/install/gems/simple_case_spec.rb
+index 0619ba5..1c932f1 100644
+--- a/spec/install/gems/simple_case_spec.rb
++++ b/spec/install/gems/simple_case_spec.rb
+@@ -796,7 +796,7 @@ describe "bundle install with gem sources" do
+     # On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if
+     # you want to avoid sudo installs for system gems with OS X's default ruby
+     it "overrides Gem.bindir" do
+-      Pathname.new("/usr/bin").should_not be_writable
++      Pathname.new("/usr/bin").should_not be_writable unless Process::euid == 0
+       gemfile <<-G
+         require 'rubygems'
+         def Gem.bindir; "/usr/bin"; end
+-- 
+1.7.8.6
+