gentoo resync : 16.04.2018

3 files changed, 22 insertions, 64 deletions

diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
index 76e9e5e39a27..1bbca4aa3b8c 100644
--- a/app-admin/logcheck/Manifest
+++ b/app-admin/logcheck/Manifest
@@ -1,8 +1,6 @@
 AUX logcheck.cron 184 BLAKE2B 5b773a77dace97e78efa565d8edf3bd715f564721ba0097e82a3894009fa86b6faffd3018a5270e224de2aefaaf07afa76c40b507d6ddffcf5ca4fb137ac6c09 SHA512 fd0b1bc8c836b766bfbb6102012996d27e378475571167b4d4df98301793624483aca2bd51ec19a2aa367e78b062ddde67355452db8dc1d69fe84a20a2081c30
 DIST logcheck_1.3.15.tar.gz 162397 BLAKE2B 111e16f482c8610ffc39c518b3fd523abaa9720e7873bcadba58d85bd13bd7a8a9d93881e64f5d8cc5cb30c8254f2216fe97d1b77fe1cf77d5e14859ec701621 SHA512 45c9e779fc1d1f417aea3f02e70eff4dbc7cd0b45e04f7efc458a4552866686cbb095d0b5ebaf32a57d423a3753b4573277a464f5539789350b087569e025abf
-DIST logcheck_1.3.17.tar.xz 130956 BLAKE2B 16fc80f983a17d55e4b5fdcefcc95657e99bb3f5229655b768ab6116a874bf0f080c368bae235802370534df27908d22f52168b9cf1123fce05f9b4d5a484015 SHA512 e4a30b6ccd7a9f0f51354b1a6e577f6a3837e3db078f61b3d3ceaf630a1f1eeae03324e6ec58307f8f723dbd017e1543c15f7dc34e50c0eeb9ee0b160b2c879d
 DIST logcheck_1.3.18.tar.xz 131252 BLAKE2B 024259d965c02d5f27a82f1df1e947d48e4b1bad705882243c4b743a1c061012f2437ecab1a97265f5a330fdec2f813a36c078dca282f54fdfaab03833340320 SHA512 3ab75969f732efa123d9df2c8b44557e4a7eddef8332a8357463930714148a13130c763c22e562bd60e106abf5e18cf39b3572e0c048727a117fbc67430b7e3f
 EBUILD logcheck-1.3.15-r2.ebuild 1189 BLAKE2B 008db9b5797783571c1ea2d7ffcd4909609ab206cfd0e9dffbd06ab2cc34d865246ff78d32de3905a2eca8410fd87b149b6c6b6cc1c2312121226c3942cd7209 SHA512 bcfc87c796cbbd553ffc18a5777ca0114c7be968512d17fc42c8dd99e80658e4d93d88208823258bebdce1323a2715aeb3a4df3888da11776bd946f9bbebf0aa
-EBUILD logcheck-1.3.17.ebuild 1190 BLAKE2B baae848c9c1ef93bbe2773bbf5ada3eac7300ec1ccc13f78929c564796b70c442026726bc004e2106d222c17fdc95ff62c0bdfb39f1a66ef55e9323ad3e23aae SHA512 161ac902f0aa625c9c26c41956926d39d63f50f8daaffb3df42f0f8faf68d45e5392b4679c1e8294f1140388692801f318644de18b6b38953ac784886f4758da
-EBUILD logcheck-1.3.18.ebuild 1190 BLAKE2B 7a298bdd14f5a957d28af0d5e6c64ad4c3d3674894af41f731c9e7a0c2a84e6d16ead3c112814bc0d21a8a1c8d29bdaa2995312a7abd31a75fbcf367ce61b202 SHA512 792074adc44cd65d44be803f9f0ee718dcfde3d6436b2662c02736811a163d3fa8a080500f5e2dde94c5fe086095cd6169b309dfb9cc2c923c451007451f35a0
+EBUILD logcheck-1.3.18-r1.ebuild 1368 BLAKE2B 7f7fedc652b010c6c4c0c9b36ac2f25a80147a39f718472d3f6a5598ee6974492ba8ac236d58e3e31d036c4dc56cb313ac39025f0f1c3ef8b93660e6800c3daa SHA512 a4532de06b10fc2d119d279feddfa78b1d912699a96a00c6b73c03f8011806cae7a44fd4e9db0829f7600dc240ddb6190702d496a5107875726292cb9953b0fe
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/logcheck/logcheck-1.3.17.ebuild b/app-admin/logcheck/logcheck-1.3.17.ebuild
deleted file mode 100644
index 412128f50978..000000000000
--- a/app-admin/logcheck/logcheck-1.3.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
-HOMEPAGE="http://packages.debian.org/sid/logcheck"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-admin/logsentry
-	app-misc/lockfile-progs
-	dev-lang/perl
-	dev-perl/mime-construct
-	virtual/mailx
-	${DEPEND}"
-
-pkg_setup() {
-	enewgroup logcheck
-	enewuser logcheck -1 -1 -1 logcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
-	# the directories removed are empty.
-	rmdir "${D}/var/lock/logcheck" || die
-	rmdir "${D}/var/lock" || die
-
-	keepdir /var/lib/logcheck
-	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
-	doman docs/logtail.8 docs/logtail2.8
-
-	exeinto /etc/cron.hourly
-	doexe "${FILESDIR}/${PN}.cron"
-}
-
-pkg_postinst() {
-	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
-
-	elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
-	elog "for installation instructions."
-}
diff --git a/app-admin/logcheck/logcheck-1.3.18.ebuild b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
index 05809634d694..4dab96b452d8 100644
--- a/app-admin/logcheck/logcheck-1.3.18.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit user
+inherit readme.gentoo-r1 user
 
 DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
-HOMEPAGE="http://packages.debian.org/sid/logcheck"
+HOMEPAGE="https://packages.debian.org/sid/logcheck"
 SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
@@ -15,20 +14,32 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="!app-admin/logsentry
+RDEPEND="${DEPEND}
+	!app-admin/logsentry
 	app-misc/lockfile-progs
 	dev-lang/perl
 	dev-perl/mime-construct
 	virtual/mailx
-	${DEPEND}"
+"
+
+DOC_CONTENTS="
+	Please read the guide at https://wiki.gentoo.org/wiki/Logcheck
+	for installation instructions.
+"
 
 pkg_setup() {
 	enewgroup logcheck
 	enewuser logcheck -1 -1 -1 logcheck
 }
 
+src_prepare() {
+	default
+	# Add /var/log/messages support, bug #531524
+	echo "/var/log/messages" >> etc/logcheck.logfiles
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
 	# the directories removed are empty.
@@ -36,6 +47,8 @@ src_install() {
 	rmdir "${D}/var/lock" || die
 
 	keepdir /var/lib/logcheck
+
+	readme.gentoo_create_doc
 	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
 	doman docs/logtail.8 docs/logtail2.8
 
@@ -45,7 +58,5 @@ src_install() {
 
 pkg_postinst() {
 	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
-
-	elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
-	elog "for installation instructions."
+	readme.gentoo_print_elog
 }