9 files changed, 162 insertions, 19 deletions
diff --git a/dev-cpp/amqp-cpp/Manifest b/dev-cpp/amqp-cpp/Manifest
index aa933bf7514b..3d50a2b70732 100644
--- a/dev-cpp/amqp-cpp/Manifest
+++ b/dev-cpp/amqp-cpp/Manifest
@@ -1 +1,2 @@
 DIST AMQP-CPP-4.3.10.tar.gz 156600 BLAKE2B 0453259e8d84b223fc8d36d4747b267a84d7db9daef55d13ff31d4c8cf1e5dd8efb87d9f83f7ff7554aa70c5000d6da45187ce03db09ff4c542bd5409d81ada8 SHA512 ef9a20cd066bbefc243d8d58dbded728e0c88f5c47134f835c50dfa01178b53200970333f0d56330c206f74aa7d7691556c3e4693d5276adb7e3bf4e66bcd057
+DIST AMQP-CPP-4.3.16.tar.gz 158954 BLAKE2B 175c5c22a88e20ca5d123fbf808a354a0b3048a0127ba75170b61e8c8822ba8d8b78cb4247cb26cfeebff92c0ca74213d6fb254afbc74e9f92a88751137e8c97 SHA512 bdce6a93f3b88a0ab26dae66e289f98194d0f1a3e2eb03e0c858111275a02ebec042dfe9d757989a1c0cbe1b15652346f86008bf4248e366d1896c4750d9194f
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10-r1.ebuild
index cc3e9267be26..33a052a82f5f 100644
--- a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
+++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 MY_PN=${PN^^}
 MY_P=${MY_PN}-${PV}
@@ -11,21 +11,19 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker"
 HOMEPAGE="https://github.com/CopernicaMarketingSoftware/AMQP-CPP"
 SRC_URI="https://github.com/CopernicaMarketingSoftware/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	sed \
 		-e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \
 		-e "s:DESTINATION cmake:DESTINATION $(get_libdir)/cmake/${PN/-/}:g" \
 		-i CMakeLists.txt || die
+
 	cmake_src_prepare
-	default
 }
 
 src_configure() {
@@ -33,5 +31,6 @@ src_configure() {
 		-DAMQP-CPP_BUILD_SHARED=ON
 		-DAMQP-CPP_LINUX_TCP=ON
 	)
-	cmake-multilib_src_configure
+
+	cmake_src_configure
 }
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild
new file mode 100644
index 000000000000..33a052a82f5f
--- /dev/null
+++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=${PN^^}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker"
+HOMEPAGE="https://github.com/CopernicaMarketingSoftware/AMQP-CPP"
+SRC_URI="https://github.com/CopernicaMarketingSoftware/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+src_prepare() {
+	sed \
+		-e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \
+		-e "s:DESTINATION cmake:DESTINATION $(get_libdir)/cmake/${PN/-/}:g" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMQP-CPP_BUILD_SHARED=ON
+		-DAMQP-CPP_LINUX_TCP=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/argparse/Manifest b/dev-cpp/argparse/Manifest
index adac49660b31..ba65ae60a21d 100644
--- a/dev-cpp/argparse/Manifest
+++ b/dev-cpp/argparse/Manifest
@@ -1 +1,2 @@
 DIST argparse-2.1.tar.gz 72452 BLAKE2B eece3f1cf6a2e58f5bec99f0223b31ba92147964053d98122099dd806a0ab62c6039ee8741281d1eca28b9d0e3aa02d7d076e8bcc64bbd5dd03c777f8e460531 SHA512 35746e0b526bd4406c954ab315f191abc57b08b48a047f108ddacc7baace406d3ddddb1af23d41caff565afecfeb41dfedd27a08cdba8d11b59dbe7c78b7e9b0
+DIST argparse-2.6.tar.gz 93865 BLAKE2B 5ab49a1e9d85e1252b4066fb3278b6c34c0e813f6b49063196cb294544a3adaf45930295834786d41ebbe483b4704be45e90e3a1d53e5085529e78e0b07fad0d SHA512 778e405b7790906794506a2175279465c7d7efa905d0848807fcbddf5ff827e9556a3f2660ee0207a70195a8e9e652ba37ba4df2a038d8646339525cec0f1784
diff --git a/dev-cpp/argparse/argparse-2.1.ebuild b/dev-cpp/argparse/argparse-2.1-r1.ebuild
index ddc41fdbc22b..67e32ea4d3d2 100644
--- a/dev-cpp/argparse/argparse-2.1.ebuild
+++ b/dev-cpp/argparse/argparse-2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Argument Parser for Modern C++"
 HOMEPAGE="https://github.com/p-ranav/argparse"
diff --git a/dev-cpp/argparse/argparse-2.6.ebuild b/dev-cpp/argparse/argparse-2.6.ebuild
new file mode 100644
index 000000000000..e273fd49b506
--- /dev/null
+++ b/dev-cpp/argparse/argparse-2.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Argument Parser for Modern C++"
+HOMEPAGE="https://github.com/p-ranav/argparse"
+SRC_URI="https://github.com/p-ranav/argparse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DARGPARSE_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test || die
+	./tests || die
+}
diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch
new file mode 100644
index 000000000000..e7bb77d6cf41
--- /dev/null
+++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch
@@ -0,0 +1,34 @@
+https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch?id=6721430ca97aa98208cc1c450e4e8c4c274ca840
+
+From c1e9f2f3d086e0df3c10a2468fd7b37fd0c5038c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 7 Sep 2022 00:02:08 -0700
+Subject: [PATCH] configure: Fix checks for system headers
+
+Define _DEFAULT_SOURCE in system.c so unistd.h can expose readlink API
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -152,7 +152,7 @@ fi
+ 
+ dnl Checks for header files.
+ 
+-AC_CHECK_HEADERS( [unistd.h, stdint.h, inttypes.h])
++AC_CHECK_HEADERS( [unistd.h stdint.h inttypes.h])
+ 
+ dnl Checks for typedefs, and compiler characteristics.
+ 
+--- a/src/system.c
++++ b/src/system.c
+@@ -36,6 +36,8 @@
+  *      1. specify the constants in "configed.H" or "noconfig.H",
+  *      2. append the system-dependent routines in this file.
+  */
++
++#define _DEFAULT_SOURCE
+ #if PREPROCESSED
+ #include    "mcpp.H"
+ #else
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
new file mode 100644
index 000000000000..beab5412fb93
--- /dev/null
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN=${PN/lib/}
+MY_P=$(ver_cut 1-4 ${MY_PN}-${PV})
+
+DESCRIPTION="A portable C++ preprocessor"
+HOMEPAGE="http://mcpp.sourceforge.net"
+SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
+SRC_URI+=" mirror://debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos"
+
+PATCHES=(
+	# bug #718808
+	"${WORKDIR}"/debian/patches/
+
+	"${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
+	"${FILESDIR}"/${PN}-2.7.2-fix-configure-checks.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #778461
+	sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-mcpplib
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-cpp/notcurses/notcurses-3.0.5.ebuild b/dev-cpp/notcurses/notcurses-3.0.5-r1.ebuild
index 7e6e9a6d462f..53d4a8c6d2f4 100644
--- a/dev-cpp/notcurses/notcurses-3.0.5.ebuild
+++ b/dev-cpp/notcurses/notcurses-3.0.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Blingful TUIs and character graphics"
 HOMEPAGE="https://notcurses.com"
@@ -29,21 +29,18 @@ src_configure() {
 		-DUSE_QRCODEGEN=OFF
 		-DUSE_STATIC=OFF
 	)
-	cmake-multilib_src_configure
+	cmake_src_configure
 }
 
-src_compile() {
-	cmake-multilib_src_compile
-}
-
-# warning: these will fail if you don't have your (utf8) locale available,
-# or the proper terminfo database for your (hopefully correct) TERM.
 src_test() {
-	cmake-multilib_src_test
+	ewarn "Tests will fail if you don't have a UTF8 locale available,"
+	ewarn "or if you're missing the proper terminfo database for your TERM."
+
+	cmake_src_test
 }
 
 src_install() {
-	cmake-multilib_src_install
+	cmake_src_install
 
 	# we use this tortured form lest we try, every time we release a
 	# x.y.1 or x.y.3, to install the source dir as a man page.