[gentoo-commits] repo/gentoo:master commit in: app-text/libmspub/

[Andreas Hüttel]

commit:     b4204b3ecd526977a86471d8c2f069bc0edf8809
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Sep  9 20:22:55 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=b4204b3e

app-text/libmspub: Bump to EAPI 6, eliminate base.eclass

Package-Manager: portage-2.3.0

 app-text/libmspub/libmspub-0.1.2.ebuild | 12 ++++++------
 app-text/libmspub/libmspub-9999.ebuild  | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app-text/libmspub/libmspub-0.1.2.ebuild 
b/app-text/libmspub/libmspub-0.1.2.ebuild
index 8fbeab7..b2b9408 100644
--- a/app-text/libmspub/libmspub-0.1.2.ebuild
+++ b/app-text/libmspub/libmspub-0.1.2.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/${PN}/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub";
@@ -27,14 +27,14 @@ RDEPEND="
        sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-       virtual/pkgconfig
        dev-libs/boost
        sys-devel/libtool
+       virtual/pkgconfig
        doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
-       base_src_prepare
+       default
        [[ -d m4 ]] || mkdir "m4"
        [[ ${PV} == 9999 ]] && eautoreconf
 }

diff --git a/app-text/libmspub/libmspub-9999.ebuild 
b/app-text/libmspub/libmspub-9999.ebuild
index c080b7b..be2fb21 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 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/${PN}/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub";
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="doc static-libs"
 
@@ -27,14 +27,14 @@ RDEPEND="
        sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-       virtual/pkgconfig
        dev-libs/boost
        sys-devel/libtool
+       virtual/pkgconfig
        doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
-       base_src_prepare
+       default
        [[ -d m4 ]] || mkdir "m4"
        [[ ${PV} == 9999 ]] && eautoreconf
 }