gentoo resync : 22.01.2021

4 files changed, 93 insertions, 6 deletions

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index a8b4b4f5ae64..b6b2e92d09a3 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -2,6 +2,8 @@ AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62
 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
 DIST sysklogd-2.1.2.tar.gz 561286 BLAKE2B f70c2d116740930761677b9fdf715242844a583a59cd93c2e3408f985ce856d1a9eabc3ba736d18af44e8d154cdadec88035fc357db83eb504b4c6f800ea1f1d SHA512 dcd715939b4285e08ead0a1e797d09a8845156f456d3776cfcd0bcff7fbb9a306cb84a2b22731b430e2199d59ba42ab975fed6e675cf9d8a78833575c1490268
-EBUILD sysklogd-2.1.2.ebuild 2071 BLAKE2B 490b6b4fe2844e4c52d7c61196533b68b61453831bbbdb28db8e678733995345b093c6de9026ad9d8400f9c4f149fc138bd0b4141c956080d292fac3e3bcf132 SHA512 f83b017e1dafb5594143d82f395852b9f2894bd29b0ea31b3e648d5c045c6b691e164be78ad6c7b31712c8cb113b2228edd199404670eca1db936b81d0bc7720
-EBUILD sysklogd-9999.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d
+DIST sysklogd-2.2.0.tar.gz 439595 BLAKE2B 82222b3993bd5f6d0b824152fe60aea97dcf1447282656692cf68576b576eacadc26f12af24f92e235f1eaf9cec243ce41f492f1e05f9fbad06d9e38854436e6 SHA512 36c4d1ae5c306195604f279c48bd837ba483deadd642e86d9eefbd0d1eefab5dc03053ad54f9751264117f9314ebbb5d492fa7bbb30b017539c6b98a7e44cf30
+EBUILD sysklogd-2.1.2.ebuild 2069 BLAKE2B 9224625d12497ab66b6eb628b0d8e95c2f106fe3894b6e1b147e71223d4c4e8c21d440b85090dba597adb2473934181241e250847921640938f24213c9c8cd30 SHA512 2f4726ac16f93df57893ecc421097715eaf6dc77eec4e66112d34bbfc56e8b01466b91ed0575385ef764e622c06b7164ac0db542854b5a51d14112c3d67fbac6
+EBUILD sysklogd-2.2.0.ebuild 2075 BLAKE2B 2c501bb6517b583508a3a6bead2878767f2bb1ca2f71e47fd071e438b73838db556f45ad2c6e12dc134f9095ffb6b9be2c9c4a3166b0b03cef881499a8443e0c SHA512 ce13e58f1ed10cf3614998b4119141e58af9e75f035df5f698a75ea7d283abbdd738ab7d450bbe33f1db307823950489cf8e398d731686d13104664034e6844a
+EBUILD sysklogd-9999.ebuild 2075 BLAKE2B 2c501bb6517b583508a3a6bead2878767f2bb1ca2f71e47fd071e438b73838db556f45ad2c6e12dc134f9095ffb6b9be2c9c4a3166b0b03cef881499a8443e0c SHA512 ce13e58f1ed10cf3614998b4119141e58af9e75f035df5f698a75ea7d283abbdd738ab7d450bbe33f1db307823950489cf8e398d731686d13104664034e6844a
 MISC metadata.xml 432 BLAKE2B 6333f9e73c96d80b69a0ae252660f93ae1466fc44fa379a461e7b611dae4841d0511887ce9a1ec3aa1f49bdb33a98fedce734be92b53580578f0e6a5ca67f192 SHA512 37d1ffbcdd86f5e94f5e38902bcb710fce1eb1c2702c06e05b00d56b02f51c6babbc05b8d1aa43317d336ab58af1df88e173dd152e4b62ca4fce411fe4a8ac23
diff --git a/app-admin/sysklogd/sysklogd-2.1.2.ebuild b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
index e3018251aba4..849a0fc7d68b 100644
--- a/app-admin/sysklogd/sysklogd-2.1.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		--runstatedir="${EPREFIX}"/run
 		$(use_with logger)
 		$(use_with systemd systemd $(systemd_get_systemunitdir))
@@ -66,7 +67,7 @@ src_install() {
 		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
 	fi
 
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-admin/sysklogd/sysklogd-2.2.0.ebuild b/app-admin/sysklogd/sysklogd-2.2.0.ebuild
new file mode 100644
index 000000000000..ff5b1d0d7b53
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-2.2.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
+else
+	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="logger logrotate systemd"
+RESTRICT="test"
+
+DEPEND="
+	logger? (
+		!<sys-apps/util-linux-2.34-r3
+		!>=sys-apps/util-linux-2.34-r3[logger]
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog.md README.md )
+
+pkg_setup() {
+	append-lfs-flags
+	tc-export CC
+}
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--runstatedir="${EPREFIX}"/run
+		$(use_with logger)
+		$(use_with systemd systemd $(systemd_get_systemunitdir))
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins syslog.conf
+	keepdir /etc/syslog.d
+
+	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
+		elog "Starting with version 2.0 syslogd has built in log rotation"
+		elog "functionality that does no longer require a running cron daemon."
+		elog "So we no longer install any log rotation cron files for sysklogd."
+	fi
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
+		elog "Starting with version 2.1 sysklogd no longer provides klogd."
+		elog "syslogd now also logs kernel messages."
+	fi
+}
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index ad19247bad98..ff5b1d0d7b53 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		--runstatedir="${EPREFIX}"/run
 		$(use_with logger)
 		$(use_with systemd systemd $(systemd_get_systemunitdir))
@@ -66,7 +67,7 @@ src_install() {
 		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
 	fi
 
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
 
 pkg_postinst() {