8 files changed, 30 insertions, 162 deletions
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 7345185952dc..f4cc4bbd330c 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,4 +1,2 @@
-DIST glibmm-2.66.5.tar.xz 7610516 BLAKE2B 766939ad6a5cd94bc642da7e9801ccb4f693d652ad4afcfc15b6e12a646b0d5d9c203a04328d13727f4e6c35730e7e9cc431f448618c75df305874dacaf0d7aa SHA512 3c1f91a1d91c23c5975254f5bf499f6752b6e3f1b056511133722cdfc853ffd2a94c375c0441dbb3f0933e7a257449ca4e365355ed580bd72d88c08d99a76684
 DIST glibmm-2.66.6.tar.xz 8668828 BLAKE2B 0e133eb73f8a290e3bc2167435e9e88b49603153c96d2eff130ac0ee0d1b1e0d3907197267cd1bc62e1f8b6a74ed8a8429e891430c4bfc512cbdf5e877e79701 SHA512 64d5ee1904ac645ee5a470889b928a24ab012bb0c310a94631bd725df9d5b7a5c0d2129f114017677db922b724ad12ab33698f1d27cae4aaeccd199b0e883099
-DIST glibmm-2.74.0.tar.xz 7938292 BLAKE2B c089826f6a33c02d525d40bcb375249fd0aa1d238a2cce44b421389812345b57e41d93c8e6a5f37a8fa6f7800bdcc0d4da531ad0f3b3bf69b6f91ef7f9f496a8 SHA512 29c16a6c921fb135721c39b5328e0b45e09c500c65175199c1ec5ee75bdd5fb907072389c6980da3bf8fac0846235af5580f692706eb00d26947804daa1c99c9
 DIST glibmm-2.76.0.tar.xz 9295168 BLAKE2B 99e6e0776f945a245ea68ca39194c6cecaace282a9be31e27e65e07b8034963c814a6306b74817aeb82740fbc01a9e4ff3a0b4a8605da15a3cd0d3e72a86bb16 SHA512 be49599f5eb8eb5a1cef015cdb37af2564fcd1ea845aa4344804ca5f0f61468949711e25cefebb93219e1be37128ebfdd2a816324e752ac4395b4b87c072fc78
diff --git a/dev-cpp/glibmm/glibmm-2.66.5.ebuild b/dev-cpp/glibmm/glibmm-2.66.5.ebuild
deleted file mode 100644
index 7e242b086528..000000000000
--- a/dev-cpp/glibmm/glibmm-2.66.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk-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
-	gtk-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 gtk-doc build-documentation)
-		$(meson_use debug debug-refcounting)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/glibmm/glibmm-2.74.0.ebuild b/dev-cpp/glibmm/glibmm-2.74.0.ebuild
deleted file mode 100644
index f93f9ed749ba..000000000000
--- a/dev-cpp/glibmm/glibmm-2.74.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.68"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk-doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.73.2:2[${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	gtk-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 gtk-doc build-documentation)
-		$(meson_use debug debug-refcounting)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 3e657a9ddf8b..e3313beb4745 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,4 +1,3 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.7.tar.xz 14813100 BLAKE2B a02d54fd8a9ace49acc503538f4d0df8cc12e57753c1463dfd9fb470b24c0db49733239fe4a51c3362953ceb98c546c29a302ba411cbaf060b3561a262faa081 SHA512 2ede6d77df5cbaa6ea3ee347d8b949e38512db7f5e9b36cb6f531eb259d5986f84ebfc6bb0cdaac1be4dc97e9d611515995184d245e2c0fab2cd8ebcae933a98
 DIST gtkmm-4.10.0.tar.xz 16148612 BLAKE2B 9b11a79866be0f12b5f0f687d556058cb491131f14442f66053705d7cf909a28c6b5641f202cb2872f79399ba854710f88f3dc728230ca30e627da5fa7c69356 SHA512 ee40cce37c34814884ffc06e614013d23fa31cac51ea9d98ea5689a08acc2ff58bb2ca80ba822d6fe3c0f3bdcb9ce2596ede3c05c69a702b524c4e38afc3d9ab
-DIST gtkmm-4.8.0.tar.xz 15898612 BLAKE2B 8263eca4df519cbf2de2da2505872b6ceec24b05b2f0d145e3980afa2a9e45fe864e7445a646d7027a6362c11355a817de0f783f5539c68ec07afd03981dc942 SHA512 9cc769ad7d0fdfd675306a441697c63164d4b5221ab895bf06800a7e47b48d2e28b09cce057bcca8e95d1b20112a809d313ae485d349f5450cf11bb4eab361a6
diff --git a/dev-cpp/gtkmm/gtkmm-4.8.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-4.8.0-r1.ebuild
deleted file mode 100644
index d6e71827ca4a..000000000000
--- a/dev-cpp/gtkmm/gtkmm-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit gnome.org meson python-any-r1 virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="gtk-doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?]
-	>=gui-libs/gtk-4.7.2:4
-	>=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?]
-	>=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?]
-	>=x11-libs/gdk-pixbuf-2.35.5:2
-	>=media-libs/libepoxy-1.2
-"
-DEPEND="
-	${RDEPEND}
-	gtk-doc? ( dev-libs/libsigc++:3 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dbuild-demos=false
-		$(meson_use gtk-doc build-documentation)
-		$(meson_use test build-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-cpp/xsimd/Manifest b/dev-cpp/xsimd/Manifest
index 53212822b10f..11ae1449e178 100644
--- a/dev-cpp/xsimd/Manifest
+++ b/dev-cpp/xsimd/Manifest
@@ -1 +1 @@
-DIST xsimd-11.0.0.tar.gz 218589 BLAKE2B ce0021f51d541d8c713645c84c38df2cf0e769fba191ba1ef030da682aa6176467cc1cc2722feac4bc0d3f931e1611d16349818eb9b4e9e1803d39f0985ecfbd SHA512 75927ab1369aa8eb321d4a2e425f14d977cd1a5792d13a8ca5a393b030fce7a5ce00492a5145a3fbedd29c3ad38556d5a4b2242534eb76dc5164b7cef4f8406b
+DIST xsimd-11.1.0.tar.gz 219350 BLAKE2B 2bbbc4f7dbe489a407fe798b146c008aba44664efc943c2e1507d5c6e7da2a03ed91abf0d872e5abf9bd94be3e76bef276ec5b47d4e356b42a7b4c680bd6f3d9 SHA512 3a6141dfa4d95a977f4222880dfd06197613d153a78a84653022423279eec037ea9def08ae225aba7231c0b2c434ab7c907c965f8367fb0db9b96113980b51f3
diff --git a/dev-cpp/xsimd/files/xsimd-11.1.0-c++17.patch b/dev-cpp/xsimd/files/xsimd-11.1.0-c++17.patch
new file mode 100644
index 000000000000..b0c99452cc4e
--- /dev/null
+++ b/dev-cpp/xsimd/files/xsimd-11.1.0-c++17.patch
@@ -0,0 +1,27 @@
+--- a/test/CMakeLists.txt	2023-05-17 19:59:34.023146040 +0200
++++ b/test/CMakeLists.txt	2023-05-17 20:01:23.021505635 +0200
+@@ -50,20 +50,11 @@
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder")
+         # Users may override the c++ standard:
+         if(NOT DEFINED CMAKE_CXX_STANDARD OR "${CMAKE_CXX_STANDARD}" STREQUAL "")
+-            if (ENABLE_XTL_COMPLEX)
+-                CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG)
+-                if (NOT HAS_CPP14_FLAG)
+-                    message(FATAL_ERROR "Unsupported compiler -- xsimd requires C++14 support when xtl complex support is enabled")
+-                endif()
+-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+-            else()
+-                CHECK_CXX_COMPILER_FLAG("-std=c++11" HAS_CPP11_FLAG)
+-                if (NOT HAS_CPP11_FLAG)
+-                    message(FATAL_ERROR "Unsupported compiler -- xsimd requires C++11 support!")
+-                else()
+-                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-                endif()
++            CHECK_CXX_COMPILER_FLAG("-std=c++17" HAS_CPP17_FLAG)
++            if (NOT HAS_CPP17_FLAG)
++                message(FATAL_ERROR "Unsupported compiler -- xsimd requires C++17 support")
+             endif()
++            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+         endif()
+ 
+         if (NOT CROSS_COMPILE_ARM)
diff --git a/dev-cpp/xsimd/xsimd-11.0.0.ebuild b/dev-cpp/xsimd/xsimd-11.1.0.ebuild
index ef4c7e854109..b1393fb6ae04 100644
--- a/dev-cpp/xsimd/xsimd-11.0.0.ebuild
+++ b/dev-cpp/xsimd/xsimd-11.1.0.ebuild
@@ -25,6 +25,8 @@ BDEPEND="
 	)
 	test? ( dev-cpp/doctest )"
 
+PATCHES=( "${FILESDIR}"/${P}-c++17.patch )
+
 src_prepare() {
 	sed -i \
 		-e '/fPIC/d' \