Skip the optional haml dependency since rails is no longer marked stable.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

diff --git a/dev-ruby/tilt/ChangeLog b/dev-ruby/tilt/ChangeLog
index a08a78068c6975f414e57da238b3414bf43d0f8b..e9bf4e06ea0136f5f8c14b6658da11dc77fb95ce 100644 (file)
--- a/dev-ruby/tilt/ChangeLog
+++ b/dev-ruby/tilt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/tilt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.38 2015/03/02 10:37:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.39 2015/04/26 18:29:44 graaff Exp $
+
+  26 Apr 2015; Hans de Graaff <graaff@gentoo.org> tilt-1.4.1.ebuild:
+  Skip the optional haml dependency since rails is no longer marked stable.
 
   02 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -tilt-1.4.1-r1.ebuild:
   Remove old.

diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index f6b5b7350fc63dc0f335dc19f1d1a0144d3c3f2d..d90a61446928de37532bbcfced5d2247006ffa90 100644 (file)
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tilt-1.3.3-yajl-test.patch 1271 SHA256 0d6b137c9333c092436bde716b3779a8ea1ba0494aa280b54ebacf95e6b4447a SHA512 93b99903d8974d01362abe8c0fc00f5dc64341a70c7608a5ba2f5e3ed31c9c6f1171a507a90abf5fc0ee7a7187ab3dd9cbe553bbc94545e2ea70f6f14ead2526 WHIRLPOOL 6a656e71bf145a224f4982f08ee889a59986e557f15bf81336cc3debbbbb23d89281913a0e72fa531f7deb6efbbef2d0ea83f0d561ee69f37e7b4e64f062cf70
 DIST tilt-1.3.3.gem 36352 SHA256 48af9536c7699dc0f8f50ba2432b627a3f47f9702d2d25d48dfc2d4a2da20da3 SHA512 6f1b23694d1a459869d581baf9f1f8bcc60218f5cd99fea3ae57d3104b1ab0857dcbf801ad636afb42985c4574427fed7039dc92da094c8761a9861a0ac65e74 WHIRLPOOL 7a5a9afcacc56b4d1dd9617e29a243cc54d607c15e34f319ee469a1bac1d90f949608dc8b4ae6d9b17858460f8cf0b06f23c037afd1e49e506ca838ebe36750c
 DIST tilt-1.4.1.gem 42496 SHA256 39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903 SHA512 10fec263596d0e18a7a1440a7edfa08a161526cc46cc70427bc251951c447c40b4a4e8675e9162a9ed288879682b4aceeeb35b48cf3f4925921025194543363f WHIRLPOOL 5d70949358b97e867cdec160bd3c3726dabfec94bfeadc3a12f17463d378779d8502dda6458c7deb92bd3d9def91e306077ef806a7f75bd6c892554739ce46e9
 DIST tilt-2.0.1.gem 44544 SHA256 73dc6e2cd2fe4251cb7d15c92d0e66c884f17d0be580500d00cb426eb29881e1 SHA512 9451b2387c7c2535c9c78ae07dc0893f675e921d845f8eb5bc24c13a1e726888baba0d813195a81014370b640b290fab2e1b47871b6b2ab1e3eddb10c71217df WHIRLPOOL 92773f66291c193e912f810b8ad3da827782e744b19e2ef0ece7db262ff8a66324e9e08362f3b37ce14d125a196e743f1e264ef739bfeeaecd37c1a29c15c7e6
 EBUILD tilt-1.3.3.ebuild 1487 SHA256 42cd73c0fa2de07eb702413bb9d184278c77e94961dd6fb45fa10e61e148094f SHA512 f16e6c5c0b4e585c557abbeebd64a04ab4a63d6c4ea3fd806d406963c0bf36540f3f5cbc9893c4170fea4e8ae4d5fa6469458a57f8616954e71777a3fb47c610 WHIRLPOOL 60be2d42c81b7107912006cee412bbaafb4760f48d4d5fe74987d10aeb5eb7260c1040086a6aa8c74e0f21d29be091b9a05666f1ab701a41be5983feb3586e5a
 EBUILD tilt-1.4.1-r2.ebuild 1182 SHA256 7b95c0ca0a16784e2181223678e8bfae5442cd966b083c4f89a3c8cd48a29c45 SHA512 4d292cdf741cc826f35e8168cf18b3500815adf2ecaa4a3214207fbc4182bbcb096cfb6d0bbb5824b169b28140a1bb78616934bdab761df47f00c4efed4c3de9 WHIRLPOOL 218c9df26a5ed029e72ae1cf2d4a7385f65b266eb36abc21fb86683edaf4565bb0aaa86d00cce8e5fd3c71488e9810acda0c63877e977da5644ecc29b51b5e2a
-EBUILD tilt-1.4.1.ebuild 1149 SHA256 4891ea0cfd43bbcd11e7f95d630baf4210bf60c32fe21f8242888d77ebfc4a0b SHA512 fa0cec99d1b3e65b89d4c59b38d89d51deffec1491551a9133612e0a30dcec34654abc97459ad2c55e75da12d434c6d8f8d2448009566eea30ca19cf82e6754e WHIRLPOOL 372abf27724f603478d23f7229cf1a21af741302e78d5f69272245befb4af2c0ba048072d5d095feaa32c48f208f6f0f15dadfd86836fe942d526864ffd3ef81
+EBUILD tilt-1.4.1.ebuild 985 SHA256 b8d2ab51994e8e04dddf9859059d03bed6d795e014861842b82d852044005b3e SHA512 af12b65f11e02f2d7a04810fa59414d5d26d29999cca0af0be6747433c23495f6ba6bd2f8914acf8bcc9dba843159ba1707cbe4cb1fe43d250c86ef92cab1a6b WHIRLPOOL cb319e87e9559e5881aa44e0b319f0b8de38094a332981db5a39e30749a5d3f5fcd4c5bd28df947509fc2d55ea50834cdd15336038f54b344e787ed89fa827af
 EBUILD tilt-2.0.1-r1.ebuild 1711 SHA256 7d115a1672aeb596f609a7fbb924e02b448a974c7ff4e7d23c1ee9e1470f540d SHA512 fe508461281c50eebb7318e51bbcf357c75a8a0c92090cdd819b7e8ba5551f02bf3c1f3a874e5c97242d0129264accb9c70af9b67516e3d22c49d7f4b6417b4d WHIRLPOOL d8b1092d7a2a9c2157a05350326209c021d2057a6e010dc9b6926633004002f6764671de66c04a081e14ea3d4e916b07995d2a6c49036e4da3bbb6d8b3d40750
-MISC ChangeLog 4955 SHA256 423c385da4e8304878db97a329084d3c69f0f1c22b8143464422383abe8df751 SHA512 33bd3dc8f074224c89f352cab6196433962a1f1b60beb9b524f407e9db6612d635f27c0f41d81005e63a8812a83738f0092e7bd4424a4d7a4c872b53ba2e41f6 WHIRLPOOL a42865a8e023680115c664c3cff1f03ae891067fc747cf37641893fb777d449e8ef9c62db64cd918fa9c7c3a6d9bae96c3f437c30e9da21f528abbf7df88877b
+MISC ChangeLog 5102 SHA256 a93ac3561300543cacc83aebbf57fafcccd8242f679dbe40fe9ae98e3fdc4736 SHA512 c7a8acec1d25c799e9ab3edb47c3fe0381b30aa1af3efbec47987c14539879a93e6e9f001eeaab855ab3365e8cb6419ce8b1886667341d48eb64a1629197938a WHIRLPOOL 22b1dfce63b9e979717d674815fff16009ee7e78f9c282b18bdfdb6268797d3bbf4e15b3eef431911dca9af72113aaaa0fe11a4348dc2daa30fc7527029bde7c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlU9LpkACgkQiIP6VqMIqNfsOwEAgfIZ7LERlIX7yM2dEiIqKMv4
+KBSJb5fS1r5i8NWCGvgA/099pTYBKCqSeXETFx4KVJpCa20hASUL4WKTIskCfeot
+=UJCD
+-----END PGP SIGNATURE-----

diff --git a/dev-ruby/tilt/tilt-1.4.1.ebuild b/dev-ruby/tilt/tilt-1.4.1.ebuild
index 4650ee7896d811fb8be4fad408cf80f640277bea..e7f9d8b3af06f2398b8128fcb82d505a61c68f98 100644 (file)
--- a/dev-ruby/tilt/tilt-1.4.1.ebuild
+++ b/dev-ruby/tilt/tilt-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# 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/tilt/tilt-1.4.1.ebuild,v 1.8 2014/08/12 19:54:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.4.1.ebuild,v 1.9 2015/04/26 18:29:44 graaff Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://github.com/rtomayko/tilt"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
@@ -27,10 +27,6 @@ ruby_add_bdepend "test? (
        dev-ruby/nokogiri
        dev-ruby/radius )"
 
-# Most dependencies are optional: skip haml for ruby20 and ruby21
-# because haml depends on rails.
-USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-ruby/haml )"
-
 ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
 
 all_ruby_prepare() {