commit:     48eae964b4658bbec32480497a6a4f71a12098f5
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 20:43:01 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 20:44:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48eae964

app-admin/puppetdb: 7.7.0 stable amd64 / x86 with 7.5.0 cleanup

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-admin/puppetdb/Manifest                 |  1 -
 app-admin/puppetdb/puppetdb-7.5.0-r1.ebuild | 90 -----------------------------
 app-admin/puppetdb/puppetdb-7.7.0.ebuild    |  2 +-
 3 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 17ebae524828..173b7fef8028 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,3 +1,2 @@
-DIST puppetdb-7.5.0.tar.gz 47469411 BLAKE2B 
98bf574e8b4edba47f58b899bdc3b6037a3ae79a2a8d8b3f69a108c416648fdc35f804d71fc412bcc257f7609be9b4d706af7e28d2fd05d3768a02e9efd95841
 SHA512 
94bf5bc9a95cacb1a3a7f0fb5b04a05eab5ded7d18c2fb396e616b44e429a4a6299e6802fc0fd72aa832a6d8181a7ecf6ef6aff4696d4c9bc16a1954aee6f77c
 DIST puppetdb-7.6.0.tar.gz 48023530 BLAKE2B 
9805b9d58b35475f744b262845e9f257666d5df8a8e97d024c4e128600285de871a758dd8650b4e28338792707e9baa23429547ef67ad3b8c5d7756d22fe49a0
 SHA512 
38c15ed990440bfdf575e624b24d35c6f5bdab943f6be4d86a2c9cfb24e09478fab15f1ce7886b7d3d4c2c368b35181a9203ac171246eda8c072973912210b38
 DIST puppetdb-7.7.0.tar.gz 48050200 BLAKE2B 
67b0152b0d3219e21fd1f0c18f235f99ad5c566c2c24c24e442e511d3eb503265497de46c5fd2d414cda8827400ee50c628d2fe5287ee1a6e1c295dbc7f8cde3
 SHA512 
a8f67b9c587d285ddd530afe1d467eb1acb20f7a3deed6d1b951695575a4283c3f4c946c7263fd44962adf05f4466ae5eac33cbd6ca75ef8f9785b2e7be6afd7

diff --git a/app-admin/puppetdb/puppetdb-7.5.0-r1.ebuild 
b/app-admin/puppetdb/puppetdb-7.5.0-r1.ebuild
deleted file mode 100644
index dbb521426d94..000000000000
--- a/app-admin/puppetdb/puppetdb-7.5.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd tmpfiles
-
-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=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-       acct-group/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
-       doins ext/config/conf.d/auth.conf
-       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
-       newtmpfiles 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() {
-       tmpfiles_process puppetdb.conf
-
-       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-7.7.0.ebuild 
b/app-admin/puppetdb/puppetdb-7.7.0.ebuild
index 5ccee6e5acad..dbb521426d94 100644
--- a/app-admin/puppetdb/puppetdb-7.7.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz";
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb

Reply via email to