prometheanfire 15/07/24 00:24:19 Modified: puppet-4.2.1.ebuild ChangeLog Log: adding some test deps, also, restricting tests because test deps are not keyworded (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Revision Changes Path 1.2 app-admin/puppet/puppet-4.2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?r1=1.1&r2=1.2 Index: puppet-4.2.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- puppet-4.2.1.ebuild 23 Jul 2015 23:03:42 -0000 1.1 +++ puppet-4.2.1.ebuild 24 Jul 2015 00:24:19 -0000 1.2 @@ -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 @@ 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 @@ 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 @@ # 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 1.234 app-admin/puppet/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.234&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.234&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.233&r2=1.234 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- ChangeLog 23 Jul 2015 23:03:42 -0000 1.233 +++ ChangeLog 24 Jul 2015 00:24:19 -0000 1.234 @@ -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 <[email protected]> + +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)
