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

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

3 files changed, 2 insertions, 95 deletions

diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 764ea260a56e..75aacd78b161 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,3 +1,2 @@
-DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456
 DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
 DIST puppetdb-6.0.0.tar.gz 23168375 BLAKE2B 05b7738d1f1dfefac50ea54682b2c2f888d9227117fc676ef5d4754b8fddce449ee75a2ae9eac977426707654737c86499efa3692f4195547f997297c1b08f5a SHA512 f2be7049cf1615f7f235be16f32c599ad9679b9da59d43b30c63ca4fd9c9f24fbdb488def01372c516ac510105292ddb163bad403d1b06429bfc10310505501f
diff --git a/app-admin/puppetdb/puppetdb-5.2.2.ebuild b/app-admin/puppetdb/puppetdb-5.2.2.ebuild
deleted file mode 100644
index e2e9e4db500f..000000000000
--- a/app-admin/puppetdb/puppetdb-5.2.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.7.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" 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.0.0.ebuild b/app-admin/puppetdb/puppetdb-6.0.0.ebuild
index 11bf34de0e67..17db5a3bc7c1 100644
--- a/app-admin/puppetdb/puppetdb-6.0.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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+=""