From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9156E158092 for ; Tue, 14 Jun 2022 15:20:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8EC3E08DD; Tue, 14 Jun 2022 15:20:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1879E08DD for ; Tue, 14 Jun 2022 15:20:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D08E73413FB for ; Tue, 14 Jun 2022 15:20:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15B8350B for ; Tue, 14 Jun 2022 15:20:23 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1655219981.0ad20a9ccc7e106a79715da042d6a80a4b0c0eb5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/, dev-util/mdds/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/mdds/Manifest dev-util/mdds/files/mdds-1.7.0-bashism.patch dev-util/mdds/files/mdds-1.7.0-rtree_test.patch dev-util/mdds/mdds-1.7.0.ebuild X-VCS-Directories: dev-util/mdds/files/ dev-util/mdds/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0ad20a9ccc7e106a79715da042d6a80a4b0c0eb5 X-VCS-Branch: master Date: Tue, 14 Jun 2022 15:20:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b5a22706-9352-468f-846d-3113160cdbd1 X-Archives-Hash: 596b6b2bc3ccad3f78f4fd1bfb6d2755 commit: 0ad20a9ccc7e106a79715da042d6a80a4b0c0eb5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 13:34:25 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 15:19:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad20a9c dev-util/mdds: Drop 1.7.0 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/mdds/Manifest | 1 - dev-util/mdds/files/mdds-1.7.0-bashism.patch | 75 ------------------------- dev-util/mdds/files/mdds-1.7.0-rtree_test.patch | 52 ----------------- dev-util/mdds/mdds-1.7.0.ebuild | 64 --------------------- 4 files changed, 192 deletions(-) diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest index b6539fa1e9b8..4b0f67636bc3 100644 --- a/dev-util/mdds/Manifest +++ b/dev-util/mdds/Manifest @@ -1,2 +1 @@ -DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a DIST mdds-2.0.3.tar.xz 419884 BLAKE2B bfadf334ccf7695ac0234a9355e5c466e4f8b8fced2b37a4446a3ef899ce28cc9f155223ac5c4ba88ed54886ffd9a38996973195a5120abb886d2e791f596609 SHA512 6600cca5cd2272905dfdeea21a8a1615bb8f15e0c0ae5efec99345b34387cc18fa2aa61ae7142edaddb41738f7386a74a91997ac5ed1a8cfc7cf4b72b0bd2935 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 -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 -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 aefcb358f629..000000000000 --- a/dev-util/mdds/mdds-1.7.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2022 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 openmp) - $(use_enable valgrind memory_tests) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - tc-export CXX - default -}