Drop optional haml dependency to simplify stable dependency chain.

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

3 files changed, 10 insertions, 10 deletions

diff --git a/dev-ruby/sinatra/ChangeLog b/dev-ruby/sinatra/ChangeLog
index df0c70dc21b0..98b728904c7c 100644
--- a/dev-ruby/sinatra/ChangeLog
+++ b/dev-ruby/sinatra/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/sinatra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.56 2015/07/26 06:31:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.57 2015/07/26 06:40:12 graaff Exp $
+
+  26 Jul 2015; Hans de Graaff <graaff@gentoo.org> sinatra-1.4.6.ebuild:
+  Drop optional haml dependency to simplify stable dependency chain.
 
 *sinatra-1.4.6-r1 (26 Jul 2015)
 
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 0f83f106ec37..07966b526012 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX sinatra-1.4.4-fix-tests.patch 795 SHA256 0ca1f49fe9ed6889241a823e9db9cf410509de924e987cf4ff73798b2c9c84a6 SHA512 d3e8f80e93a46319f91b381133758dd9239ac49bebfdb0ffb39215dc1ba05b780f8224f352d2811e75cf1a77122230efc6673c3a92d9945d035fe3638bfbb995 WHIRLPOOL e80043b9b0bd6ae1e4056d80caafb108b4ff31cfdacd4e6667bfca019b765190406d66823f84154a5a1296fb294aaef571900f3dca83aff0fc243c96bae19cf0
 DIST sinatra-1.4.6.gem 355840 SHA256 87225b2bc25d5806b24bfac05383d4224109ce073b7ece1d3d55e58018e615c2 SHA512 3b80137a8c31bc60c24b4fb4e5984fc9064f52733f5a7214079a50d1c9acfa3046f06935c7eeb611aa4e3d0979fcd88c8db741a08429000a2fb94956c7648552 WHIRLPOOL 7ae683bc03f355c4e99ea94a6661cf89e2effc857e74c7ec0e4d86572999139460b3cb8f3bfa2db8a36c18e6ac9f2d20347d0163cd0271121ac5bdbff8a33ef6
 EBUILD sinatra-1.4.6-r1.ebuild 1258 SHA256 56983e5e9048f01c3eb893dc9408248fcf47baa6766f0e678667f1342caf2cb6 SHA512 d188b0033b42b2f17b6208ff8dfc1db0d5bcbe13a87e17f1f4ae12f2e7e5911ab43d534b1e86e4828fd135ac9f6c23704c98e5950e512745c24414b977ad1563 WHIRLPOOL ec730588c6062ad6967571f177ee291e675828ed3730c31657626dd0b5c0403ef1d569559ac7f7227f1219f88815566c3ba824dbb64ffa3bf94eaea6b16a7784
-EBUILD sinatra-1.4.6.ebuild 1248 SHA256 c6782f7f50c0d7082e755ccf159237dc347ee30d332aaebb8001257535011ac7 SHA512 48c7e2599c1277534483d7b0b6297aef0c87df88e7ecea114ee8f9167cd2ad5cd614f22d965082521ef814e9a09f2e19c084b590ea646200df89f34f9ffe0876 WHIRLPOOL ddb6f43f60f61536d6cc192b156bc079f74aa105cbf33d11c54458ce887bac2d3d1dcb84c018dfeb78ff533ec7291b45ada3e09aa9198065b60dc159a1611886
-MISC ChangeLog 7586 SHA256 ac75a1acabf3493c87a3cca20ada3a674a3517d8d9acbaab277cfb7b325f55ed SHA512 0d3754e40068b3bd93cc1db353201a2c82fcfdc97e5a721be1dec6bb55c2bfdb1d0c50fe8dc8762a3c65e134a28e26fbdc7a62a66bb09f3a72574c6a40926390 WHIRLPOOL 346126a81d7ecd884dd1db575c1a5cc60eca00d127ba1431012fe92ee352e122ac184712074e72bb76183276a74cf9eac36b4678e82ad2c3a1ed241aa8c4341e
+EBUILD sinatra-1.4.6.ebuild 1123 SHA256 141ec34e71a324e23eb4f1f44c4ed58166856f345dceef3970ac7009b393a4a0 SHA512 2cd064899b9e61404720a7add695d59bd2284063336239d76e2721d16643acccc2277daab045dbfdf40ac0d96a87f6a1bddb1d52b11306b116a7d8cb68a8ce3e WHIRLPOOL 8f7c0d6324c27360818ebed292a1cabb9ff6cd09c1c9e9d7fac30441b31c7a176b4a06a7b589fa59bfb9a817672129a86707cbc30ae19be875d17d5f30a2400d
+MISC ChangeLog 7728 SHA256 49b22feb7afb4fdeaaa48da1125c6bb075f76c223ac297f1bfbcc6866f92771e SHA512 30ac3639c8a0c434d9dc8aac16de66ce15758c9e5d564a390ca833b01d25e27202cf4edcb698974aedd31b206a3b3be1c715856af35bf03be4ee326f6804977c WHIRLPOOL 7f31edbe18a9de53eec3c7ac47b5ff63ea1ec35e211e2d2f29b3760c578d5e4a37867eb29efac6e8009462f3d11c941726d00032036e3e633988e0043d168937
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlW0ftkACgkQiIP6VqMIqNdLRgD6AuGQMfbeqCnssNE8po7t5aJY
-RXb6pzTjkpeAyo2vuCYA/3ziBRmSBhJQM2y+y6wdbMR7QebRi8gIZyuVFHbfw5qg
-=EjtJ
+iF4EAREIAAYFAlW0gM0ACgkQiIP6VqMIqNfSygD+LicXKkgcdfLUVe2FOy7KRE9K
+IqJUD3Ww1w5hvkrfoBsA/3wtVWlTle4Ch8ZPfisNmrHR18+ppsqwInKySKuqirjR
+=aLLr
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/sinatra/sinatra-1.4.6.ebuild b/dev-ruby/sinatra/sinatra-1.4.6.ebuild
index a8c08af926ba..8c73fe1b55e6 100644
--- a/dev-ruby/sinatra/sinatra-1.4.6.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.4.6.ebuild,v 1.3 2015/07/26 06:31:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.4.6.ebuild,v 1.4 2015/07/26 06:40:12 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -25,9 +25,6 @@ ruby_add_rdepend "=dev-ruby/rack-1*:* >=dev-ruby/rack-1.4:*
 	>=dev-ruby/tilt-1.3.4:* <dev-ruby/tilt-3:*"
 ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder )"
 
-# haml tests are optional and not yet marked for ruby20.
-USE_RUBY="ruby19" ruby_add_bdepend "test? ( >=dev-ruby/haml-3.0 )"
-
 all_ruby_prepare() {
 	# Remove implicit build dependency on git.
 	sed -i -e '/\(s.files\|s.test_files\|s.extra_rdoc_files\)/d' sinatra.gemspec || die