summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2013-11-20 15:07:28 +0000
committerManuel Rüger <mrueg@gentoo.org>2013-11-20 15:07:28 +0000
commit0380c91fc027024ac6fea6d3b937dcf1b651b596 (patch)
treefd02f4d76eee8aefc65a79c8fff6e6c05f83f1c7 /dev-ruby/merb-core
parentInitial ebuild. (diff)
downloadhistorical-0380c91fc027024ac6fea6d3b937dcf1b651b596.tar.gz
historical-0380c91fc027024ac6fea6d3b937dcf1b651b596.tar.bz2
historical-0380c91fc027024ac6fea6d3b937dcf1b651b596.zip
Add ruby20 target. Drop doc dependency on rspec:0
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/merb-core')
-rw-r--r--dev-ruby/merb-core/ChangeLog8
-rw-r--r--dev-ruby/merb-core/Manifest14
-rw-r--r--dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild (renamed from dev-ruby/merb-core/merb-core-1.1.3.ebuild)13
3 files changed, 16 insertions, 19 deletions
diff --git a/dev-ruby/merb-core/ChangeLog b/dev-ruby/merb-core/ChangeLog
index 08d69281170e..cef632363704 100644
--- a/dev-ruby/merb-core/ChangeLog
+++ b/dev-ruby/merb-core/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-ruby/merb-core
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-core/ChangeLog,v 1.7 2013/07/08 05:16:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-core/ChangeLog,v 1.8 2013/11/20 15:07:24 mrueg Exp $
+
+*merb-core-1.1.3-r1 (20 Nov 2013)
+
+ 20 Nov 2013; Manuel Rüger <mrueg@gentoo.org> +merb-core-1.1.3-r1.ebuild,
+ -merb-core-1.1.3.ebuild:
+ Add ruby20 target. Drop doc dependency on rspec:0
08 Jul 2013; Hans de Graaff <graaff@gentoo.org> -merb-core-1.1.2.ebuild:
Cleanup.
diff --git a/dev-ruby/merb-core/Manifest b/dev-ruby/merb-core/Manifest
index c3205fae1660..dac6add56c83 100644
--- a/dev-ruby/merb-core/Manifest
+++ b/dev-ruby/merb-core/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST merb-core-1.1.3.gem 1818624 SHA256 cc07172d56b4d1a37e435575bef5be432aef4e63e084ab3c0c554ff90ac82c47 SHA512 0c7cc059730e75dc1ff06a47f2a58277e5246074b482831025b6c9fa2922c67f0afc3cc62cc21734aa798a109085e0a7778176b1f1d04e57e8a38cf3d12253fe WHIRLPOOL e41c51ebde3a606a4b9af0ce18e7b25c094158f9255500e88056d0955b53e755d5e9e11ff78b255effe559accb1ef6259c192ddd8920217afb1f4e545c58786c
-EBUILD merb-core-1.1.3.ebuild 1077 SHA256 4f5b0a812d684886f8e515251fdb30338bab71be256b4cfc058e69579b31d755 SHA512 e6a357ff8942d59cfb6e9cc336d9698cdf9a2ff39650a2958272ad28011f6709c930266076f3b53adaff7e80982183a498eb7158a8fe18a83090170345695949 WHIRLPOOL 7dccc62a339d538dc4fcec0f23c6e258f4e91a80ef7e9783a4bb4a591d14e27acc21faa74da0589b5b1277bbc47a644bb684fc5d823afe4a51a8ecf4dc486b6c
-MISC ChangeLog 1106 SHA256 ca7e7f6236ed2d587992eeef00e64263aedf611d01174acf3fb1a98547a31e75 SHA512 fb6b1617d8cb49731a0b2d11bd252412420737bbdc23197335b298fee6d0dd222617e65c1c7c8cb74c74beeb5131974838c14c5f399e15c7789716a28ce614ac WHIRLPOOL 853da657d9dc6790a478c2d030b0abafc4b5e85b58b449f58a7eb25f513e51ac59b25c06f0f31ec1bee624d446877cf58fcfb9169eb8fc1ffa163efb4a416eb0
+EBUILD merb-core-1.1.3-r1.ebuild 1187 SHA256 95775f9107d75cc0ff012ba3e424c3150dbd1032d10b14ae6db2370c34657bbd SHA512 529c4f224c5f3ba911b19fa71d7542a473bbca41fbd7f593f6ff19c97d57ede91781cd71068cbea42b46a69c925458a719bdb89276f4c3eef9c83ce87a69af69 WHIRLPOOL 72cb751cc115926d2ac2fea2ed61789314f93d60d0a1c1b24d7467293694f98b9be43f1f3d6f802d0cd6af8bb4cdbe8ab209f6d3c5b13e6057433466549b0b6f
+MISC ChangeLog 1296 SHA256 2124eee341db30bce8895689a56c5ca5f330a0c91c9c65c203bc708df2a198d3 SHA512 41bde74cd09ff325b15240c5ee915b9faad55c455ccfb46e29af3f125ab70d02380627506a7bb823f6c43650fc786282076b057e955f0bad45447c94e3990a0e WHIRLPOOL 198c2f006e9480df951e2236bbbf5f56bf1054290a07f1a5e1becba4ab8726f106db41d6fe50dd75feab94d8ac0ee9b92ddc5452f5278caa5f2e59805ae0c751
MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iF4EAREIAAYFAlHaSxQACgkQiIP6VqMIqNertwD/VjSJ2qc6dHlGkhF8aXzQo2wp
-8oe7cKnMkVItDg1cMj0BAJc3nDoOqnlnno2ujMIsysfeHRDgoLhK79J22GaBVyjA
-=0GLj
------END PGP SIGNATURE-----
diff --git a/dev-ruby/merb-core/merb-core-1.1.3.ebuild b/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild
index 9edfde25bdae..17ba93815b45 100644
--- a/dev-ruby/merb-core/merb-core-1.1.3.ebuild
+++ b/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-core/merb-core-1.1.3.ebuild,v 1.4 2012/08/11 11:23:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-core/merb-core-1.1.3-r1.ebuild,v 1.1 2013/11/20 15:07:24 mrueg Exp $
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
# Tools to generate docs are missing from gem distribution.
RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
@@ -25,7 +25,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-ruby_add_bdepend "doc? ( dev-ruby/rspec:0 )"
+ruby_add_bdepend "doc? ( dev-ruby/rspec )"
ruby_add_rdepend "dev-ruby/bundler
>=dev-ruby/erubis-2.6.2
@@ -36,5 +36,6 @@ ruby_add_rdepend "dev-ruby/bundler
all_ruby_prepare() {
# Remove unpackaged tool so that we can use the Rakefile.
- sed -i '/annotation_extract/d' Rakefile || die
+ sed -i -e '/annotation_extract/d' -e 's#spec/rake/spectask#rspec/core/rake_task#'\
+ -e 's#Spec::Rake::SpecTask#RSpec::Core::RakeTask#' Rakefile || die
}