[gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/

[Lars Wendler]

commit:     29afcce64732a333017c2c10bfc083c1af3271f7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 17:38:44 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 17:39:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29afcce6

app-admin/sysklogd: Minor ebuild enhancements.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild | 30 ++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild 
b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
index 9fdc76a..4ca42aa 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -22,19 +22,25 @@ DEPEND=""
 RDEPEND="dev-lang/perl
        sys-apps/debianutils"
 
-src_prepare() {
-       epatch "${WORKDIR}"/${PN}_${DEB_PV}.diff
+DOCS=( ANNOUNCE CHANGES NEWS README.1st README.linux )
+
+PATCHES=(
+       "${WORKDIR}"/${PN}_${DEB_PV}.diff
 
-       epatch "${FILESDIR}"/${PN}-1.5-debian-cron.patch
-       epatch "${FILESDIR}"/${PN}-1.5-build.patch
+       "${FILESDIR}"/${PN}-1.5-debian-cron.patch
+       "${FILESDIR}"/${PN}-1.5-build.patch
 
        # CAEN/OWL security patches
-       epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
-       epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
-       epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
+       "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
+       "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
+       "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
+
+       "${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601
+       "${FILESDIR}"/${PN}-1.5-glibc-2.24.patch #604232
+)
 
-       epatch "${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601
-       epatch "${FILESDIR}"/${PN}-1.5-glibc-2.24.patch #604232
+src_prepare() {
+       epatch "${PATCHES[@]}"
 }
 
 src_configure() {
@@ -56,7 +62,9 @@ src_install() {
                exeinto /etc/cron.weekly
                newexe debian/cron.weekly syslog
        fi
-       dodoc ANNOUNCE CHANGES NEWS README.1st README.linux
+
+       einstalldocs
+
        newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd
        newconfd "${FILESDIR}"/sysklogd.confd sysklogd
 }