summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-05-29 05:50:55 +0000
committerHans de Graaff <graaff@gentoo.org>2015-05-29 05:50:55 +0000
commit35ce4b0eaa7351eda1e91cb007f96a02045013db (patch)
treed7736493b0256b34e29f44eabeba8c653c2349d1 /dev-ruby
parentAdd a live ebuild (diff)
downloadhistorical-35ce4b0eaa7351eda1e91cb007f96a02045013db.tar.gz
historical-35ce4b0eaa7351eda1e91cb007f96a02045013db.tar.bz2
historical-35ce4b0eaa7351eda1e91cb007f96a02045013db.zip
Avoid now-incomptaible typhoeus tests. Use a newer mocha version so ruby21 can be added. Add missing rack test dependency.
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7!
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/oauth/ChangeLog6
-rw-r--r--dev-ruby/oauth/Manifest10
-rw-r--r--dev-ruby/oauth/oauth-0.4.7-r2.ebuild18
3 files changed, 21 insertions, 13 deletions
diff --git a/dev-ruby/oauth/ChangeLog b/dev-ruby/oauth/ChangeLog
index 0c3620e048a0..c981d7afe186 100644
--- a/dev-ruby/oauth/ChangeLog
+++ b/dev-ruby/oauth/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/oauth
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.29 2015/03/16 19:43:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.30 2015/05/29 05:50:54 graaff Exp $
+
+ 29 May 2015; Hans de Graaff <graaff@gentoo.org> oauth-0.4.7-r2.ebuild:
+ Avoid now-incomptaible typhoeus tests. Use a newer mocha version so ruby21
+ can be added. Add missing rack test dependency.
16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -oauth-0.4.7-r1.ebuild:
Cleanup.
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 85397e084424..ccd8d70e5bc4 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -2,13 +2,13 @@
Hash: SHA256
DIST oauth-0.4.7.gem 50688 SHA256 bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc SHA512 7d8df61574aaf53ffcb206c6a210546c36b67b2c545d6b31afef2961ee135050923f427dc4720379b7689eef9d921015c26fedd8b11bbd13761dd498155fc550 WHIRLPOOL 5a9dd0eeb2137db2b9810482dca116bf38c06ed75dff2df434118c147ed907d4fdad55dfd2e9c0751b42a110cd240c2ff70bfca75bcffc7f08dd454f65ca7591
-EBUILD oauth-0.4.7-r2.ebuild 996 SHA256 d6c20a38d8e6f392fdbbc3440e66514cedd8da1107aaf7fb2f100521a271949c SHA512 577fa0e503d6c26dfc125ede71ee137e6582e92f242e66c297ce92b4edf1c5b13214e91d07e6627994b023d268456ba4f9193d8a5d370aa93d0af224740ce369 WHIRLPOOL fec8f6850096e8f46b41ea433bf7d682ac0c37c0b5e94cbf806e53e1b3cc94986bfab7505690b82e182b87a7e86a68d855eec5b0931afa58cb7bcbe9d81cfd2c
-MISC ChangeLog 4119 SHA256 9e205a4a6075f5feeeec303bdc440b8e1ef3918f2d6705ef81ce64e937e90f6c SHA512 b6032bf3125b859139ca540a3f39373527ada37c42580410d18e27969b8ffa5cff9c160c2d1543f386a5830d228d25775184f7b401f0c60ac69b27e08ec0ec15 WHIRLPOOL f635dabf89e1435f527611f8b31786cec3eb5e938a62b70f65e8abe37af29a5bdc046d4a154fe8774b50d3984e18397d6d46e2272d0c92c1a432a859b2b41c4e
+EBUILD oauth-0.4.7-r2.ebuild 1136 SHA256 0d240025485e903046fbbe302f7820098e983b0f1bd3a559db8c2de14c50a3e0 SHA512 486466bd1c97511fb2b6a019e2e7d29f0d41f3c449d57dbeef294d3ef1d4292437c94a9895052d52622a0a0d4f977c1dd9969c3c393f9c79c7f17392fdae9efe WHIRLPOOL ac3c544aa9f9b84aa6f50c8b0daf669b3b680eb3403bbf2996c9cdc362e919712b772017a28b32941f0e9780eb45575750be60e578e8f0c519ce4baccb2774a6
+MISC ChangeLog 4320 SHA256 33fc9bc02080aaab9281b0dbdf7e72251286b6e097b3be237fc103c903d727b1 SHA512 7190d29b8be352a142a5b40e80dfeb67a5397ce4935424b7403c92f777ae8aafcad93bd66a4a16d1cfd8fdc32e68df181bab227d7f18919287b4fe4ba6ef2c57 WHIRLPOOL f79784b717c99359163676428bff6ca6fde90f31e146a8824a5d172f02083d80dc7b29f42dd672250c24f8e30cbfc9cf03e74896e4b95bbb6960e01ee9089eee
MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlUHMnYACgkQiIP6VqMIqNd3RQD/WzfjraF6+Go+sz85VxMGeMrM
-QiTe6kbViQzwzJzgzUoA/RWfnBUaclaKXd2ukKJvJLp7JPf/wfDRG/bj7kn0CMj9
-=lz8m
+iF4EAREIAAYFAlVn/j8ACgkQiIP6VqMIqNeu4QD/VL4fYnB8qWACQv1hhhFwOHDJ
+mhoQlPCeqz4pDQGTVZIA/0GvKH8V+fMHSAX3esAlkl2P80aPbG/KTzZGpaATM+c6
+=4Cvc
-----END PGP SIGNATURE-----
diff --git a/dev-ruby/oauth/oauth-0.4.7-r2.ebuild b/dev-ruby/oauth/oauth-0.4.7-r2.ebuild
index bcd0ba815a22..03cc76a1aa3f 100644
--- a/dev-ruby/oauth/oauth-0.4.7-r2.ebuild
+++ b/dev-ruby/oauth/oauth-0.4.7-r2.ebuild
@@ -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/oauth/oauth-0.4.7-r2.ebuild,v 1.4 2014/12/19 13:27:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild,v 1.5 2015/05/29 05:50:54 graaff Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_TASK_DOC=""
@@ -21,16 +21,20 @@ IUSE=""
ruby_add_bdepend "test? (
dev-ruby/test-unit:2
- dev-ruby/mocha:0.12
- dev-ruby/webmock )"
+ dev-ruby/mocha:0.14
+ dev-ruby/webmock
+ dev-ruby/rack )"
all_ruby_prepare() {
# Require a compatible version of mocha
- sed -i -e '1igem "mocha", "~> 0.12.0"' test/test_helper.rb || die
+ sed -i -e '1igem "mocha", "~> 0.14.0"' test/test_helper.rb || die
# Ensure a consistent test order to avoid loading issues with e.g. rack
sed -i -e "s/.rb']/.rb'].sort/" Rakefile || die
# Remove tests that require Rails 2.3 since that is ruby18-only.
- rm test/test_action_controller_request_proxy.rb || die
+ rm -f test/test_action_controller_request_proxy.rb || die
+
+ # Remove typhoeus tests since they require an old version.
+ rm -f test/test_typhoeus_request_proxy.rb || die
}