summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-12-25 09:53:40 +0000
committerHans de Graaff <graaff@gentoo.org>2013-12-25 09:53:40 +0000
commitb6d5c98a747fe2fac3fa3686f13f5939a89810cd (patch)
treedb1360494a57e888ebbb8dd0d562a47eab5ac199 /dev-ruby/dalli
parentRemove unneeded useflag description from metadata.xml (diff)
downloadhistorical-b6d5c98a747fe2fac3fa3686f13f5939a89810cd.tar.gz
historical-b6d5c98a747fe2fac3fa3686f13f5939a89810cd.tar.bz2
historical-b6d5c98a747fe2fac3fa3686f13f5939a89810cd.zip
Simplify dependencies and add ruby20.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7!
Diffstat (limited to 'dev-ruby/dalli')
-rw-r--r--dev-ruby/dalli/ChangeLog5
-rw-r--r--dev-ruby/dalli/Manifest14
-rw-r--r--dev-ruby/dalli/dalli-2.6.4.ebuild15
3 files changed, 27 insertions, 7 deletions
diff --git a/dev-ruby/dalli/ChangeLog b/dev-ruby/dalli/ChangeLog
index d35ee7d9e36d..5c8c5a8673ae 100644
--- a/dev-ruby/dalli/ChangeLog
+++ b/dev-ruby/dalli/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/dalli
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/ChangeLog,v 1.5 2013/11/02 19:59:39 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/ChangeLog,v 1.6 2013/12/25 09:53:39 graaff Exp $
+
+ 25 Dec 2013; Hans de Graaff <graaff@gentoo.org> dalli-2.6.4.ebuild:
+ Simplify dependencies and add ruby20.
02 Nov 2013; Manuel Rüger <mrueg@gentoo.org> -dalli-2.1.0.ebuild,
-dalli-2.5.0.ebuild:
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 660a0fdca18d..502c1294cd1a 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST dalli-2.6.4.gem 40448 SHA256 04fde96890b41a4b4c71bdcdddbf8522d7685bd3b57d4632ef2f4a04c481cbc1 SHA512 ce734e1d122a9b20c567497ff88dbbf5ddb03912e88ae70199746808695c139062a25797c34b82a203139568f44791dd09a91eff9b4816d26ce50f6e74cef860 WHIRLPOOL 3a30d3ddcdfc976a42a9d0feb1b8beaa39c5b45179127a01e1493899dc68c18cb79f06e57ad32c8b03dccec6c82652b218b4691567530954af0e77fab2ffa5ea
-EBUILD dalli-2.6.4.ebuild 860 SHA256 17dabeed28d6d8dec4049e59c14a72ead250c073d4193e3ce507c0308d9a259d SHA512 dec64a0fb727e2d0940d73b086524977380a0d764833196b2e5fe03f2026a0ecc406184cde267b11ee2c000ffc479d5c4d0c1cccb7c41e4513374326303a5cfe WHIRLPOOL ffea408433cdd6a3466e3ef26b81b3d7c5a0d770875b67451b68cab2bed770d1be712c45e488203f1ff9eb1bca4b0893ce477b24fedf6559f3ecfd93e5d7de76
-MISC ChangeLog 806 SHA256 9cd495d036fb985087a86535d18bf99ecfaac6537ae0f7087c7e65c57a37dec3 SHA512 65c6eac935ca8dad6b6a975c45ebc037235c8fcfa94e73de51ffe00904f8a49f402c154bbf1182a8b64caac33360ac5005d799fb51aa038208cdd294c3f21dd0 WHIRLPOOL b773526e26c03765e51a8ae3a637eb24b6e66fb128e01e90a6b648d19cd162e3d7891a41f99114dbdabaafa738012b5c033613f8bf933e55875d70e4279d6aa2
+EBUILD dalli-2.6.4.ebuild 1161 SHA256 90faefcb3a5293416e4c281c92c466ae2e82a9904bea7906dffc5b1e5a2d7c11 SHA512 634698b7d3caccc2c1dc872a8815b6076c3157a4d266916b113a30a629b4fb15f4d1815da6d443f6840bc07deab924e24143b57aa42e0acd73d31972874584ef WHIRLPOOL 816e2158eaa69596f8ccc28f9f6b9a9a337d766913169934a48eb22a17bb7878d3d3004765f1fdcbcb9110a1374da18c8bd34f708fcd21847e6e0f3594e3da75
+MISC ChangeLog 918 SHA256 100dfd79486e8afd792737d44c8f32051d2571d14bd675783f42afb154dfbbf0 SHA512 5aee600780bbeef4cbca786ec2dec5ab61f3ecfd87ed0e12137ceeba1fc1131d77c31748cfd9aed87c30666d52ee46f0691e24ec7b598a82dbead9c1dc2905b5 WHIRLPOOL 057d1d6a2cd811a06b08c7fc2c9d85297854ebe499bff687a543a91df5d14c237f19da419014dc5c28c9ab21613fc2cfbc7e54e9db96e0b8f1de4ec8235f03a1
MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlK6qyQACgkQiIP6VqMIqNcymAD9HgTYeAKaxsbWmzoNWF9SE4he
+lDBVOhNRY+Ohl2zlBrQBAIOXhT5oBx8xoGj+zQbecqByV3T1PAIurSP+sWiA6NNM
+=I0IL
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/dalli/dalli-2.6.4.ebuild b/dev-ruby/dalli/dalli-2.6.4.ebuild
index d630f4c1e4e5..c5781770e437 100644
--- a/dev-ruby/dalli/dalli-2.6.4.ebuild
+++ b/dev-ruby/dalli/dalli-2.6.4.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild,v 1.2 2013/10/13 22:05:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dalli/dalli-2.6.4.ebuild,v 1.3 2013/12/25 09:53:39 graaff Exp $
EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18 ruby19 ruby20"
RUBY_FAKEGEM_TASK_TEST="test"
@@ -22,12 +22,19 @@ IUSE=""
DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
ruby_add_bdepend "test? (
- dev-ruby/minitest
+ dev-ruby/minitest:0
>=dev-ruby/mocha-0.13
- =dev-ruby/rails-3* )"
+ >=dev-ruby/activesupport-3 )"
all_ruby_prepare() {
chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
sed -i -e '/appraisal/ s:^:#:' Rakefile || die
+
+ sed -i -e '1igem "minitest", "~> 4.0"' test/helper.rb || die
+
+ # Drop rails dependency which is only used to display the version
+ # number, so we only need to depend on activesupport and avoid
+ # complicated circular dependencies.
+ sed -i -e '/rails/I s:^:#:' test/helper.rb || die
}