[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetdb/

[Matthew Thode]

commit:     39d198db4344341ff9541d19376d545db9a34da9
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 19:45:59 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jul  3 19:47:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39d198db

app-admin/puppetdb: 7.4.1 stable amd64 and x86 with cleanup

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

 app-admin/puppetdb/Manifest              |  1 -
 app-admin/puppetdb/puppetdb-7.3.1.ebuild | 87 --------------------------------
 app-admin/puppetdb/puppetdb-7.4.1.ebuild |  2 +-
 3 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index f2179a46eaa..a5f3a34e402 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,2 +1 @@
-DIST puppetdb-7.3.1.tar.gz 47173502 BLAKE2B e9f57300585cb556f75975c4a20c35c0789816a9f141a3979348200e28e24352870109fc3597a44d075b490b9da2308e963a24e64e37552f7124205beb87aae8 SHA512 aa15aebec2f7a24a2da125078017baabe054d741ee651b91219074a274400ae54862c38d3e253e904fe26165f4fc34fb3eb021937aa9ee4304b7e83bc3f5d0dc
 DIST puppetdb-7.4.1.tar.gz 47409868 BLAKE2B 0ac4234547b27e9ad12c9c008d76be8fff7f724d93acc2ca26700d18ac2e30bf9689c46550a8976b90e662d7af97994d7e299b94e2d68e5b5f7d1166a54d4ff8 SHA512 64c42477554039991b35dfd2d29f4fa507226cc3256b07ff3524cd287c1dbf09bdf60116dd12288d1340ca74ced2872ac886f4eadde8bd83965976579e99738d

diff --git a/app-admin/puppetdb/puppetdb-7.3.1.ebuild b/app-admin/puppetdb/puppetdb-7.3.1.ebuild
deleted file mode 100644
index 06b2986213b..00000000000
--- a/app-admin/puppetdb/puppetdb-7.3.1.ebuild
+++ /dev/null
@@ -1,87 +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
-	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() {
-	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.4.1.ebuild b/app-admin/puppetdb/puppetdb-7.4.1.ebuild
index 78bd75a0264..06b2986213b 100644
--- a/app-admin/puppetdb/puppetdb-7.4.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.4.1.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