app-admin/puppet: 5.5.14 and 6.4.2 stable amd64/x86 with cleanup
authorMatthew Thode <prometheanfire@gentoo.org>
Thu, 30 May 2019 14:56:55 +0000 (09:56 -0500)
committerMatthew Thode <prometheanfire@gentoo.org>
Thu, 30 May 2019 15:05:35 +0000 (10:05 -0500)
Package-Manager: Portage-2.3.66, Repoman-2.3.13
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
app-admin/puppet/Manifest
app-admin/puppet/puppet-5.5.12.ebuild [deleted file]
app-admin/puppet/puppet-5.5.14.ebuild
app-admin/puppet/puppet-6.3.0.ebuild [deleted file]
app-admin/puppet/puppet-6.4.2.ebuild

index 52c8336dd412e61ee357bbdcf927997536580b6e..37939116421291310ac33be512101779f44a00f6 100644 (file)
@@ -1,6 +1,4 @@
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.12.tar.gz 3073481 BLAKE2B 8044af48e7d86e754f767b42199814ff9b2dcda04f1e13920cea332ae79b23997cc1a17fe761bb5216d174bc5d77c244a9eba7752c004bf1558a648c334f698a SHA512 33d844d671710adae1dbe184981143883bf4f3ac1516f8aedd1cd8d30157bc947a3a66df30c10a2357a8cb42dafe02a80a24007312b2107c68350ed0871a3249
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
-DIST puppet-6.3.0.tar.gz 2831909 BLAKE2B ccf6353c0fc1fcdd4ac06e79bd8d91980162b8f1b2012fc2bfc1cdea3d2d6b22bf55216cea9b94a4024273ca9f76eedcc92a861de9db348408a361596033b51c SHA512 1d30706049fe378facddb923a9ecb521d37faa84740251602ac340ea1299c247252fbdaca17f1ea450ff716ab26ac4e9524f1137080318e6d9237a9e2699f6b8
 DIST puppet-6.4.1.tar.gz 2893151 BLAKE2B 5c48b30083f93ce3625551020cc3b386cbc4ca8ab249099249099dc7aa8866186c197732ad603366d5fa54c3fc1664d7b457d323a2e6d9266faa754f7d4fa4ca SHA512 260f933dac3a3033e807c5b7c63d5562d9d8d29d11550efd38b0a94eac811f27444156cc11db38da170dc2369981072288df471fd05738a0f0e951bbdffe2a52
 DIST puppet-6.4.2.tar.gz 2891159 BLAKE2B dfd8e5d9935d54272096fac66a037b8eab75dedc42caf18bafe29738e749a66869ad2e741753e8b38d872e21b1a261f2b4017c54faa57043754d619cf27652ed SHA512 7ec2746ef2a021d1cc3e3076840a9f1195fe51ba591cf2907e542b3f450cb1f4002fa3c958aee966c5976245073ba3cfacc9fd2a653d1d823720b33984aff911
diff --git a/app-admin/puppet/puppet-5.5.12.ebuild b/app-admin/puppet/puppet-5.5.12.ebuild
deleted file mode 100644 (file)
index 12914f0..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-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"
-RESTRICT="test"
-
-ruby_add_rdepend "
-       dev-ruby/hiera
-       dev-ruby/json:=
-       >=dev-ruby/facter-3.0.0
-       augeas? ( dev-ruby/ruby-augeas )
-       diff? ( dev-ruby/diff-lcs )
-       doc? ( dev-ruby/rdoc )
-       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
-
-RDEPEND+=" ${RDEPEND}
-       rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-       selinux? (
-               sys-libs/libselinux[ruby]
-               sec-policy/selinux-puppet
-       )
-       vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-       >=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-       enewgroup puppet
-       enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-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.7.0.patch"
-
-       # fix systemd path
-       epatch "${FILESDIR}/puppet-systemd.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
-
-       # Avoid failing spec that need further investigation.
-       rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-       each_fakegem_install
-#      dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-       all_fakegem_install
-
-       # systemd stuffs
-       insinto /usr/lib/systemd/system
-       doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-       # tmpfiles stuff
-       insinto /usr/lib/tmpfiles.d
-       newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-       # openrc init stuff
-       newinitd "${FILESDIR}"/puppet.init-4.x puppet
-       newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-       newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-       keepdir /etc/puppetlabs/puppet/ssl
-
-       keepdir /var/lib/puppet/facts
-       keepdir /var/lib/puppet/files
-       fowners -R puppet:puppet /var/lib/puppet
-
-       fperms 0750 /var/lib/puppet
-
-       fperms 0750 /etc/puppetlabs
-       fperms 0750 /etc/puppetlabs/puppet
-       fperms 0750 /etc/puppetlabs/puppet/ssl
-       fowners -R :puppet /etc/puppetlabs
-       fowners -R :puppet /var/lib/puppet
-
-       if use ldap ; then
-               insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-       fi
-
-       # ext and examples files
-       for f in $(find ext examples -type f) ; do
-               docinto "$(dirname ${f})"; dodoc "${f}"
-       done
-}
-
-pkg_postinst() {
-       elog
-       elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-       elog "cause puppet to hang while installing packages."
-       elog
-       elog "Portage Puppet module with Gentoo-specific resources:"
-       elog "http://forge.puppetlabs.com/gentoo/portage"
-       elog
-
-       for v in ${REPLACING_VERSIONS}; do
-               if [ "$(ver_cut 1 "$v")" -eq "4" ]; 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
-               fi
-       done
-}
index 3f494c1f6871adfd36b915f5ce6abdc661cdd796..12914f0e266d83fe0889010dad86661b68bc814f 100644 (file)
@@ -19,7 +19,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.3.0.ebuild b/app-admin/puppet/puppet-6.3.0.ebuild
deleted file mode 100644 (file)
index 3a0606a..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-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"
-RESTRICT="test"
-
-ruby_add_rdepend "
-       dev-ruby/hiera
-       dev-ruby/json:=
-       dev-ruby/semantic_puppet
-       >=dev-ruby/facter-3.0.0
-       augeas? ( dev-ruby/ruby-augeas )
-       diff? ( dev-ruby/diff-lcs )
-       doc? ( dev-ruby/rdoc )
-       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
-
-RDEPEND+=" ${RDEPEND}
-       rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-       selinux? (
-               sys-libs/libselinux[ruby]
-               sec-policy/selinux-puppet
-       )
-       vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-       >=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-       enewgroup puppet
-       enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-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-6.0.0.patch"
-
-       # fix systemd path
-       epatch "${FILESDIR}/puppet-systemd.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
-
-       # Avoid failing spec that need further investigation.
-       rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-       each_fakegem_install
-#      dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-       all_fakegem_install
-
-       # systemd stuffs
-       insinto /usr/lib/systemd/system
-       doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-       # tmpfiles stuff
-       insinto /usr/lib/tmpfiles.d
-       newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-       # openrc init stuff
-       newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-       keepdir /etc/puppetlabs/puppet/ssl
-
-       keepdir /var/lib/puppet/facts
-       keepdir /var/lib/puppet/files
-       fowners -R puppet:puppet /var/lib/puppet
-
-       fperms 0750 /var/lib/puppet
-
-       fperms 0750 /etc/puppetlabs
-       fperms 0750 /etc/puppetlabs/puppet
-       fperms 0750 /etc/puppetlabs/puppet/ssl
-       fowners -R :puppet /etc/puppetlabs
-       fowners -R :puppet /var/lib/puppet
-
-       if use ldap ; then
-               insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-       fi
-
-       # ext and examples files
-       for f in $(find ext examples -type f) ; do
-               docinto "$(dirname ${f})"; dodoc "${f}"
-       done
-}
-
-pkg_postinst() {
-       elog
-       elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-       elog "cause puppet to hang while installing packages."
-       elog
-       elog "Portage Puppet module with Gentoo-specific resources:"
-       elog "http://forge.puppetlabs.com/gentoo/portage"
-       elog
-       elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-       elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-       elog "not already done so."
-       elog
-}
index 0038f1ebf4334ea6bcbe4edd84e25ae28ee3700f..eeefd4e8c63d7a0793ea7b99f52dc62113427726 100644 (file)
@@ -19,7 +19,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"