gentoo resync : 22.01.2019

4 files changed, 72 insertions, 7 deletions

diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 42627e598167..731523241490 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,8 +1,9 @@
 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-6.0.0.tar.gz 23168375 BLAKE2B 05b7738d1f1dfefac50ea54682b2c2f888d9227117fc676ef5d4754b8fddce449ee75a2ae9eac977426707654737c86499efa3692f4195547f997297c1b08f5a SHA512 f2be7049cf1615f7f235be16f32c599ad9679b9da59d43b30c63ca4fd9c9f24fbdb488def01372c516ac510105292ddb163bad403d1b06429bfc10310505501f
+DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
 DIST puppetdb-6.1.0.tar.gz 40448212 BLAKE2B fc12d7177eda99e755eddf33c7833b98a1567ac8675bd080720105709b44421b0293a3c8eb38c104104b0bade72f0dd8e2862a10d25f52c4ecbd0f914e66bd77 SHA512 185403b528099d6ef318cbbdd58228c31face25c540435e049585f68fabcc17f5850cc10eec342746c910ebfdcf2a1d99c7f9ca01b0baf2dd4585ccae1ede205
 EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-6.0.0.ebuild 2760 BLAKE2B 57ea7ff1a81c62ec1d42bd40eb33dd0743b4d2d513991425d4ec35d5be751a76e340debab8c753098bf6d20c19d1ad54f669b6612bf77f032e96ec3c8693f927 SHA512 4c245b096cb4a169c566a294c026dcde1dfea946c5ca5e3cbd7a13bc8cb34a4ba9b55d8165b4d81feaf8b03fe073c5477219cfe290c0ace903addffcacac9788
-EBUILD puppetdb-6.1.0.ebuild 2762 BLAKE2B 1ccc4176c10e2ddfa56493ead809e80cc202f3ad060f765d8739c5c40e524800ccfd12b771c63e52434150fcc87416265e65e98f18d9bb3b03957d1ab527ce61 SHA512 7cd2fa8b260cd47b68963579b163c451d6752a12ff04cf832df41a3f662a9a8aa6cd8e080b06c73ecf54f08893e2ea62ba792d30235117b5967b155eaf79af19
+EBUILD puppetdb-5.2.7.ebuild 2762 BLAKE2B a0a831a2d5fc57e047d2e02f3b186e07b16b4a2397c91f2d5420ff7664eeb7be1d3ad8dc68bf5577b1c43555c1e52bee45a3ec5179cd41f8475ed2d08856054d SHA512 3b7560b937e8888412fbbc44d891e587af7aaf27e2802534788dd248697aeac422e0be1348ef6896a09c8c60de9d48dc61ef067a61ec561f41ee9f8e6274e3ab
+EBUILD puppetdb-6.1.0-r1.ebuild 2763 BLAKE2B 09a088412310f2de919ad26d13485135f791b1498640410304c96d6bb30712f61fb9afd0ed0e7ec4628d9079da2d33afd83eded15f4ae79deaffc25fcd702640 SHA512 b10d6d224b610a6478bfbfa66fa4ee96c4dfafd9188840815f2406872dda090334f22b090f110689e7e3d65a68be3ae19fc777f676a848331069d1b7ab64365c
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/files/puppetdb.initd-r2 b/app-admin/puppetdb/files/puppetdb.initd-r2
new file mode 100644
index 000000000000..a59d798a6382
--- /dev/null
+++ b/app-admin/puppetdb/files/puppetdb.initd-r2
@@ -0,0 +1,64 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+
+LOGDIR="/var/log/puppetlabs/puppetdb"
+RUNDIR="/run/puppetlabs/puppetdb"
+
+checkconfig() {
+    if [ ! -x $JAVA_BIN ]; then
+        eerror "Missing JAVA_BIN."
+        eend 1
+    fi
+    if [ ! -d $INSTALL_DIR ]; then
+        eerror "Missing INSTALL_DIR."
+        eend 1
+    fi
+    if [ ! -e $BOOTSTRAP_CONFIG ]; then
+        eerror "Missing BOOTSTRAP_CONFIG."
+        eend 1
+    fi
+    if [ ! -e $CONFIG ]; then
+        eerror "Missing CONFIG."
+        eend 1
+    fi
+    if [ ! -n $USER ]; then
+        eerror "Missing USER."
+        eend 1
+    fi
+    if [ ! -n $GROUP ]; then
+        eerror "Missing GROUP."
+        eend 1
+    fi
+
+    checkpath -d -m 0755 "${LOGDIR%/*}"
+    checkpath -d -m 0755 "${RUNDIR%/*}"
+    checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+    checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+    JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppetdb.jar' clojure.main -m puppetlabs.puppetdb.cli.services --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}' --restart-file /opt/puppetlabs/server/data/puppetdb/restartcounter"
+    EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetlabs/puppetdb -Djava.security.egd=/dev/urandom ${JAVA_ARGS}"
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting PuppetDB"
+    start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+        -m --pidfile "${RUNDIR}/puppetdb.pid" \
+        -b --exec "/bin/bash" \
+        -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting puppetdb."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping PuppetDB"
+    start-stop-daemon --stop --pidfile "${RUNDIR}/puppetdb.pid"
+    eend $?
+}
diff --git a/app-admin/puppetdb/puppetdb-6.1.0.ebuild b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
index 480aee3abe2e..40efa2d8d9ca 100644
--- a/app-admin/puppetdb/puppetdb-6.1.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE=""
 # will need the same keywords as puppet
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND+=">=virtual/jdk-1.8.0"
+RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
 
 pkg_setup() {
diff --git a/app-admin/puppetdb/puppetdb-6.0.0.ebuild b/app-admin/puppetdb/puppetdb-6.1.0-r1.ebuild
index 17db5a3bc7c1..3353ad78822f 100644
--- a/app-admin/puppetdb/puppetdb-6.0.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,7 +77,7 @@ src_install() {
 	newconfd ext/default puppetdb
 	systemd_dounit ext/redhat/puppetdb.service
 	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
 	# misc
 	insinto /etc/logrotate.d
 	newins ext/puppetdb.logrotate.conf puppetdb