[gentoo-commits] repo/gentoo:master commit in: dev-libs/librevenge/

[Andreas Hüttel]

commit:     4a202c922ac2e32fd3769f99e95d00e69c98180e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 26 01:09:59 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 15:56:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a202c92

dev-libs/librevenge: EAPI 6, drop eutils.eclass

Package-Manager: portage-2.3.0

 dev-libs/librevenge/librevenge-0.0.4.ebuild | 10 +++++-----
 dev-libs/librevenge/librevenge-9999.ebuild  |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dev-libs/librevenge/librevenge-0.0.4.ebuild 
b/dev-libs/librevenge/librevenge-0.0.4.ebuild
index 5ebbd77..eb932b4 100644
--- a/dev-libs/librevenge/librevenge-0.0.4.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="A helper library for REVerse ENGineered formats filters"
 HOMEPAGE="http://sf.net/p/libwpd/librevenge";
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+       default
        [[ ${PV} = 9999 ]] && eautoreconf
 }
 
@@ -40,10 +41,9 @@ multilib_src_configure() {
                --disable-static \
                --disable-werror \
                $(use_with doc docs) \
-               $(use_enable test tests) \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}"
+               $(use_enable test tests)
 }
 
 multilib_src_install_all() {
-       prune_libtool_files --all
+       find "${D}" -name '*.la' -delete || die
 }

diff --git a/dev-libs/librevenge/librevenge-9999.ebuild 
b/dev-libs/librevenge/librevenge-9999.ebuild
index e98fab1..03f0a4d 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="A helper library for REVerse ENGineered formats filters"
 HOMEPAGE="http://sf.net/p/libwpd/librevenge";
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-       eapply_user
+       default
        [[ ${PV} = 9999 ]] && eautoreconf
 }
 
@@ -41,10 +41,9 @@ multilib_src_configure() {
                --disable-static \
                --disable-werror \
                $(use_with doc docs) \
-               $(use_enable test tests) \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}"
+               $(use_enable test tests)
 }
 
 multilib_src_install_all() {
-       prune_libtool_files --all
+       find "${D}" -name '*.la' -delete || die
 }