gentoo resync : 24.07.2021

3 files changed, 99 insertions, 6 deletions

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 80b246be38c0..b8c58a6d2884 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,6 +1,8 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.5.5.tar.gz 474167 BLAKE2B 3e4183ea6dad4f415987870c555391d2a9496b4d4d894f1c06336876077b2a72e06b4e3f8d272aeb65aa5ea14f5f4d17a6f461ae54b2e50f073fef58a27a5241 SHA512 71df4d69d7e580b21dc0a0f813201822a161ada68a19c6d3f0df9c8576f22c8d43ebe90643d6184e91ee1c6628de9501896a9444ff7ad6af6fe17eba5d3573f2
+DIST logwatch-7.5.6.tar.gz 484873 BLAKE2B 18a10f7baade4650c836ad402fcb92096923e0a8b6890352916e3b514bf85fe5b5070c0a47059c68fd84624407006107332f75a5ce3164a25cfa05f28f2ec882 SHA512 fb490f5bc1bf469309ee9caa1e040d71b4332d7fb64f94865a9b5fe707a92cb10c207022ce5e279709bf3412605f67f7da11303d91aa078f680c598398aab2ab
 EBUILD logwatch-7.5.5.ebuild 2431 BLAKE2B ae8fff1ed90832f1ff9296ca8b3c6c3a97a16d9ba9268b988bc38b7f2426bb146b1b76c41c5f41c82a0dfa4cdfe7b227f6ca08a19870fc50d804ecbb03988f54 SHA512 d79ae36bd32a98bae350145687f23ef442aeb82a8706f41cb77e56ee5ccfddf996ea457bfcc4aae1ba11498f6d95c210859e511fd610017d270718db288215cf
-EBUILD logwatch-9999.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
+EBUILD logwatch-7.5.6.ebuild 2420 BLAKE2B 5876966303c0c8c809b49a14278f2196747b21c32bdfd7aee74418ec8309b3a2eb6f7fe28c89cd1cffaafb7b371d4837b5ee32fdd44226d98b3a9bd3b1e0ff1a SHA512 7bb4bc9a0e4e463185f7080fd8144d0f42f036fc354f55aaf25025ef722e6ad5921c942bface3571465b308bf7ed892c8623224bc991651c4144833d63cbdc4e
+EBUILD logwatch-9999.ebuild 2420 BLAKE2B 5876966303c0c8c809b49a14278f2196747b21c32bdfd7aee74418ec8309b3a2eb6f7fe28c89cd1cffaafb7b371d4837b5ee32fdd44226d98b3a9bd3b1e0ff1a SHA512 7bb4bc9a0e4e463185f7080fd8144d0f42f036fc354f55aaf25025ef722e6ad5921c942bface3571465b308bf7ed892c8623224bc991651c4144833d63cbdc4e
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.6.ebuild b/sys-apps/logwatch/logwatch-7.5.6.ebuild
new file mode 100644
index 000000000000..13d30026df24
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.5.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit tmpfiles
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+PATCHES=()
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
index 247b3915d881..13d30026df24 100644
--- a/sys-apps/logwatch/logwatch-9999.ebuild
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit tmpfiles
 
-PATCHES=()
-
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
 	inherit git-r3
@@ -20,9 +18,7 @@ HOMEPAGE="https://sourceforge.net/projects/logwatch/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
-DEPEND=""
 RDEPEND="virtual/cron
 	virtual/mta
 	virtual/mailx
@@ -33,6 +29,8 @@ RDEPEND="virtual/cron
 	dev-perl/Sys-CPU
 	dev-perl/Sys-MemInfo"
 
+PATCHES=()
+
 src_install() {
 	dodir /usr/share/logwatch/lib
 	dodir /usr/share/logwatch/scripts/services