graaff 15/02/21 09:37:16
Modified: rspec-core-2.99.2-r1.ebuild ChangeLog
rspec-core-3.2.0.ebuild metadata.xml
Log:
Add ruby22. Add missing coderay (testing) dependency.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0x8883FA56A308A8D7!)
Revision Changes Path
1.2 dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild?r1=1.1&r2=1.2
Index: rspec-core-2.99.2-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rspec-core-2.99.2-r1.ebuild 7 Dec 2014 07:32:24 -0000 1.1
+++ rspec-core-2.99.2-r1.ebuild 21 Feb 2015 09:37:16 -0000 1.2
@@ -1,9 +1,9 @@
-# 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-2.99.2-r1.ebuild,v 1.1
2014/12/07 07:32:24 graaff Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild,v 1.2
2015/02/21 09:37:16 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST="none"
RUBY_FAKEGEM_TASK_DOC="none"
@@ -38,7 +38,7 @@
# 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/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+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.
1.92 dev-ruby/rspec-core/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/ChangeLog?rev=1.92&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/ChangeLog?rev=1.92&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/ChangeLog?r1=1.91&r2=1.92
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog 15 Feb 2015 07:12:23 -0000 1.91
+++ ChangeLog 21 Feb 2015 09:37:16 -0000 1.92
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/rspec-core
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.91
2015/02/15 07:12:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.92
2015/02/21 09:37:16 graaff Exp $
+
+ 21 Feb 2015; Hans de Graaff <[email protected]> rspec-core-2.99.2-r1.ebuild,
+ rspec-core-3.2.0.ebuild, metadata.xml:
+ Add ruby22. Add missing coderay (testing) dependency.
*rspec-core-3.2.0 (15 Feb 2015)
1.2 dev-ruby/rspec-core/rspec-core-3.2.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild?r1=1.1&r2=1.2
Index: rspec-core-3.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rspec-core-3.2.0.ebuild 15 Feb 2015 07:12:23 -0000 1.1
+++ rspec-core-3.2.0.ebuild 21 Feb 2015 09:37:16 -0000 1.2
@@ -1,9 +1,9 @@
# 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.2.0.ebuild,v 1.1
2015/02/15 07:12:23 graaff Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild,v 1.2
2015/02/21 09:37:16 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST="none"
RUBY_FAKEGEM_TASK_DOC="none"
@@ -24,17 +24,19 @@
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=""
+IUSE="highlight"
SUBVERSION="$(get_version_component_range 1-2)"
ruby_add_rdepend "
=dev-ruby/rspec-support-${SUBVERSION}*
!!<dev-ruby/rspec-core-2.14.8-r4
+ highlight? ( >=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
@@ -43,7 +45,7 @@
# 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/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+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.
@@ -62,11 +64,18 @@
# 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 || 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() {
1.3 dev-ruby/rspec-core/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/metadata.xml?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/metadata.xml?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rspec-core/metadata.xml?r1=1.2&r2=1.3
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml 14 Aug 2012 18:48:38 -0000 1.2
+++ metadata.xml 21 Feb 2015 09:37:16 -0000 1.3
@@ -2,4 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<herd>ruby</herd>
+<use>
+ <flag name="highlight">
+ Enable source code highlighting via <pkg>dev-ruby/coderay</pkg>
+ </flag>
+</use>
</pkgmetadata>
