Updating liguros repo21.1.2

4 files changed, 91 insertions, 5 deletions

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index a7bca40c61a7..ab44b89a5ad7 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1 +1,2 @@
 DIST sysklogd-2.1.2.tar.gz 561286 BLAKE2B f70c2d116740930761677b9fdf715242844a583a59cd93c2e3408f985ce856d1a9eabc3ba736d18af44e8d154cdadec88035fc357db83eb504b4c6f800ea1f1d SHA512 dcd715939b4285e08ead0a1e797d09a8845156f456d3776cfcd0bcff7fbb9a306cb84a2b22731b430e2199d59ba42ab975fed6e675cf9d8a78833575c1490268
+DIST sysklogd-2.2.0.tar.gz 439595 BLAKE2B 82222b3993bd5f6d0b824152fe60aea97dcf1447282656692cf68576b576eacadc26f12af24f92e235f1eaf9cec243ce41f492f1e05f9fbad06d9e38854436e6 SHA512 36c4d1ae5c306195604f279c48bd837ba483deadd642e86d9eefbd0d1eefab5dc03053ad54f9751264117f9314ebbb5d492fa7bbb30b017539c6b98a7e44cf30
diff --git a/app-admin/sysklogd/sysklogd-2.1.2.ebuild b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
index 275e55226102..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
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="BSD"
@@ -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() {