summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/puppet')
-rw-r--r--app-admin/puppet/Manifest10
-rw-r--r--app-admin/puppet/files/puppet.init (renamed from app-admin/puppet/files/puppet.init-4.x)4
-rw-r--r--app-admin/puppet/files/puppetmaster.confd18
-rw-r--r--app-admin/puppet/files/puppetmaster.init-4.x37
-rw-r--r--app-admin/puppet/files/tmpfiles.d1
-rw-r--r--app-admin/puppet/files/tmpfiles.d-21
-rw-r--r--app-admin/puppet/metadata.xml5
-rw-r--r--app-admin/puppet/puppet-7.24.0-r1.ebuild (renamed from app-admin/puppet/puppet-5.5.22-r1.ebuild)55
-rw-r--r--app-admin/puppet/puppet-7.27.0-r1.ebuild (renamed from app-admin/puppet/puppet-7.18.0.ebuild)13
-rw-r--r--app-admin/puppet/puppet-7.28.0-r1.ebuild (renamed from app-admin/puppet/puppet-7.17.0.ebuild)13
-rw-r--r--app-admin/puppet/puppet-8.4.0-r1.ebuild (renamed from app-admin/puppet/puppet-5.5.22-r2.ebuild)52
-rw-r--r--app-admin/puppet/puppet-8.5.0.ebuild115
-rw-r--r--app-admin/puppet/puppet-8.5.1.ebuild115
-rw-r--r--app-admin/puppet/puppet-8.6.0.ebuild115
14 files changed, 411 insertions, 143 deletions
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index e1cc7d9ed734..aa69cc8b22a8 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,3 +1,7 @@
-DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-7.17.0.tar.gz 2812615 BLAKE2B 80b5115b8825a87427a688ca7a9337334180fcb7722d437f44009b5cf74ede16dac52f1648a2e7595558abb5fa92322095e71dcf0d7d8d06a2275e13caf79163 SHA512 f691b6d3e931c5cc879c8e5129af2a935bedc891964ba5cbb873d6d69e0ec61bd82ca7d413a94389cda13cb6c8c536aae6f11dade4c6e2597abc7756a74f4df0
-DIST puppet-7.18.0.tar.gz 2816776 BLAKE2B 7c653744a9aa694c6e7558295d33fa8de1958f333cb274a51119ce543846ce649755d5c37ba677d1cdcf2417b237611073ef523aa7a109a3e3dc0e75bd986614 SHA512 428268c9d8333c0624023a3d4b55b5dddfaa890eb6d88a31486c8de5112db4d1dce7553050de81c4b5ffd0fec74c5d10f3c09c3fb1826ffc196808f2b45495d4
+DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9
+DIST puppet-7.27.0.tar.gz 2825666 BLAKE2B dffc2329c28588a5b4a08996f5fbff95c092961aa68af6287c4216ffb3e5b6ab811df876b8efb0f6724d9990b21ad1c56d65bd9fd8d502008ba385f4460f0591 SHA512 a864357f5079c9fad53c2cff35f73f0bc25900359e25b5fb1130e3a3e6f77f63bc38ef59c0ce1b37913eb0acb1e42f39891ed7de0fe39ab138faa426ab2a9392
+DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3158cfede2ffda90ee23ebcfecfdabcf35459d1a048c3a204e13611f67852028233e4da4b9ed2ea08cad07a37c9 SHA512 d570452ceec764c657f4678f7179400d30f8513766edc6f020db35c3a4246c1d857615a647ca481920a7d1a40cf9a15057432468ccd4697e4335dca55e121faa
+DIST puppet-8.4.0.tar.gz 2882328 BLAKE2B de46a8fbdc7522f022d19953845c73e6872ed430a9380f157809bb95e7d7315063f136b5159468708dcb5dcb4353cc89eacffffbd4045458351c63261a6d9bd0 SHA512 23d5aede9ba55e4e63a7f815fd1d274e97d5d0c35aa1b5444c24b223a59d5d913ac5b4652acc2258b1721a213e4c24e1e8b4a146ca6a1b81a1536a51ed856270
+DIST puppet-8.5.0.tar.gz 1565122 BLAKE2B c787b981c64f2b52cc3c8998516599891980bb176cb3bce6596cb4b139fbae2f58e156fb007a3aa2bd2a5bb069dc63eb7fc36bde3f3533c27729fccfa19ee0e7 SHA512 1adf88f69b3b5a7071a2ee5dad66c3cd3fc1db57fdeaf7945f8cb167d1b76dcf12e85e17eefc418cda67952a4c75a6b43d320d0c0f1db610411d188304994cdc
+DIST puppet-8.5.1.tar.gz 1565085 BLAKE2B f352f9f70e090c4a32edd45ced5c01ed4eff891fb46c0f2d753ceeba43250960356ceb2d9047e7308732585ec114c5f728ec29a65b6a08348b74a9709ec92a89 SHA512 f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f
+DIST puppet-8.6.0.tar.gz 1567398 BLAKE2B 749cc055c6797e5715907fdb768264774efba62e4681733a59a457cfda9dd2682990a96331cc04d313a367e32b820ce351fb103e19891976e900d99c30ca7ba5 SHA512 b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d
diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init
index f7106e6f0294..9821134c8ae3 100644
--- a/app-admin/puppet/files/puppet.init-4.x
+++ b/app-admin/puppet/files/puppet.init
@@ -2,7 +2,7 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/run/puppet}"
pidfile="${PUPPET_PID_DIR}/puppet.pid"
PUPPET_LOG_DIR="/var/log/puppet"
@@ -14,7 +14,7 @@ command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPP
depend() {
need localmount
- use dns logger puppetmaster netmount nfsmount
+ use dns logger puppetmaster netmount
}
start_pre() {
diff --git a/app-admin/puppet/files/puppetmaster.confd b/app-admin/puppet/files/puppetmaster.confd
deleted file mode 100644
index afecf479a6a1..000000000000
--- a/app-admin/puppet/files/puppetmaster.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Location of PID files
-PUPPETMASTER_PID_DIR="/var/run/puppet"
-
-# Where to log general messages to.
-# Specify syslog to send log messages to the system log.
-#PUPPETMASTER_LOG="syslog"
-
-# You may specify other parameters to the puppetmaster here
-#PUPPETMASTER_EXTRA_OPTS="--noca"
-
-# You may specify an alternate port on which puppetmaster should listen.
-# Default is: 8140
-#PUPPETMASTER_PORT="8140"
-
-# To start multiple servers:
-# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
-# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
-# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)
diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x
deleted file mode 100644
index 286f7e67579a..000000000000
--- a/app-admin/puppet/files/puppetmaster.init-4.x
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "puppetmaster" ] ; then
- PUPPETMASTER_PID="master"
-else
- PUPPETMASTER_PID="${SVCNAME#*.}"
-fi
-PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
-pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}"
-if [ -n "${PUPPETMASTER_PORT}" ] ; then
- command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
-fi
-
-command="/usr/bin/puppet"
-extra_started_commands="reload"
-
-depend() {
- need localmount
- use dns logger slapd netmount nfsmount
-}
-
-start_pre() {
- checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
- checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
- checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
-}
-
-reload() {
- ebegin "Reloading $RC_SVCNAME"
- start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
- eend $?
-}
diff --git a/app-admin/puppet/files/tmpfiles.d b/app-admin/puppet/files/tmpfiles.d
deleted file mode 100644
index cd33231df7f7..000000000000
--- a/app-admin/puppet/files/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/puppet 0755 puppet puppet -
diff --git a/app-admin/puppet/files/tmpfiles.d-2 b/app-admin/puppet/files/tmpfiles.d-2
new file mode 100644
index 000000000000..b36eec4dbdfc
--- /dev/null
+++ b/app-admin/puppet/files/tmpfiles.d-2
@@ -0,0 +1 @@
+D /run/puppet 0755 puppet puppet -
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index 74bbc6466d28..8f56170190b1 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -4,10 +4,6 @@
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
- <maintainer type="person">
- <email>graaff@gentoo.org</email>
- <description>Puppet 5.x only</description>
- </maintainer>
<maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
@@ -33,6 +29,7 @@
<!-- <flag name='puppetdb'>Enable puppetdb support</flag> -->
<flag name="augeas">Enable augeas support</flag>
<flag name="diff">Enable diff support</flag>
+ <flag name="hiera">Enable hiera support</flag>
<flag name="rrdtool">Enable rrdtool support</flag>
<flag name="shadow">Enable shadow support</flag>
</use>
diff --git a/app-admin/puppet/puppet-5.5.22-r1.ebuild b/app-admin/puppet/puppet-7.24.0-r1.ebuild
index f534c29f43f0..e6415c71f2b2 100644
--- a/app-admin/puppet/puppet-5.5.22-r1.ebuild
+++ b/app-admin/puppet/puppet-7.24.0-r1.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI="7"
+USE_RUBY="ruby27 ruby30 ruby31"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
RUBY_FAKEGEM_TASK_DOC="doc:all"
-
RUBY_FAKEGEM_EXTRAINSTALL="locales"
inherit ruby-fakegem systemd tmpfiles
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="https://puppet.com/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
+# <dev-ruby/concurrent-ruby-1.2 for bug #900206
+# - https://tickets.puppetlabs.com/browse/PUP-11722 (workaround, pinning)
+# - https://tickets.puppetlabs.com/browse/PUP-11723 (bug for fixing the pinning)
ruby_add_rdepend "
- >=dev-ruby/hiera-3.2.1:0
- =dev-ruby/facter-3*
- >=dev-ruby/fast_gettext-1.1.2:0
- >=dev-ruby/locale-2.1:0
- >=dev-ruby/multi_json-1.10:0
+ dev-ruby/hiera
+ dev-ruby/json:=
+ dev-ruby/semantic_puppet
+ >=dev-ruby/facter-3.0.0
+ <dev-ruby/concurrent-ruby-1.2
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
@@ -77,7 +77,8 @@ all_ruby_prepare() {
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}"
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
}
all_ruby_install() {
@@ -87,12 +88,10 @@ all_ruby_install() {
systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
- newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+ newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
# openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+ newinitd "${FILESDIR}"/puppet.init puppet
keepdir /etc/puppetlabs/puppet/ssl
@@ -108,13 +107,10 @@ all_ruby_install() {
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}"
+ docinto "$(dirname ${f})"
+ dodoc "${f}"
done
}
@@ -128,13 +124,8 @@ pkg_postinst() {
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
+ 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
}
diff --git a/app-admin/puppet/puppet-7.18.0.ebuild b/app-admin/puppet/puppet-7.27.0-r1.ebuild
index b0c6d6d3ffe3..b23327410b34 100644
--- a/app-admin/puppet/puppet-7.18.0.ebuild
+++ b/app-admin/puppet/puppet-7.27.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC="doc:all"
RUBY_FAKEGEM_EXTRAINSTALL="locales"
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
@@ -74,7 +74,8 @@ all_ruby_prepare() {
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}"
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
}
all_ruby_install() {
@@ -84,10 +85,10 @@ all_ruby_install() {
systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
- newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+ newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
# openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppet.init puppet
keepdir /etc/puppetlabs/puppet/ssl
diff --git a/app-admin/puppet/puppet-7.17.0.ebuild b/app-admin/puppet/puppet-7.28.0-r1.ebuild
index b0c6d6d3ffe3..2331b40f31d2 100644
--- a/app-admin/puppet/puppet-7.17.0.ebuild
+++ b/app-admin/puppet/puppet-7.28.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC="doc:all"
RUBY_FAKEGEM_EXTRAINSTALL="locales"
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
@@ -74,7 +74,8 @@ all_ruby_prepare() {
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}"
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
}
all_ruby_install() {
@@ -84,10 +85,10 @@ all_ruby_install() {
systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
- newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+ newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
# openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppet.init puppet
keepdir /etc/puppetlabs/puppet/ssl
diff --git a/app-admin/puppet/puppet-5.5.22-r2.ebuild b/app-admin/puppet/puppet-8.4.0-r1.ebuild
index 7f79dde74e75..da3eb9487a0c 100644
--- a/app-admin/puppet/puppet-5.5.22-r2.ebuild
+++ b/app-admin/puppet/puppet-8.4.0-r1.ebuild
@@ -1,35 +1,32 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
+EAPI="7"
+USE_RUBY="ruby31"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
RUBY_FAKEGEM_TASK_DOC="doc:all"
-
RUBY_FAKEGEM_EXTRAINSTALL="locales"
inherit ruby-fakegem systemd tmpfiles
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="https://puppet.com/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
ruby_add_rdepend "
- >=dev-ruby/hiera-3.2.1:0
- =dev-ruby/facter-3*
- >=dev-ruby/fast_gettext-1.1.2:0
- >=dev-ruby/locale-2.1:0
- >=dev-ruby/multi_json-1.10:0
- dev-ruby/sync
+ hiera? ( dev-ruby/hiera )
+ dev-ruby/json:=
+ dev-ruby/semantic_puppet
+ >=dev-ruby/facter-3.0.0
+ dev-ruby/deep_merge
+ dev-ruby/concurrent-ruby
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
@@ -78,7 +75,8 @@ all_ruby_prepare() {
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}"
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
}
all_ruby_install() {
@@ -88,12 +86,10 @@ all_ruby_install() {
systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
- newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+ newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
# openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+ newinitd "${FILESDIR}"/puppet.init puppet
keepdir /etc/puppetlabs/puppet/ssl
@@ -109,13 +105,10 @@ all_ruby_install() {
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}"
+ docinto "$(dirname ${f})"
+ dodoc "${f}"
done
}
@@ -129,13 +122,4 @@ pkg_postinst() {
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
}
diff --git a/app-admin/puppet/puppet-8.5.0.ebuild b/app-admin/puppet/puppet-8.5.0.ebuild
new file mode 100644
index 000000000000..6ee8a0e304c8
--- /dev/null
+++ b/app-admin/puppet/puppet-8.5.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby31"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ hiera? ( dev-ruby/hiera )
+ dev-ruby/json:=
+ dev-ruby/semantic_puppet
+ >=dev-ruby/facter-3.0.0
+ dev-ruby/deep_merge
+ dev-ruby/concurrent-ruby
+ 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
+ acct-user/puppet
+ acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+ # fix systemd path
+ eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+}
+
+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
+ systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init 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
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"
+ dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ tmpfiles_process puppet.conf
+
+ 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
+}
diff --git a/app-admin/puppet/puppet-8.5.1.ebuild b/app-admin/puppet/puppet-8.5.1.ebuild
new file mode 100644
index 000000000000..6ee8a0e304c8
--- /dev/null
+++ b/app-admin/puppet/puppet-8.5.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby31"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ hiera? ( dev-ruby/hiera )
+ dev-ruby/json:=
+ dev-ruby/semantic_puppet
+ >=dev-ruby/facter-3.0.0
+ dev-ruby/deep_merge
+ dev-ruby/concurrent-ruby
+ 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
+ acct-user/puppet
+ acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+ # fix systemd path
+ eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+}
+
+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
+ systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init 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
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"
+ dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ tmpfiles_process puppet.conf
+
+ 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
+}
diff --git a/app-admin/puppet/puppet-8.6.0.ebuild b/app-admin/puppet/puppet-8.6.0.ebuild
new file mode 100644
index 000000000000..6ee8a0e304c8
--- /dev/null
+++ b/app-admin/puppet/puppet-8.6.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby31"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ hiera? ( dev-ruby/hiera )
+ dev-ruby/json:=
+ dev-ruby/semantic_puppet
+ >=dev-ruby/facter-3.0.0
+ dev-ruby/deep_merge
+ dev-ruby/concurrent-ruby
+ 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
+ acct-user/puppet
+ acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+ # fix systemd path
+ eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+}
+
+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
+ systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init 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
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"
+ dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ tmpfiles_process puppet.conf
+
+ 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
+}