graaff 15/01/04 10:12:39 Modified: ChangeLog rspec-core-3.1.7.ebuild Added: rspec-core-2.14.8-r4.ebuild Removed: rspec-core-2.99.2.ebuild Log: Add rspec 2.14.8 revision that does not install /usr/bin/rspec, and let rspec 3.x block on it to avoid file collisions, fixing bug 534420. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Revision Changes Path 1.89 dev-ruby/rspec-core/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/ChangeLog?rev=1.89&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/ChangeLog?rev=1.89&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/ChangeLog?r1=1.88&r2=1.89 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- ChangeLog 28 Dec 2014 10:12:26 -0000 1.88 +++ ChangeLog 4 Jan 2015 10:12:39 -0000 1.89 @@ -1,6 +1,13 @@ # ChangeLog for dev-ruby/rspec-core -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.88 2014/12/28 10:12:26 graaff Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.89 2015/01/04 10:12:39 graaff Exp $ + +*rspec-core-2.14.8-r4 (04 Jan 2015) + + 04 Jan 2015; Hans de Graaff <[email protected]> +rspec-core-2.14.8-r4.ebuild, + -rspec-core-2.99.2.ebuild, rspec-core-3.1.7.ebuild: + Add rspec 2.14.8 revision that does not install /usr/bin/rspec, and let rspec + 3.x block on it to avoid file collisions, fixing bug 534420. *rspec-core-3.1.7 (28 Dec 2014) 1.2 dev-ruby/rspec-core/rspec-core-3.1.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild?r1=1.1&r2=1.2 Index: rspec-core-3.1.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rspec-core-3.1.7.ebuild 28 Dec 2014 10:12:26 -0000 1.1 +++ rspec-core-3.1.7.ebuild 4 Jan 2015 10:12:39 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild,v 1.1 2014/12/28 10:12:26 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.1.7.ebuild,v 1.2 2015/01/04 10:12:39 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21" @@ -30,6 +30,7 @@ ruby_add_rdepend " =dev-ruby/rspec-support-${SUBVERSION}* + !!<dev-ruby/rspec-core-2.14.8-r4 " ruby_add_bdepend "test? ( 1.1 dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild?rev=1.1&content-type=text/plain Index: rspec-core-2.14.8-r4.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild,v 1.1 2015/01/04 10:12:39 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_TASK_TEST="none" RUBY_FAKEGEM_TASK_DOC="none" RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" # Also install this custom path since internal paths depend on it. RUBY_FAKEGEM_EXTRAINSTALL="exe" RUBY_FAKEGEM_BINWRAP="" RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec" inherit ruby-fakegem DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby" HOMEPAGE="http://rspec.rubyforge.org/"; SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz" LICENSE="MIT" SLOT="2" 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_bdepend "test? ( >=dev-ruby/nokogiri-1.5.2 dev-ruby/syntax >=dev-ruby/zentest-4.6.2 >=dev-ruby/rspec-expectations-2.14.0:2 >=dev-ruby/rspec-mocks-2.12.0:2 )" # Skip yard for ruby20 for now since we don't support ruby20 eselected # yet and we can't bootstrap otherwise. USE_RUBY=${USE_RUBY/ruby20/} ruby_add_bdepend "doc? ( dev-ruby/yard )" all_ruby_prepare() { # Don't set up bundler: it doesn't understand our setup. sed -i -e '/[Bb]undler/d' Rakefile || die # Avoid dependency on cucumber since we can't run the features anyway. sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die # Cover all released versions of ruby 2.1.x. This should be reported # upstream since ruby 2.1.x uses semantic versioning and the file # should not have the full version number. cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.1.html|| die # Duplicate exe also in bin. We can't change it since internal stuff # also depends on this and fixing that is going to be fragile. This # way we can at least install proper bin scripts. cp -R exe bin || die # Avoid unneeded dependency on git. sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die # Avoid aruba dependency so that we don't end up in dependency hell. sed -i -e '/aruba/ s:^:#:' -e '104,106 s:^:#:' spec/spec_helper.rb || die rm spec/command_line/order_spec.rb || die } each_ruby_prepare() { sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die } all_ruby_compile() { if use doc ; then yardoc || die fi } each_ruby_test() { PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed." } all_ruby_install() { all_fakegem_install ruby_fakegem_binwrapper rspec /usr/bin/rspec-2 'gem "rspec", "~>2.0"' }
