From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51441138332 for ; Sat, 21 Apr 2018 04:12:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22BFDE087C; Sat, 21 Apr 2018 04:12:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFF3EE087C for ; Sat, 21 Apr 2018 04:12:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57D6D335C77 for ; Sat, 21 Apr 2018 04:12:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38ED027C for ; Sat, 21 Apr 2018 04:12:43 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1524283946.e509f12911cddc3f802097242feb473996a00e80.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppet/Manifest app-admin/puppet/puppet-4.10.11.ebuild app-admin/puppet/puppet-5.5.0.ebuild app-admin/puppet/puppet-5.5.1.ebuild X-VCS-Directories: app-admin/puppet/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: e509f12911cddc3f802097242feb473996a00e80 X-VCS-Branch: master Date: Sat, 21 Apr 2018 04:12:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: be6b5cc4-a1b3-450e-ae5c-183ada341dab X-Archives-Hash: 93168a64cb190668a438f682fb8019dd commit: e509f12911cddc3f802097242feb473996a00e80 Author: Matthew Thode gentoo org> AuthorDate: Sat Apr 21 03:54:41 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Sat Apr 21 04:12:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e509f129 app-admin/puppet: 4.10.11 and 5.5.1 bup Package-Manager: Portage-2.3.27, Repoman-2.3.9 app-admin/puppet/Manifest | 3 +- .../{puppet-5.5.0.ebuild => puppet-4.10.11.ebuild} | 100 ++++++++++++++++----- .../{puppet-5.5.0.ebuild => puppet-5.5.1.ebuild} | 0 3 files changed, 78 insertions(+), 25 deletions(-) diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index de605191928..bceaae6fa27 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -1,6 +1,7 @@ DIST puppet-4.10.10.tar.gz 2995864 BLAKE2B c01e6a7529d70a4481e64b4119cfd9d05e79d655ef17495a98e2ab800ea527ef09f234782e7362b25bf1b1ed11d7c2a48e40815ac6dccc5a2d460886beb604e7 SHA512 e517ee349ead56932c9ff54f910d10842c1cd6b6f28673223a65fb72334662d4eabeccc1c7c7603e17aa712c356edbc27fe53d6e7dd7ba042cc0616d0076d755 +DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a76c7ee60b4ff314e7ba2ce19613f834baced94afbbf499b513391107c4229be5f40c275d0724b200358722db0e96 SHA512 5eaac8bd973d0013e7774c9bda81524332f2b3b0177c04e78554bfb0815697b4b296d5dd11a04f7fad782ad975b350b149b1cd97fc5f06974952314f163f1b40 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d DIST puppet-5.3.4.tar.gz 2889645 BLAKE2B f1f4e2d9dfe457f89aa7d99724eaa9368ea50027747e2506b5cbfa176c1a9060bf87ce8c037b78f3c86c2e2974087f9ab4fc76cb7374f1a348ff410e9cfa83e1 SHA512 f24008651be15cf5c915f7a03dc0319eb2d076ddfb06c44fd846421fe29baba27ea43b29134077e1dc7c14a48b44104dcaaefe73bfdb00d7667c1c25a1b871fd DIST puppet-5.3.5.tar.gz 2890869 BLAKE2B 1baeddbaa47803811e14bfdbbf5624b617ced2ec6ec6b8072d51a556455838bf0934b1e0c578ef6b4d5df763260c0fa0f027295e3c8403c172a25fcc72179283 SHA512 d48b836a9c7db451c73048917e091a1dd3e1c259f4dde7a8867fe9931d9dbab46219f4b4dfa739669bb8d713a9defe13eae0d5b2dd26a6930b589f4cb0ab1361 DIST puppet-5.4.0.tar.gz 2958138 BLAKE2B 2cb7e890774abde7183a7b3ac33771fe8006f526b7780a566788591cba20c1ff7540429a4ead13830700fc07105fdaec4317de69f4efa44c4b245b31164b6048 SHA512 6b6955416e4f14ba45318c1afce7db77226da2d14f8dbfeca059780caf188f9687bf31dff4a4c57f8172468e09c35e021721a8b8caf99050d72f90b290fbdb71 -DIST puppet-5.5.0.tar.gz 3033293 BLAKE2B c8131e023b09bccc9228caae711654534a1cc5a6f290e3ece8cc1614de4374e0c440fd02826b5425576c4d61181a5e3218fa73bf9a277dee392a93193761a596 SHA512 96da65373153a0687f4823e66f7ee1f25b8e157be1840ed8ddfa9d18c030f2964211736b280b9a95dc651a2591bbd1b32d1a65376461f392ebd9104c633f3f3d +DIST puppet-5.5.1.tar.gz 3035639 BLAKE2B 2930ca9eb928d7c6a69ea76673fc4d002e230bf6dbcd28764e8d5bd504ae11326dc856ed64480e13c9eb1d683ad5e8ef64fc9e217942b59d90c6a0bc98e0197c SHA512 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc diff --git a/app-admin/puppet/puppet-5.5.0.ebuild b/app-admin/puppet/puppet-4.10.11.ebuild similarity index 53% copy from app-admin/puppet/puppet-5.5.0.ebuild copy to app-admin/puppet/puppet-4.10.11.ebuild index 452d26e515b..a75388c365f 100644 --- a/app-admin/puppet/puppet-5.5.0.ebuild +++ b/app-admin/puppet/puppet-4.10.11.ebuild @@ -5,13 +5,11 @@ EAPI="6" USE_RUBY="ruby22 ruby23 ruby24" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_TASK_DOC="doc:all" +#RUBY_FAKEGEM_RECIPE_TEST="rspec3" RUBY_FAKEGEM_EXTRAINSTALL="locales" -inherit eutils user ruby-fakegem versionator +inherit xemacs-elisp-common eutils user ruby-fakegem versionator DESCRIPTION="A system automation and configuration management software." HOMEPAGE="http://puppetlabs.com/" @@ -20,11 +18,14 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" +IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs" RESTRICT="test" ruby_add_rdepend " - dev-ruby/hiera + >=dev-ruby/gettext-setup-0.10:0 + >=dev-ruby/hiera-2.0 + >=dev-ruby/locale-2.1 + >=dev-ruby/rgen-0.6.5 dev-ruby/json:= >=dev-ruby/facter-3.0.0 augeas? ( dev-ruby/ruby-augeas ) @@ -33,19 +34,20 @@ ruby_add_rdepend " ldap? ( dev-ruby/ruby-ldap ) shadow? ( dev-ruby/ruby-shadow ) sqlite? ( dev-ruby/sqlite3 ) - virtual/ruby-ssl - dev-ruby/hocon" - -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - 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 - + virtual/ruby-ssl" + +# ruby_add_bdepend " +# test? ( +# dev-ruby/mocha:0.14 +# =dev-ruby/rack-1* +# dev-ruby/rspec-its +# dev-ruby/rspec-collection_matchers +# >=dev-ruby/vcr-2.9:2 +# >=dev-ruby/webmock-1.24:0 +# )" + +DEPEND+=" ${DEPEND} + xemacs? ( app-editors/xemacs )" RDEPEND+=" ${RDEPEND} rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( @@ -56,6 +58,8 @@ RDEPEND+=" ${RDEPEND} >=app-portage/eix-0.18.0" PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" +SITEFILE="50${PN}-mode-gentoo.el" + pkg_setup() { enewgroup puppet enewuser puppet -1 -1 /var/lib/puppet puppet @@ -71,12 +75,44 @@ all_ruby_prepare() { # fix systemd path epatch "${FILESDIR}/puppet-systemd.patch" + if use experimental; then + epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch" + fi + + # Use working version of mocha + sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die + # 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 - # Avoid failing spec that need further investigation. - rm spec/unit/module_tool/metadata_spec.rb || die + # Avoid failing specs that need further investigation. + sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \ + spec/integration/indirector/facts/facter_spec.rb || die + sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die + rm -f spec/unit/indirector/ldap_spec.rb \ + spec/unit/parser/functions/create_resources_spec.rb || die + + # Avoid specs that rely on tools from other OSs + rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \ + spec/unit/provider/user/directoryservice_spec.rb || die + + # Avoid specs that depend on hiera-eyaml to avoid circular + # dependencies + rm -f spec/unit/functions/lookup_spec.rb || die + + # Avoid specs that fail due to an unpackaged file + sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die +} + +all_ruby_compile() { + if use xemacs ; then + # Create a separate version for xemacs to be able to install + # emacs and xemacs in parallel. + mkdir ext/xemacs + cp ext/emacs/* ext/xemacs/ + xemacs-elisp-compile ext/xemacs/puppet-mode.el + fi } each_ruby_install() { @@ -114,6 +150,11 @@ all_ruby_install() { fowners -R :puppet /etc/puppetlabs fowners -R :puppet /var/lib/puppet + if use xemacs ; then + xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* + xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + if use ldap ; then insinto /etc/openldap/schema; doins ext/ldap/puppet.schema fi @@ -133,12 +174,23 @@ pkg_postinst() { elog "http://forge.puppetlabs.com/gentoo/portage" elog + local v for v in ${REPLACING_VERSIONS}; do - if [ "$(get_major_version $v)" = "4" ]; then + if [ "$(get_major_version $v)" = "3" ]; then elog - elog "Please see the following url for the release notes for puppet-5" - elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x" + elog "If you're upgrading from 3.x then please move everything in /etc/puppet to" + elog "/etc/puppetlabs/puppet" + elog "Also, puppet now uses config directories for modules and manifests." + elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html" + elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html" + elog "for more information." elog fi done + + use xemacs && xemacs-elisp-site-regen +} + +pkg_postrm() { + use xemacs && xemacs-elisp-site-regen } diff --git a/app-admin/puppet/puppet-5.5.0.ebuild b/app-admin/puppet/puppet-5.5.1.ebuild similarity index 100% rename from app-admin/puppet/puppet-5.5.0.ebuild rename to app-admin/puppet/puppet-5.5.1.ebuild