gentoo resync : 02.06.2019

3 files changed, 2 insertions, 96 deletions

diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 3ffe9ebfebc3..6d0647c0927d 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
 DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
 DIST puppetdb-6.3.2.tar.gz 41707817 BLAKE2B 480737af3abc862e90a7075011327ce3821a5d9460c785602c105ec7accc82f2ea712ae488c585226126e88f817cbb1acda7fa09793b7508aa38cc47e1c76ab0 SHA512 e2a3ce73c976cbbfa6acc62612187478cf5ecc9d514ff4866a74e2c6364979f17c3daeba0f03a01e7fc3eeb1ca84a3c886fd5eed07d2a9fbaa5fd9f7c9d577af
-EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-5.2.7.ebuild 2762 BLAKE2B a0a831a2d5fc57e047d2e02f3b186e07b16b4a2397c91f2d5420ff7664eeb7be1d3ad8dc68bf5577b1c43555c1e52bee45a3ec5179cd41f8475ed2d08856054d SHA512 3b7560b937e8888412fbbc44d891e587af7aaf27e2802534788dd248697aeac422e0be1348ef6896a09c8c60de9d48dc61ef067a61ec561f41ee9f8e6274e3ab
+EBUILD puppetdb-5.2.7.ebuild 2760 BLAKE2B e5c86d79191a026de2ffd9e322669c07258ef6fe4ddef436be534c580fb14e7ba5fb13c91d1cae61e7addd3571a938e2ec23c0fb61d6a4318f7807f08f1bdff9 SHA512 e60d80aa5c60d54b904e8402bb9e729e2216c2b038b34aff64ad5234cdeda32418da10b3f79029a879f20bfddcfd6923647aade0e3c566672316f72c9dd78761
 EBUILD puppetdb-6.3.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-5.2.4.ebuild b/app-admin/puppetdb/puppetdb-5.2.4.ebuild
deleted file mode 100644
index e2e9e4db500f..000000000000
--- a/app-admin/puppetdb/puppetdb-5.2.4.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-5.2.7.ebuild b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
index 40efa2d8d9ca..5a1f774d271d 100644
--- a/app-admin/puppetdb/puppetdb-5.2.7.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.7.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.7.0"
 DEPEND+=""