gentoo resync : 17.02.2020

5 files changed, 91 insertions, 4 deletions

diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 577b4e2a5223..8c53b9b74dee 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,11 +1,14 @@
 AUX consolelog.sh 269 BLAKE2B 83aefc979d30847eb2d0b588232361cf129dec5a01ff8fafea7dd14daf4e2376c7381ce43e715e1093f13083d0e42cb037fcd65ae83f13b964c946f147e42cb9 SHA512 4cbf2145480d67b46db8a291137f5d953ce07d5d35b7c011e3dec13e4e5ab729f81666884c23db568065cb0b16fddba7178570c04777428861107aeb7c48f332
+AUX consolelog.sh-r1 276 BLAKE2B 0db3c2201f4d628a4e650b39aa17998e0523bc33861375d3bebd2729e649451793ebed46bfbdfee5c56d79902c489152d57d6e3951a19dbb872e5e1f9711e11d SHA512 022bc6510cf744e1beded8999f61e87ae31dbb151d5abbc4acee6f37a46684edcceb5259d6ea25e0ceea5a3056bb50fde869e97371678f302269b31be2cade0b
 AUX metalog-0.9-metalog-conf.patch 269 BLAKE2B ed59aa36a7388b4f91be80731fcfda0c806fc8bb90b86ca6357fea949ff6f231b42b37fdf2f044541c07fbbc4b0a67db4d6dcdcb18c9cd5091e2c3106bb4fc34 SHA512 0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df
 AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac642195c7566667c7a330a4113acdd451522c907aa0814195ed5124aa92184bfca08eddc670b2d3f SHA512 4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e
 AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c20613b58d0eede015cc7faa7d489530150bacc9ae5c4f4ecdee69ac2a9fbd4eb7157296413d0594 SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096
 AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7f67e6cd347ef3361fe7212ce1441ba4a582cb0e59f8b2c9d2e7832b4e8b4f019c87d268a2833639f0 SHA512 09d8ac585418c6a3dfccc9d0f1a050b5862924712d78dc44fce3cb497bb362afe0a556240b14cf957fcdf64d0d06f5b6a8df4372c69129b43dc3520ecd310344
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-20181125.tar.gz 39472 BLAKE2B 64d90835d50c7cb10ab2bf2708d00189b9f8cb56438c29d5c445c5527cce030f918ba74f83cdcd54017f04fe2a8ab30e5631bcdf6681e56c311f8069981a9b5c SHA512 4b187a29b9e25a0f762f929c6993fa6e49ead470916a43a0dfbf16720a1a633121357d2f152bf4cdcd71c016aa4fc8fd6cffb35249abd430fbbf66651986bc4b
+DIST metalog-20200113.tar.gz 40276 BLAKE2B f2fcaccf610f3b7f1974aa97f2c7b5181f3c625c9e28d72832ba1570cfa369873887c83468bcea6a9f3d3080356bd1dd62849ec34a5d03c1272ada7f476946f6 SHA512 d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-20181125.ebuild 1577 BLAKE2B caca6cdb6cf9a4c5b7b54cc76600df0e71f5389a66c199dbcabb2b8f8f7c005dbedaf434078cc10523999c16eb72ffea8a9fa915f655ea3727774757dfd3ed82 SHA512 d693a843985b3ef15eccd2862f2384f7f7356a0d50ed464d1cda3fd35471804e109ae2430a575c64d8a9cd83e894f6f112da65bb47f3999418efd0ef815f3ee4
-EBUILD metalog-3-r2.ebuild 1462 BLAKE2B 516a4936f515651da209eb203b4f058b1579bf3f0c01d19312e2efc851ffec76d9164ad41b29c16ac5511aae781217da1efec97f94d9c6d0fec9a4805240d471 SHA512 d0d4850ffa06a99d0583914babd94be44cd2401b6722983673a8bc73771a83b679065ef61a87583d4323b9896d106eacbf14e757d60be785e717780636d33eea
+EBUILD metalog-20181125.ebuild 1577 BLAKE2B 4092c9406f9f7c9ce88407ad4c3a8a54c4792a4600d00341b5822284fa7368551a7ba19f8ecfb9faf6a57e02530bf53a21b714004436d84b47808eb619b1c9a4 SHA512 270ee8c235d6cc261599495c89c092e734b362ded5adff418df8f760fc68fb5e70ba9d23bb995c65bde36679ddd0c4631ccfa4af079d8b1449aae90d6defe262
+EBUILD metalog-20200113-r1.ebuild 1601 BLAKE2B 26a007e015445faad590ab7d0a77e47a8ac0c9ab6fcd45b9a6d6977f98305a2335f223452df7846276adb359672f44c16f84ed479407d733ad1dfda7918a7aea SHA512 47cf889dd8b120d63e6e644099fffdaa29c0eeee77a63e4d0da80569b373a43c6c20930d29008a59937a5f69e7854307da81d5c6ad6c8fee62a44d3ed1bd0bde
+EBUILD metalog-3-r2.ebuild 1459 BLAKE2B bf3e76a596ac544764e1fad89349baeb08b03eb1dc6edfaedd6a72255d6efc26541f832937efbf28d2230ecc15e8831cd77922a1c6dfdd41634c1ce9886a8bfc SHA512 a89ecc63647d5199f0f7803f63a3472ccef7fcbc97eb16a3c8c8cc58d9ab1d5d2e8430f3ca5077dd7bdf72156568a0c56836f7eaa6518c752ac6b0a9585c981c
 MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/files/consolelog.sh-r1 b/app-admin/metalog/files/consolelog.sh-r1
new file mode 100644
index 000000000000..3a67fe7b2d3f
--- /dev/null
+++ b/app-admin/metalog/files/consolelog.sh-r1
@@ -0,0 +1,19 @@
+#!/bin/sh
+# consolelog.sh
+# For metalog -- log to a console
+
+set -f
+
+. /etc/conf.d/metalog
+
+: "${CONSOLE:=/dev/console}"
+
+# shellcheck disable=SC2016
+: "${FORMAT:='$1 [$2] $3'}"
+
+for d in ${CONSOLE} ; do
+	# shellcheck disable=SC2086
+	eval echo ${FORMAT} > "${d}"
+done
+
+exit 0
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index 637038cce91a..5b05f9208809 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/metalog/metalog-20200113-r1.ebuild b/app-admin/metalog/metalog-20200113-r1.ebuild
new file mode 100644
index 000000000000..0810553ec43d
--- /dev/null
+++ b/app-admin/metalog/metalog-20200113-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools systemd
+
+DESCRIPTION="A highly configurable replacement for syslogd/klogd"
+HOMEPAGE="https://github.com/hvisage/metalog"
+SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin"
+IUSE="unicode"
+
+RDEPEND=">=dev-libs/libpcre-3.4"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9-metalog-conf.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README NEWS metalog.conf
+
+	into /
+	newsbin "${FILESDIR}"/consolelog.sh-r1 consolelog.sh
+
+	newinitd "${FILESDIR}"/metalog.initd-r1 metalog
+	newconfd "${FILESDIR}"/metalog.confd metalog
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+}
+
+pkg_preinst() {
+	if [[ -d "${ROOT}"/etc/metalog && ! -e "${ROOT}"/etc/metalog.conf ]] ; then
+		mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
+		rmdir "${ROOT}"/etc/metalog
+		export MOVED_METALOG_CONF=true
+	else
+		export MOVED_METALOG_CONF=false
+	fi
+}
+
+pkg_postinst() {
+	if ${MOVED_METALOG_CONF} ; then
+		ewarn "The default metalog.conf file has been moved"
+		ewarn "from /etc/metalog/metalog.conf to just"
+		ewarn "/etc/metalog.conf.  If you had a standard"
+		ewarn "setup, the file has been moved for you."
+	fi
+}
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
index 6476fa7febe5..548059b41774 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"