commit: 562a30ba9680feca49df3d4bdb775b470a2653af Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 22 19:51:25 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 22 22:22:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562a30ba
dev-util/mdds: add 3.0.0 Thanks to jospezial for rebasing the build system patch. Closes: https://bugs.gentoo.org/938111 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/mdds/Manifest | 1 + dev-util/mdds/files/mdds-3.0.0-buildsystem.patch | 41 ++++++++++++++++++++++ dev-util/mdds/files/mdds-3.0.0-include.patch | 19 ++++++++++ .../mdds/{mdds-9999.ebuild => mdds-3.0.0.ebuild} | 11 ++++-- dev-util/mdds/mdds-9999.ebuild | 10 ++++-- 5 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest index b1e2412f89ad..8ddfc863847c 100644 --- a/dev-util/mdds/Manifest +++ b/dev-util/mdds/Manifest @@ -1 +1,2 @@ DIST mdds-2.1.1.tar.xz 540732 BLAKE2B d549bf5c39db6b8ec738cca2833545fef48ffd0b603c2c97dd425ae89bd5368a6981fb75bd4cbf90c9cf09efc7116a4e485c843bb2200fc198d23a02dbdd6559 SHA512 5fe345e7d84d2e290a519d65b27332f69001c01da961c05a30abfe2a17cb8545822490bcd63b320d49e1b26291a4a898f77495951919aece83208133027848ea +DIST mdds-3.0.0.tar.xz 635852 BLAKE2B 67a10991409d92dfbae97242dcf0925936587f037b496bd3448b8f7c8fe5e1a5574fc29d7b89342750cb50dce3ce6eee1da9ce628987a3d2ad9260a23a904061 SHA512 c6b6be808a6b4a44ce41bf7e28cfe8c5bd3c5ede70dab808d1361b61ee51604750c5d47c46bf3e9bbdce6260311f4e5845afad158d2d1b3d9c349beae9611491 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 <[email protected]> (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-@[email protected] + + 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 <[email protected]> +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-9999.ebuild b/dev-util/mdds/mdds-3.0.0.ebuild similarity index 75% copy from dev-util/mdds/mdds-9999.ebuild copy to dev-util/mdds/mdds-3.0.0.ebuild index 420358f97a95..4bb9c8b2b25e 100644 --- a/dev-util/mdds/mdds-9999.ebuild +++ b/dev-util/mdds/mdds-3.0.0.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,10 @@ BDEPEND=" test? ( dev-util/dejagnu ) " -PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-3.0.0-buildsystem.patch" + "${FILESDIR}/${P}-include.patch" +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp 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
