| 1 |
prometheanfire 15/07/24 00:24:19 |
| 2 |
|
| 3 |
Modified: puppet-4.2.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
adding some test deps, also, restricting tests because test deps are not keyworded |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-admin/puppet/puppet-4.2.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: puppet-4.2.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- puppet-4.2.1.ebuild 23 Jul 2015 23:03:42 -0000 1.1 |
| 23 |
+++ puppet-4.2.1.ebuild 24 Jul 2015 00:24:19 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild,v 1.1 2015/07/23 23:03:42 prometheanfire Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild,v 1.2 2015/07/24 00:24:19 prometheanfire Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -18,11 +18,13 @@ |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="~amd64 ~hppa ~ppc ~x86" |
| 35 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs" |
| 36 |
+RESTRICT="test" |
| 37 |
|
| 38 |
ruby_add_rdepend " |
| 39 |
dev-ruby/hiera |
| 40 |
>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6* |
| 41 |
dev-ruby/json |
| 42 |
+ >=dev-ruby/facter-3.0.0 |
| 43 |
augeas? ( dev-ruby/ruby-augeas ) |
| 44 |
diff? ( dev-ruby/diff-lcs ) |
| 45 |
doc? ( dev-ruby/rdoc ) |
| 46 |
@@ -31,12 +33,19 @@ |
| 47 |
sqlite? ( dev-ruby/sqlite3 ) |
| 48 |
virtual/ruby-ssl" |
| 49 |
|
| 50 |
-DEPEND="${DEPEND} |
| 51 |
- dev-lang/ruby |
| 52 |
- >=dev-ruby/facter-3.0.0 |
| 53 |
+ruby_add_bdepend " |
| 54 |
+ test? ( |
| 55 |
+ dev-ruby/mocha |
| 56 |
+ dev-ruby/rack |
| 57 |
+ dev-ruby/rspec-its |
| 58 |
+ )" |
| 59 |
+# this should go in the above lists, but isn't because of test deps not being keyworded |
| 60 |
+# dev-ruby/rspec-collection_matchers |
| 61 |
+ |
| 62 |
+DEPEND+=" ${DEPEND} |
| 63 |
emacs? ( virtual/emacs ) |
| 64 |
xemacs? ( app-editors/xemacs )" |
| 65 |
-RDEPEND="${RDEPEND} |
| 66 |
+RDEPEND+=" ${RDEPEND} |
| 67 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
| 68 |
selinux? ( |
| 69 |
sys-libs/libselinux[ruby] |
| 70 |
@@ -56,6 +65,9 @@ |
| 71 |
# Avoid spec that require unpackaged json-schema. |
| 72 |
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
| 73 |
|
| 74 |
+ # can't be run within portage. |
| 75 |
+ epatch "${FILESDIR}/puppet-fix-tests-4.x.patch" |
| 76 |
+ |
| 77 |
# Avoid specs that can only run in the puppet.git repository. This |
| 78 |
# should be narrowed down to the specific specs. |
| 79 |
rm spec/integration/parser/compiler_spec.rb || die |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.234 app-admin/puppet/ChangeLog |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.234&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.234&content-type=text/plain |
| 87 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.233&r2=1.234 |
| 88 |
|
| 89 |
Index: ChangeLog |
| 90 |
=================================================================== |
| 91 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
| 92 |
retrieving revision 1.233 |
| 93 |
retrieving revision 1.234 |
| 94 |
diff -u -r1.233 -r1.234 |
| 95 |
--- ChangeLog 23 Jul 2015 23:03:42 -0000 1.233 |
| 96 |
+++ ChangeLog 24 Jul 2015 00:24:19 -0000 1.234 |
| 97 |
@@ -1,6 +1,11 @@ |
| 98 |
# ChangeLog for app-admin/puppet |
| 99 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 100 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.233 2015/07/23 23:03:42 prometheanfire Exp $ |
| 101 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.234 2015/07/24 00:24:19 prometheanfire Exp $ |
| 102 |
+ |
| 103 |
+ 24 Jul 2015; Matthew Thode <prometheanfire@g.o> |
| 104 |
+ +files/puppet-fix-tests-4.x.patch, puppet-4.2.1.ebuild: |
| 105 |
+ adding some test deps, also, restricting tests because test deps are not |
| 106 |
+ keyworded |
| 107 |
|
| 108 |
*puppet-4.2.1 (23 Jul 2015) |
Archives