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

Package-Manager: portage-2.3.0

diff --git a/dev-libs/librevenge/librevenge-0.0.4.ebuild b/dev-libs/librevenge/librevenge-0.0.4.ebuild
index 5ebbd773b1507a7e3cd9a463decce36788eb350a..eb932b4908cfbc14faefdb4ae21c4b96d7ac6788 100644 (file)
--- 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 e98fab1c9b996d368971247f4af79b1850e37054..03f0a4df373c1552d67ce9043cb7fdd99e6fc998 100644 (file)
--- 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
 }