gentoo christmass resync : 25.12.2020

8 files changed, 7 insertions, 51 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/ETL/Manifest b/dev-cpp/ETL/Manifest
index 8ba33ec17510..6c55692911f4 100644
--- a/dev-cpp/ETL/Manifest
+++ b/dev-cpp/ETL/Manifest
@@ -1,3 +1,3 @@
 DIST ETL-0.04.15.tar.gz 362312 BLAKE2B c2afe67486a9154de559a00680b9409ee6b8b2d3312d8c8777906926c3335d4ead3e6d5da6b11771b359caa56917969fd5be7d12c2337872a41c16997421f923 SHA512 647d03f5660703a326357b0f1bb969c1e00f94c51ae72cf036f6618df1e44c6e379244a1a827b4d3c9545455efd81ff1d97254ee159e0f578f544ab856341e6f
-EBUILD ETL-0.04.15-r1.ebuild 538 BLAKE2B 95f1b26b1ce6e08cad12f443fe8e1e8eeedc013b9c4dee1c791bb189026ab8d8cff95d34423cda686d2972787d59847946690ded79a463d26bc3be67ef0a66c1 SHA512 81c731332335ca77735ecf1efb6a1904699ee8e713894be592e94a49349d8e583d2b11e47b6db0780e428dd32275d22ccda202acc9c15ceaac9cf3e965d10889
+EBUILD ETL-0.04.15-r1.ebuild 535 BLAKE2B 605d6d9fcf67c9e37d3632a8ac64a6a54be4c424048d8f85c7b6eadac34de9c7fb66bd47cd047ba9cb7cbffb4b4cbd85acd17008fe58fefdccc108fdd66539b6 SHA512 a6a98d800a3ccba0ab0fdba04fee894e28c83d1596ed1c76666a3c31ae7f44b8430b3c0af0ab844efc9614cecb3a1fa3abd4ad5de327db5eee4588cbd27c7819
 MISC metadata.xml 322 BLAKE2B f93194ae044574f8c02cdafc05cf99ef8c8b446971ab6ef91f3c6d49429d4f1919234fdef7e566999a4a10170d97933e3f91887f24e57641c31d7f277dc63fcd SHA512 eca4baf7aa303177e49b50b3697edeaec633add9a42adac767ee63a804141d15f07f86bca3d94e13bf6330a6e461ac614c254fbfebdfff86d9aef957443834b6
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index ebe7bc681d8e..31d62293c351 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest
index f0a331c579c3..d52e07de02b1 100644
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@@ -2,5 +2,5 @@ AUX cpp-hocon-0.2.1-cmake.patch 1792 BLAKE2B 2caf382ed29013b85d989f827a07430aa40
 DIST cpp-hocon-0.2.1.tar.gz 158108 BLAKE2B 4b7097768d4fcbc72df5c63fb036b12bb08108a0e1ef57ec182c64c2aa337b56197c8c10dea8f26f64a273b578d4c1b53a898024558d95e99d2ba1b3778c2414 SHA512 fcc377da7923b77436a6f2787d5b8b1b573f239de4f059c4a5949cbb1a755fd12024b9155f5e44cf60141181942f3e9a2a8fad07ee0b1d516fe2cd4a88d4ac8b
 DIST cpp-hocon-0.3.0.tar.gz 159032 BLAKE2B a5503d28d4740c78ad13836d5e7c60fc56b06d8f60f3d977a1db1008e0e90e159f2bef4d9737215684a4318b3c6d0a5efa20da1c14cd94ceacdb597bc5eaaab8 SHA512 de997e6d90330f901863b7da0d6f6e069a31e052b6f31c1e3009a9559c863f08879ecf4e202c763ec32567dd3a1e436ff5d3bf0b3009a085ef3ee95e5ca6c7e5
 EBUILD cpp-hocon-0.2.1.ebuild 588 BLAKE2B 3cb26d87e544bffdb3d77e51234f580b40ebe30a5d3c53ecab26b7224ff0657396833a1bd4c4d215c4ce3dad2cf87030eb62cfc6fc7ca84f5f9deee95a201157 SHA512 1cbfaf089c07c522c69dc3dc3c1de5af435d9baaa24ce6092fd61b403088f34c5c177fd957de5d75425ba9dfd300d93b294d12fd71de423e9fdb80a21caaf049
-EBUILD cpp-hocon-0.3.0.ebuild 584 BLAKE2B 8a740a334344a83933b076e2166bb4fd935abcadef5fac956d77c7d5c1a83dcb7f2d395712c74c82cc6b835a7a40c1aef12582631f4ed4bceeabcd23822867c8 SHA512 326f0cb3728284087115d0c6518ee0bf16462435bed19cd031718b4cb2fc698198d833bb58b1548db165574d674531dacd7aab575856f9279394013c332f1a94
+EBUILD cpp-hocon-0.3.0.ebuild 583 BLAKE2B 07e9241102d8402ca278e9c3bef86e961002e8cd66d142e2419bb0824bf7d7337bea4e34085c53ca1044a616c4fba19948a5a761b1fcb85ee82ad0d9e2104cfb SHA512 ae883347f8fe5ed11e1e62121efe7072bb354bffb830147ff47475fc305d4b168bafe617469128b1b1c5892179d95eb49e0b0af58b6a4d1865bf85373b7abbe2
 MISC metadata.xml 339 BLAKE2B 1318ce43b3d36322704fef45dfb7d54658e15394bb96120b9f0afe31099370d263fe033564aac1e113cd287e65900baea0add55fe81b7fe8e2ba31f627834302 SHA512 a7f1e55152a79c6a199de7f1264ecfe59f9e7135fcf650629b19655912d43371648c4b9efa75e6a4d6eafe30a7dc8c597c6936ba7b0ec59e38de2a2bcddd9d01
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 cdf3a111f176..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/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest
index 03692f0db14a..15e9e10579da 100644
--- a/dev-cpp/libmcpp/Manifest
+++ b/dev-cpp/libmcpp/Manifest
@@ -2,6 +2,5 @@ AUX libmcpp-2.7.2-fix-build-system.patch 1008 BLAKE2B d9a87af2faada430c9bd09bb6d
 AUX libmcpp-2.7.2-gniibe.patch 1039 BLAKE2B 2d69c087602432013c86cfe3a54f67e113842b0ae1cb9d293862f9ab1956c0b38a86a93c294936eb9e43c9fc6f7c8726bcfe198d0cdd9ede68bb05acec340e46 SHA512 a31a0f2e7430381e5e62ea4257a35891ce9d2f3beed60c6caad3b6d298a58557e9c850223840ef8c6f6c2e8139cf4a4edf29ac93b2532680feafba503fcfaf6d
 AUX libmcpp-2.7.2-zeroc.patch 2342 BLAKE2B d33a7539044a084ce42d5655db298c92b288574ae677621ccbde252abbc46ea7f5c071c500431e2e761c6158944beb2efd7fa95ec8cebd4e5ea1ce3a6ddf4af9 SHA512 86b2e851490e180dfe3028a5a37019ea423924c921ab053a642fb78d4533a87f913ede2928daf9da4daf60e67795a24521186b40c76961ae99ebeb75f8aa95ad
 DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235
-EBUILD libmcpp-2.7.2-r2.ebuild 716 BLAKE2B 8dae6fae2e6fddda5581b1adf3faea20d9b6132b034abd7932b009820d5e5553344c4c7f75b61b992f19fdd6a01ea5a24b6d55f2c0f6a28b1f69c4f2f6726237 SHA512 a4b00d7c475c7c1deb37576fd2c0e137635df1c9c8caf31c6dc3b0579d2b73b9e1794472a3f82d24636c901ff434b9a2d8a160057293cf0ad7165cdbdf227846
-EBUILD libmcpp-2.7.2-r3.ebuild 776 BLAKE2B 20b6e5e79784b777925e8ae927ce0a5dc08321bad61fd64836c7b99796c7a6e23f19fe10749fbb6b8d34f1a1c7653a1e471c5338fae1f352d1abdcd3e08ab6cc SHA512 d0ad25a3a72047b086dc840a094da909f40995098700580e78e1e7cc040b4e6dffb07b81e741062e62aa5e3bdbcdd1abcaa3a5c9a35fa84effd59965c8c6658f
+EBUILD libmcpp-2.7.2-r3.ebuild 771 BLAKE2B 306444121f6c963ae823a42ad8d1adc58e54f3d196385f0a6f95443421896779d5b821108bbdc4da0e4de6de332f73335a6f4c9e4727bc341f7d749fd60207c1 SHA512 2017ba16c121bc09393b7a1df4ff586d90034c8b568076fbfd824864f45a296306ad99ef66104caf9bf99264997469dca9579891db44b7ac873aab51c2100492
 MISC metadata.xml 241 BLAKE2B 243a081993d2297570d94667e0858f3a05bc5a214321a6d5a132f0b7a20a4cdfd9fdd1ccfd9e4753e6ea74e26907b167c484e504671e68458664d0fee31e1a2b SHA512 d242d2c5f6c5b13d0380745c59f6d4672fefcf85b888df7bc88f4501853f262eb1f615b25787ad4bce10fb8b5aad23de076feff3350f214be3d3793a3d249444
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 0f8a8f23a825..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="http://mcpp.sourceforge.net"
-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 69aa40621369..d22a2e028a4e 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}