Updating liguros repo21.1.2

24 files changed, 79 insertions, 114 deletions

diff --git a/dev-cpp/ETL/ETL-0.04.15-r1.ebuild b/dev-cpp/ETL/ETL-0.04.15-r1.ebuild
index 98488ac2a7b2..1996b2b7abab 100644
--- a/dev-cpp/ETL/ETL-0.04.15-r1.ebuild
+++ b/dev-cpp/ETL/ETL-0.04.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-cpp/benchmark/benchmark-1.5.2.ebuild b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
index ccdf771385b2..840648c7edc2 100644
--- a/dev-cpp/benchmark/benchmark-1.5.2.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
@@ -11,10 +11,14 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug test"
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-Add-missing-limits-inclusion.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBENCHMARK_ENABLE_TESTING=$(usex test)
@@ -22,5 +26,7 @@ src_configure() {
 		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
 	)
 
+	use debug || append-cppflags -DNDEBUG
+
 	cmake_src_configure
 }
diff --git a/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch b/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch
new file mode 100644
index 000000000000..42bdbbef1f43
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.5.2-Add-missing-limits-inclusion.patch
@@ -0,0 +1,30 @@
+From 3d1c2677686718d906f28c1d4da001c42666e6d2 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@inbox.ru>
+Date: Thu, 15 Oct 2020 09:12:40 +0100
+Subject: [PATCH] src/benchmark_register.h: add missing <limits> inclusion
+ (#1060)
+
+Noticed missing header when was building llvm with gcc-11:
+
+```
+llvm-project/llvm/utils/benchmark/src/benchmark_register.h:17:30:
+  error: 'numeric_limits' is not a member of 'std'
+   17 |   static const T kmax = std::numeric_limits<T>::max();
+      |                              ^~~~~~~~~~~~~~
+```
+---
+ src/benchmark_register.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/benchmark_register.h b/src/benchmark_register.h
+index 61377d74..204bf1d9 100644
+--- a/src/benchmark_register.h
++++ b/src/benchmark_register.h
+@@ -1,6 +1,7 @@
+ #ifndef BENCHMARK_REGISTER_H
+ #define BENCHMARK_REGISTER_H
+ 
++#include <limits>
+ #include <vector>
+ 
+ #include "check.h"
diff --git a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
index 98407388284e..616d02ae0adc 100644
--- a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.12.0-r1.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=5
@@ -11,7 +11,7 @@ HOMEPAGE="https://cairographics.org/cairomm/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="aqua doc +svg X"
 
 RDEPEND="
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index da18f8a9fc40..d98826da0593 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 IUSE="debug doc static-libs"
 
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
index 082eef626412..015fa6c96c75 100644
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-cpp/glibmm/glibmm-2.64.2.ebuild b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
index ab483e4d6d71..74f0934dfcef 100644
--- a/dev-cpp/glibmm/glibmm-2.64.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.64.2.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=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
index 2f2a3c4f95a6..e11c9fb99778 100644
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.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=7
@@ -21,7 +21,7 @@ else
 		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
 	fi
 	SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild
deleted file mode 100644
index 4336b8f55271..000000000000
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P=${P/lib/}
-
-DESCRIPTION="A portable C++ preprocessor"
-HOMEPAGE="https://sourceforge.net/projects/mcpp/"
-SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-mcpplib \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
index d15f98594e5a..cbea80626ba9 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
 IUSE="static-libs"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
index b2c4dad19ba5..dad258ac582f 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/libxmlplusplus/"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
index 946284fb4fb0..5fa60ee388b8 100644
--- a/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/libxmlplusplus/"
 
 LICENSE="LGPL-2.1"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-cpp/lucene++/lucene++-3.0.7-r1.ebuild b/dev-cpp/lucene++/lucene++-3.0.7-r1.ebuild
index 731f88718271..73ce5940456c 100644
--- a/dev-cpp/lucene++/lucene++-3.0.7-r1.ebuild
+++ b/dev-cpp/lucene++/lucene++-3.0.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.
 
 LICENSE="|| ( LGPL-3 Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="debug"
 
 DEPEND="dev-libs/boost:="
diff --git a/dev-cpp/lucene++/lucene++-3.0.7-r2.ebuild b/dev-cpp/lucene++/lucene++-3.0.7-r2.ebuild
index d81bc12c9a8a..30c7d8b5fa31 100644
--- a/dev-cpp/lucene++/lucene++-3.0.7-r2.ebuild
+++ b/dev-cpp/lucene++/lucene++-3.0.7-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.
 
 LICENSE="|| ( LGPL-3 Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="debug"
 
 DEPEND="dev-libs/boost:="
diff --git a/dev-cpp/mm-common/mm-common-1.0.1.ebuild b/dev-cpp/mm-common/mm-common-1.0.1.ebuild
index 4ef6c6ff34dc..d9d3bc89f63e 100644
--- a/dev-cpp/mm-common/mm-common-1.0.1.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/muParser/muParser-2.2.6.1.ebuild b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
index 9310bcb88bad..f2025d294739 100644
--- a/dev-cpp/muParser/muParser-2.2.6.1.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index c040d31592de..9e63f828a377 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.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=7
@@ -7,42 +7,44 @@ inherit cmake
 
 DESCRIPTION="JSON for Modern C++"
 HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> ${P}-testdata.tar.gz )"
+SRC_URI="
+	https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> ${P}-testdata.tar.gz )"
 S="${WORKDIR}/json-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="doc test"
 #RESTRICT="!test? ( test )"
 # Need to report failing tests upstream
 # Tests only just added, large test suite, majority pass
 RESTRICT="test"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( ChangeLog.md README.md )
 
 src_configure() {
+	# Tests are built by default so we can't group the test logic below
 	local mycmakeargs=(
 		-DJSON_MultipleHeaders=ON
+		-DJSON_BuildTests=$(usex test)
 	)
 
-	if use test ; then
-		# Define test data directory here to avoid unused var QA warning
-		# #747826
-		mycmakeargs+=(
-			-DJSON_BuildTests=ON
-			-DJSON_TestDataDirectory="${S}/json_test_data"
-		)
-	fi
+	# Define test data directory here to avoid unused var QA warning, bug #747826
+	use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
+
 	cmake_src_configure
 }
 
 src_compile() {
 	cmake_src_compile
-	use doc && emake -C doc
+
+	if use doc; then
+		emake -C doc
+		HTML_DOCS=( doc/html/. )
+	fi
 }
 
 src_test() {
@@ -56,8 +58,3 @@ src_test() {
 
 	cmake_src_test
 }
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-cpp/pangomm/pangomm-2.42.1.ebuild b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
index f19e34ec2a2e..4569f9de7ba5 100644
--- a/dev-cpp/pangomm/pangomm-2.42.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
index ba450049d43e..bbfba1ff0074 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sparsehash/sparsehash/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index 25976f821bad..08a93301b150 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.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=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.threadingbuildingblocks.org"
 SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples"
 
 DEPEND=""
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index 95f59399a2f5..a38364264aae 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1,2 +1 @@
-DIST tclap-1.2.1.tar.gz 442387 BLAKE2B 413d77f59224dd7751621f32a5712178c4954cb532095203a1eb839c97d20e8651f94f90d4961a47f654d5b478946fb988db66df0d17c8230fde0b771af77405 SHA512 8bd6ee724600880840048c7b36f02d31b1aa4910b17f80fb04aef89b1f1917856d9979ec488edbd457b66d9d689aea97540abb842a8b902bbd75c66a6e07b9b1
 DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
diff --git a/dev-cpp/tclap/tclap-1.2.1.ebuild b/dev-cpp/tclap/tclap-1.2.1.ebuild
deleted file mode 100644
index 10640380338c..000000000000
--- a/dev-cpp/tclap/tclap-1.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-DESCRIPTION="Simple templatized C++ library for parsing command line arguments"
-HOMEPAGE="https://sourceforge.net/projects/tclap/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf $(use_enable doc doxygen)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-}
diff --git a/dev-cpp/tclap/tclap-1.2.2.ebuild b/dev-cpp/tclap/tclap-1.2.2.ebuild
index 260363e5ce4d..f68b8f2db4b6 100644
--- a/dev-cpp/tclap/tclap-1.2.2.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-cpp/tree/tree-2.81.ebuild b/dev-cpp/tree/tree-2.81.ebuild
index f4aae731cd7e..02e717ec1e73 100644
--- a/dev-cpp/tree/tree-2.81.ebuild
+++ b/dev-cpp/tree/tree-2.81.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.aei.mpg.de/~peekas/tree/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 S="${WORKDIR}/${P}/src"