dev-libs/log4cpp: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

1 files changed, 21 insertions, 17 deletions

diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild
index bea580222cae..d27aa21fff1c 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AT_M4DIR="m4"
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
 HOMEPAGE="http://log4cpp.sourceforge.net/"
@@ -19,14 +17,12 @@ IUSE="doc static-libs test"
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
 PATCHES=(
-	"${FILESDIR}/1.0-doc_install_path.patch"
-	"${FILESDIR}/1.0-gcc43.patch"
-	"${FILESDIR}/1.0-asneeded.patch"
-	"${FILESDIR}/${P}-cmath-fix.patch"
-	"${FILESDIR}/${P}-automake-1.13.patch"
+	"${FILESDIR}"/1.0-doc_install_path.patch
+	"${FILESDIR}"/1.0-gcc43.patch
+	"${FILESDIR}"/1.0-asneeded.patch
+	"${FILESDIR}"/${P}-cmath-fix.patch
+	"${FILESDIR}"/${P}-automake-1.13.patch
 )
 
 S="${WORKDIR}/${PN}"
@@ -36,6 +32,8 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 src_prepare() {
+	default
+
 	mv configure.{in,ac} || die
 
 	# Build tests conditionally
@@ -43,13 +41,19 @@ src_prepare() {
 		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
 	fi
 
-	autotools-multilib_src_prepare
+	eautoreconf
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--without-idsa
-		$(use_enable doc doxygen)
-	)
-	autotools-utils_src_configure
+	ECONF_SOURCE=${S} econf \
+		--without-idsa \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
 }