gentoo resync : 11.05.2021

12 files changed, 113 insertions, 220 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c8aa39a02e7c..68da59f47455 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index e6c5879d8316..42654ad4c431 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -2,11 +2,7 @@ AUX eigen-3.3.7-gentoo-cmake.patch 910 BLAKE2B 9cad2b9c54fb1299dfe45f9a94a427d1c
 AUX eigen-3.3.8-no-error-counting-in-openmp-parallelize_gemm.patch 2382 BLAKE2B 99d69381ebb3ecf8b097eef69916bde88ab5cec075df623a46537281b37059876ce39e687de4ca441ebe6459c66438f3282d051d0e85b0574df98205be8cf6d0 SHA512 26cdf877d4d3378b322cc08c0430b0628a07279a030732661ba4acb85d6c835956c99474fc4587a170d11437ca6715e56d8eaabb625a1eba7c46ce4d6e4d66f9
 AUX eigen-3.3.9-max-macro.patch 476 BLAKE2B aa2e810a7be5a934a8bf5844b7e24633ab8f6b6a58388d6d9cb9b4b925f68311443f79cb3f94c8c50adc14f2165530c43b735abc4aa21340868d9330c1e9b4fa SHA512 ad8d10c90136188ffda547b8d8781e9d26bc43d1dba7e9c3ff12f8a73725d1b331dd47bccdd331f998a0b03251eb2e3373a8cb39284f82c4bc63a5a703f21a46
 DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
-DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
-DIST eigen-3.3.8.tar.gz 2141903 BLAKE2B c33e699ba08338e7b9b215c9466e161229164ed3c466ce3d760c6917749af33c0414c3bc4bbdd216e3466e69ece8a38ca8beb78b7e0f1609894df6bb4a7fcca3 SHA512 5b4b5985b0294e07b3ed1155720cbbfea322fe9ccad0fc8b0a10060b136a9169a15d5b9cb7a434470cadd45dff0a43049edc20d2e1070005481a120212edc355
 DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
 EBUILD eigen-3.3.7-r1.ebuild 2251 BLAKE2B 8ac30181d5c64ecb1a5ba47d386b00962e772319dfaeb393deb1c0d742a8c4721b4ea57de43ee79c754634872b455e0ae6a086617b46b4ca9bf19b9ff038a20e SHA512 02b5f22b042d817b9d4729bc13bea27b54683508db23d22ae0215003f49a7b9f70069e92911f9e4e40d5f71ac847035cc89843f426b7dcfca214e1e4cd3034eb
-EBUILD eigen-3.3.7.ebuild 2432 BLAKE2B 2312d5d606907923882c74f4842128d95f9fa25eff68ab7217a58131c2fab11f42d8e1658129f29a7dbc68d3ab42510f6289ff1fe9ec7987596f691aebb67fd6 SHA512 e411a3a4c08776dc667d2145e52b23225d88b6bc9e6b36e664392fc26bd34195fcfcf2b54d0b20dec4ad8597f6e262d4dd7671513ab3581b10d0a16ed2713701
-EBUILD eigen-3.3.8-r1.ebuild 2292 BLAKE2B ec49dbace8c35444eb8a823270845eca371973500d187d91dbc897329fbe295c0ffdd5bc566301a51b1cc1ac26d51618762fd41c2d958ab4d7d813860df7ad45 SHA512 1aa8b8db7450a986fd3df736de11f7b1060523e30173d0240dc5bbdf18db0cbaf6b5657f2517e8dcdf4dd34b55efba88b3e51686c145b7c0a97502424be2aab8
 EBUILD eigen-3.3.9.ebuild 2499 BLAKE2B 3b9577b804ab4059a94f5fd2fdf0f55fa094d570bc998ea41feb3e0ab3ec3014492b78466e0602d4b9be448b3c82c243b41bfd635f62fe2b0f53bf16fa055e8e SHA512 68b000a435dc937d09d21c6ef3528b561548f7f4903cf902bf32c9c116fdec53ae12bd504b552e39244b06cf1d08d419d4ba07b767a40e4abcbcebd808676585
-MISC metadata.xml 945 BLAKE2B 11864f5eb57e7a8ecfa9d1869536fbfbd9fcb24bc965edad51ec5013bea87a48d63c1b6427b5bffe26191de7e24b950a1c7ad1f0a801fed6b77a41bad4786334 SHA512 99fe52d30c344b957a76a7f6add1dd4251c606f47befa6f517fa50cbd8ba1ef325e66051ff799093cef8281bf1099709e86d3f3a896b078267c665ad68063203
+MISC metadata.xml 886 BLAKE2B 650db5b70b6440feb58275f3c949a9b191121798f47baba77e10e53f176470084136fc880914a7cce29d7424472f1f0116a81e33ab7eb25541e1fa549a9aa362 SHA512 32adfdc1a0501b1926b027d729c2c204d8b84c00623ff250bd8b66877371f812a966aed20efc71b5bf47c3fcfe5249f68a4ef0fb3ab2422eec9c8e7f6af341ca
diff --git a/dev-cpp/eigen/eigen-3.3.7.ebuild b/dev-cpp/eigen/eigen-3.3.7.ebuild
deleted file mode 100644
index 1f3bb7907f70..000000000000
--- a/dev-cpp/eigen/eigen-3.3.7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED="test"
-inherit cmake-utils cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-cpp/eigen:0"
-DEPEND="
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-		media-libs/freeglut
-		media-libs/glew
-		sci-libs/adolc[sparse]
-		sci-libs/cholmod
-		sci-libs/fftw:3.0
-		sci-libs/pastix
-		sci-libs/umfpack
-		sci-libs/scotch
-		sci-libs/spqr
-		sci-libs/superlu
-		virtual/opengl
-		virtual/pkgconfig
-	)
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-src_unpack() {
-	default
-	mv ${PN}* ${P} || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e 's:-g2::g' \
-		-i cmake/EigenConfigureTesting.cmake || die
-
-	sed -e "/add_subdirectory(demos/d" \
-		-i CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/add_subdirectory(test/d" \
-			-i CMakeLists.txt || die
-
-		sed -e "/add_subdirectory(blas/d" \
-			-e "/add_subdirectory(lapack/d" \
-			-i CMakeLists.txt || die
-	fi
-	sed -e "/Unknown build type/d" \
-		-i CMakeLists.txt || die
-
-	use cuda && cuda_src_prepare
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC="$(usex cpu_flags_ppc_altivec)"
-		-DEIGEN_TEST_CXX11="$(usex c++11)"
-		-DEIGEN_TEST_CUDA="$(usex cuda)"
-		-DEIGEN_TEST_OPENMP="$(usex openmp)"
-		-DEIGEN_TEST_NEON64="$(usex cpu_flags_arm_neon)"
-		-DEIGEN_TEST_VSX="$(usex cpu_flags_ppc_vsx)"
-	)
-	cmake-utils_src_configure
-	cmake-utils_src_compile blas
-	cmake-utils_src_compile buildtests
-	cmake-utils_src_test
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake-utils_src_install
-
-	# Debian installs it and some projects started using it.
-	insinto /usr/share/cmake/Modules/
-	doins "${S}/cmake/FindEigen3.cmake"
-}
diff --git a/dev-cpp/eigen/eigen-3.3.8-r1.ebuild b/dev-cpp/eigen/eigen-3.3.8-r1.ebuild
deleted file mode 100644
index bddd6bddf843..000000000000
--- a/dev-cpp/eigen/eigen-3.3.8-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED="test"
-inherit cmake cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/index.php?title=Main_Page"
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( virtual/pkgconfig )
-"
-DEPEND="
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	test? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-		media-libs/freeglut
-		media-libs/glew
-		sci-libs/adolc[sparse]
-		sci-libs/cholmod
-		sci-libs/fftw:3.0
-		sci-libs/pastix
-		sci-libs/scotch
-		sci-libs/spqr
-		sci-libs/superlu
-		sci-libs/umfpack
-		virtual/opengl
-	)
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
-	"${FILESDIR}"/${P}-no-error-counting-in-openmp-parallelize_gemm.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	cmake_comment_add_subdirectory demos
-
-	if ! use test; then
-		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
-			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
-			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
-			-i CMakeLists.txt || die
-	fi
-
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKEPACKAGE_INSTALL_DIR=$(get_libdir)/cmake/${PN}${SLOT}
-	)
-	use test && mycmakeargs+=(
-		-DEIGEN_TEST_CXX11=ON
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
-		-DEIGEN_TEST_CUDA=$(usex cuda)
-		-DEIGEN_TEST_OPENMP=$(usex openmp)
-		-DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
-		-DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-	if use test; then
-		cmake_src_compile blas
-		cmake_src_compile buildtests
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-}
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index f955d9ffca0a..2a269f7122ee 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -17,7 +17,6 @@
 		providing optimal speed with GCC.
 	</longdescription>
 	<use>
-		<flag name="c++11">Build using the C++11 standard</flag>
 		<flag name="cuda">Build with cuda support</flag>
 	</use>
 	<upstream>
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index af5999272af2..745a3b4590f7 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,7 +1,9 @@
 DIST glibmm-2.64.2.tar.xz 7438116 BLAKE2B 6ff458e90a5dbc606a2e04ecd3589262a1b96e827dba245985467818a7a4ba80a9c4cb15686fe479636cb8ce7e1db3334195d6334d7ec56327076cad87e22170 SHA512 0130af9a16981a54630150db6f4b1a95458d72d650c5e4781ee97ce624ec98c600b79ebf234d212e025781453fd11d78b9e8273235ffa143397423418fe970cc
 DIST glibmm-2.64.5.tar.xz 7491108 BLAKE2B 3c0f2215542a6ccc65c37d566856df326b7c0d45999e525df6153862edd0841c501c64fc3cfd0e4c3f1bae29bbaca1eed44738acc11b3f1515ffc8a396b0791f SHA512 e90bb722a35292b0fc54dff82604ec8d23a9e72b08581de14fd515539392ed713d0691352bf7de42d5027579959f76b268cdc11a76a3d3033ae8268f486ee817
+DIST glibmm-2.66.0.tar.xz 7507608 BLAKE2B e6c8f9bac453e81a0a80850fe13b32751fd9644db40acd9d6a45e96f52cdccdbed633ad1ffde566103eb22af9cb073da11368d5c11db237d43127c0962768a64 SHA512 e6b38847a70d61412e7013a04fae2db1163cf746c1b8cb6bc43bd6985d66c1859ceb74dc2ca070ca88e5e4cd443325ccf8200c14fad9af47e33b5b49a0bb854f
 DIST glibmm-2.68.0.tar.xz 7652260 BLAKE2B df87b3f3d8cd74b693f843dec15d5376f2a755b0a72042983383c15cca9fdb90c2fed6320bf0f3fe846fcda5be3ee15c0fc1b683d29cebe64e8dcdd101fc9bf0 SHA512 a13121052315e949acf2528e226079f1a2cf7853080aec770dcb269e422997e5515ed767c7a549231fb3fa5f913b3fd9ef083080589283824b6a218d066b253e
-EBUILD glibmm-2.64.2.ebuild 1445 BLAKE2B bb31548b8263d78dc9f14f7baed5895814a26b9650ad106c6b60031432129d3df3eb05787e68e717c87ab9b11c645c03a55739582fe0b423b2ba6aad61f29588 SHA512 ec5b14755ee4e3b1b56041f982bc256fb5d2cf1cf883602f6b3dfb15b183c01a634013012689f9358c70ef668c1ef41a8319fd06f6cf3afeead3f0606bc35ad2
-EBUILD glibmm-2.64.5.ebuild 1515 BLAKE2B 2891382d33c079dba65a7ee040e60dc16d8b956b979552aa4e366b6e636b47b59bc7b2029c705dc6dd26880893f1dd27db67b8aa9d92dbf949e4765b8ebbaf57 SHA512 b205e9216663354fa736deb1403edf14419b164b3125d6776da98e7582f0fcbca128c1d942b7e95cc527d673a24ad1533476ed6130e56c7bbab35b3f1131a28b
+EBUILD glibmm-2.64.2.ebuild 1466 BLAKE2B 1f88a4ed53ab42adc54ceca53f1766f0a6f4d8207129142f3f71e21ff3c561ec8bf9a935f827dd14d2bab1f2fb5be87a9b47deb8f89c555a0d5eabc96b3f2106 SHA512 4e5ea2477f1ab5ddaf6844dd765f2bdc127d9e4453b289ed51cd1eeab5ff8e9e0216226e35a11cc487c00caf9539970b62c5f6982fa64980c760a64d7d186d64
+EBUILD glibmm-2.64.5.ebuild 1536 BLAKE2B 90643f5aa0dc607869bf09b3a0355bce6bc1fdcb4daba7cfde5b330c8fdb2bef903b146af47338da39618a4104b11d9bdd1efc5eb34b2b1860c5c4d456872565 SHA512 8084c94c8757bd59d16a0e5bd5f701d5ae294aab79a8bdd5c320639cafc751a540cf6ad961c184066f9b826d2d894697f44c3f3cb740778669c73b13cbf0a854
+EBUILD glibmm-2.66.0.ebuild 1402 BLAKE2B fdfe6c6ff707947a55c50e8cd805fac966dc471988ebede5467e962d3b75b1da854f5d468175a0d10c5df2ba419e8cb8fde9a85a628d013934d4b49155fdaff3 SHA512 e8b55f88c0c68e254c0e41c70b927765bafb42cdc2b5434fa30217dadc2c45c276e4661d9f90136cc6258549244eb86cb82451640f3801b15a334602e39c6e63
 EBUILD glibmm-2.68.0.ebuild 1359 BLAKE2B bc0d66ed662df3a61153428fb01a0767c55a3a323e5338e45b68448d10ddd09702521acbe9824bb6b0778d95d67c1f7d5065155e2f954c89660f29e31089bc40 SHA512 8175e60c96ee44577b0d7aa7d3e59edbac17bf7e990d2f38b3712bbdab12ddac8dc518df4d92aeeb06c7d22641f299100ed22ef0f6602b3e5139431fef93a98e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.64.2.ebuild b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
index 74f0934dfcef..e23b61cde0c0 100644
--- a/dev-cpp/glibmm/glibmm-2.64.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
@@ -23,6 +23,7 @@ BDEPEND="
 	>=dev-cpp/mm-common-1.0.0
 	sys-devel/m4
 	dev-lang/perl
+	dev-perl/XML-Parser
 	doc? (
 		app-doc/doxygen
 		dev-libs/libxslt
diff --git a/dev-cpp/glibmm/glibmm-2.64.5.ebuild b/dev-cpp/glibmm/glibmm-2.64.5.ebuild
index 25300c2afb5d..9cf987f5d897 100644
--- a/dev-cpp/glibmm/glibmm-2.64.5.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.64.5.ebuild
@@ -25,6 +25,7 @@ BDEPEND="
 	>=dev-cpp/mm-common-1.0.0
 	sys-devel/m4
 	dev-lang/perl
+	dev-perl/XML-Parser
 	doc? (
 		app-doc/doxygen
 		dev-libs/libxslt
diff --git a/dev-cpp/glibmm/glibmm-2.66.0.ebuild b/dev-cpp/glibmm/glibmm-2.66.0.ebuild
new file mode 100644
index 000000000000..27244f110de8
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.66.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal 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 ~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
+		-Dbuild-documentation=$(usex doc true false)
+		-Ddebug-refcounting=$(usex debug true false)
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index 496847228649..5b5d1a123c06 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -1,4 +1,5 @@
+AUX tree-2.81-gcc11.patch 933 BLAKE2B c3b1afcd9325e9b452eb5b9279e4542d9f82f7d8de7060efbabecb302c2c064e5a5891533449e33f75c45078b2bc8c5fc7f7e3e8f204118345a02afa5a32b5c6 SHA512 43ec3975ecbd4b38105a2c4980da8ca0b19a5075bb6eaa5cae313c4f2eb5b8d44118dc55b778c5f973bc5ad69236bb94086cf1c72e8d9a9198ad25c14a8b5fa1
 AUX tree-2.81-test.patch 550 BLAKE2B fe73799591f7f0c65d2f031792bc87b2d85bc143bf4adb35e04db712ef95a5ba0e15d8256aec28a0ac95d2306fa45de41d1a8dc5d53629d38ede35fe87cef256 SHA512 a859891662a1093f517f43a6ea14a4e1f7d81988d0fe83253554bea83bfdecde0b51ed05795d0d6f0b3494a7cde6db56a8304397ea5ad9fb2d446647f4301514
 DIST tree-2.81.tar.gz 1167128 BLAKE2B ea92724b16fc7ea8a5f0036f5a7a57d000d66b332b4ba46139463f707f95922f38b1d4d56a6d2fca0a3c4ece8f11e28bbf4aa6bec5c5a7bc59ccaa36a01413d6 SHA512 85e910fdb19ffd03ae79302a95ebffdb44725fd9f291a61d6912f743b54fe9b3d1c863e00c7e75d238f428946809e42c7ae6379b1051688fb06ee6c6d761d294
-EBUILD tree-2.81.ebuild 779 BLAKE2B 1bab4cf235c8213c3a44759abf740a2ac8de846911a00d7161844b27fb88951c43f083414c8be85984bf14b49b76a551a3d7188d5d36456421451c8d3fb2a522 SHA512 de075f3ec751044814319ed5011522e77a7d138bb8a9adea50b760b4dae1881aad2d1079f7c40a5d620d9fc1b08e326ccc9c96ff162418e163a76f932e3bf168
+EBUILD tree-2.81.ebuild 811 BLAKE2B 2b55073288c7c192ad70c07289cfb950d0f5b5a50d6374e6ca456ba3b62ce1fa0aaad4430d0479492978622e4d6efde76c33c8b1371ceea2441a2e07866190fe SHA512 3e6f39990b5457f9e55078b1625be939a05c33ad7fd40cdb7b64d726ba0b5ed183fcd9ee029d3a12498309529874b10a2b5fd228821e48299c05d1cd4ab8f003
 MISC metadata.xml 619 BLAKE2B ac5307e69727d5da71a21955619b8e322df63ebd877617c70b494ad541c470ef6df41a90ddf92b132452c293e2fbcbb85f2b72ee372f95491124ab50f7299ce2 SHA512 b2486910e891482643fc8464b11269ca6f83e87a8403edb78b2163e7fa37586b503597f0ea61332439322d257ad239d0c0a210707788043d555a96f3b712cc84
diff --git a/dev-cpp/tree/files/tree-2.81-gcc11.patch b/dev-cpp/tree/files/tree-2.81-gcc11.patch
new file mode 100644
index 000000000000..feffe0de13cc
--- /dev/null
+++ b/dev-cpp/tree/files/tree-2.81-gcc11.patch
@@ -0,0 +1,33 @@
+--- "a/simple tree.hpp"
++++ "b/simple tree.hpp"
+@@ -323,7 +323,7 @@
+ 	public:

+ 		compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};

+ 

+-		bool operator()(const tree_node *a, const tree_node *b) 

++		bool operator()(const tree_node *a, const tree_node *b) const

+ 		{

+ 			return comp_(a->data, b->data);

+ 		}

+--- a/tree.hh
++++ b/tree.hh
+@@ -422,7 +422,7 @@
+ 			public:
+ 				compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
+ 				
+-				bool operator()(const tree_node *a, const tree_node *b) 
++				bool operator()(const tree_node *a, const tree_node *b) const
+ 					{
+ 					return comp_(a->data, b->data);
+ 					}
+--- a/xinlin.hh
++++ b/xinlin.hh
+@@ -332,7 +332,7 @@
+ 	public:

+ 		compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};

+ 

+-		bool operator()(const tree_node *a, const tree_node *b) 

++		bool operator()(const tree_node *a, const tree_node *b) const

+ 		{

+ 			return comp_(a->data, b->data);

+ 		}

diff --git a/dev-cpp/tree/tree-2.81.ebuild b/dev-cpp/tree/tree-2.81.ebuild
index dc164fccce71..8bf33d70b234 100644
--- a/dev-cpp/tree/tree-2.81.ebuild
+++ b/dev-cpp/tree/tree-2.81.ebuild
@@ -8,15 +8,17 @@ inherit toolchain-funcs
 DESCRIPTION="An STL-like tree class"
 HOMEPAGE="http://www.aei.mpg.de/~peekas/tree/"
 SRC_URI="http://www.aei.mpg.de/~peekas/tree/${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
-S="${WORKDIR}/${P}/src"
-
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+	"${FILESDIR}"/${P}-gcc11.patch
+)
 
 src_configure() {
 	tc-export CXX