From 5a72fa99c24aac8a895e809e6e24c758a18e6277 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Mon, 26 Feb 2018 19:42:02 +0100
Subject: [PATCH] x11-misc/xbatt: EAPI=6 (bug #648876).

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 .../xbatt/files/xbatt-1.2.1-implicits.patch   |  4 +-
 x11-misc/xbatt/xbatt-1.3_rc1.ebuild           | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch
index d86e42ef3fc8..5e135d5c313a 100644
--- a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch
+++ b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch
@@ -1,7 +1,7 @@
 Fix implicit functions declarations
 
---- xbatt.c
-+++ xbatt.c
+--- a/xbatt.c
++++ b/xbatt.c
 @@ -47,6 +47,9 @@
  #include <time.h>
  #include <sys/file.h>
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index a3d3a1f562f4..f291714e25c9 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-
-inherit versionator eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs versionator
 
 MY_PV=${PV/_rc/pr}
 DESCRIPTION="Notebook battery indicator for X"
@@ -13,32 +12,35 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
 LICENSE="xbatt"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXaw
 	x11-libs/libXext
 	x11-libs/libxkbfile
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
 	x11-proto/xextproto
-	x11-misc/imake"
-
+	x11-misc/imake
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
+)
 S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2)
 
-src_prepare(){
-	epatch "${FILESDIR}"/${PN}-1.2.1-implicits.patch
-}
-
 src_compile() {
 	xmkmf || die
-	emake xbatt CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" || die
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		xbatt
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README* || die
+	emake DESTDIR="${D}" install
+	dodoc README*
 }
-- 
2.26.2