8 files changed, 74 insertions, 17 deletions
diff --git a/dev-cpp/dtl/Manifest b/dev-cpp/dtl/Manifest
index 1bfa96ce0020..8566de94c0ec 100644
--- a/dev-cpp/dtl/Manifest
+++ b/dev-cpp/dtl/Manifest
@@ -1 +1,2 @@
 DIST dtl-1.19_p20210531.tar.gz 26011 BLAKE2B 1ac4194cf536c072c45c2e2da0f0fd26232a5bf2e7aa57e8323457b5d43222df6a8579a41e54cd941cc69e013d4dac9fd051ad33950ed89692629ef57564a5f6 SHA512 2ac1f3d9871ed39f4183ebf0d9d8a1381ef2dacc3677f525d025eb292fbf4676a5a67abe34dfa1ff12bdb66e0fa71a83b8a99130e2e8048e08d3392327e84a9a
+DIST dtl-1.20.tar.gz 26227 BLAKE2B a52f1e8878b0bbd7204d979eaf0ba303722140c5f57259dc8592a50f0f039baa3a90c1d309ac089805736a383e9265cbd133289216fe85aaac677265a29303d2 SHA512 44cdaf190d8a103effbca8df244c652b642590795f7307f5f7fdf64fc34bdbe2fa5ab2e1a08185abf099e35b0d9158306a80a8dc24bba9eccab4c77c7b1eed5e
diff --git a/dev-cpp/dtl/dtl-1.20.ebuild b/dev-cpp/dtl/dtl-1.20.ebuild
new file mode 100644
index 000000000000..94197b892421
--- /dev/null
+++ b/dev-cpp/dtl/dtl-1.20.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="diff template library written by C++"
+HOMEPAGE="https://github.com/cubicdaiya/dtl"
+SRC_URI="https://github.com/cubicdaiya/dtl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples test"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-1.19_p20210531-do-not-append-O2.patch" )
+
+src_compile() {
+	escons CC="$(tc-getCC)"
+	if use test; then
+		pushd test || die
+		escons CC="$(tc-getCC)"
+		popd || die
+	fi
+	if use examples; then
+		pushd examples || die
+		escons CC="$(tc-getCC)"
+		popd || die
+	fi
+}
+
+src_install() {
+	escons prefix="${T}" install
+	insinto /usr/include/dtl
+	doins "${T}/dtl/include"/*
+	if use examples; then
+		pushd examples || die
+		rm SConstruct *.o *.cpp *.hpp || die
+		exeinto /usr/libexec/dtl/examples
+		doexe *
+	fi
+}
+
+src_test() {
+	pushd test || die
+	escons check
+}
diff --git a/dev-cpp/dtl/metadata.xml b/dev-cpp/dtl/metadata.xml
index 89883e0bef32..443e0cd502e7 100644
--- a/dev-cpp/dtl/metadata.xml
+++ b/dev-cpp/dtl/metadata.xml
@@ -5,6 +5,12 @@
   <email>lssndrbarbieri@gmail.com</email>
   <name>Alessandro Barbieri</name>
  </maintainer>
- 
+ <upstream>
+  <maintainer>
+   <email>cubicdaiya@gmail.com</email>
+   <name>Tatsuhiko Kubo</name>
+  </maintainer>
+  <bugs-to>https://github.com/cubicdaiya/dtl/issues</bugs-to>
+ </upstream>
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-cpp/glibmm/glibmm-2.66.4.ebuild b/dev-cpp/glibmm/glibmm-2.66.4.ebuild
index 4acde68e8511..4f51245ee3e9 100644
--- a/dev-cpp/glibmm/glibmm-2.66.4.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.4.ebuild
@@ -10,7 +10,7 @@ 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"
+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="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glibmm/glibmm-2.72.1.ebuild b/dev-cpp/glibmm/glibmm-2.72.1.ebuild
index 7dcf0f8ccf66..ba8c33cca9ad 100644
--- a/dev-cpp/glibmm/glibmm-2.72.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.72.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.68"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+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 )"
 
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
index b88179136f81..93fa6997e1e5 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/gtkmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/vexcl/metadata.xml b/dev-cpp/vexcl/metadata.xml
index 28e4a8eb626a..9b0b226d10e5 100644
--- a/dev-cpp/vexcl/metadata.xml
+++ b/dev-cpp/vexcl/metadata.xml
@@ -15,9 +15,6 @@
  </upstream>
  <use>
   <flag name="amdsi">Implement workaround for AMD SI GPUs</flag>
-  <flag name="backend-compute">Use Boost.Compute algorithms</flag>
-  <flag name="backend-jit">Use the JIT backend</flag>
-  <flag name="backend-opencl">Use OpenCL as backend</flag>
  </use>
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-cpp/vexcl/vexcl-1.4.3-r1.ebuild b/dev-cpp/vexcl/vexcl-1.4.3-r1.ebuild
index 9dd820913775..80ac90057da8 100644
--- a/dev-cpp/vexcl/vexcl-1.4.3-r1.ebuild
+++ b/dev-cpp/vexcl/vexcl-1.4.3-r1.ebuild
@@ -21,18 +21,18 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE_BACKEND="
-	backend-compute
-	backend-jit
-	+backend-opencl
+	backend_compute
+	backend_jit
+	+backend_opencl
 "
-#	backend-cuda
+#	backend_cuda
 IUSE="${IUSE_BACKEND} amdsi examples test" #clogs
 
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/clhpp
-	backend-jit? ( virtual/opencl )
-	backend-opencl? ( virtual/opencl )
+	backend_jit? ( virtual/opencl )
+	backend_opencl? ( virtual/opencl )
 "
 DEPEND="${RDEPEND}"
 
@@ -47,10 +47,10 @@ src_prepare() {
 src_configure() {
 	local backend
 #	use  && backend="All"
-	use backend-compute && backend="Compute"
-#	use backend-cuda && backend="CUDA"
-	use backend-jit && backend="JIT"
-	use backend-opencl && backend="OpenCL"
+	use backend_compute && backend="Compute"
+#	use backend_cuda && backend="CUDA"
+	use backend_jit && backend="JIT"
+	use backend_opencl && backend="OpenCL"
 
 	local mycmakeargs=(
 		-DBoost_USE_STATIC_LIBS=OFF