[gentoo-commits] dev/heroxbd:master commit in: sys-devel/automake/

[Benda XU]

commit:     f6674a7e56d207841f3524a2d856941cbd0ce43d
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 02:56:19 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu May 12 02:56:19 2016 +0000
URL:        https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=f6674a7e

sys-devel/automake: bump to EAPI=6.

 sys-devel/automake/automake-1.15-r2.ebuild | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild 
b/sys-devel/automake/automake-1.15-r2.ebuild
index af9496d..24fbb57 100644
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="6"
 
-inherit eutils versionator
+inherit versionator
 
 if [[ ${PV/_beta} == ${PV} ]]; then
        MY_P=${P}
@@ -36,19 +36,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-       export WANT_AUTOCONF=2.5
-       epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
-       epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492
-}
-
-src_configure() {
-       econf --docdir="${EPREFIX}"/usr/share/doc/${PF} HELP2MAN=true
-}
-
-src_compile() {
-       emake APIVERSION="${SLOT}" 
pkgvdatadir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
+                 "${FILESDIR}"/${PN}-1.15-mdate-tz.patch ) #520818 #574492
 
 src_test() {
        emake check
@@ -84,8 +73,7 @@ slot_info_pages() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install \
-               APIVERSION="${SLOT}" 
pkgvdatadir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+       emake DESTDIR="${D}" install
        slot_info_pages
        rm "${ED}"/usr/share/aclocal/README || die
        rmdir "${ED}"/usr/share/aclocal || die