gentoo resync : 13.11.2021

17 files changed, 612 insertions, 8 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 6d28bc0af1d7..08cb1eb60a85 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 09f27dbafc4e..806ebfad61c8 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,7 +1,9 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
 DIST asio-1.19.2.tar.bz2 1842597 BLAKE2B b2236c33432984ab660eba4c93be32374bb49f688a1e6a0711d7bac322cc4a7f817db209278f216468c6a72b9d3dd564cf298e1f49f8098c3fd9aec7acd66eb7 SHA512 07f9c29d8f02090b4d4b6a1867bcc07a8e9f3388556dff787ca3ba143022eeb63bfac0b5bc264076fed4db3b2e5ec6b7ff0ebefde40ba4753c832032a72d54cc
 DIST asio-1.20.0.tar.bz2 1845826 BLAKE2B a768dc0b9ae380bef07d674507f7571d0bc47e182cdde10b24cee246814874dd7739c523b071dfede61a12059f52e04d7bbd309a03d93070bc1dd4640c253c19 SHA512 6421960abd2cf0c205cc50e86adfe492bca2870b486328b4825dc0cefc9c40cdc085516d474c23e15a73f4c108c0e69add5fab6dbe594a1e53636c5c3027e4c5
+DIST asio-1.21.0.tar.bz2 1967398 BLAKE2B 95e0ba44910e7450e614011b487acac0cd292302c0f502ec678639b70af7e6f9b86ee2c50c7f7e3e3437ce4474323e44b5e371c08f3a9ed464ffb3f428de728b SHA512 62252b2d3ca4fb99579c5fe57bf64b700792198dd7fa45acb4af7f64e83494bade1885b848f9e364f4c42d9db025841324cbd9a0fd3fe45526e7e4be6f60f8c0
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 EBUILD asio-1.19.2.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
 EBUILD asio-1.20.0.ebuild 946 BLAKE2B 91a50e5f66e132353c4d822df9f5401a662be2257a70e700c2e80dd476ee028bd1030dbb10ebbd9c52a525f5a528a7ca0294237a155eeec92ddaa8ef6e0e278c SHA512 8a21e1e1397b5f7c301cfa35ecd7347cb07b313c0dedafec9b1ad18a4be11f77daaf9cba583a956bdc6ba8ac491fab055bca081c9251e722be1d2f3004b2ab1c
+EBUILD asio-1.21.0.ebuild 946 BLAKE2B 91a50e5f66e132353c4d822df9f5401a662be2257a70e700c2e80dd476ee028bd1030dbb10ebbd9c52a525f5a528a7ca0294237a155eeec92ddaa8ef6e0e278c SHA512 8a21e1e1397b5f7c301cfa35ecd7347cb07b313c0dedafec9b1ad18a4be11f77daaf9cba583a956bdc6ba8ac491fab055bca081c9251e722be1d2f3004b2ab1c
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.21.0.ebuild b/dev-cpp/asio/asio-1.21.0.ebuild
new file mode 100644
index 000000000000..0b91e779c0be
--- /dev/null
+++ b/dev-cpp/asio/asio-1.21.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Asynchronous Network Library"
+HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/boost
+		dev-libs/openssl
+	)
+"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		# Don't build nor install any examples or unittests
+		# since we don't have a script to run them
+		cat > src/Makefile.in <<-EOF || die
+			all:
+
+			install:
+
+			clean:
+		EOF
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	default
+
+	if use examples; then
+		# Get rid of the object files
+		emake clean
+		dodoc -r src/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 861e8b1b6174..d5270cfefa1b 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,5 +1,5 @@
 DIST cairomm-1.14.3.tar.xz 604572 BLAKE2B a626ee20a229c4597622e7ead3320e5ff971632548488e970b877712d5579731093a14791a13416bec783e180a4f8432be1a743c7a5d77af2fdf30fa36ee3caa SHA512 8dc8a0de733904742c54d4935b596d4103f2e498c6735894bc6a5a81eb4962c6ea944bad94102b18b25850f78e948d38f117c566b197bc76da23a4e88b62ee4e
 DIST cairomm-1.16.1.tar.xz 580020 BLAKE2B 219e83fb328a73cc7c5801aa155156e65245fbccfb3899d98573266f78f9f489ef968fac3c8c577fa98fbdc61af6d873293783c41dd00046e5db327443bdeda2 SHA512 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757
 EBUILD cairomm-1.14.3.ebuild 1033 BLAKE2B 2b660377913e31f0f2b5d99345e21723393af72e2ec602d9edc49c98e55aef929a7c7191adf1e6f46ef615e21d5bc89f515b7d231ca8edd57611f9aa22a7b433 SHA512 e9f1dd80c55b8017e9aaf245ca69a6881cf1b115f59a3f49366d23ebe9da9dfb40ddeaa6dad89b25d4ea5983b2f4e7ca00d10c814f82cbb577bce2033095a8d3
-EBUILD cairomm-1.16.1.ebuild 1022 BLAKE2B 5f937740c97b48527116939b610620456346a9ffa65607eca3c7be5d28140b0df89066be090143f59c15ddd57335470529b011293b1c195dd851b472455b4cd2 SHA512 8a928dc2f3286ee288f56f3c8e8d4a48baf739eec0aeaec3ea58d4163740eebf11615b4810a77fb26004cb5f22efe27813018986e8cb6cf13148a2eee33180d2
+EBUILD cairomm-1.16.1.ebuild 1028 BLAKE2B 46b3e513b24c5ad50d6c2318b236211ff7a36ab15efb753a22b63e3cac529df096fa74b00610ac7122002c18fa41aa7c2903d45903fd8ef2962ce06da67f4e59 SHA512 cd3a377dc95f2ede06ea88e2bbb9004acf5370717983f55f7e4d049de1f3e124d45033f481e7500654980725f75c63ccb9e81022585ddca46d44b945197f1ff7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/cairomm/cairomm-1.16.1.ebuild b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
index a2d8be8732dc..5130d24cf117 100644
--- a/dev-cpp/cairomm/cairomm-1.16.1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		$(meson_native_use_bool doc documentation)
+		$(meson_native_use_bool doc build-documentation)
 		-Dbuild-examples=false
 		$(meson_use test build-tests)
 		-Dboost-shared=true
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 69d1b775f76d..66961ea5349a 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -5,5 +5,5 @@ DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0
 DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
 EBUILD eigen-3.3.7-r1.ebuild 2252 BLAKE2B f4e7a4c7e9f8cabe363eea903e82c073408f6143dc1bda05041c9a30f4a8d3f4f2aa63c7238949414f5a4d289799cc675df56a6cc6f8c968128cfb0149a3168d SHA512 09be623abde6bde8dd2dac1ce9f431e9c501f8336e8faacb2f03da71bfa81f6dd9cd984246f46873b3e81401977f35c4ebfb6ffd35705f740798c6d7e36cc09e
 EBUILD eigen-3.3.9.ebuild 2510 BLAKE2B 5a6792afa7132411ad9980ee7f8be71776f73991e7f3328595a29712d71491b9f433f033b9c422054a472a90b3e7555a5a4debd42fed7a704c15c36062efe2a1 SHA512 86e5e560bb26edd70469c0ccc372e51acdf8971c58ed7b9838744bd7ead54227d4cf801c8605348f6c37bf9edff4a0f6fa6b209cdc408249c9e4d8745b6375c3
-EBUILD eigen-3.4.0-r1.ebuild 2485 BLAKE2B f5e853aee207aa58d200ce4eed78512439ffc90f86a525764d87f8f137e2161212cb16525dfd503ddf005fc116262042b7a0683c3c361bc33aadbb2b1fcdc9e9 SHA512 dc7a7d8e6f94c4b00b21503533f366886d935d5e196f50729c7f24ee6ff6a6c1e7f966915af87b0d956baba805e92da5ac8babb9e722473ca4b4dacdc8cd9269
+EBUILD eigen-3.4.0-r1.ebuild 2497 BLAKE2B 163e495c4ca8fd27aa39c56b3ea327c0745dfa6873e610b3cd393111370981f3751385fae3a66d26f9827fb00bb6de35f905bf631e69397d4a1573f8e3d2e454 SHA512 91d98398f784148964de42db55653ea77f9505aadeab4ca9849a71aed2f73a2deb486da4945d054cd21fcf8decbf085b21bf68d83824076f8387710e53d4071e
 MISC metadata.xml 887 BLAKE2B f6d225ff8a5b80f64b8e326962953b412526a0706c5dd7d9724d813a0e903d4d689f6a03249d33f1302c7575688e3246987bce6438163bb3130e7fee020cf9ed SHA512 a779ec093ee5008f881c07d3c3c9ea730a3393f8f9b6f1dde036b215ce30a006317d5f765df66f424491269179980cf3433061f693d902f5ac2e3341b4166ac8
diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
index 8bd4d5d66425..59a2a982583c 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
 
 # Tests failing again because of compiler issues
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 148b91a12870..2476a3470fbd 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,9 @@
 DIST glibmm-2.66.1.tar.xz 7509820 BLAKE2B 4750940093cadbae7c32d387ac8b16c8230eb08ed1645e457edfa27542a2e8a01d70de08bb41d1872dd1f03d1506bfaefc2af582250ca64ad480ce5f98f20d56 SHA512 caf57c2c9d163fff45041c33ed70d2692040d7bea44660d68e8c16a76be2609e0f857a5e16ad5220a0ec681a560c864dc86c2988a2c40741b4f29c9fe5b7d8b9
+DIST glibmm-2.66.2.tar.xz 7603104 BLAKE2B 5696391bd5dbb35f8c961250af6d9b2644e900ac6a800054e9e7630cbf4882c17ef1bf8cf322e89a3bdbe613d13d4a045920bfc1071442daa3afc78afa8cd759 SHA512 097af6b140a5af3e52cc2c5d251475a5aa923d0c528c3cbc97f31d3a95868bcb3aa2328047ca94a55ef7fd188f271917dfe29faa86f477a441f0a024284216f9
 DIST glibmm-2.68.1.tar.xz 7657712 BLAKE2B a8141e53f89c981a9916d5f71dfd8c6d08e45a653b98c507acaadfefbedf2f22e8130a722f3398f5e0dff8196ffc8efa6567ebb2c8290f7373e34377e281db18 SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c
+DIST glibmm-2.68.2.tar.xz 7844508 BLAKE2B 890f3a8f15580891df000acfe365989a6b09a63712b5f24f999a70e62983c725c9aef2b386b8995933c41b345164bb0b330b6cb0af182476f14657db8ba7d0cf SHA512 96b2970ac47e6a8de2d4352412f0107fbdcb61942d27f20a2f533f9704304e5f55c52829567457e7c925f830a69c739bf00676882741ed2969e52caf3e135c46
 EBUILD glibmm-2.66.1.ebuild 1255 BLAKE2B 20753f7a289f47fc393bfa7b155c2f8b056935bbd76a29808dba8a1ab9e3909912e39dc8c07032f5c96265150936e4c9f842a6b89fadf3e9dbd5e1a19da18b8b SHA512 58f016cb9a9157970afaa6ad9ea2fd70b1f360e34c1b32b442c5431e5e0098cbfb79ab8ac28cdf340f3e102fc74ae3a38daa07a66b9c6d383d9164dcc4c97f73
+EBUILD glibmm-2.66.2.ebuild 1263 BLAKE2B d9e9ed54517a2a322aaa15ea707b81d3a1e378a46adb678fe67e6e10d0cf97d6e0d5350cb96d76d2f5b785d7ceb4d0ffcbeeacf81f4d6717e83fbd709e5d5f1a SHA512 ab9659ac6267c9afa93d058736de43df3a72acaf4821482807adacd54b160847c8bffd82cf5d5a4b4115568b1dc107ee0fae2cf55e730d79ddb4fa28e158d353
 EBUILD glibmm-2.68.1.ebuild 1212 BLAKE2B f14e59f2fdeb8c35c2ad1ea08cf66ec76d4fbe1cb52b40acbb35030635c00f97b4af1d402e56188cfd5669e5df3b8c7553b3e6ee02bb0e4b2087e14733c77424 SHA512 a9adde41b1ccb31741dccbdf4ae45c74973cbc7419d066f3de5fb1ae0dd9b2e67099a9534893b9af05921375439ad75cc38dcc35d26e405a5987e64bc884e794
+EBUILD glibmm-2.68.2.ebuild 1213 BLAKE2B 3656f64800b84e19906b62ec05e29dffbcb9eef88e43e70f1be1e5e1725bf160a5702bf8005f3bbe52e2f8d0945240a61c4fcb915a4d209891a248ce235266fc SHA512 edc9f10adabb024ff710aab7fff34a9c663dad5ed0f669252da954756f3e15ef6eaa6e24529e0f472a81612c30094e79d3f459323c14121c1f1412071871010b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/glibmm/glibmm-2.66.2.ebuild b/dev-cpp/glibmm/glibmm-2.66.2.ebuild
new file mode 100644
index 000000000000..d6657cf05be6
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.66.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-perl/XML-Parser
+		dev-libs/libxslt
+		media-gfx/graphviz
+	)
+"
+
+src_prepare() {
+	default
+
+	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
+	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
+
+	if ! use test; then
+		sed -i -e "/^subdir('tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dwarnings=min
+		-Dbuild-deprecated-api=true
+		$(meson_native_use_bool doc build-documentation)
+		$(meson_use debug debug-refcounting)
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
diff --git a/dev-cpp/glibmm/glibmm-2.68.2.ebuild b/dev-cpp/glibmm/glibmm-2.68.2.ebuild
new file mode 100644
index 000000000000..b380e4af013d
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.68.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.68"
+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 )"
+
+RDEPEND="
+	>=dev-libs/glib-2.63.0:2[${MULTILIB_USEDEP}]
+	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+"
+
+src_prepare() {
+	default
+
+	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
+	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
+
+	if ! use test; then
+		sed -i -e "/^subdir('tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dwarnings=min
+		-Dbuild-deprecated-api=true
+		$(meson_native_use_bool doc build-documentation)
+		$(meson_use debug debug-refcounting)
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest
index 6171a42bac4e..89670a9e941c 100644
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@@ -1,4 +1,4 @@
 AUX gstreamermm-1.10.0-no-volatile.patch 856 BLAKE2B 40e2735424873d2dedda0a8ee2fcac848362741a08acb291ffe532e3b6a1d9af8967345f535148692b7322ecc74fb94a244c0841a57f571e6d6a37eda095c1fe SHA512 6babe0b607646c77850512df029be989256403e86010bcc198f782a04f357fbb3580c1015924b46af0ec2f3b9bb3c5b2f96b8a21befba8ee24c877dc32f59660
 DIST gstreamermm-1.10.0.tar.xz 3529640 BLAKE2B 29b99928cd1b21fd295683b4a1ad0a1b0f8ae959237fcbfef7d5a9296a70a140a04fa390fbbcb8d3151d28239f281e72feb30a0466478e38dfb4e172beaf21f1 SHA512 34eeb9eec5958c96acf7c7791eef80138e5d55fea6ddf1bf9ace6b1ec7f052da2abf04d87089e4c9ead51c631ef7afceaf9fceb946ec3d105da522187c69e429
-EBUILD gstreamermm-1.10.0.ebuild 1510 BLAKE2B 6c6e75c2c7653ede07d0b169fbfe2e55adb638dc446a08d5b5aae35f5c18d7bb622da2ff95ce931e75434e2b2c7dc46e9ccdf9cb646d6859105ad702e3b33533 SHA512 c47f97f245c78b7a9660c44dbc7bf0e6109765439ed332b951d94e1500d1ba596d96784a7be5454f93cb1036412ad30280bc7f095e80f7cfa7ad17ba416ee698
+EBUILD gstreamermm-1.10.0-r1.ebuild 1510 BLAKE2B 51f000e27bd006e22a86dcdb47a2eacf7cc857cfe94a8a17e4c1b5eeceb40dfe35878f9fd7740a0d75150582b97acf985c60b638d3a567780cf9b1ec9724ea24 SHA512 bad63b8fa16352c6c58894c8191ff6dd1ca0d7c2ecfb7907f0a63b1d05ddb7c85a0f4fb1fff4547259744d61a4649e245799e59153252360411df5ef6d4f9024
 MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
diff --git a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild b/dev-cpp/gstreamermm/gstreamermm-1.10.0-r1.ebuild
index fced073bba0a..8f28a2ec3d97 100644
--- a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-1.10.0-r1.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=6
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 2fa797dc5d63..da427c0b597a 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,4 +1,7 @@
 AUX muParser-1.32-parallel-build.patch 680 BLAKE2B 7699b129186f0173bfbc7f742d51175ed67eddb9898b61f7d6a3a462e1a262112a2d4af445e12501caa88d4630308bb5f273ef2a704e2948db9cdb7649ee6bb7 SHA512 a39af330803786ebb86259dd86ecfac00ca04978b0e623b418d887f6b20a6eb6cee2b37da8164aa7038b3accf388b40b6a6d4eccd2f20afdfd6051cc3505ac90
+AUX muParser-2.3-export-cmake.patch 13652 BLAKE2B a83680f1214a6941a89f28fbdf0789fd665ca002d4259ffb802cc32c37f83a48f45b601c52640a9e0bcb39b4e4869317ccb71898b557f9b19caaf5b3ee11ecec SHA512 a126199cb71e8160f78bd3872fe252ce7cc77f99185af8922750bee85b0a60a2657a688913a9df897d15c76bd0446d16371cf792f334b96e101e07d84856bb6b
 DIST muParser-2.2.6.1.tar.gz 755653 BLAKE2B b3b6b8da57c0e8a0bda74038689d444ba8da00d6cce80030d8b35693209f0293874e4822c4941974be21fd4b7c09ba7df2c9cef861bc10b890aae4f641040faf SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
+DIST muParser-2.3.2.tar.gz 103979 BLAKE2B f892b4d440a1b7326be27aa0a2b703ccafc02de5e881ef4780e8907688cf7905284f3e5f5855ad2596683f1dad309d287ebae527d917ebf5e0dad045551df7de SHA512 8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef
 EBUILD muParser-2.2.6.1.ebuild 884 BLAKE2B 0632f4ac0e8b1c70fa866d0113496891d28dd7a3ef42f6124326e175e98a11922bbef7653c317b9e80186ba0e3ed7d888f7416f7893632184c2a155cd09137f3 SHA512 886577b677945b49b0422733c0f4f78bf0d4a239ee1fc41ad6b420484d8d461254eb8b6e71599799764258820b8de88768caf3e552c460bdcf33caeabf04cbb9
+EBUILD muParser-2.3.2-r1.ebuild 759 BLAKE2B d0cf80151df77795cc47e099dbc5319af65e1cd85e70ff18b4445fc56fc8c427bc2d68bd472cf6281a89bf25197711ff006f5924982b627085b2c74e2bf81760 SHA512 7aace9aec071b81b463dc2eeff86d1091148cc0e91ffe90c84a6a66e0967f5c553dbbd9978a59d5ce1bcdbe7d35cade97ddc4509b2dae37df0dccda24105d9d6
 MISC metadata.xml 625 BLAKE2B 319444cf45ae4e0e7ad24cc11590e5141a5a7b05404fcb9b95373e548e4ca0b23dda45057317a68051006805c77d031cdd4ff55b6b4c827e1cdf36ac9b0df3b7 SHA512 029296e964eecf47ba83943e51bb14dc251d55de449a0d6c3f0396f5b3e8fcd19c02074f46ad5d71dd03f46c61029d6300569d3b9bfaa106464515adecf0b1ee
diff --git a/dev-cpp/muParser/files/muParser-2.3-export-cmake.patch b/dev-cpp/muParser/files/muParser-2.3-export-cmake.patch
new file mode 100644
index 000000000000..79254626db6a
--- /dev/null
+++ b/dev-cpp/muParser/files/muParser-2.3-export-cmake.patch
@@ -0,0 +1,405 @@
+From a9e6626c9b2e250eb9161c767d2fb2e5a07315e2 Mon Sep 17 00:00:00 2001
+From: Francis Giraldeau <francis.giraldeau@nrc-cnrc.gc.ca>
+Date: Wed, 8 Jul 2020 14:59:27 -0400
+Subject: [PATCH] Export muparser cmake targets
+
+Export muparser targets, such that client projects can
+import it using find_package(). This mechanism for both the build tree
+and the install tree. The provided example3 shows how to import muparser
+targets.
+
+Signed-off-by: Francis Giraldeau <francis.giraldeau@nrc-cnrc.gc.ca>
+Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
+---
+ CMakeLists.txt                  |  39 ++++++-
+ CMakeLists.txt.orig             | 173 ++++++++++++++++++++++++++++++++
+ muparserConfig.cmake.in         |   6 ++
+ samples/example3/CMakeLists.txt |  12 +++
+ samples/example3/README.md      |   2 +
+ samples/example3/build.sh       |  23 +++++
+ samples/example3/example3.cpp   |  49 +++++++++
+ 7 files changed, 301 insertions(+), 3 deletions(-)
+ create mode 100644 CMakeLists.txt.orig
+ create mode 100644 muparserConfig.cmake.in
+ create mode 100644 samples/example3/CMakeLists.txt
+ create mode 100644 samples/example3/README.md
+ create mode 100755 samples/example3/build.sh
+ create mode 100644 samples/example3/example3.cpp
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cfdce99..aecc67d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,6 +55,11 @@ add_library(muparser
+     src/muParserTest.cpp
+     src/muParserTokenReader.cpp
+ )
++# use the headers in the build-tree or the installed ones
++target_include_directories(muparser PUBLIC
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
++    $<INSTALL_INTERFACE:include>
++)
+ 
+ # this compiles the "DLL" interface (C API)
+ target_compile_definitions(muparser PRIVATE MUPARSER_DLL)
+@@ -77,9 +82,6 @@ set_target_properties(muparser PROPERTIES
+     SOVERSION ${MUPARSER_VERSION_MAJOR}
+ )
+ 
+-# Install the export set for use with the install-tree
+-export(TARGETS muparser FILE "${CMAKE_BINARY_DIR}/muparser-targets.cmake")
+-
+ if(ENABLE_SAMPLES)
+   add_executable(example1 samples/example1/example1.cpp)
+   target_link_libraries(example1 muparser)
+@@ -91,8 +93,10 @@ endif()
+ # The GNUInstallDirs defines ${CMAKE_INSTALL_DATAROOTDIR}
+ # See https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
+ include (GNUInstallDirs)
++set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/muparser)
+ 
+ install(TARGETS muparser
++    EXPORT muparser-export
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries
+@@ -116,6 +120,35 @@ install(FILES
+     COMPONENT Development
+ )
+ 
++# Export the target under the build-tree (no need to install)
++export(EXPORT muparser-export
++    FILE "${CMAKE_BINARY_DIR}/muparser-targets.cmake"
++    NAMESPACE muparser::
++)
++
++# Export the installed target (typically for packaging)
++include(CMakePackageConfigHelpers)
++write_basic_package_version_file(
++    "${CMAKE_CURRENT_BINARY_DIR}/muparserConfigVersion.cmake"
++    VERSION ${MUPARSER_VERSION}
++    COMPATIBILITY AnyNewerVersion
++)
++configure_file(muparserConfig.cmake.in
++    "${CMAKE_CURRENT_BINARY_DIR}/muparserConfig.cmake"
++    COPYONLY
++)
++install(EXPORT muparser-export
++    FILE muparser-targets.cmake
++    NAMESPACE muparser::
++    DESTINATION ${INSTALL_CONFIGDIR}
++)
++install(FILES
++    ${CMAKE_CURRENT_BINARY_DIR}/muparserConfig.cmake
++    ${CMAKE_CURRENT_BINARY_DIR}/muparserConfigVersion.cmake
++    DESTINATION ${INSTALL_CONFIGDIR}
++    COMPONENT Development
++)
++
+ # Define variables for the pkg-config file
+ set(PACKAGE_NAME muparser)
+ configure_file(
+diff --git a/CMakeLists.txt.orig b/CMakeLists.txt.orig
+new file mode 100644
+index 0000000..b496584
+--- /dev/null
++++ b/CMakeLists.txt.orig
+@@ -0,0 +1,173 @@
++# CMake based on work from @xantares
++cmake_minimum_required (VERSION 3.1.0)
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++
++# By default, build in Release mode. Must appear before project() command
++if (NOT DEFINED CMAKE_BUILD_TYPE)
++  set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
++endif ()
++
++project(muParserProject)
++
++
++
++# Bump versions on release
++set(MUPARSER_VERSION_MAJOR 2)
++set(MUPARSER_VERSION_MINOR 3)
++set(MUPARSER_VERSION_PATCH 2)
++set(MUPARSER_VERSION ${MUPARSER_VERSION_MAJOR}.${MUPARSER_VERSION_MINOR}.${MUPARSER_VERSION_PATCH})
++
++# Build options
++option(ENABLE_SAMPLES "Build the samples" ON)
++option(ENABLE_OPENMP "Enable OpenMP for multithreading" ON)
++option(BUILD_SHARED_LIBS "Build shared/static libs" ON)
++
++if(ENABLE_OPENMP)
++    find_package(OpenMP REQUIRED)
++    set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
++    set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
++endif()
++
++
++# Credit: https://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake/3818084
++if(MSVC)
++    # Force to always compile with W4
++    if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
++      string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++    else()
++      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
++    endif()
++elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
++    # Update if necessary
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
++endif()
++
++include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
++add_library(muparser
++    src/muParserBase.cpp
++    src/muParserBytecode.cpp
++    src/muParserCallback.cpp
++    src/muParser.cpp
++    src/muParserDLL.cpp
++    src/muParserError.cpp
++    src/muParserInt.cpp
++    src/muParserTest.cpp
++    src/muParserTokenReader.cpp
++)
++<<<<<<< HEAD
++=======
++# use the headers in the build-tree or the installed ones
++target_include_directories(muparser PUBLIC
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
++    $<INSTALL_INTERFACE:include>
++)
++>>>>>>> e259981 (Export muparser cmake targets)
++
++# this compiles the "DLL" interface (C API)
++target_compile_definitions(muparser PRIVATE MUPARSER_DLL)
++
++if (BUILD_SHARED_LIBS)
++  target_compile_definitions(muparser PRIVATE MUPARSERLIB_EXPORTS)
++else ()
++  target_compile_definitions(muparser PUBLIC MUPARSER_STATIC)
++endif()
++
++if (CMAKE_BUILD_TYPE STREQUAL Debug)
++  target_compile_definitions(muparser PRIVATE _DEBUG)
++endif ()
++
++if(ENABLE_OPENMP)
++  target_compile_definitions(muparser PRIVATE MUP_USE_OPENMP)
++endif()
++set_target_properties(muparser PROPERTIES
++    VERSION ${MUPARSER_VERSION}
++    SOVERSION ${MUPARSER_VERSION_MAJOR}
++)
++
++if(ENABLE_SAMPLES)
++  add_executable(example1 samples/example1/example1.cpp)
++  target_link_libraries(example1 muparser)
++
++  add_executable(example2 samples/example2/example2.c)
++  target_link_libraries(example2 muparser)
++endif()
++
++# The GNUInstallDirs defines ${CMAKE_INSTALL_DATAROOTDIR}
++# See https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
++include (GNUInstallDirs)
++set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/muparser)
++
++install(TARGETS muparser
++    EXPORT muparser-export
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries
++)
++
++install(FILES
++    include/muParserBase.h
++    include/muParserBytecode.h
++    include/muParserCallback.h
++    include/muParserDef.h
++    include/muParserDLL.h
++    include/muParserError.h
++    include/muParserFixes.h
++    include/muParser.h
++    include/muParserInt.h
++    include/muParserTemplateMagic.h
++    include/muParserTest.h
++    include/muParserToken.h
++    include/muParserTokenReader.h
++    DESTINATION include
++    COMPONENT Development
++)
++
++# Export the target under the build-tree (no need to install)
++export(EXPORT muparser-export
++    FILE "${CMAKE_BINARY_DIR}/muparser-targets.cmake"
++    NAMESPACE muparser::
++)
++
++# Export the installed target (typically for packaging)
++include(CMakePackageConfigHelpers)
++write_basic_package_version_file(
++    "${CMAKE_CURRENT_BINARY_DIR}/muparserConfigVersion.cmake"
++    VERSION ${MUPARSER_VERSION}
++    COMPATIBILITY AnyNewerVersion
++)
++configure_file(muparserConfig.cmake.in
++    "${CMAKE_CURRENT_BINARY_DIR}/muparserConfig.cmake"
++    COPYONLY
++)
++install(EXPORT muparser-export
++    FILE muparser-targets.cmake
++    NAMESPACE muparser::
++    DESTINATION ${INSTALL_CONFIGDIR}
++)
++install(FILES
++    ${CMAKE_CURRENT_BINARY_DIR}/muparserConfig.cmake
++    ${CMAKE_CURRENT_BINARY_DIR}/muparserConfigVersion.cmake
++    DESTINATION ${INSTALL_CONFIGDIR}
++    COMPONENT Development
++)
++
++# Define variables for the pkg-config file
++set(PACKAGE_NAME muparser)
++configure_file(
++    muparser.pc.in
++    ${CMAKE_BINARY_DIR}/muparser.pc
++    @ONLY
++)
++install(
++    FILES ${CMAKE_BINARY_DIR}/muparser.pc
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
++)
++
++include(CTest)
++enable_testing()
++
++add_executable (t_ParserTest test/t_ParserTest.cpp)
++target_link_libraries(t_ParserTest muparser)
++add_test (NAME ParserTest COMMAND t_ParserTest)
++
+diff --git a/muparserConfig.cmake.in b/muparserConfig.cmake.in
+new file mode 100644
+index 0000000..6a28a5e
+--- /dev/null
++++ b/muparserConfig.cmake.in
+@@ -0,0 +1,6 @@
++get_filename_component(muparser_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
++include(CMakeFindDependencyMacro)
++
++if(NOT TARGET muparser::muparser)
++    include("${muparser_CMAKE_DIR}/muparser-targets.cmake")
++endif()
+diff --git a/samples/example3/CMakeLists.txt b/samples/example3/CMakeLists.txt
+new file mode 100644
+index 0000000..0049c3e
+--- /dev/null
++++ b/samples/example3/CMakeLists.txt
+@@ -0,0 +1,12 @@
++cmake_minimum_required(VERSION 3.2)
++project(muparser-example3)
++
++# find muparser target already installed
++find_package(muparser 2.0 REQUIRED)
++
++add_executable(example3 example3.cpp)
++target_link_libraries(example3 muparser::muparser)
++
++include(CTest)
++add_test(example3 example3)
++
+diff --git a/samples/example3/README.md b/samples/example3/README.md
+new file mode 100644
+index 0000000..73e15d4
+--- /dev/null
++++ b/samples/example3/README.md
+@@ -0,0 +1,2 @@
++The example3 shows how to import and use muparser as an installed external
++dependency using cmake `find_package()`.
+diff --git a/samples/example3/build.sh b/samples/example3/build.sh
+new file mode 100755
+index 0000000..289fac9
+--- /dev/null
++++ b/samples/example3/build.sh
+@@ -0,0 +1,23 @@
++#!/bin/bash -x
++
++CWD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
++MP_SOURCES=${CWD}/../../
++MP_BUILD=${CWD}/muparser-build
++MP_INSTALL=${CWD}/muparser-install
++EX3_BUILD_TREE=${CWD}/example3-using-buildtree
++EX3_INSTALL_TREE=${CWD}/example3-using-installtree
++
++# Build muparser and install it
++cmake -H${MP_SOURCES} -B${MP_BUILD} -DCMAKE_INSTALL_PREFIX=${MP_INSTALL}
++cmake --build ${MP_BUILD} --target install
++
++# Build the example using muparser build tree
++cmake -H${CWD} -B${EX3_BUILD_TREE} -DCMAKE_PREFIX_PATH=${MP_BUILD} 
++cmake --build ${EX3_BUILD_TREE} --target all
++cmake --build ${EX3_BUILD_TREE} --target test
++
++# Build the example using muparser install tree
++cmake -H${CWD} -B${EX3_INSTALL_TREE} -DCMAKE_PREFIX_PATH=${MP_INSTALL} 
++cmake --build ${EX3_INSTALL_TREE} --target all
++cmake --build ${EX3_INSTALL_TREE} --target test
++
+diff --git a/samples/example3/example3.cpp b/samples/example3/example3.cpp
+new file mode 100644
+index 0000000..78df86f
+--- /dev/null
++++ b/samples/example3/example3.cpp
+@@ -0,0 +1,49 @@
++/*
++
++    _____  __ _____________ _______  ______ ___________
++   /     \|  |  \____ \__  \\_  __ \/  ___// __ \_  __ \
++   |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
++   |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
++       \/      |__|       \/           \/     \/
++   Copyright (C) 2004 - 2020 Ingo Berg
++
++   Redistribution and use in source and binary forms, with or without modification, are permitted
++   provided that the following conditions are met:
++
++     * Redistributions of source code must retain the above copyright notice, this list of
++      conditions and the following disclaimer.
++     * Redistributions in binary form must reproduce the above copyright notice, this list of
++      conditions and the following disclaimer in the documentation and/or other materials provided
++      with the distribution.
++
++   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
++   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
++   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
++   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
++   IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
++   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++// Small example using the cmake imported target. Include file and link library
++// should work automagically.
++
++#include <muParser.h>
++#include <muParserDef.h>
++
++int main()
++{
++   mu::Parser  parser;
++
++   mu::value_type  values[] = { 1, 2 };
++   parser.DefineVar("a", &values[0]);
++   parser.DefineVar("b", &values[1]);
++
++   std::string expr = "a + b";
++   parser.SetExpr("a + b");
++   mu::value_type ans = parser.Eval();
++   std::cout << expr << " == " << ans << "\n";
++
++   return (ans == 3.0) ? 0 : -1;
++}
+-- 
+2.33.1
+
diff --git a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild b/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..010002a56d2e
--- /dev/null
+++ b/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for parsing mathematical expressions"
+HOMEPAGE="http://muparser.beltoforion.de/"
+SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/muparser-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc openmp test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/muParser-2.3-export-cmake.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_OPENMP=$(usex openmp)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile test
+}
+
+src_install() {
+	cmake_src_install
+	dodoc Changes.txt
+}
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 275c36c21bf8..1104ebeba5f7 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -6,5 +6,5 @@ AUX websocketpp-0.8.2-fix-clang.patch 1042 BLAKE2B 8d453efb82fea72a0a4b2ed5ab7ec
 DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc82cdad20685a52ac1130c2fc4e94764a38d2e4f7c36101b11705e10c67eb149ba2c30750e7a6f63696d52c272fed2 SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
 DIST websocketpp-0.8.2.tar.gz 701364 BLAKE2B dacee33832f493d465afe208f9edea1393414a22c8db8f8c86b8f913521d0d8d68b95673a2e82b7479acfbab1ac541eda2d713a55d5de387b3879461d5884df7 SHA512 b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06
 EBUILD websocketpp-0.8.1-r1.ebuild 1327 BLAKE2B f7bd8864f76bbb9a8f10520d64a64283a74bf6390d95a0240f5a2d075b9d476a49e7a54835bf6311bba15131f73800c4a03b5cbd4b1a7863d0e6dc35b68657f8 SHA512 dcc5ce6f4f13be6d6b880daabe9d9830ba33096afdf5dc6fb576e32394ac5a5f8f90cb79dc121faea8792926fd02554a278ce156e337e10f91d07b1562e81802
-EBUILD websocketpp-0.8.2.ebuild 1271 BLAKE2B 1f7411b49bf296e3c67e336d94c3f0be5abc4b78a3efbedc19e8fb4551926d0865c9d9339819fd19d7dbaaef2293274e7be843a611209322d6824b4f674bbba0 SHA512 f783b260c9c592bce423117ae53821d6d565f531c00a3154bd021c4aea8797baf14e41f2e90ea66dd58013d82f816ffdf91909f447998baa37d4afece6d98e49
+EBUILD websocketpp-0.8.2.ebuild 1278 BLAKE2B e1cf8f380473662ba0d4ccb397e082204b11936b5bc670077b36495502505d47a096b93e4a0094fcccf6da0d89cd4f1cbc9473c2e6d12e123e3c3645957ec81b SHA512 74d56d4452f78d1dcfaa4b2963e4fe59c92c530282419814d9efeee2b4a789e6814a334d0639a97be9eeca250aecf69d01b8c4661910ffa26ff8d8d927f7a1d9
 MISC metadata.xml 252 BLAKE2B 4beafc2dbc69f457e4880196afd696198e1d4006e76836d7581c4a3098bf68d58da79344c88974c92a63303dbd0199d5de0bfd984adbc358ad92da2a9edd96a4 SHA512 20cc70561adba76fc4ac65953dc2a2dfc4b8261d6a56bed78d00b7aa8e0edd507bc851bf7c1dba138b55175dd1d1bb8b4f853fe96242046dc7611ab10cfb0a5b
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
index 3e9339f27dba..e7142f79cd03 100644
--- a/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"