8 files changed, 16 insertions, 60 deletions
diff --git a/dev-cpp/dpp/dpp-10.0.23.ebuild b/dev-cpp/dpp/dpp-10.0.23.ebuild
index d5cee490ccde..04c891383263 100644
--- a/dev-cpp/dpp/dpp-10.0.23.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.23.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
 	https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 "
 
+S="${WORKDIR}/DPP-${PV}"
+
 LICENSE="Apache-2.0"
 # DPP is extremely ABI instable due to frequent changes in the Discord API
 # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157
@@ -33,8 +35,6 @@ DEPEND="
 	dev-cpp/nlohmann_json
 "
 
-S="${WORKDIR}/DPP-${PV}"
-
 DOCS=( "README.md" "SECURITY.md" )
 
 src_configure() {
diff --git a/dev-cpp/dpp/dpp-10.0.24.ebuild b/dev-cpp/dpp/dpp-10.0.24.ebuild
index d5cee490ccde..04c891383263 100644
--- a/dev-cpp/dpp/dpp-10.0.24.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.24.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
 	https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 "
 
+S="${WORKDIR}/DPP-${PV}"
+
 LICENSE="Apache-2.0"
 # DPP is extremely ABI instable due to frequent changes in the Discord API
 # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157
@@ -33,8 +35,6 @@ DEPEND="
 	dev-cpp/nlohmann_json
 "
 
-S="${WORKDIR}/DPP-${PV}"
-
 DOCS=( "README.md" "SECURITY.md" )
 
 src_configure() {
diff --git a/dev-cpp/dpp/dpp-10.0.25.ebuild b/dev-cpp/dpp/dpp-10.0.25.ebuild
index d5cee490ccde..04c891383263 100644
--- a/dev-cpp/dpp/dpp-10.0.25.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.25.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
 	https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 "
 
+S="${WORKDIR}/DPP-${PV}"
+
 LICENSE="Apache-2.0"
 # DPP is extremely ABI instable due to frequent changes in the Discord API
 # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157
@@ -33,8 +35,6 @@ DEPEND="
 	dev-cpp/nlohmann_json
 "
 
-S="${WORKDIR}/DPP-${PV}"
-
 DOCS=( "README.md" "SECURITY.md" )
 
 src_configure() {
diff --git a/dev-cpp/dpp/dpp-10.0.29.ebuild b/dev-cpp/dpp/dpp-10.0.29.ebuild
index d5cee490ccde..04c891383263 100644
--- a/dev-cpp/dpp/dpp-10.0.29.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.29.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
 	https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 "
 
+S="${WORKDIR}/DPP-${PV}"
+
 LICENSE="Apache-2.0"
 # DPP is extremely ABI instable due to frequent changes in the Discord API
 # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157
@@ -33,8 +35,6 @@ DEPEND="
 	dev-cpp/nlohmann_json
 "
 
-S="${WORKDIR}/DPP-${PV}"
-
 DOCS=( "README.md" "SECURITY.md" )
 
 src_configure() {
diff --git a/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild b/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild
index 187eb5e624b7..67cf73b0e654 100644
--- a/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild
+++ b/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild
@@ -7,12 +7,12 @@ MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
 
 inherit build2
 
-SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz"
 DESCRIPTION="C++ utility library"
 HOMEPAGE="https://www.codesynthesis.com/projects/libcutl/"
+SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
 
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild b/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
index f998177bcf17..394244384b70 100644
--- a/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
+++ b/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
@@ -7,12 +7,12 @@ MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
 
 inherit build2
 
-SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz"
 DESCRIPTION="Streaming XML pull parser/serializer for modern C++"
 HOMEPAGE="https://www.codesynthesis.com/projects/libstudxml/"
+SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
 
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-cpp/simpleini/files/simpleini-4.20-pkgconfig-var.patch b/dev-cpp/simpleini/files/simpleini-4.20-pkgconfig-var.patch
deleted file mode 100644
index 1250a01f3ca2..000000000000
--- a/dev-cpp/simpleini/files/simpleini-4.20-pkgconfig-var.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Use $(PKG_CONFIG), and also avoid repeating the calls for every objects.
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -2,2 +2,2 @@
--CXXFLAGS+=-Wall -std=c++14 `pkg-config --cflags gtest_main`
--LDFLAGS+=`pkg-config --libs gtest_main`
-+CXXFLAGS:=-Wall -std=c++14 $(shell $(PKG_CONFIG) --cflags gtest_main) $(CXXFLAGS)
-+LDFLAGS:=$(LDFLAGS) $(shell $(PKG_CONFIG) --libs gtest_main)
diff --git a/dev-cpp/simpleini/simpleini-4.22.ebuild b/dev-cpp/simpleini/simpleini-4.22.ebuild
deleted file mode 100644
index ccc5bfadc70d..000000000000
--- a/dev-cpp/simpleini/simpleini-4.22.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ library providing a simple API to read and write INI-style files"
-HOMEPAGE="https://github.com/brofield/simpleini/"
-SRC_URI="https://github.com/brofield/simpleini/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest )"
-BDEPEND="test? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.20-pkgconfig-var.patch
-)
-
-src_compile() {
-	if use test; then
-		tc-export CXX PKG_CONFIG
-		emake -C tests "${emakeargs[@]}"
-	fi
-}
-
-src_install() {
-	# note: this skips ConvertUTF, can use -DSI_CONVERT_ICU instead if needed
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	einstalldocs
-}