From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EC30813888F for ; Wed, 7 Oct 2015 05:39:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E01D321C00A; Wed, 7 Oct 2015 05:39:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F66021C00A for ; Wed, 7 Oct 2015 05:39:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C168D340845 for ; Wed, 7 Oct 2015 05:39:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91C79B28 for ; Wed, 7 Oct 2015 05:39:12 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1444196327.e830412f7e62217d33814d2c4ebdf614cf61652e.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild X-VCS-Directories: dev-ruby/rspec-core/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: e830412f7e62217d33814d2c4ebdf614cf61652e X-VCS-Branch: master Date: Wed, 7 Oct 2015 05:39:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a4f5b5a7-5ee3-4d41-a5da-c06d1e1079f3 X-Archives-Hash: 441a94946d5e9a46c20f315a6ebd2596 commit: e830412f7e62217d33814d2c4ebdf614cf61652e Author: Hans de Graaff gentoo org> AuthorDate: Wed Oct 7 05:37:54 2015 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Wed Oct 7 05:38:47 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e830412f dev-ruby/rspec-core: fix gemspec and missing test dependency Include proper 'files' and 'executables' fields in the gemspec. Some other tools depend at least on executables being correct. Add a missing test dependency on dev-ruby/tread_order. Drop keywords due to this: bug 562452. Package-Manager: portage-2.2.20.1 dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild | 95 +++++++++++++++++++++++ dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild | 100 +++++++++++++++++++++++++ 2 files changed, 195 insertions(+) diff --git a/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild new file mode 100644 index 0000000..e8884f7 --- /dev/null +++ b/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +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_GEMSPEC="rspec-core.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby" +HOMEPAGE="https://github.com/rspec/rspec-core" +SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz" + +LICENSE="MIT" +SLOT="3" +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="highlight" + +SUBVERSION="$(get_version_component_range 1-2)" + +ruby_add_rdepend " + =dev-ruby/rspec-support-${SUBVERSION}* + !!=dev-ruby/coderay-1.0.9 ) +" + +ruby_add_bdepend "test? ( + >=dev-ruby/nokogiri-1.5.2 + >=dev-ruby/coderay-1.0.9 + dev-ruby/syntax + >=dev-ruby/zentest-4.6.2 + >=dev-ruby/rspec-expectations-3.0.0:3 + >=dev-ruby/rspec-mocks-2.99.0:3 + )" + +# Skip yard for ruby21 for now since we don't support ruby21 eselected +# yet and we can't bootstrap otherwise. +USE_RUBY=${USE_RUBY/ruby21 ruby22/} 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 + + # 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 's/git ls-files --/find/' rspec-core.gemspec || die + + # Avoid aruba dependency so that we don't end up in dependency hell. + sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die + rm spec/integration/{filtering,order}_spec.rb spec/support/aruba_support.rb || die +} + +each_ruby_prepare() { + sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die + + case ${RUBY} in + *ruby22) + # The rubygems version bundled with ruby 2.2 causes warnings. + sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/core_spec.rb || die + ;; + esac +} + +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-3 'gem "rspec", "~>3.0"' +} diff --git a/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild new file mode 100644 index 0000000..37da4c9 --- /dev/null +++ b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +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_GEMSPEC="rspec-core.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby" +HOMEPAGE="https://github.com/rspec/rspec-core" +SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz" + +LICENSE="MIT" +SLOT="3" +KEYWORDS="~amd64" +IUSE="highlight" + +SUBVERSION="$(get_version_component_range 1-2)" + +ruby_add_rdepend " + =dev-ruby/rspec-support-${SUBVERSION}* + !!=dev-ruby/coderay-1.0.9 ) +" + +ruby_add_bdepend "test? ( + >=dev-ruby/nokogiri-1.5.2 + >=dev-ruby/coderay-1.0.9 + dev-ruby/syntax + >=dev-ruby/thread_order-1.1.0 + >=dev-ruby/zentest-4.6.2 + >=dev-ruby/rspec-expectations-3.3.0:3 + >=dev-ruby/rspec-mocks-2.99.0:3 + )" + +# Skip yard for ruby22 for now since we don't support ruby22 eselected +# yet and we can't bootstrap otherwise. +USE_RUBY=${USE_RUBY/ruby22/} 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 + + # 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 's/git ls-files --/find/' rspec-core.gemspec || die + + # Avoid aruba dependency so that we don't end up in dependency hell. + sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die + rm spec/integration/{filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die + + # Avoid a spec failing due to path issues + sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \ + spec/rspec/core/configuration_spec.rb || die +} + +each_ruby_prepare() { + sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die + + # case ${RUBY} in + # *ruby22) + # # The rubygems version bundled with ruby 2.2 causes warnings. + # sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/core_spec.rb || die + # ;; + # esac +} + +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-3 'gem "rspec", "~>3.0"' +}