[gentoo-commits] repo/gentoo:master commit in: app-editors/aee/

["Akinori Hattori" <hattya@gentoo.org>]

commit:     0ae1e3f61e2bbb3fb4b5757608271bc6f72be986
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 13:22:29 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 13:22:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae1e3f6

app-editors/aee: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-editors/aee/aee-2.2.15b.ebuild | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app-editors/aee/aee-2.2.15b.ebuild b/app-editors/aee/aee-2.2.15b.ebuild
index 7d50170e51a..3610053fa69 100644
--- a/app-editors/aee/aee-2.2.15b.ebuild
+++ b/app-editors/aee/aee-2.2.15b.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="An easy to use text editor"
 #HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/"
@@ -18,36 +18,37 @@ IUSE="X"
 RDEPEND="X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ae-location.patch
+PATCHES=( "${FILESDIR}"/${P}-ae-location.patch )
+DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
 
+src_prepare() {
 	sed -i \
 		-e "s/make -/\$(MAKE) -/g" \
 		-e "/^buildaee/s/$/ localaee/" \
 		-e "/^buildxae/s/$/ localxae/" \
-		Makefile || die
+		Makefile
 
 	sed -i \
 		-e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
 		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
 		-e "/other_cflag/s/ \${strip_option}//" \
-		create.mk.{aee,xae} || die
+		create.mk.{aee,xae}
 
-	tc-export CC
+	default
 }
 
 src_compile() {
 	local target="aee"
 	use X && target="both"
 
-	emake ${target}
+	emake CC="$(tc-getCC)" ${target}
 }
 
 src_install() {
 	dobin ${PN}
 	dosym ${PN} /usr/bin/rae
 	doman ${PN}.1
-	dodoc Changes README.${PN} ${PN}.i18n.guide ${PN}.msg
+	einstalldocs
 
 	insinto /usr/share/${PN}
 	doins help.ae