gentoo resync : 29.12.2022

6 files changed, 6 insertions, 213 deletions

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 659f3ad13ab5..ee2d288a6326 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,9 +1,5 @@
 AUX mdds-1.5.0-buildsystem.patch 1006 BLAKE2B a6205a749a5a619443a060912bd863c93f74eb88cc68e62b077bdbab0a3e67e2f9ab35774ec5fcd23599b5b10478f529ebd2f89806fe926786d63967f83a9075 SHA512 eb03daf08605c9e54326621af3be39214659627fc4922c9cd3f031073f78a0823c2f1bb7267eb671c189b0326f9ff5d1fe3f60cda14fe9a7ac58d293972d67b9
-AUX mdds-1.7.0-bashism.patch 2061 BLAKE2B 766eb3b27b55f058175894d01c91d4b9fa544c8ba15fab79eafb0e333ddf86ed328fa928d21add6bb2da9a31420f35de3a97e960723ce2766b898313434c56d5 SHA512 4994df435477e600aba80c8c7e80cf2b8a76f4d20b19090b61ce94aadfa3d9ff0b75d26fc88094a6b1aa5742fd5ddc70a535dcb6456c890416ac9393aeab0738
-AUX mdds-1.7.0-rtree_test.patch 1673 BLAKE2B c5913765972b2c6346a8414cc9b980337e7fabed862286e421adc59de81ef67cde97cbe084c1b3c8a8549d94a0a4699be8e10c9ca41a101b71f6f45b1dc4c906 SHA512 1bb8fdeffb0cba1eba713856d408f9962531fd73b8b5e61cca382c6ddd09cb10f2afe3a2f964e98201c0ca29d8138f14fe0d8fab1c922d92a66205a353939caa
-DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a
-DIST mdds-2.0.2.tar.xz 415824 BLAKE2B 47b720b96fec4a4410dcb15c86c19ddaa502b9d45905905609a28ba9cbb2e6021ce20c82d26e28cd2374e76d779361e1805a7401134c2ee30fd09fbf6ac35d79 SHA512 eba7dc5a5961e69208c8e605995355c0fef392eb4273e8391d529aa9c49b24e491675f443767abef80ff30440bd9fcbaf0f1fbd5bad9c0ecb6b761033efd6f27
-EBUILD mdds-1.7.0.ebuild 1429 BLAKE2B b04b3825a006f761fa9c887dbb404deed36f3f0bd66c86377ae753134fb3492495d8588ae7b6ba4decca52fbe994846c5cfa2c46fdb9e1a9d02ad37eceb9cb88 SHA512 885cfe58f6ba20cbbd4a222a340ff2154faf8054a54dba61d15e80de782dda7999d1126db3c8865a5309687009454f2a193868c7d7681c764967d620df35dd90
-EBUILD mdds-2.0.2.ebuild 1334 BLAKE2B 0669bb75895ba68a453a8b40e8766f24ae74d3a253c15773ab4cce8be2a49f1296689f254fd4a9cf4d18699d1a0cd7f73bc450426d15b8f1096938450dbd0537 SHA512 db2988dd86abbb73e815b0e8560953dc9da4798912c5cea9b5af16d384c098fa8811b1b7e7d53d2dd6c595664bee444dc709fd28f37d0dd986f7b0cf9acddbe2
-EBUILD mdds-9999.ebuild 1334 BLAKE2B 0669bb75895ba68a453a8b40e8766f24ae74d3a253c15773ab4cce8be2a49f1296689f254fd4a9cf4d18699d1a0cd7f73bc450426d15b8f1096938450dbd0537 SHA512 db2988dd86abbb73e815b0e8560953dc9da4798912c5cea9b5af16d384c098fa8811b1b7e7d53d2dd6c595664bee444dc709fd28f37d0dd986f7b0cf9acddbe2
+DIST mdds-2.0.3.tar.xz 419884 BLAKE2B bfadf334ccf7695ac0234a9355e5c466e4f8b8fced2b37a4446a3ef899ce28cc9f155223ac5c4ba88ed54886ffd9a38996973195a5120abb886d2e791f596609 SHA512 6600cca5cd2272905dfdeea21a8a1615bb8f15e0c0ae5efec99345b34387cc18fa2aa61ae7142edaddb41738f7386a74a91997ac5ed1a8cfc7cf4b72b0bd2935
+EBUILD mdds-2.0.3.ebuild 1235 BLAKE2B a586927914b85a4deff10886ccbefc9f9c3e6aabf898fabb3b27e3929470e30484bc3e27fc4473f6789df2950ee4be5b9952892934b0e1dd453d63a0478463be SHA512 fee04d2e294c953b95e5b5c32650c146e8c357a67927210b06508a08147c013bd6499a48abe40bd937b87ccdaa81e23aecf4f69b9d9755ca241ddcb6b3ee929a
+EBUILD mdds-9999.ebuild 1238 BLAKE2B a2b718ac576154410d7f621be4f14ff08c7c113d691e2007d2ea0a84614bb4f47aabb9e61ba23cf8344bcf173dcf635b3f6c549c7d740744072b7141a9a9f05a SHA512 679ee1ea68f9f4dbe88e59393d83d4d4e4f4e8e019c6b10e782896952078ce85dd6b6bbac945113c7088a76565782bc6aaf693d62a5fa917ef1e6bb3c8d039c3
 MISC metadata.xml 457 BLAKE2B 571d7e12d435c01accaf935cda5f1847ef38c5d8f996c098dcf689e63e6b03c2401e52b05552f03b0ac9a466b72a3359ba3cfc7a36c0dff1b2536d2f627faa38 SHA512 cc5b5a07a05e8bc74ceb3a53965b7d7256d66134c60ed933c9d75054be8cc9aef833b3383a00bac3efe360943f5bf8cd886a5da3c5dd44943e50da0f7055aa1c
diff --git a/dev-util/mdds/files/mdds-1.7.0-bashism.patch b/dev-util/mdds/files/mdds-1.7.0-bashism.patch
deleted file mode 100644
index 3e94f32e8f8b..000000000000
--- a/dev-util/mdds/files/mdds-1.7.0-bashism.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 65da7c25f4d8204b1379a0afb46d82dc1b263ab0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 28 May 2020 18:36:07 +0200
-Subject: [PATCH] Fix bashisms in configure.ac
-
----
- configure.ac | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 00ab937..2282165 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug-stdcxx,
- ]
- ,debug_stdcxx=yes)
- 
--AS_IF([test x"$debug_stdcxx" == "xyes"], [
-+AS_IF([test x"$debug_stdcxx" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -D_GLIBCXX_DEBUG"
- ])
- 
-@@ -42,7 +42,7 @@ AC_ARG_ENABLE(release-tests,
- ]
- ,release_tests=yes)
- 
--AS_IF([test x"$release_tests" == "xyes"], [
-+AS_IF([test x"$release_tests" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -DNDEBUG -O2"
- ])
- 
-@@ -56,11 +56,11 @@ AC_ARG_ENABLE(loop-unrolling,
-     [enable_loop_unrolling="$enableval"],[enable_loop_unrolling=yes]
- )
- 
--AS_IF([test x"$enable_loop_unrolling" == "xno"], [
-+AS_IF([test x"$enable_loop_unrolling" = "xno"], [
-   CXXFLAGS="$CXXFLAGS -DMDDS_LOOP_UNROLLING=0"
- ])
- 
--AS_IF([test x"$enable_gcov" == "xyes"], [
-+AS_IF([test x"$enable_gcov" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS --coverage -O0"
- ])
- 
-@@ -69,7 +69,7 @@ AC_ARG_ENABLE(openmp,
-     [enable_openmp="$enableval"],[enable_openmp=yes]
- )
- 
--AS_IF([test x"$enable_openmp" == "xyes"], [
-+AS_IF([test x"$enable_openmp" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -fopenmp -DMDDS_USE_OPENMP=1"
-   LDFLAGS="$LDFLAGS -fopenmp"
- ])
-@@ -79,7 +79,7 @@ AC_ARG_ENABLE(sanitizer-coverage,
-     [enable_sanitizer_coverage="$enableval"],[enable_sanitizer_coverage=no]
- )
- 
--AS_IF([test x"$enable_sanitizer_coverage" == "xyes"], [
-+AS_IF([test x"$enable_sanitizer_coverage" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -fprofile-instr-generate -fcoverage-mapping -O0"
- ])
- 
-@@ -122,7 +122,7 @@ AC_ARG_ENABLE([werror],
- 	[enable_werror="$enableval"],
- 	[enable_werror=no]
- )
--AS_IF([test x"$enable_werror" == "xyes"], [
-+AS_IF([test x"$enable_werror" = "xyes"], [
- 	CXXFLAGS="$CXXFLAGS -Werror"
- ])
- 
--- 
-2.26.2
-
diff --git a/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch b/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch
deleted file mode 100644
index 391f89798915..000000000000
--- a/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7ab81002fe127d16602b85b391c1d1b0422a9afd Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Mon, 14 Jun 2021 22:52:14 -0400
-Subject: [PATCH] std::deque::erase invalidates all elements if the erased
- element ...
-
-... is not the first or the last element. My previous assumption (
-that only the elements that occur after the erased element become
-invalid) was in fact wrong.
-
-This should resolve #66.
----
- include/mdds/rtree_def.inl | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/include/mdds/rtree_def.inl b/include/mdds/rtree_def.inl
-index ed0e9be..84f0673 100644
---- a/include/mdds/rtree_def.inl
-+++ b/include/mdds/rtree_def.inl
-@@ -836,17 +836,20 @@ bool rtree<_Key,_Value,_Trait>::directory_node::erase(const node_store* ns)
-     if (it == children.end())
-         return false;
- 
--    it = children.erase(it);
-+    // NB: std::deque::erase invalidates all elements when the erased element
-+    // is somwhere in the middle. But if the erased element is either the
-+    // first or the last element, only the erased element becomes invalidated.
- 
--    // All nodes that occur after the erased node have their memory addresses
--    // shifted.
-+    std::size_t pos = std::distance(children.begin(), it);
-+    bool all_valid = pos == 0 || pos == children.size() - 1;
- 
--    std::for_each(it, children.end(),
--        [](node_store& this_ns)
--        {
--            this_ns.valid_pointer = false;
--        }
--    );
-+    it = children.erase(it);
-+
-+    if (!all_valid)
-+    {
-+        for (node_store& ns : children)
-+            ns.valid_pointer = false;
-+    }
- 
-     return true;
- }
--- 
-GitLab
-
diff --git a/dev-util/mdds/mdds-1.7.0.ebuild b/dev-util/mdds/mdds-1.7.0.ebuild
deleted file mode 100644
index a94927502245..000000000000
--- a/dev-util/mdds/mdds-1.7.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-	KEYWORDS="amd64 ~arm arm64 ~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/1.5" # Check API version on version bumps!
-IUSE="doc openmp valgrind test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-	valgrind? ( dev-util/valgrind )
-"
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-buildsystem.patch"
-	"${FILESDIR}/${P}-bashism.patch" # bug 723094
-	"${FILESDIR}/${P}-rtree_test.patch" # bug 775056
-)
-
-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 valgrind memory_tests)
-	)
-	if use openmp && tc-has-openmp; then
-		myeconfargs+=( --enable-openmp )
-	else
-		myeconfargs+=( --disable-openmp )
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	tc-export CXX
-	default
-}
diff --git a/dev-util/mdds/mdds-2.0.2.ebuild b/dev-util/mdds/mdds-2.0.3.ebuild
index ed3476333789..6599638fac76 100644
--- a/dev-util/mdds/mdds-2.0.2.ebuild
+++ b/dev-util/mdds/mdds-2.0.3.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools toolchain-funcs
 
@@ -48,13 +48,9 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_enable doc docs)
+		$(use_enable openmp)
 		$(use_enable valgrind memory_tests)
 	)
-	if use openmp && tc-has-openmp; then
-		myeconfargs+=( --enable-openmp )
-	else
-		myeconfargs+=( --disable-openmp )
-	fi
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index ed3476333789..9185efd612ad 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -48,13 +48,9 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_enable doc docs)
+		$(use_enable openmp)
 		$(use_enable valgrind memory_tests)
 	)
-	if use openmp && tc-has-openmp; then
-		myeconfargs+=( --enable-openmp )
-	else
-		myeconfargs+=( --disable-openmp )
-	fi
 	econf "${myeconfargs[@]}"
 }