gentoo resync : 08.01.2021

3 files changed, 3 insertions, 65 deletions

diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index 338a76b1a331..97269737b57f 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -5,7 +5,5 @@ AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2
 AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
-DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb
-EBUILD log4cpp-1.1.3.ebuild 1260 BLAKE2B 560f16a733613bfda221da956ed28c1801bcdd8c45e63b01bed25b29d82855f0072a0e9f8ebc12865a19e543dcaff635e4e71febd3b815466566604eb1488cfd SHA512 9b3553438e752699f2c876f969641290519ee50cbfed6da9d3d66e9163ab9a4d067e2cf621f2401ed45d773647d2e56cf0ed7bc97aaf83c727e519d0cd1e6b2f
-EBUILD log4cpp-1.1.ebuild 1204 BLAKE2B dd6c9be9cb70665b4a8bbc6bc1bee4b51792c97738b2cfff8cd5ada7d77b6e6013b4ce839699cff71a8ea2402d395c6c7a6cde0b404ad8b88e9a8766e5b57de8 SHA512 87712a5daa9dc26a6305be0ebc6145925659f1736d1cbe5ea208b72d8f1989838a42f579fecb78a3fd617b36b39b3ce0311306d29b745ace15a0f14fade531d4
+EBUILD log4cpp-1.1.3.ebuild 1256 BLAKE2B d39928e410991866cab1fba01212606f77164d68336b0c458772c1242d38576806bd43c0936cf5cc216cee625144f7697356e6162c06efa6e7c9673a3e04015e SHA512 0852bf6c27231f07aa214073511789de1d90a8d66d60f5f35243880a0ef2b927e1bac349a00bc398d369238ba7a939e8867e2c5726f8cd58e912771b8c7037e8
 MISC metadata.xml 244 BLAKE2B c211d7844d07df7225f7396d520699eb92a3d36a24a42153a7e736aa91ec766fef9ba07b120f90fe0ac295a982123259d294cc7a4cda1375c52e5d55a938e41c SHA512 0adb9b66d52e83eef31fe24ba677684835d998f9cf88054128834a3bff80878aabb6b2b8209f1d34f3e91b4d9c615d632d58c86bcb6fba38c85dc33c05d950e1
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
index b293ed92d241..705c161ed490 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild
deleted file mode 100644
index 406828fdb425..000000000000
--- a/dev-libs/log4cpp/log4cpp-1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-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/5"
-KEYWORDS="amd64 ~arm ppc s390 x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-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() {
-	default
-
-	mv configure.{in,ac} || die
-
-	# Build tests conditionally
-	if ! use test; then
-		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-multilib_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
-}