dev-util/cppunit: 1.14.0 version bump, EAPI 6

Reported-by: jospezial <jospezial@gmx.de>
Gentoo-bug: 615894

Package-Manager: Portage-2.3.5, Repoman-2.3.1

dev-util/cppunit/cppunit-9999.ebuild

@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/libreoffice/cppunit"
 [[ ${PV} = 9999 ]] && inherit git-r3 autotools
-inherit eutils flag-o-matic multilib-minimal
+inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
@@ -23,16 +23,14 @@ DEPEND="${RDEPEND}
 	doc? (
 		app-doc/doxygen[dot]
 		media-gfx/graphviz
-	)"
+	)
+"
 
 DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
 [[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
 
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cppunit-config
-)
-
 src_prepare() {
+	default
 	[[ ${PV} = 9999 ]] && eautoreconf
 }
 
@@ -49,14 +47,17 @@ multilib_src_configure() {
 		$(use_enable static-libs static) \
 		$(multilib_native_use_enable doc doxygen) \
 		$(multilib_native_use_enable doc dot) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-silent-rules
+		--disable-werror
 }
 
 multilib_src_install_all() {
+	if use doc; then
+		mv "${ED%/}"/usr/share/${PN}/html "${ED%/}"/usr/share/doc/${PF} || die
+		rm -r "${ED%/}"/usr/share/${PN} || die
+	fi
 	einstalldocs
-	prune_libtool_files --all
+
+	find "${D}" -name '*.la' -delete || die
 
 	if use examples ; then
 		find examples -iname "*.o" -delete