Version bump, wrt bug #454712. Migrate to autotools-multilib eclass, build tests only when they are requested, build static lib conditionally. Fix building with Automake 1.13, wrt bug #467666

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 99 insertions, 6 deletions

diff --git a/dev-libs/log4cpp/ChangeLog b/dev-libs/log4cpp/ChangeLog
index b1c3caf951f9..fdd5759b3dfc 100644
--- a/dev-libs/log4cpp/ChangeLog
+++ b/dev-libs/log4cpp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/log4cpp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/ChangeLog,v 1.20 2014/08/10 20:38:10 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/ChangeLog,v 1.21 2015/01/14 06:48:11 pinkbyte Exp $
+
+*log4cpp-1.1 (14 Jan 2015)
+
+  14 Jan 2015; Sergey Popov <pinkbyte@gentoo.org> +log4cpp-1.1.ebuild,
+  +files/log4cpp-1.1-automake-1.13.patch, +files/log4cpp-1.1-cmath-fix.patch:
+  Version bump, wrt bug #454712. Migrate to autotools-multilib eclass, build
+  tests only when they are requested, build static lib conditionally. Fix
+  building with Automake 1.13, wrt bug #467666
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> log4cpp-1.0.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index c834217a226a..8fca05f9017e 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -4,14 +4,22 @@ Hash: SHA256
 AUX 1.0-asneeded.patch 4256 SHA256 950ecd6719ecc01747f25f2306c4ea072b55202fa558ede29269fba8612994c5 SHA512 fde4d6ee84f3865f84ebb61d42c6c8689e81211cf09987a2167638e46ab490cf87271e592f7a430d6228f5164eb8922e6f882b97689342669a4b364e621116ea WHIRLPOOL 566ad3657f239f981c77aa550f821b3b658ae968f1bca81dc750d415d11347152d8e661d26a4d373e25becea07596cd492c499b0a00329f7918e5e94948a38d7
 AUX 1.0-doc_install_path.patch 1150 SHA256 509681de09b218d922ecc1640f881ba5577d2d45817f40d01e644740ff84d507 SHA512 d65b1313830536a78ba5cf0ea45e95650c1e58ccc79cbe8e060dc50dfab0a1d1590c75e972407441f4ddfa51fd58731207e548442f81089efd4404581641e2cd WHIRLPOOL 043395124d0a6ddfad68ceda415f21789c0f14f8bc9e91a9133680f6042133d4d35efa19ea164e9fb38e4eb7281e5d1a6d43fb2865b944b6971691c3cb7a5e43
 AUX 1.0-gcc43.patch 1166 SHA256 f569a48f495d3a4b87f6b2174e845b3fe328dfbd759a795e7ace53beb71ff308 SHA512 61ffeddb968a4cc138db1ec854460ad86d864cabc48e4801da8e6e886783d34b112115441090039307d2f7305caee1c0275ad988176adf339170f981fba41262 WHIRLPOOL b3801a2ba557c8cd95b0fdc80e435c94e76908e4c107281e96fa9f28f5c73aa9629189395030c3f132ad3d5ee1a332b20a02dd94a4af71c7250a87b2dd6c4c2f
+AUX log4cpp-1.1-automake-1.13.patch 288 SHA256 b93bf172a4ab1983f8d3dfc064b4c8ba96d4d2ea3cd11ba6048599dedd902aaa SHA512 344c1cb481139debc8c2f79185ad1ba2abead0b1c39ee42bede44078273951f2b207a6e906227fe0acab2b83067311ded6daf4ac9d701fe7c18413d84362ccbf WHIRLPOOL 82f53215521de79370234365ba11ba73eecbde63d625b83315701c110a17dd1520911bd4d57839702e7b69e2758092f7ce49af1ffa345821b3f1ee7317961999
+AUX log4cpp-1.1-cmath-fix.patch 286 SHA256 5027558bea64b22481369c97139ea6e6492304250a0ee5237cad0a6d3c590e72 SHA512 e1af4f7e6f33b5d28eb4c9058730689c9570ab156aa4848fd9c7ec8c1395052d75dec2a6cef556050cb5919d1205c918002458183192441f3f44ca67d5ae8d24 WHIRLPOOL da0396daf9b212efcd6038214572cb1e513e8371f48c84500f462f99ffc666d85de52f680ddbbd2daa0b6fe6aaf51a640bc818902485675c7432677c64ac3c5e
 DIST log4cpp-1.0.tar.gz 495726 SHA256 b4533324b0a1f46ad74a9e92bf2caa46c246e9353059e1a835e735d41826ed19 SHA512 461ce64aa6343c90a909b4f877dd5cfae8aad12a94965c41ad619da137e76fdf48f045a2575273971115aa56ee9649f59453f7c3c265678bafca93289bd9a012 WHIRLPOOL 96510c5e7c8a057c1a187966ba5b6d6baf0c2ca21abf5b74a3a93fc59a6caee2b797ff50dc7647f2774a6c7989f9a57cb2bff53bf4e1f4999206fec4aa498fbf
+DIST log4cpp-1.1.tar.gz 547676 SHA256 c25bd1e0abd47a5dee2ab49b84cbce6292fcada90536a26a5fc9999d343768b4 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb WHIRLPOOL 2ae511f67dbe80d8ec054e1e3ba370736105aca85418ffc3bd7b3ef6fd4d0f5d24f01bac28cd6932df833785da566776dc3664e6d7e8a1573fe1c1642aefadb2
 EBUILD log4cpp-1.0.ebuild 918 SHA256 d47ee7162871593919e7410b32023ebef627153ac051ec735a9160c94d3afd9a SHA512 664f884e5584cf07b2dce2583f30677135d6b016603dcbac86f7a3501a50880df32bfe205146111153e5d1240f341906cad64d2cc187afb8c8b172b2d7a69a91 WHIRLPOOL 8f840a0a0ed058d9959cb0d1c7de8c4f3d8fa97a02eef1d27200a5799be87e989fa4b95f78b9b8347c4e2f685d1ba8cfe944f0a956dcd41eff330983bd375b78
-MISC ChangeLog 2651 SHA256 a2db0a145c613c2e82ce188cc68d4a5fbbf2be1c5006dc3d9b5ac6559e66ec1e SHA512 9ebb7e18604f907485737d7fde1c1003f65b043a75011048024bfa7c666328a16caa83c89e8b02c43d18a1748e9713049db8af73977ad5ee40ecaf2a15a172b6 WHIRLPOOL 021a4225a6f62024cb8f4a73cb67fb21554c1112818ae36bb665ef54bf1e19efbc2771327c1298b921b5bc6dad886745fe92aca976d9afa7faf3ee25da78d76d
+EBUILD log4cpp-1.1.ebuild 1268 SHA256 28daa0d583a132b80e6c0448381851ecd7fc296e9641ac481613be51aa8e4b28 SHA512 b06898b12206c16743b29615489059c0a3c6c12852355bec5c2a523c9313d3f47f6b026331f72e0eba4356ef96c1e5184aa4cd90a68374e57a3d2e5d8bf48578 WHIRLPOOL 2baa4e15f617d5636cdcc18e207a79904a6815cb9d3dae35ef7f0ea36afa0995a612222c3ca81fcc528aeb484932c96c5be39836d92511ba87911d96c23ae88f
+MISC ChangeLog 3029 SHA256 2d7153563bca7a7bb94165d9838fa055159719e1b9a65cd6c0ccbb7655dba586 SHA512 33cb56ed3b16fc50a817a83168d65b2aa823dda20f368f11dced3fc4e8dbc52320155dffbe31b27caf40e78ae4675a8ef41b8e37109adb305c29ff7e4e9bea59 WHIRLPOOL 2c655ee06fdf3c2c4fa87008e8c9ec864cf1a4b7e57b63e0fdc2381156fd8f1041ce9dc2effdd7890a673957c06540848f4d3742c0ef5a9a94477ef7218d42fc
 MISC metadata.xml 156 SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f SHA512 e91dd7187a03a5b11f6d23d0d620c7a0326c8b3631599d616c9bd4aaf5f7901fdf8405a86bae896ecbad57afcbc9f3515a067f78817d06de4a426d5a07e7cf75 WHIRLPOOL e7838d8e96cb2762d53f85ddc28d8034cd19c2ec76c5d5356d21e2508539b7dca9e8e2ed636731eb578aa9f914a6710f165e321aa3a321a4f622cf2624e38808
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn2DMACgkQcaHudmEf86q59ACcDvCeUuGkQhxilGTHtq0PF1pk
-+XEAnR6EISHMeGOw4tVAno7FQHxgCbHD
-=/MlX
+iQEcBAEBCAAGBQJUthErAAoJECo/aRed9267S4gIAKTl9PUDHT83kTl95fVeirAu
+y1+Acv23S4pBK+tdCWgMmNfFoSYaRUCogqG4+F/XIeuBtLTESjNsfhNhTxa6sT5M
+PJi4eMPxHwLdXYoB7tiXbR74mY7YbwDR9sLZZwCqfIgySLazmPT4epNR/09mwc+w
+QJx+euUCfTPbCwKZpA+KcNvsO22YeNDFZH7aeRxqj5cBmwdO9Oi8/lhFcluOxxI+
+T8+qi85+GiJjbXu8IhH5drIfKgcV2ZF61TLRXuLru1xyNi7cG1TC39Lb9kwxcVki
+aoAoy8VZZuqbrf5S9Pc80oln6RaTPXAIdl/K3JaTBoudG+x1WrUsbICIbZXCHH4=
+=Yar9
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..ffac4a1dbfc7
--- /dev/null
+++ b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ 
+ #AC_CONFIG_SRCDIR(configure.in)
+ AC_CONFIG_AUX_DIR(config)
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS([include/config.h])
+ 
+ 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
new file mode 100644
index 000000000000..fe3c810814bd
--- /dev/null
+++ b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch
@@ -0,0 +1,10 @@
+--- src/PatternLayout.cpp.orig      2015-01-14 09:24:32.332489499 +0300
++++ src/PatternLayout.cpp   2015-01-14 09:23:18.162493691 +0300
+@@ -24,6 +24,7 @@
+ #include <iomanip>
+ #include <ctime>
+ #include <cstdlib>
++#include <cmath>
+ #include "Localtime.hh"
+ 
+ #ifdef LOG4CPP_HAVE_INT64_T
diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild
new file mode 100644
index 000000000000..b1f4dd383a9d
--- /dev/null
+++ b/dev-libs/log4cpp/log4cpp-1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/log4cpp-1.1.ebuild,v 1.1 2015/01/14 06:48:11 pinkbyte Exp $
+
+EAPI=5
+
+AT_M4DIR="m4"
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-multilib
+
+DESCRIPTION="Library of 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/5"
+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"
+)
+
+S="${WORKDIR}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/log4cpp-config
+)
+
+src_prepare() {
+	mv configure.{in,ac} || die
+
+	# Build tests conditionally
+	if ! use test; then
+		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
+	fi
+
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-idsa
+		$(use_enable doc doxygen)
+	)
+	autotools-utils_src_configure
+}