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

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     188b033eb5992113dcba6c2f6dac9c9fe705244e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Nov 25 23:04:01 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 15:55:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=188b033e

app-text/libwpd: EAPI 6, drop eutils.eclass, improve metadata

Gentoo-bug: 600716

Package-Manager: portage-2.3.0

 app-text/libwpd/libwpd-0.10.1.ebuild | 13 +++++--------
 app-text/libwpd/metadata.xml         |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app-text/libwpd/libwpd-0.10.1.ebuild b/app-text/libwpd/libwpd-0.10.1.ebuild
index 43b6109..d1631de 100644
--- a/app-text/libwpd/libwpd-0.10.1.ebuild
+++ b/app-text/libwpd/libwpd-0.10.1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit alternatives eutils
+inherit alternatives
 
 DESCRIPTION="WordPerfect Document import/export library"
 HOMEPAGE="http://libwpd.sf.net"
@@ -15,13 +15,11 @@ SLOT="0.10"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~mips x86 ~x86-fbsd"
 IUSE="doc +tools"
 
-COMMON_DEPEND="dev-libs/librevenge"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-RDEPEND="${COMMON_DEPEND}
-	!<app-text/libwpd-0.8.14-r1"
 
 src_configure() {
 	econf \
@@ -29,13 +27,12 @@ src_configure() {
 		--disable-werror \
 		$(use_with doc docs) \
 		$(use_enable tools) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--program-suffix=-${SLOT}
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {

diff --git a/app-text/libwpd/metadata.xml b/app-text/libwpd/metadata.xml
index 6965195..19419ec 100644
--- a/app-text/libwpd/metadata.xml
+++ b/app-text/libwpd/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Office project</name>
 	</maintainer>
 	<use>
-		<flag name="tools">Build miscellaneous tools</flag>
+		<flag name="tools">Build file conversion tools</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">libwpd</remote-id>