[gentoo-commits] repo/gentoo:master commit in: media-libs/libfreehand/

[Andreas Hüttel]

commit:     b0bed2cf3ca5ab2944a60d02ca3cd3505aac0026
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Sep  9 20:39:09 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bed2cf

media-libs/libfreehand: Bump to EAPI 6, eliminate base.eclass

Package-Manager: portage-2.3.0

 media-libs/libfreehand/libfreehand-0.1.1.ebuild | 10 +++++-----
 media-libs/libfreehand/libfreehand-9999.ebuild  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-libs/libfreehand/libfreehand-0.1.1.ebuild 
b/media-libs/libfreehand/libfreehand-0.1.1.ebuild
index 484a835..ad5d0aa 100644
--- a/media-libs/libfreehand/libfreehand-0.1.1.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libfreehand/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library for import of FreeHand drawings"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand";
@@ -32,8 +32,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+       default
        [[ -d m4 ]] || mkdir "m4"
-       base_src_prepare
        [[ ${PV} == 9999 ]] && eautoreconf
 }
 

diff --git a/media-libs/libfreehand/libfreehand-9999.ebuild 
b/media-libs/libfreehand/libfreehand-9999.ebuild
index 902fedc..091b546 100644
--- a/media-libs/libfreehand/libfreehand-9999.ebuild
+++ b/media-libs/libfreehand/libfreehand-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libfreehand/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library for import of FreeHand drawings"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand";
@@ -32,8 +32,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+       default
        [[ -d m4 ]] || mkdir "m4"
-       base_src_prepare
        [[ ${PV} == 9999 ]] && eautoreconf
 }