From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 dev-libs/log4cxx/Manifest                 |  2 +-
 dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'dev-libs/log4cxx')

diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index fe74b06b068c..0fde4e55b3ff 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -3,5 +3,5 @@ AUX log4cxx-0.10.0-gcc44.patch 357 BLAKE2B b70ff78b141b6952bc8a5f1eca9e251a7dd7b
 AUX log4cxx-0.10.0-missing_includes.patch 1554 BLAKE2B 9eacadeff4a26cf7eb97c9b4af43874c2640a0e7b0e0ed6b85424aa2e8d4d54d13d7eea1361c5b2d2d57f33cdc2260d6e3f5d6afd6b3d240fecc3565aab9f29f SHA512 8fb9017206bca39fa4481707cdb13b68195cc2fce66383a601bc8c7cc20869ca356f2616459b5f10615d5a40f0759c24058f22d7e08c02fee1ce367c34b2d707
 AUX log4cxx-0.10.0-unixODBC.patch 2989 BLAKE2B 8314e9777d41186e21bf7af1f2263a0461ec469af0f63ebe2b3a0787f88dcab4800342d3c707c89f271c92e966df3781ed41ace34211d158350b325743242a3f SHA512 8f21778cb797750071a5db025d50ef580c64ff9e634e18fa6b7d90082bf842f4470fe5996cc0dcf2cece6c8c0c4d5e2aa9852ff596d0c5d4ba6a33be8eb3f651
 DIST apache-log4cxx-0.10.0.tar.gz 1667425 BLAKE2B f753e1ddb1f2d7abfca92e60883752acfacc0491aa93cfe0ac26c12b32c1f6406df7be2aa83b65a176671debdaa67a69d68af6cb7901cb626eee572425de40c4 SHA512 1c34d80983db5648bc4582ddcf6b4fdefdc6594c2769f95235f5441cd6d03cf279cc8f365e9a687085b113f79ebac9d7d33a54b6aa3b3b808c0e1a56a15ffa37
-EBUILD log4cxx-0.10.0-r1.ebuild 1514 BLAKE2B ba4a6471a0c2ef3e2670cfcf16d9ae705e330df40b0d0f43ee46638e6202867a381497101d1950af861af6a94f17235c95ecbca66b23bc491b561bce3e439562 SHA512 1c9fd0e8de77870aadee0cfda237c115b66819e26af647e644cfb0f6d13a5ec6260085c17c3537b576cc17967a1c763a038662f0e2acd8238bdb13f08d6874db
+EBUILD log4cxx-0.10.0-r1.ebuild 1529 BLAKE2B e992a65f67e822180f2a47c1571fc62e3c4118ddd379c36436dd877852170f3a7f4a77d03d31621fd8b3cd82806b7356c4426f4ddd953229430aae38ad52b22e SHA512 8d392b861093fffc81624fe7331a5cff8ad9771a0220aeb1a3884509272e15e45c85bb39e88a89b2b3e7b01bdfdc999483394459e8442c53457797782d866a52
 MISC metadata.xml 258 BLAKE2B cf93caef61cf1a9150eb415d7449132b91513df5484adbd3865479cbf7b9c9dd51bff52faa129b190a4d56dd81c6285c9a58633dbccd9ca0f82a9ecc79661a80 SHA512 99d78b7a141de786112b116d0f2bcb6aa272e250c7b866b8f447f0aa778157910f0f491b79c36c6ae1a6326ad988c1e6bc9b704d8f9133ac48563c1dbe3f031c
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
index a1756aaab0f3..adc8b749d16b 100644
--- a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P=apache-${P}
 
@@ -13,26 +13,27 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
 IUSE="iodbc unicode odbc smtp"
+# test suite fails
+RESTRICT="test"
 
-RDEPEND="dev-libs/apr:1
+RDEPEND="
+	dev-libs/apr:1
 	dev-libs/apr-util:1
 	odbc? (
 		iodbc? ( >=dev-db/libiodbc-3.52.4 )
-		!iodbc? ( dev-db/unixODBC ) )
+		!iodbc? ( dev-db/unixODBC )
+	)
 	smtp? ( net-libs/libesmtp )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-# test suite fails
-RESTRICT="test"
-
 HTML_DOCS=( site/. )
 PATCHES=(
-	"${FILESDIR}/${PN}-0.10.0-missing_includes.patch"
-	"${FILESDIR}/${PN}-0.10.0-gcc44.patch"
-	"${FILESDIR}/${PN}-0.10.0-unixODBC.patch"
-	"${FILESDIR}/${PN}-0.10.0-fix-c++14.patch"
+	"${FILESDIR}"/${PN}-0.10.0-missing_includes.patch
+	"${FILESDIR}"/${PN}-0.10.0-gcc44.patch
+	"${FILESDIR}"/${PN}-0.10.0-unixODBC.patch
+	"${FILESDIR}"/${PN}-0.10.0-fix-c++14.patch
 )
 
 pkg_setup() {
@@ -43,9 +44,10 @@ pkg_setup() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		--disable-doxygen \
 		--disable-html-docs \
-		--with-apr-util="${SYSROOT}${EPREFIX}/usr" \
+		--with-apr-util="${ESYSROOT}"/usr \
 		$(use_with smtp SMTP libesmtp) \
 		$(use_with odbc ODBC $(usex iodbc iODBC unixODBC)) \
 		--with-charset=$(usex unicode utf-8 auto)
@@ -59,5 +61,5 @@ src_install() {
 	docompress -x /usr/share/doc/${PF}/examples
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
-- 
cgit v1.2.3