5 files changed, 74 insertions, 77 deletions
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index 7dcec8ee8e1b..9a31e5dae7d4 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -2,7 +2,7 @@ AUX cxxtools-3.0-gcc12-time.patch 244 BLAKE2B 2bd3c5713f68e261607d21273c8a98893a
 AUX cxxtools-3.0-lld-linking-openssl.patch 323 BLAKE2B 32cd482d39132bb9793383e2afb1d7f2c10b1526fda67ae8f896c2081d61a07e9a2251e9339e166937dd2365fe5c9165a32413bb850eb0ef6d61079c1a29f43c SHA512 04c86dbb1aaac5549adaad0a8b8f0e09805924c69e3d759537e1a3b97690c9a7e7e9321df7671479780b2aa1d18951cba9d0f00fdabe5a7cdc9b15ff02e3da51
 AUX cxxtools-3.0_gcc11.patch 847 BLAKE2B ae4c4caf2d33351a33e7f54addeda32a922dabab867d1ca41684a3fa73b040a2b4df515a0af7fc33a1e3a8159c03d8189b4b97f2d36dab882c6d237e6d50faf8 SHA512 cb53d59849c8034fde4bb81e9db2f71ea34ccb809671e269dce47bd4d9847369213f43f1a32bb578547fd03f60df31f96d678249c34613ee4619fe1f32af8355
 DIST cxxtools-3.0.tar.gz 1079247 BLAKE2B 536680373e194dbdb6a79bdb09960830b6aad34c2657a0024b218321154de81653f1e47db13abfcf13f0179fa6f85e0a30a4b97f0e64ca0ac5f1cc7be003270d SHA512 839be18a8bf40c1cbaa016ac50ddacfd879d1f9bea6521209c65790d67d5ee81377519aac2fb373a5de154a293e33185401848e41a697aa57ad6aa42d4854250
-EBUILD cxxtools-3.0-r1.ebuild 716 BLAKE2B 73caa9b56a2796bda7b29abdc4f34ea84bdca1ad04dbf6f1a4b9192ae65e257500caf543a406a70818cc3cfe8329012161ce6e9e43132f89a1bb4e14519b3c65 SHA512 689b9531a324c04d7cd9f153d567eabe00866508c839804cd0d3eb5ed4539d41b2a07de976e1778e9a887d00aa96097dbd51fcdf80930bd50463b9323d7ebcc8
+DIST cxxtools-3.0.tgz 668184 BLAKE2B 914ad057888d943c438491590e905505c13c938cafa0b81586f42ff7fd4059815e85f89b6a6ae799dee9e1a239b31840d9e328d92d28aab1e2dc78fb9e9ea674 SHA512 a08d667bcc9e998ed94cd749fe632560ea7d014968bd9f1515b711f9533111f50612aff62fcc0154bdfe17823c7b708f945a83bb681407b42496d370aaaa6594
 EBUILD cxxtools-3.0-r2.ebuild 1029 BLAKE2B 6b1f85d55df750aebd231d63c963d338ee9612d7fca345ac6f690a448d0625def763f235d7a8be6ab6f0ad0844a57366218dc6a6e4b64e4531de5c293b491024 SHA512 ef733bd9b15e29f6e3110fb1fba3b515f14fda836b7b6bd08138f96e76a3f5fa099ef20a9d65da0e55d9ca8d7e5b6b2cac0ea205a611e49d8caf83695f0286f7
-EBUILD cxxtools-3.0.ebuild 676 BLAKE2B f640431bf4c41b1f1d87d1ece7005638c8e6b4caf9c7e365a03550f1d4c0b540e57cc78114185e9ad60d21599eab699177f9cf3d4973004f11d8705b4d0225b9 SHA512 4d10b859219f52027fab420a5e215076513705481b84b59b06df59320ffb4f960cb35593a60b5d0fe0c901de4a3056d2ae12e22acd3381db1b2a4e0b9007842d
-MISC metadata.xml 244 BLAKE2B 7222dd1e8f714217b90fa86e81e31b345a4b2e861ca846f3cfcaab3f6820dea4b067d0d335336af53dfd7985287fc213d27ca777bd876cb2bb72fadba79cc1ec SHA512 d066cd23818ff8a6ace46dde4dd13e5da409672c7843057ff90819a7d691fd53c2e7de7b696a0a08945a4e770f63722f4923e78b22c40568db755ddca6a58f0e
+EBUILD cxxtools-3.0-r3.ebuild 1026 BLAKE2B aff47aa08ae32b802576c03e1c1acd9e7e15409e6bf95d1efe844fc901718655a1e64ff53ff8c694ed3d027b0409b05c49d1fcd0f9cb5b1e11818309203cdd31 SHA512 e1b24ae2885b47980da36de6914a368e38e9e2995a01dbdafd15500377edc62e58a9aa1a9d0734f064b3c80acd340ebf630fa817505f0ce4089d29161979c94b
+MISC metadata.xml 591 BLAKE2B b23f54db40ad8f000d90135e9600b0603d1baf9192ac72b9cd2967ad89a46d234c20ca69dfd3ee677b071f4c10ba9714ecefa669a473fa7500ef746c73118c8b SHA512 74b2c74de9814d667520bf9bf417b0d04d45bffcfab6eedcff4202bfb92c1de011d694bb322913baae447c5c28a57925304a2b44ac75dd58c8dc91396b583e64
diff --git a/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
deleted file mode 100644
index 0ed30bef3c1c..000000000000
--- a/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Collection of general purpose C++-classes"
-HOMEPAGE="http://www.tntnet.org/cxxtools.html"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-
-RDEPEND="virtual/libiconv"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS )
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-demos \
-		--disable-unittest
-
-	eapply "${FILESDIR}/${P}_gcc11.patch"
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	# remove static libs
-	rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
-}
diff --git a/dev-libs/cxxtools/cxxtools-3.0-r3.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r3.ebuild
new file mode 100644
index 000000000000..1994399b37c0
--- /dev/null
+++ b/dev-libs/cxxtools/cxxtools-3.0-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Collection of general purpose C++-classes"
+HOMEPAGE="https://github.com/maekitalo/cxxtools"
+SRC_URI="https://github.com/maekitalo/cxxtools/archive/refs/tags/V${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}_gcc11.patch
+	"${FILESDIR}"/${PN}-3.0-gcc12-time.patch
+	"${FILESDIR}"/${PN}-3.0-lld-linking-openssl.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-demos \
+		$(use_enable test unittest)
+}
+
+src_test() {
+	emake -C test
+
+	local -x USER=${LOGNAME}
+	local -x TZ=UTC # doesn't like e.g. :/etc/timezone
+	cd test || die
+	./alltests || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# remove static libs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/cxxtools/cxxtools-3.0.ebuild b/dev-libs/cxxtools/cxxtools-3.0.ebuild
deleted file mode 100644
index 23367377184d..000000000000
--- a/dev-libs/cxxtools/cxxtools-3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Collection of general purpose C++-classes"
-HOMEPAGE="http://www.tntnet.org/cxxtools.html"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-
-RDEPEND="virtual/libiconv"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS )
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-demos \
-		--disable-unittest
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	# remove static libs
-	rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
-}
diff --git a/dev-libs/cxxtools/metadata.xml b/dev-libs/cxxtools/metadata.xml
index b038c919cd23..4442b17f526e 100644
--- a/dev-libs/cxxtools/metadata.xml
+++ b/dev-libs/cxxtools/metadata.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">maekitalo/cxxtools</remote-id>
+	</upstream>
 </pkgmetadata>