adding some test deps, also, restricting tests because test deps are not keyworded

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

4 files changed, 57 insertions, 21 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 22cf06e18118..87950f8e575d 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.233 2015/07/23 23:03:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.234 2015/07/24 00:24:19 prometheanfire Exp $
+
+  24 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +files/puppet-fix-tests-4.x.patch, puppet-4.2.1.ebuild:
+  adding some test deps, also, restricting tests because test deps are not
+  keyworded
 
 *puppet-4.2.1 (23 Jul 2015)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 8677c791cc49..5eac39116709 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
+AUX puppet-fix-tests-4.x.patch 1017 SHA256 2cd2090dce6db9173e2336bd97aaa08784e760f2809aa9a6f905416c4b226d29 SHA512 517b36758ff25bfd8f6f7088cb2530499c74cb252ed9f1f4583282134f9ce282d935fcbac8ba080c58d7d32eea1df9631c2effcf2abdb71d0bb312b8f6ec47a1 WHIRLPOOL 49702d6bc1179f61eb09e0991b7dee9e498c2a6ab3d6996c42575340a988bab964ebc6cd2fb5a12904750b3a052028e7f60b062cbd75875e723021215c78f79c
 AUX puppet-openrc-status-fix.patch 709 SHA256 76d320e7a5f8922e3f438b3baf09fb7c86dcd70e821e364cee19fd5f33596a82 SHA512 2959646f3d2a5ceed41faff64debe2dae08ef524679ee1a117ce709a22284f055d40a7a28848a8e1cee0a2603a0a6ad417560714d4bc000b3288fe7a3a5e0d81 WHIRLPOOL 030d85bfef14d74e2ccabdf249fca657beaeba36d0dcd26cf706abf1ecdb81b79a4dd95063cf0781cb9006523cd1fa86a35ac2efd70821c1f3623bd2ea11ae77
 AUX puppet.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c
 AUX puppet.init-4.x 763 SHA256 4b65d1a666cde6fe15abd861bc08d1986e3e95c250585990625973985a943408 SHA512 ace44a6e91ba6f65ba5780093b1749c920acec5a0828decbdc90643054a84de1606bc591e54ad171934f87e28015c0d805a2b3df6e7f97f613b3eee185ff992d WHIRLPOOL e19ce589be8ef6a82a93e6f442c8907e5ac68774208d75c48675c69e5367aa7d8c72a22f0a6dfecce6307c77d171577966805b5da546388257c97b7b190cdf6d
@@ -22,22 +23,22 @@ EBUILD puppet-3.7.4-r2.ebuild 5246 SHA256 8c1b4e0d69c71c8d0de390a0a3c5192354e9ff
 EBUILD puppet-3.8.1-r1.ebuild 5221 SHA256 5943c19eb5bb5db2c02a25b08d34d017e00e83785e84dfe95439817b0d5a23dc SHA512 ede1726941acff9abf7c799b44b577be6b3651fcee931eb6c092775e0b88c944456a0b97829f2a04675193c259e9de9d17ccb9d5cda0f246686493b232d67445 WHIRLPOOL fdca27d4ee2d5b7076fb03b6ed42128b9fd7892802d882ad0d24a964827932f275dd9d8603fe57eeb1d603a4c2124b31e4a46d9355f9c93f407f059d7c892186
 EBUILD puppet-4.0.0-r2.ebuild 4484 SHA256 8b87ea61ca4b11a33e587364b82f6146bf1fba68bae9686fd41553d82939845f SHA512 b86ed3d3cead398c5677ee78aeae2581bcb2a773dcad8306ef7314bf1424779337727b7195a3fab6da39de64b6adc2bf18039f58b2684a1e470ba0eae119a201 WHIRLPOOL 25fe2bd9ea079a0153134f1f6dcc5c49533a04efd7f86c473412e57908fbb80ee2a4fae5d30925193e3e2704eb0ed4c83e442bd55c15059ca270d90306c88d0c
 EBUILD puppet-4.1.0.ebuild 4481 SHA256 93f731db802583371f05a30ee0d38eb38d7c460ca2aa4469eef9302c7c1f3557 SHA512 bcef899e43af8f2b01547fb330c42cdf70af20b6d4c7593d6d11d62028e36a5587e89802300db6ee8363b0f780a21cdf01dc5657e32038f2218372f1d44a5a92 WHIRLPOOL a9576c8d726d6bf421301817713a0549ff3307eaaa0c504fd505f9874812369717b61d68b543f4561cd1ed78b30431f3194747915cc2b4d90ee4d889ae8675ad
-EBUILD puppet-4.2.1.ebuild 4525 SHA256 13b40873ca7787e7d154dc03f1058483cf6403d36289864c50f765d3ba98ed3c SHA512 b281d9b941bf4220d1856e07b4b57df44f44fa0f41d245555b788da74eb961600d487949bd2a794ff0af540c7778cc35a4e7398185120402cf376ea674c2c312 WHIRLPOOL 027105bfc2f17b00551f8abdadc7c5c3a435f64bb02d162bd8e805088cd8cfa872de4f0d6388d109def4f53cb9440e9b21c8b7795c87f5615d7c4debd4cef73a
-MISC ChangeLog 37452 SHA256 d88ce6158a41a0c04506c0de2f023247f5ed08cf4fdf8d5c6343660a2936b5df SHA512 88402ba687e59f7aa1a3a2c5035a93d539d925671d2851f040ff29d12dcd8bcf69c1481499427e0138ef6c905c0d311645f60d7e4533927ad0b89a4449faa045 WHIRLPOOL c5faaf36789863d641161205a95db70d8c7269026cdaa7f5bcf90929b39decb9c5153327f673937d1c39c5554e30e8285277e2ee3630eeec09c4117800644886
+EBUILD puppet-4.2.1.ebuild 4825 SHA256 372dd6e52e977c6590fbe9e939a33d660989c590092ad57de178b338a2d1d6c3 SHA512 740f5e7e3889b642ee50122976d3b8c50319c1eba3469e114bdd852146d037feaca6b8a553aeff31993260880550c9c44bc47695e21342272d38a9ff94fa44d6 WHIRLPOOL b0d6e2be63fc1486c864c7c2a496c8f41bd91ce6cc72e7bc5588a867c89061dae48e967454108b87cb087c14e9c96c3dff7c31b6bc143b3f11ff489e978c710f
+MISC ChangeLog 37655 SHA256 e281ac75b030af2a584cfcce76afe4844023966d9123d6a20c254b2fb683b2fc SHA512 2c743f4a39c02aa25e5d485f51f96a6ebf9013fa84196e302ea9d682158dcb50db5e2bacaa8dbfa283af96c6338b3b825bae9db815c6f496fdfbe52034620964 WHIRLPOOL 0db5557321f8913f159e355e254730518a17cf4758eca45f4286648c83a0ff49f0c8915392f50a125e493f3d621b152524534cf026afe28c8c4868d46b95132b
 MISC metadata.xml 1241 SHA256 6dc0cd19fc91fdc3d38a020329de7a9eaadeaa4f96e4d779211b36b3720951ff SHA512 81a8d21ba798de148e406cc22ee465c466fbebe4c14b8e71274da8369fcf1c3e23f11514f3e061c78acd4adc9015dc664e2c20d443e38a6f9162d35f6ec2856e WHIRLPOOL 2e709845671c7cd441519203f09a5d1312dfb6a6eebac91c24fe4100c95b70a5b7e0f897f03b280dbc156ddd1fe3c2d33f820777f40e5ee3c1e55c53ff686e97
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVsXMTAAoJEGSje+quGaTog98P/3ULQZZdGqx/XRTKDji7I8lg
-uESKB7jeZOJLLaRRgRObzzTvsp02mKQc6BeQ5W2m4TM8pIu9/JcFKilTiydganU4
-3K+T/xkHOazFK8i6i6bzjf/31m7rN5UJO3VMIzLC/E4H1561uy9h0YY7c6wkCclx
-2MQDL6J8WRmy4Xg8g+BINi9BkTAu0NKaI/xr90vVw6Xg+qv4OEJLlebqWH8WIaZq
-fTs+2K5Nyvr9h8sdKoKgMtgcN3jLORt/XmFkIUXOGKCYVnTXyWrbgLQP4j7Brou1
-pu4Vg570TU25/m0HA6GrnWYlty5Z0rBUrfI526YKG+BevBWdbv6l9E/sobYr904I
-lb3M2zTj9d2P6Rs+DEnM011njeI8DkJ/s2mQ1zrQKw/PbgtNNwNf5/4tQSfut1lI
-galB6Az7bivZl9mJfAvgyZZV2ku2OR7yioNSeLb1N0/KZ4XBeaFSrFs/NUWSQRra
-zsdjtehQNPaajxasDnH4yzaXpx1DByIGRNjYNc0Y3wq7uUC8jkpQuAyN/ic6oDaQ
-zd9PWrFx8IidTBZOgQpH4ov5v3AfWvt/kOhfkY19rItJj90JAl3xm1C+oARzm+pV
-TwgUHbfuyGTo3TDwv2o2roomeetl4jZmWKFemWjUNW2w2J/CDJE7EvXq/YhIKktE
-1o89HZLsY50OE4Y4/G3u
-=w9HD
+iQIcBAEBCAAGBQJVsYX5AAoJEGSje+quGaTodPYQALd2ZTo3rUUAQt1LTrzc32ls
+hpT5ZY9BMBxZWBPVpcQu+jsEqlWVvVyXNKvgQDj7VT0hepM4KcuZ1YP79w9kCkOh
+let8dv+xLiOdVQb2Y9+hTaVzwucxAqYhnjXhidNwc2hNR9WCJ7l8A3bdohQv8Ovb
+Mtbz16R4haNZMNiLyJ4m93IZ3ozc9wjw5+FOtsV4dmCtdi9dhXSdQ7/vxtK4TUa1
+cxHoELpsMeFZUUMtbZaUcNi/xqoxbledkyvDHuCl7ZYCtTjEreVKBRf64d4n8P0i
+lo8zL+NrvTFP2JQvTwhF7nXy4+xOk8wrjH5nDUkoNlci3we9aRr3URzpg+w1wIZs
+zHXBnvIFyVpbrUbCh53TelmtGhB8+81DR3WmehGxo0eROFe0tYvb412PhH/JO0jr
+mNlPXzyvJ3ZCdJ0GozU+v0WFu+BUsBg6q2TiiVCG4FpyAdafQHkpFZ6qA1gki87N
+VRSCHkUp1ZFYrNu/fPTIeWWqZOSpB1Mjr9+khOEJ3+ogJm1dbwHrg4PAEfz8ZUu9
+haPM7WcucfHYHoZTPuqad/oR76YE+FsI2VidZPcSfuS8xcuoHxE1gf8LBQWzl1iT
+JjDoYBzWgEPmVXfm9rVqqs0bGQQzHdRutuZ7wfhhAhFsMXItHcXv0XBlZRRRVAsL
+pwLTN/cmHFqvUyCHCi8F
+=SCuF
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppet-fix-tests-4.x.patch b/app-admin/puppet/files/puppet-fix-tests-4.x.patch
new file mode 100644
index 000000000000..77d9cfbda60a
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-4.x.patch
@@ -0,0 +1,18 @@
+--- ./spec/unit/network/http/api/indirected_routes_spec.rb	2015-07-21 12:09:09.000000000 -0500
++++ ./spec/unit/network/http/api/indirected_routes_spec.rb.new	2015-07-23 18:33:22.839914116 -0500
+@@ -144,15 +144,6 @@
+                                                                            :env))))
+       handler.uri2indirection("GET", "#{master_url_prefix}/node/bar", params)
+     end
+-
+-    it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
+-      handler.expects(:check_authorization).with(anything,
+-                                                 anything,
+-                                                 Not(has_entry(:environment)))
+-      expect(lambda { handler.uri2indirection("GET",
+-                                              "#{master_url_prefix}/node/bar",
+-                                              {:environment => 'bogus'}) }).to raise_error(ArgumentError)
+-    end
+   end
+ 
+   describe "when converting a request into a URI" do
diff --git a/app-admin/puppet/puppet-4.2.1.ebuild b/app-admin/puppet/puppet-4.2.1.ebuild
index 749689c25298..7860c0adcb2a 100644
--- a/app-admin/puppet/puppet-4.2.1.ebuild
+++ b/app-admin/puppet/puppet-4.2.1.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/app-admin/puppet/puppet-4.2.1.ebuild,v 1.1 2015/07/23 23:03:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild,v 1.2 2015/07/24 00:24:19 prometheanfire Exp $
 
 EAPI="5"
 
@@ -18,11 +18,13 @@ LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
 
 ruby_add_rdepend "
 	dev-ruby/hiera
 	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
 	dev-ruby/json
+	>=dev-ruby/facter-3.0.0
 	augeas? ( dev-ruby/ruby-augeas )
 	diff? ( dev-ruby/diff-lcs )
 	doc? ( dev-ruby/rdoc )
@@ -31,12 +33,19 @@ ruby_add_rdepend "
 	sqlite? ( dev-ruby/sqlite3 )
 	virtual/ruby-ssl"
 
-DEPEND="${DEPEND}
-	dev-lang/ruby
-	>=dev-ruby/facter-3.0.0
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#		dev-ruby/rspec-collection_matchers
+
+DEPEND+=" ${DEPEND}
 	emacs? ( virtual/emacs )
 	xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
+RDEPEND+=" ${RDEPEND}
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
 	selinux? (
 		sys-libs/libselinux[ruby]
@@ -56,6 +65,9 @@ all_ruby_prepare() {
 	# Avoid spec that require unpackaged json-schema.
 	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
 
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.x.patch"
+
 	# Avoid specs that can only run in the puppet.git repository. This
 	# should be narrowed down to the specific specs.
 	rm spec/integration/parser/compiler_spec.rb || die