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

[Patrice Clement]

commit:     53685ddb52a6450d26365222e0dc6adc275cc2bf
Author:     charIes17 <charles17 <AT> arcor <DOT> de>
AuthorDate: Mon Oct  9 14:06:45 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 17:14:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53685ddb

app-admin/socklog: EAPI 6 bump.

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5897
Closes: https://bugs.gentoo.org/618574

 app-admin/socklog/socklog-2.1.0.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
index f7853dd9904..1cfad278844 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -16,20 +16,22 @@ IUSE="static"
 
 RDEPEND=">=sys-process/runit-1.4.0"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-headers.patch )
+
 S=${WORKDIR}/admin/${P}/src
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-headers.patch
+	default
 	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
 }
 
 src_install() {
-	dobin tryto uncat socklog-check || die
-	dosbin socklog socklog-conf || die
+	dobin tryto uncat socklog-check
+	dosbin socklog socklog-conf
 
-	cd ..
+	cd .. || die
 	dodoc package/CHANGES
 	dohtml doc/*.html
 	doman man/*