app-admin/puppetdb: 6.7.2 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index d90c2464fb2066043244633f600d30b14f9667dd..52de874631a2bcd2673a3fc4dc8beac89bb8a478 100644 (file)
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,3 +1 @@
-DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205
-DIST puppetdb-6.7.1.tar.gz 43563417 BLAKE2B 902397b2bedb64f4ccb2d6932d6dbfb7d67c479640fb8429aecf3de558ce31ab0017175f183ee3e66268d802fc9901f5473271b6598414a7b57182bc1788f1e3 SHA512 58c6f3db268885e603bb1219f89c2aeb237c042fe7eccc95ce5622cfc739f971d9d37e0cc37cae335552d0d9845fccfd9425381faf6ec3534b20991bd9f7db0e
 DIST puppetdb-6.7.2.tar.gz 43566885 BLAKE2B b90376330cb084c2c14154d647ce334673c526e6f9b9d4430e0be4b420132a0c4c518a0c8ed98b15cfacc6716044f78c384123f3ff87ea1463736a352744b840 SHA512 2e32f7a5a3daf37d74082aa3a66c26fa23643e456dbf80cd16815687f289093c96defc9bfa10c3502f9a9f9a7674cef83b838163f11339c13d4b12c82f8e0664

diff --git a/app-admin/puppetdb/puppetdb-6.6.0.ebuild b/app-admin/puppetdb/puppetdb-6.6.0.ebuild
deleted file mode 100644 (file)
index 77d1c1c..0000000
--- a/app-admin/puppetdb/puppetdb-6.6.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+=""
-
-pkg_setup() {
-       enewgroup puppetdb
-       enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-       sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-       sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-       sed -i 's/sysconfig/conf\.d/g' install.sh || die
-       sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-       sed -i 's/var\/run/run/g' install.sh || die
-       default
-}
-
-src_compile() {
-               einfo "not compiling"
-}
-
-src_install() {
-       dodir /opt/puppetlabs/server/data/puppetdb
-       insinto /opt/puppetlabs/server/apps/puppetdb
-       insopts -m0744
-       doins ext/ezbake-functions.sh
-       insopts -m0644
-       doins ext/ezbake.manifest
-       doins puppetdb.jar
-       insinto /etc/puppetlabs/puppetdb
-       doins ext/config/logback.xml
-       doins ext/config/bootstrap.cfg
-       doins ext/config/request-logging.xml
-       insinto /etc/puppetlabs/puppetdb/conf.d
-       doins ext/config/conf.d/jetty.ini
-       doins ext/config/conf.d/repl.ini
-       doins ext/config/conf.d/database.ini
-       doins ext/config/conf.d/config.ini
-       insopts -m0755
-       insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-       doins install.sh
-       insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-       doins ext/cli/foreground
-       doins ext/cli/ssl-setup
-       doins ext/cli/config-migration
-       doins ext/cli/foreground
-       doins ext/cli/anonymize
-       doins ext/cli/reload
-       doins ext/cli/start
-       doins ext/cli/stop
-       insinto /opt/puppetlabs/server/apps/puppetdb/bin
-       doins ext/bin/puppetdb
-       insopts -m0644
-       dodir /opt/puppetlabs/server/bin
-       dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-       dodir /opt/puppetlabs/bin
-       dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-       dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-       # init type tasks
-       newconfd ext/default puppetdb
-       systemd_dounit ext/redhat/puppetdb.service
-       systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-       newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-       # misc
-       insinto /etc/logrotate.d
-       newins ext/puppetdb.logrotate.conf puppetdb
-       fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-       fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-       elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-       elog
-       elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}

diff --git a/app-admin/puppetdb/puppetdb-6.7.1.ebuild b/app-admin/puppetdb/puppetdb-6.7.1.ebuild
deleted file mode 100644 (file)
index 77d1c1c..0000000
--- a/app-admin/puppetdb/puppetdb-6.7.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+=""
-
-pkg_setup() {
-       enewgroup puppetdb
-       enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-       sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-       sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-       sed -i 's/sysconfig/conf\.d/g' install.sh || die
-       sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-       sed -i 's/var\/run/run/g' install.sh || die
-       default
-}
-
-src_compile() {
-               einfo "not compiling"
-}
-
-src_install() {
-       dodir /opt/puppetlabs/server/data/puppetdb
-       insinto /opt/puppetlabs/server/apps/puppetdb
-       insopts -m0744
-       doins ext/ezbake-functions.sh
-       insopts -m0644
-       doins ext/ezbake.manifest
-       doins puppetdb.jar
-       insinto /etc/puppetlabs/puppetdb
-       doins ext/config/logback.xml
-       doins ext/config/bootstrap.cfg
-       doins ext/config/request-logging.xml
-       insinto /etc/puppetlabs/puppetdb/conf.d
-       doins ext/config/conf.d/jetty.ini
-       doins ext/config/conf.d/repl.ini
-       doins ext/config/conf.d/database.ini
-       doins ext/config/conf.d/config.ini
-       insopts -m0755
-       insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-       doins install.sh
-       insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-       doins ext/cli/foreground
-       doins ext/cli/ssl-setup
-       doins ext/cli/config-migration
-       doins ext/cli/foreground
-       doins ext/cli/anonymize
-       doins ext/cli/reload
-       doins ext/cli/start
-       doins ext/cli/stop
-       insinto /opt/puppetlabs/server/apps/puppetdb/bin
-       doins ext/bin/puppetdb
-       insopts -m0644
-       dodir /opt/puppetlabs/server/bin
-       dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-       dodir /opt/puppetlabs/bin
-       dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-       dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-       # init type tasks
-       newconfd ext/default puppetdb
-       systemd_dounit ext/redhat/puppetdb.service
-       systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-       newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-       # misc
-       insinto /etc/logrotate.d
-       newins ext/puppetdb.logrotate.conf puppetdb
-       fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-       fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-       elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-       elog
-       elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}

diff --git a/app-admin/puppetdb/puppetdb-6.7.2.ebuild b/app-admin/puppetdb/puppetdb-6.7.2.ebuild
index 616793cb4123c4854e126413dc42533619c64ac0..77d1c1ca9cc4e8f38f4df172ea15fb72462f56d5 100644 (file)
--- a/app-admin/puppetdb/puppetdb-6.7.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.7.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""