gentoo auto-resync : 28:07:2022 - 03:03:20

4 files changed, 1 insertions, 102 deletions

diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index 8c618f5009bf..cce9d8fc53e6 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -1,6 +1,3 @@
-AUX log4cplus-1.2.0-fix-c++14.patch 897 BLAKE2B c4067272e84b2e442ef61c5468734ee985a9931171e7651242e79029dd6c5c6a9aae03fb9aa9a3ec9c1d391763c7acc7d57c794904636a261b2ebefda4986fe4 SHA512 9771a43add0af52417d67f54c991d637928d5f8340e90a786f2e9714cbc206e4ce6e7cc55face0f2ed0ed2c34e0a52bd922fa11978b85ffa48f02235df7c2de9
-DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626
 DIST log4cplus-2.0.7.tar.bz2 1210637 BLAKE2B 59e9c3c351c7893c7e9c39e9d12616579cff3b4dfdd3e069f0adb4b75fb2b46d6fe8efceea2b6103c5531a723f015518bf10ce6a581724b6ae5f49e994b74c72 SHA512 9d1b36d0c2347dd9d9ab8852114b8138f56063c51625eaab7f4c680ee852e1e6872c6712465b10057ec9e42305b83d956f6753100dfd3ec58518d6620cc4106c
-EBUILD log4cplus-1.2.0.ebuild 1608 BLAKE2B 9a57f60b53167c615a168a58eb9d6c600c22de0b6494256ee433c360cfb9fcff284fd531ea6c728f56b72ce508c0ac400d01fac0eff27273aaf674a78d908945 SHA512 0a2827afef22fbf973f3dc67edf8c9491e29b754770896c819d1e0ef468b933036e0751a0f7c610a4962c74993c34676d83d89ebf8596e4311cb56ed634ffe32
 EBUILD log4cplus-2.0.7.ebuild 999 BLAKE2B 485e5b26b1b5cc036b169af385ef4d9b238d2fa90c9609b3e7b90fdcb4806c7343477404bd8a3e35c2fb79ac17c4122f93354bfc95aeb5f92c6a2c57998eeb73 SHA512 a58a8dfd2300a3d2f6da90deeb5bd1b7baae33d34b0858efd413eb8364c29e24b65b7f16c44738dae09be692ca2ed47bcbffef9fe398686c4be885fd676616f7
-MISC metadata.xml 1019 BLAKE2B 4656573d247296e8ef15672860d7131eb38e2ec19b6a020d545a0df5b2cef3bb2ab23098dadb747960914a0b1afe0e95b3c9598001b4f23f43e531d0ea04c765 SHA512 e0568fab0d1b3d20bf05c3cb1feb65f3e6737de39e5df251ab9fff20b4142e67b143c99749e374edfd6c6c23326e90a4d294551efd2be60b2c849bac40bd6593
+MISC metadata.xml 716 BLAKE2B dcb81a8ab633126286970909239487cfe302b1f1a0132fee4bc3c9b453f9fe82fef578f8a3a5b6c5ccd8a91ca7be33b8991b297d9b4b0235ef6c36c786702449 SHA512 37b620663b8bfdf5c1e2ee9d8d351bd4c91cf48500363030d6c3096a567610abc76646ee3145a8e49405c13c91a83194e473dcc4cde079f30a940002abb7e832
diff --git a/dev-libs/log4cplus/files/log4cplus-1.2.0-fix-c++14.patch b/dev-libs/log4cplus/files/log4cplus-1.2.0-fix-c++14.patch
deleted file mode 100644
index ccd6e1aadd2e..000000000000
--- a/dev-libs/log4cplus/files/log4cplus-1.2.0-fix-c++14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Make dtors noexcept(false) when compiling in C++11 and above. This avoids
-silent breakage due to the semantic changes between C++98 and C++11.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595424
-
---- a/include/log4cplus/hierarchylocker.h
-+++ b/include/log4cplus/hierarchylocker.h
-@@ -48,7 +48,11 @@
-     public:
-       // ctor & dtor
-         HierarchyLocker(Hierarchy& h);
--        ~HierarchyLocker();
-+        ~HierarchyLocker()
-+#if __cplusplus >= 201103L
-+        noexcept(false)
-+#endif
-+        ;
-         
-         /**
-          * Calls the <code>resetConfiguration()</code> method on the locked Hierarchy.
---- a/src/hierarchylocker.cxx
-+++ b/src/hierarchylocker.cxx
-@@ -62,6 +62,9 @@
-  
- 
- HierarchyLocker::~HierarchyLocker()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
- {
-     try {
-         for(LoggerList::iterator it=loggerList.begin(); it!=loggerList.end(); ++it) {
diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
deleted file mode 100644
index d0049f0f238c..000000000000
--- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
-HOMEPAGE="https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-SLOT="0/1.2-5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="iconv qt5 threads working-locale working-c-locale"
-REQUIRED_USE="?? ( iconv working-locale working-c-locale )"
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-fix-c++14.patch" )
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with iconv) \
-		$(use_with qt5) \
-		$(use_enable threads) \
-		$(use_with working-locale) \
-		$(use_with working-c-locale)
-}
-
-src_test() {
-	cd tests/ || die
-
-	local t
-	for t in appender customloglevel fileappender filter \
-	 hierarchy loglog ndc ostream patternlayout performance priority \
-	 propertyconfig timeformat; do
-		einfo "Running test \"${t}_test\""
-		pushd "${t}_test/" >/dev/null || die
-		"${S}"/${t}_test || die "Running ${t}_test failed!"
-		popd >/dev/null || die
-	done
-
-	if use threads; then
-		for t in configandwatch thread; do
-			einfo "Running test \"${t}_test\""
-			pushd "${t}_test/" >/dev/null || die
-			"${S}"/${t}_test || die "Running ${t}_test failed!"
-			popd >/dev/null || die
-		done
-	fi
-}
-
-src_install() {
-	default
-	dodoc docs/unicode.txt
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/log4cplus/metadata.xml b/dev-libs/log4cplus/metadata.xml
index 29dbbbef8a20..a7db4616f45a 100644
--- a/dev-libs/log4cplus/metadata.xml
+++ b/dev-libs/log4cplus/metadata.xml
@@ -6,8 +6,6 @@
 		<flag name="explicit-initialization">Require explicit initialization</flag>
 		<flag name="iconv">Use inconv for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
 		<flag name="server">Build the logging server</flag>
-		<flag name="working-locale">Use C++'s std::locale for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
-		<flag name="working-c-locale">Use the C99 locale facilities for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation </flag>
 	</use>
 	<slots>
 		<subslots>soname major version number</subslots>