Version bump.

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

2 files changed, 63 insertions, 1 deletions

diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog
index 72a3e0ea562c..752a5e8e0061 100644
--- a/dev-ruby/bundler/ChangeLog
+++ b/dev-ruby/bundler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/bundler
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.67 2014/09/27 08:32:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.68 2014/10/26 07:55:30 graaff Exp $
+
+*bundler-1.7.4 (26 Oct 2014)
+
+  26 Oct 2014; Hans de Graaff <graaff@gentoo.org> +bundler-1.7.4.ebuild:
+  Version bump.
 
 *bundler-1.7.3 (27 Sep 2014)
 
diff --git a/dev-ruby/bundler/bundler-1.7.4.ebuild b/dev-ruby/bundler/bundler-1.7.4.ebuild
new file mode 100644
index 000000000000..529ebe2cdcb8
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.7.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.7.4.ebuild,v 1.1 2014/10/26 07:55:30 graaff Exp $
+
+EAPI=5
+
+# jruby → Many tests fail and test suite hangs.
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md UPGRADING.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="http://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 )"
+
+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
+
+	# Remove unneeded git dependency from gemspec, which we need to use
+	# for bug 491826
+	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that are not compatible with all rspec versions.
+	sed -e '/has no malformed whitespace/,/^  end/ s:^:#:' \
+		-e '/uses double-quotes consistently/,/^  end/ s:^:#:' \
+		-i spec/quality_spec.rb || die
+
+	# Avoid spec failing with git 2.0.
+	sed -i -e '/on releasing/,/^        end/ s:^:#:' spec/bundler/gem_helper_spec.rb || die
+}