gentoo auto-resync : 23:02:2025 - 19:24:09

5 files changed, 136 insertions, 4 deletions

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index e22c080adb11..6c23d4518b12 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,5 +1,9 @@
 AUX mdds-1.5.0-buildsystem.patch 1006 BLAKE2B a6205a749a5a619443a060912bd863c93f74eb88cc68e62b077bdbab0a3e67e2f9ab35774ec5fcd23599b5b10478f529ebd2f89806fe926786d63967f83a9075 SHA512 eb03daf08605c9e54326621af3be39214659627fc4922c9cd3f031073f78a0823c2f1bb7267eb671c189b0326f9ff5d1fe3f60cda14fe9a7ac58d293972d67b9
+AUX mdds-3.0.0-buildsystem.patch 1108 BLAKE2B a741dc504d85531a8beb3d4a0e5d18522201d29a4371fc01c040e58d39b7ae196fceec9927f9d35f3b5c45d27f7e6e842ee24d44260d3fc969718a3bc47a448f SHA512 0936e4ee545e3c7818acbd3860956dfbf0d13c12438a5bab29ab11371f68c41b2813be539a5f4c39b38f00914c691219b47690ea457e4e56a310b86084248549
+AUX mdds-3.0.0-include.patch 474 BLAKE2B 85378932f51d3714f107f6fdbfcd86c5b6a26be986b71ad80367493dffb70a103a305d2575929e9ff73573cecbaba67332a2de72c8a8054efa9cb55dd15453d4 SHA512 e7ca965a2d42e98467b8f831ce1160e8520159cfbe7eca351a835de61823c608b30b20363ba404e1cd255792f92676a75651a7fd3b8919d7e8a8c33c4eec86d9
 DIST mdds-2.1.1.tar.xz 540732 BLAKE2B d549bf5c39db6b8ec738cca2833545fef48ffd0b603c2c97dd425ae89bd5368a6981fb75bd4cbf90c9cf09efc7116a4e485c843bb2200fc198d23a02dbdd6559 SHA512 5fe345e7d84d2e290a519d65b27332f69001c01da961c05a30abfe2a17cb8545822490bcd63b320d49e1b26291a4a898f77495951919aece83208133027848ea
+DIST mdds-3.0.0.tar.xz 635852 BLAKE2B 67a10991409d92dfbae97242dcf0925936587f037b496bd3448b8f7c8fe5e1a5574fc29d7b89342750cb50dce3ce6eee1da9ce628987a3d2ad9260a23a904061 SHA512 c6b6be808a6b4a44ce41bf7e28cfe8c5bd3c5ede70dab808d1361b61ee51604750c5d47c46bf3e9bbdce6260311f4e5845afad158d2d1b3d9c349beae9611491
 EBUILD mdds-2.1.1.ebuild 1190 BLAKE2B 19957d5d6d68b7a21db0a6fff05a257ce963211c9cb3afbe3b6f02c9d6314fab9d453d5a027bf0f969fe766c148a47d25180d1292a849d97a228a0406719b417 SHA512 53ce4a4675c48a5f80dcd1c6150037bc19264a766e0120a2c54fb7e3d41a5584d9505f361ab73192300801b68328047b7fbcee4cad08f9a03afe7480c9b80774
-EBUILD mdds-9999.ebuild 1194 BLAKE2B b90fb12365e43dd6429d5b5dd79d467a1173b4cfbd236dbdf3f7a976f860bdd2b069d449d35788bf2072c2cced82f8088c5ced65235bf4491dc2b2fb766b68df SHA512 9695deceaf0f88ab5a770c38809d5b6516f7717a64b5f850e9c6f5cc4aebde5f92d398a13aa6758f4062f6ed1341bdf39e3a63e6f3587876722ef2f380f5576c
+EBUILD mdds-3.0.0.ebuild 1379 BLAKE2B 1eb990b1e435df2a069ced4668e70f02f07696cb2f35a56b6e33558a051ebd10110898a55b15300e4b9b91836a6cd4f62f6eb6fa7e0fcfb545e581639a2195e0 SHA512 1774928266b21d7826988494d75036c257814596fdb398fa7159984269837028da8cf575a0aaef26b8746faa50ba83f4ea0951b942679fe11739774efa4d5de3
+EBUILD mdds-9999.ebuild 1345 BLAKE2B 3c79eb231296ca837ebf54f5d8a23ddd7569d84ccf0bc0e8934c6ecc70c8786ce3c542917c27c69aebd0cd2502a71b0bdb238b7e21979fb1babb71d021c06666 SHA512 08ecc5f00ef43bd2a2483976702b296d88a3c59ca89f7c18bff22efc953a8d7b6c4d3f8ae6f5d527bf19b3df3d8f94feb3b520da4046f4d97d3725125b36ab84
 MISC metadata.xml 392 BLAKE2B 20ed5d7821a30f4a40f5dfcf7e53bbb66459525267b56d0b4522cb964cc99244ae85e8b6dde4d53433633e22151772a865b735dcd570bba4bd03a7c98db5e5bc SHA512 557d107f93e5407cef32868890c5853b8a3ed82e058542e4447287b0534a94a77e914443e1c179522a054cd7e03d5f7562435b4ca9f132597a4c0fa9f91ad7fe
diff --git a/dev-util/mdds/files/mdds-3.0.0-buildsystem.patch b/dev-util/mdds/files/mdds-3.0.0-buildsystem.patch
new file mode 100644
index 000000000000..ce4816d94dc7
--- /dev/null
+++ b/dev-util/mdds/files/mdds-3.0.0-buildsystem.patch
@@ -0,0 +1,41 @@
+# Nils Freydank <holgersson@posteo.de> (2020-01-08)
+Avoid auto installation of files we install later manually.
+Adopted from asturm's patch for mdds-1.4.3.
+
+diff --git a/Makefile.am b/Makefile.am
+index 9b69455b..010c7826 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/test/include \
+ 	$(CXXFLAGS_UNITTESTS)
+ 
+-dist_doc_DATA = AUTHORS README.md
+ nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
+ 
+ DISTCLEANFILES = \
+@@ -15,8 +14,6 @@ DISTCLEANFILES = \
+ 
+ EXTRA_DIST = \
+ 	autogen.sh \
+-	CHANGELOG \
+-	LICENSE \
+ 	doc/_static/images/fst-example1-initial.svg \
+ 	doc/_static/images/fst-example1-insert1.svg \
+ 	doc/_static/images/fst-example1-insert2.svg \
+@@ -95,14 +92,6 @@ EXTRA_DIST = \
+ 	misc/sorted_string_data.dat \
+ 	misc/sorted_string_map_perf.cpp
+ 
+-install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(docdir)
+-	$(INSTALL_DATA) $(top_srcdir)/LICENSE $(DESTDIR)$(docdir)/COPYING
+-	$(INSTALL_DATA) $(top_srcdir)/CHANGELOG $(DESTDIR)$(docdir)/NEWS
+-
+-uninstall-local:
+-	rm -f $(DESTDIR)$(docdir)/COPYING $(DESTDIR)$(docdir)/NEWS
+-
+ if BUILD_DOCS
+ 
+ doc-doxygen:
+
diff --git a/dev-util/mdds/files/mdds-3.0.0-include.patch b/dev-util/mdds/files/mdds-3.0.0-include.patch
new file mode 100644
index 000000000000..6bd5477d08ad
--- /dev/null
+++ b/dev-util/mdds/files/mdds-3.0.0-include.patch
@@ -0,0 +1,19 @@
+https://gitlab.com/mdds/mdds/-/commit/7c414ddc0bd2fae590cc09944579e90d822d9e0b
+
+From 7c414ddc0bd2fae590cc09944579e90d822d9e0b Mon Sep 17 00:00:00 2001
+From: Gwyn Ciesla <gwync@protonmail.com>
+Date: Tue, 28 Jan 2025 13:33:22 -0600
+Subject: [PATCH] Fix build with most recent gcc/glibc
+
+--- a/include/mdds/trie_map.hpp
++++ b/include/mdds/trie_map.hpp
+@@ -37,6 +37,7 @@
+ #include <map>
+ #include <memory>
+ #include <limits>
++#include <cstdint>
+ 
+ namespace mdds {
+ 
+-- 
+GitLab
diff --git a/dev-util/mdds/mdds-3.0.0.ebuild b/dev-util/mdds/mdds-3.0.0.ebuild
new file mode 100644
index 000000000000..4bb9c8b2b25e
--- /dev/null
+++ b/dev-util/mdds/mdds-3.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+	inherit git-r3
+else
+	# For 3.0.0, it mysteriously redirects to 2.0.0
+	#SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
+	SRC_URI="https://gitlab.com/api/v4/projects/mdds%2Fmdds/packages/generic/source/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+
+LICENSE="MIT"
+SLOT="1/3.0" # Check API version on version bumps!
+IUSE="doc openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		dev-python/sphinx
+	)
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-buildsystem.patch"
+	"${FILESDIR}/${P}-include.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable openmp)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 420358f97a95..f4fcc56bded0 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
 	inherit git-r3
 else
-	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
+	# For 3.0.0, it mysteriously redirects to 2.0.0
+	#SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
+	SRC_URI="https://gitlab.com/api/v4/projects/mdds%2Fmdds/packages/generic/source/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools toolchain-funcs
@@ -30,7 +32,9 @@ BDEPEND="
 	test? ( dev-util/dejagnu )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-buildsystem.patch"
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp