gentoo resync : 08.06.2019

3 files changed, 99 insertions, 2 deletions

diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 3d14447c5577..7c5cb23ee659 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -4,7 +4,9 @@ AUX logwatch-7.4.3+-openssh-hpn.patch 885 BLAKE2B 2a381c8b321ae4e545e8620e1ad3ad
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.4.3.tar.gz 462552 BLAKE2B 98ecba949d9fa2737da6b22ff2cced14d384ff4f119a7a8e613a66869102ea76ce1093ef5f0b38e6d4e948a8e9e0dafe8b4071e028c5f5f5be2ee48e9b1f186b SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a
 DIST logwatch-7.4.3_p20171025.zip 704529 BLAKE2B 12f4e34d9cd044f677b1b4cbe473c425e9b3ab2f222e781a0a3df95b9cbc088cf16321ccd67ec9acaa4c21b8da3deac4d58d84cba2259b272717337c5c87c3ff SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268
+DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c
 EBUILD logwatch-7.4.3.ebuild 2054 BLAKE2B e7ae5b810b3bc55e481fa4dbd35c923f3c8737b14aa2c52e166c86dc55165a1977a21b33d2e8c518f21f24ac16f206263e5ccc0ce4655bbdd17fd1d03faff755 SHA512 975fe721a5bee017d9da2efb98914749ae4f6a1a52e0563dedab92cf6c5b029fbb2b0ce880849f3ea143796cc06dd7001101ffe0fede0d07ffa6597dddd5fd69
 EBUILD logwatch-7.4.3_p20171025.ebuild 2836 BLAKE2B 8a7aad2786d4c7509e60106ccc5e00949416753103d986921f7964321972cf3cf6500e1a76e0570b5c71f63290774b718fe34b89aa3e69650c59e570a2f4f624 SHA512 0979e2451fbadb4a60f6c7b418dc31e00fb1d825f818ed13320225e8f026fa8cbf4ac90285dc16c78f4964ba568c53826b91fedc33f0923d7b42bd33e456ce45
-EBUILD logwatch-9999.ebuild 2430 BLAKE2B 02706b7a5c947f58f5d27eb3df8cf6f6f146b9943070ff22dd9015daf64968d07a6d9338b3718867e214fe971c5647e106b3c624d7b7bae60d4c3b67cc9bfb0c SHA512 9bce4d3643241d6214d0dca3290574e1fcb7fc560ad2d4e55d889b6faa72b09a51b1f921db8e7a1c95c7ade42db21b8e512402ddb10344e09784d1a4307478b1
+EBUILD logwatch-7.5.1.ebuild 2430 BLAKE2B f0273cf44e1c7abe6059bcc3ce949263a4cadf57e1e84c46b7255be4d64626b1520b45e85762c3b0bd56f5750165762bbb1a15ce1b28a6967c375736be0b3dec SHA512 312d6634eaced0149f9d6a70cc62241f2273dc4476db468e1d71a19dbde7f8ebcd5e542a41c0fce78313b902d1a5858193e5e624016461bf9d5c6e14d5bf8a21
+EBUILD logwatch-9999.ebuild 2430 BLAKE2B f0273cf44e1c7abe6059bcc3ce949263a4cadf57e1e84c46b7255be4d64626b1520b45e85762c3b0bd56f5750165762bbb1a15ce1b28a6967c375736be0b3dec SHA512 312d6634eaced0149f9d6a70cc62241f2273dc4476db468e1d71a19dbde7f8ebcd5e542a41c0fce78313b902d1a5858193e5e624016461bf9d5c6e14d5bf8a21
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.1.ebuild b/sys-apps/logwatch/logwatch-7.5.1.ebuild
new file mode 100644
index 000000000000..eefc16389fc7
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.5.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 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
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+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"
+
+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 971e5d621f38..eefc16389fc7 100644
--- a/sys-apps/logwatch/logwatch-9999.ebuild
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit tmpfiles