gentoo resync : 09.03.2018

4 files changed, 2 insertions, 192 deletions

diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 81244f2d1f2f..9cd266f3630d 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,10 +1,6 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
-DIST puppetdb-4.4.0.tar.gz 23629723 BLAKE2B 03f78df8598216b213843c7277818ae443217d69bf2dca3f79c408e8b75d6ce5f4315b77cb801f3af877e6533dd71cfa8f420b52504aa0b0e4986f4d84f5caba SHA512 2caaa2b39146b42388b03ecd830d386efcc25774dfe9b6e1bd25fd6f1820902364dda7526c2e019657d18371be4afdb84a165d9bec1078a6c3621bc80241a5a2
-DIST puppetdb-5.0.1.tar.gz 24055687 BLAKE2B 8769009e85c632b4dbf1015eebe7305acff28a0803f046b3be5d6100f8be39850f5a0f9bee565a2c8d1428c2a7715551805f31633d823aa8ac66e577a8efc910 SHA512 0e08e27a2004b6cf07704a77d931ad30326559e3fd6504c9a839f468c8379c49407214187bf47f960fd3b5cdba9ec162c69e67e7ed7125c4137a77ed076e42f1
 DIST puppetdb-5.1.3.tar.gz 24157962 BLAKE2B 750159e8c83cfdc820040bb6837c83309d96da519a84fdf6aadd394473993f128edbd76b7a5b0e2591f75d52c9fdf942e84545ff97b8a7d29ac3ae3520d04ea1 SHA512 153e6cba59fb824fd9bca802ea4f0e05e6c6d69d6ef47566079bdf1ac26f7bc13fa893b633f9506494d2189ef160b6b3c23fcb340e76df41089228c047c566e0
 DIST puppetdb-5.1.4.tar.gz 25425088 BLAKE2B daa4788676d85d3a51d2b572aa9bf88b50fa1a35c92d175b44c532e7d82c3f19b734d885411174a8929a772b25a405738a08dca009a1369bfcb69a456e819f96 SHA512 2a34a6188bc474742e6b9cba5f0df1d5bcecd176f2874e12dbbf9c2fa8706b2d9276baece09f7a593eb6ab7cccd6b8804e15d67cb99cedcf7f6226fd59e82308
-EBUILD puppetdb-4.4.0.ebuild 2807 BLAKE2B 58006223111d7f7d4bc97b7cdf66701aa6c305e2975c0c89b6ce627487fda0374a57f1195bc760e6d8de06e5ed2fd2319989134774ea54c8e84e24b2d537b75e SHA512 16d8e30f793351b58fee71964122754bf270dc977480804e86461e0131c67e2081eff5f2b728bcce69186ebdab7707aa7f03cf70b3afc4e42a18b59d1ed2d11a
-EBUILD puppetdb-5.0.1.ebuild 2763 BLAKE2B 4f7058feec44cc0b681cb7d83b494c8e024a923fb84dc173f013ffed64103ed46f6725278e2039bc6c33bc79798f1e3e03f481959a8a08f05d3b820af36ff993 SHA512 032e3f021880cd77a83d5841e130af2eb2e831f54d3760542ee7c3a97a98e5f92e7abe2697d83e896881fd285c7af826854030faade413bba66f0642cd6d7fcf
 EBUILD puppetdb-5.1.3.ebuild 2763 BLAKE2B 4f7058feec44cc0b681cb7d83b494c8e024a923fb84dc173f013ffed64103ed46f6725278e2039bc6c33bc79798f1e3e03f481959a8a08f05d3b820af36ff993 SHA512 032e3f021880cd77a83d5841e130af2eb2e831f54d3760542ee7c3a97a98e5f92e7abe2697d83e896881fd285c7af826854030faade413bba66f0642cd6d7fcf
-EBUILD puppetdb-5.1.4.ebuild 2765 BLAKE2B 9a316933c8e8d0e28eb674c4b5aaa6830a7f1db5aad515d6fd7ac1c649c067d482b367a9fff7e6de0c31bd06b35e915a165a50f9af192ae5440a5cd9cf3207f7 SHA512 19a3c9de354f5c9a88cfe8d6b350878a63b9c0bdc262cf66c9ca2655df3f88a269c78afef7cd89d6f28689989e593ada7221c842e6be1e041a329e37192b57cf
+EBUILD puppetdb-5.1.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-4.4.0.ebuild b/app-admin/puppetdb/puppetdb-4.4.0.ebuild
deleted file mode 100644
index c2792c8d0e2f..000000000000
--- a/app-admin/puppetdb/puppetdb-4.4.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 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/export
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/import
-	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.0.1.ebuild b/app-admin/puppetdb/puppetdb-5.0.1.ebuild
deleted file mode 100644
index f9227ac7708d..000000000000
--- a/app-admin/puppetdb/puppetdb-5.0.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 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.1.4.ebuild b/app-admin/puppetdb/puppetdb-5.1.4.ebuild
index 5c45e1c342fd..e2e9e4db500f 100644
--- a/app-admin/puppetdb/puppetdb-5.1.4.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.1.4.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+=""