7 files changed, 38 insertions, 72 deletions
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index ed7b4d27cfb2..fbbd3ea9c984 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -1,10 +1,8 @@
-AUX 1.0-asneeded.patch 4256 BLAKE2B e73a7100bb87af13af4ceeceda2c7fe0dbc3bd88577600e585ab7f763fa43120c4d8f0cb2a66f79070bac2d545e2ce2d0ead85138ff9e7b90002f37dcb88d45d SHA512 fde4d6ee84f3865f84ebb61d42c6c8689e81211cf09987a2167638e46ab490cf87271e592f7a430d6228f5164eb8922e6f882b97689342669a4b364e621116ea
-AUX 1.0-doc_install_path.patch 1150 BLAKE2B 40af6eca8f584d2fb334e069e3833211f5b7ffcc44a6a21b6624e4dc4f8561ba45e09e01db4bd93ba482e81ccbe280d5ddb86b916caa790d123a5292e8e9daca SHA512 d65b1313830536a78ba5cf0ea45e95650c1e58ccc79cbe8e060dc50dfab0a1d1590c75e972407441f4ddfa51fd58731207e548442f81089efd4404581641e2cd
+AUX 1.0-asneeded.patch 4260 BLAKE2B 1ca62ef0541f632474d8be23cf23caacc8fe153c70dd58c51af173a8e4b8c0a7a743b425ade6bcab422974e0f41f11308569d94316d44587328079f0fef15299 SHA512 36031e48cdbc6a94b18a399fab3257b433ef5ea873b3fbe57e373f87f491945aba5c99cce901fa4203cba04aa5f420872a957dc066f53afe5315a41c233b450d
+AUX 1.0-doc_install_path.patch 1010 BLAKE2B 1f8f1b488e2ee87ad29738d175e2a2cb205c174553bdd5f7f6d6095fb371e8a255e2fefe023ada1fbcbdd8fd60953c5d944bf74566975fa0b0a1cc6fff1a2d1c SHA512 1f72992eaef44bfb214132736590514b57bb4321d3fc28412b19e5f9f6a7a67fc63a00e91af9cd85f6b921de36b835ce238b40590850f1a7f19011dab595b73d
 AUX 1.0-gcc43.patch 1166 BLAKE2B 2669ceaed022d24e5090a6b96e856ab9612c5818b216949c78732d887e0749818da1d94ae7f9e85d53ec2631e73b3baff2c2cab98ef926d38e0fa6bb0b2c083d SHA512 61ffeddb968a4cc138db1ec854460ad86d864cabc48e4801da8e6e886783d34b112115441090039307d2f7305caee1c0275ad988176adf339170f981fba41262
-AUX log4cpp-1.1-automake-1.13.patch 288 BLAKE2B 3cf6c23fad3827e6762af9689a9978aa4b41261750456db561466909637a02806f59e91f77b89268cfd57ce4b0d526cb5ed090d7e7af19cd636e47b85a1f960c SHA512 344c1cb481139debc8c2f79185ad1ba2abead0b1c39ee42bede44078273951f2b207a6e906227fe0acab2b83067311ded6daf4ac9d701fe7c18413d84362ccbf
-AUX log4cpp-1.1-cmath-fix.patch 286 BLAKE2B 5f8eac41610972c061fdbc0844d9151cf32733d6392351611d981021f3475ceb6f7a7e2b1744f8e9583d419dc55489d77ba9249e3a61cb5ebb9767ccd71c7b5a SHA512 e1af4f7e6f33b5d28eb4c9058730689c9570ab156aa4848fd9c7ec8c1395052d75dec2a6cef556050cb5919d1205c918002458183192441f3f44ca67d5ae8d24
-DIST log4cpp-1.0.tar.gz 495726 BLAKE2B 9b639eab2b1f9c56202901a19595f220fda5355630835d28012f45e9d570be7149b477a8e6512f6998de48aebe7374d6e12126982fa0b4fbbee7eae91cfdc3a9 SHA512 461ce64aa6343c90a909b4f877dd5cfae8aad12a94965c41ad619da137e76fdf48f045a2575273971115aa56ee9649f59453f7c3c265678bafca93289bd9a012
+AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5
+AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb
-EBUILD log4cpp-1.0.ebuild 797 BLAKE2B 046cb6292041178752f33dc47d8cba3e89f321846af7cb0b882fce0677e1ad85f9a870d44758097461e979bf97c7dd2d710ba886492ef8e4cf834d5796268a26 SHA512 5930cb65a8a6654fa89a36be70f580bcb628d919aa0ca258a2de2bdb143409a9147889ad57b522f903358a7665388fa3381369ce91ddc9cc9ee8cefb6b3f88ea
-EBUILD log4cpp-1.1.ebuild 1145 BLAKE2B 5b8718e75b90726921e38dc9932d5314f2c257a04bb73deea3362095b73c7353e0ebe08fd7f418005b3692ada6c4d8c8ce2ceb766451cb5d997e6db56043836f SHA512 a32421f79c6ae075c7c6db2db169e0c3611dc0e9fccd5b090626e67ee9c632bd05ee881eaec33c560dbfa5719af84ae9a27f709c477c6ebac38c5c7495ebce96
+EBUILD log4cpp-1.1.ebuild 1180 BLAKE2B d2479b287b38fc15721b40067055239de919631624c61f969ae4b7cf42ae493d95e3480ec850eae0f1add7bae2aa421c00faefe4486dc2f16ec29915e7b50e5e SHA512 759252ba0fe75e6654980f45ec40474dcc5105b302545bf299f4918b39570d19e2fe6b57c0f125c7a1a18d1fcee9ffbb8c1bb0fa8e69418b002bd57e17136382
 MISC metadata.xml 326 BLAKE2B 5a3581c83f878d7a0f3c9426a9b66b711087cf6d4234e7e9337108c148ae808100cfb54864d7c7db6ea951109bd8c178dd42f676e14c804e5620e1797e2213ad SHA512 007af73e5317d5cb942a532e2535e1b6a55d3a39300706eff6ac9d9215e017a3334dde7c2608289ccbbfc020bb7cea1ba75c4670d5770d4d63128cae902c81cf
diff --git a/dev-libs/log4cpp/files/1.0-asneeded.patch b/dev-libs/log4cpp/files/1.0-asneeded.patch
index e9fb05f4ae99..7e88c545a374 100644
--- a/dev-libs/log4cpp/files/1.0-asneeded.patch
+++ b/dev-libs/log4cpp/files/1.0-asneeded.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/247067
 
---- m4/ACX_PTHREAD.m4
-+++ m4/ACX_PTHREAD.m4
+--- a/m4/ACX_PTHREAD.m4
++++ b/m4/ACX_PTHREAD.m4
 @@ -266,6 +266,117 @@
          else
            PTHREAD_CC=$CC
diff --git a/dev-libs/log4cpp/files/1.0-doc_install_path.patch b/dev-libs/log4cpp/files/1.0-doc_install_path.patch
index 8f9ef5137619..abe88dfd123b 100644
--- a/dev-libs/log4cpp/files/1.0-doc_install_path.patch
+++ b/dev-libs/log4cpp/files/1.0-doc_install_path.patch
@@ -1,11 +1,10 @@
---- doc/Makefile.am.orig	2007-10-13 09:39:44.000000000 +0200
-+++ doc/Makefile.am	2007-10-13 09:40:03.000000000 +0200
-@@ -1,7 +1,7 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,6 @@
  SUBDIRS = html
  
  man3dir = $(mandir)/man3
 -docdir  = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-+docdir  = $(prefix)/share/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
  
  EXTRA_DIST = \
  	mainPage.txt
diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch
index ffac4a1dbfc7..3e7cb560a509 100644
--- a/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch
+++ b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch
@@ -1,11 +1,12 @@
---- configure.ac.orig	2015-01-14 09:37:13.616446476 +0300
-+++ configure.ac	2015-01-14 09:37:26.119445770 +0300
-@@ -17,7 +17,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -17,7 +17,8 @@
  
  #AC_CONFIG_SRCDIR(configure.in)
  AC_CONFIG_AUX_DIR(config)
 -AM_CONFIG_HEADER(include/config.h)
 +AC_CONFIG_HEADERS([include/config.h])
++AC_CONFIG_MACRO_DIR([m4])
  
  AM_INIT_AUTOMAKE
  
diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch
index fe3c810814bd..0180580717ab 100644
--- a/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch
+++ b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch
@@ -1,5 +1,5 @@
---- src/PatternLayout.cpp.orig      2015-01-14 09:24:32.332489499 +0300
-+++ src/PatternLayout.cpp   2015-01-14 09:23:18.162493691 +0300
+--- a/src/PatternLayout.cpp
++++ b/src/PatternLayout.cpp
 @@ -24,6 +24,7 @@
  #include <iomanip>
  #include <ctime>
diff --git a/dev-libs/log4cpp/log4cpp-1.0.ebuild b/dev-libs/log4cpp/log4cpp-1.0.ebuild
deleted file mode 100644
index b5571d38673a..000000000000
--- a/dev-libs/log4cpp/log4cpp-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
-HOMEPAGE="http://log4cpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc s390 x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-doc_install_path.patch \
-		"${FILESDIR}"/${PV}-gcc43.patch \
-		"${FILESDIR}"/${PV}-asneeded.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-idsa \
-		$(use_enable doc doxygen)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild
index bea580222cae..c2371180dd30 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/"
@@ -13,20 +11,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~x86"
+KEYWORDS="amd64 ~arm ppc s390 x86"
 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
 }