[gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/, dev-util/mdds/files/

2022-06-14 Thread Andreas Sturmlechner 
commit: 0ad20a9ccc7e106a79715da042d6a80a4b0c0eb5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 14 13:34:25 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 14 15:19:41 2022 +
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..
--- 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..
--- 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 ==

[gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/, dev-util/mdds/files/

2021-06-17 Thread Andreas Sturmlechner 
commit: 39c12693d5372029f54a3b853179bf4c7fada1c3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 17 12:45:37 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 17 12:47:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c12693

dev-util/mdds: Fix rtree_test

See also: https://gitlab.com/mdds/mdds/-/issues/66
Upstream commit 7ab81002fe127d16602b85b391c1d1b0422a9afd

Thanks-to: Paul Mulders  gmail.com>
Closes: https://bugs.gentoo.org/775056
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/mdds/files/mdds-1.7.0-rtree_test.patch | 52 +
 dev-util/mdds/mdds-1.7.0.ebuild |  3 +-
 2 files changed, 54 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..391f8979891
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch
@@ -0,0 +1,52 @@
+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
index 6bd8e95ff76..62a57426b64 100644
--- a/dev-util/mdds/mdds-1.7.0.ebuild
+++ b/dev-util/mdds/mdds-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ 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() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/, dev-util/mdds/files/

2020-12-12 Thread Andreas Sturmlechner 
commit: c38a81451b247cf802a119addc63fbc6a773c91c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 12 21:48:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 12 21:59:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38a8145

dev-util/mdds: Drop 1.6.0

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/mdds/Manifest   |  1 -
 dev-util/mdds/files/mdds-1.6.0-bashism.patch | 75 
 dev-util/mdds/mdds-1.6.0.ebuild  | 69 -
 3 files changed, 145 deletions(-)

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 4483da3da7c..bbcf1672121 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,2 +1 @@
-DIST mdds-1.6.0.tar.bz2 350406 BLAKE2B 
70a99d779f318140f37bb3f873f1845c153f389a9e671a4d9ee4d1f0e762db312d536392061923c3c02494df6945a5a7743480eca1020d9cda6f3495888d7b00
 SHA512 
7c66894748e998f24374a5c6ea342ae2736e4bdba53be89510a1674690517ed7303786e1290fcfa26b07f236788c192ad29790129c228074397ab43699cdb290
 DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 
02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f
 SHA512 
ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a

diff --git a/dev-util/mdds/files/mdds-1.6.0-bashism.patch 
b/dev-util/mdds/files/mdds-1.6.0-bashism.patch
deleted file mode 100644
index 4fa155c653f..000
--- a/dev-util/mdds/files/mdds-1.6.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"
-   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/mdds-1.6.0.ebuild b/dev-util/mdds/mdds-1.6.0.ebuild
deleted file mode 100644
index 916b5bce61a..000
--- a/dev-util/mdds/mdds-1.6.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == * ]]; then
-   EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git;
-   inherit git-r3
-else
-   SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2;
-   KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A 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"
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/, dev-util/mdds/files/

2020-03-16 Thread Andreas Sturmlechner 
commit: 9d366f6c2acc6f0e770b501ca1b077e29140fc34
Author: Nils Freydank  posteo  de>
AuthorDate: Mon Mar  2 22:24:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 16 21:25:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d366f6c

dev-util/mdds: Bump to 1.5.0

Note: Avoid the bump to 1.6.0 as upstream forgot to bump the version in paths.

This bump also updates general ebuild style, adds the QA test for
tests and drops the src_compile() function.

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Nils Freydank  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/14825
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/mdds/Manifest   |  1 +
 dev-util/mdds/files/mdds-1.5.0-buildsystem.patch | 39 +
 dev-util/mdds/mdds-1.5.0.ebuild  | 53 
 3 files changed, 93 insertions(+)

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 6af7c94a04a..c2d2a2288a4 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1 +1,2 @@
 DIST mdds-1.4.3.tar.bz2 334515 BLAKE2B 
3a42b7858346b2907040b8e42b1fae56626fc0881737ed04e20ffe4f9a23d2a2459c45e4244ac77745d2b1c7e3ff1642fe883b16def36e56c5c3d15077445793
 SHA512 
fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c
+DIST mdds-1.5.0.tar.bz2 346888 BLAKE2B 
c5c33649b6d8ba7d289eafe39c00c4334caa04f2a619d396e4f2499db9d66f48cb3ad0081805e7cef93bda49c24e6ce1a50c85a5e738120ee575c319959f6129
 SHA512 
9ed434dbc00285defbf3e0989396a1b52439bfdda01e5fd5822fef5e42e2c9b0b9436dd11b99af84a09a1965191ec106114e4046834f5b733474759f43bbfd95

diff --git a/dev-util/mdds/files/mdds-1.5.0-buildsystem.patch 
b/dev-util/mdds/files/mdds-1.5.0-buildsystem.patch
new file mode 100644
index 000..113581a8de6
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.5.0-buildsystem.patch
@@ -0,0 +1,39 @@
+# Nils Freydank  (2020-01-08)
+Avoid auto installation of files we install later manually.
+Adopted from asturm's patch for mdds-1.4.3.
+
+--- a/Makefile.am   2020-02-08 20:00:00.0 +0100
 b/Makefile.am  2020-02-08 20:00:00.1 +0100
+@@ -4,7 +4,6 @@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include $(CXXFLAGS_UNITTESTS)
+ 
+-dist_doc_DATA = AUTHORS README.md
+ nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
+ 
+ DISTCLEANFILES = \
+@@ -14,8 +13,6 @@
+ 
+ EXTRA_DIST = \
+   autogen.sh \
+-  CHANGELOG \
+-  LICENSE \
+   doc/conf.py \
+   doc/doxygen.conf \
+   doc/flat_segment_tree.rst \
+@@ -164,14 +161,6 @@
+   rtree_test_bulkload_mem.mem
+ endif
+ 
+-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
+ html-local:
+   (cd doc && $(DOXYGEN) doxygen.conf)
+

diff --git a/dev-util/mdds/mdds-1.5.0.ebuild b/dev-util/mdds/mdds-1.5.0.ebuild
new file mode 100644
index 000..3b7f1556f29
--- /dev/null
+++ b/dev-util/mdds/mdds-1.5.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == * ]]; then
+   EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git;
+   inherit git-r3
+else
+   SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2;
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing 
algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds;
+
+LICENSE="MIT"
+SLOT="1/${PV%.*}"
+IUSE="doc 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}/${P}-buildsystem.patch" )
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_enable doc docs)
+   $(use_enable valgrind memory_tests)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_test() {
+   tc-export CXX
+
+   default
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/, dev-util/mdds/files/

2019-09-12 Thread Andreas Sturmlechner 
commit: 24e85e0a4ba3c69a4edb32536f08bdf9009bbe21
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 12 20:26:34 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 12 20:27:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24e85e0a

dev-util/mdds: Drop 1.3.1

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/mdds/Manifest   |  1 -
 dev-util/mdds/files/mdds-1.2.3-buildsystem.patch | 36 ---
 dev-util/mdds/mdds-1.3.1.ebuild  | 46 
 3 files changed, 83 deletions(-)

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index dc1ce053a2d..6af7c94a04a 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,2 +1 @@
-DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 
476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30
 SHA512 
c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
 DIST mdds-1.4.3.tar.bz2 334515 BLAKE2B 
3a42b7858346b2907040b8e42b1fae56626fc0881737ed04e20ffe4f9a23d2a2459c45e4244ac77745d2b1c7e3ff1642fe883b16def36e56c5c3d15077445793
 SHA512 
fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c

diff --git a/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch 
b/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
deleted file mode 100644
index 89b45d826e0..000
--- a/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-We want to install (not all of) those files manually.
-
 a/Makefile.am  2017-05-24 23:59:15.0 +0200
-+++ b/Makefile.am  2017-05-26 21:52:01.184258647 +0200
-@@ -4,16 +4,12 @@
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include
- 
--dist_doc_DATA = AUTHORS README.md
--nodist_doc_DATA = VERSION
- nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
- 
- DISTCLEANFILES = misc/mdds-@API_VERSION@.pc
- 
- EXTRA_DIST = \
-   autogen.sh \
--  CHANGELOG \
--  LICENSE \
-   doc/conf.py \
-   doc/doxygen.conf \
-   doc/flat_segment_tree.rst \
-@@ -151,14 +147,6 @@
-   trie_map_test_mem.mem
- endif
- 
--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
- html-local:
-   (cd doc && $(DOXYGEN) doxygen.conf)

diff --git a/dev-util/mdds/mdds-1.3.1.ebuild b/dev-util/mdds/mdds-1.3.1.ebuild
deleted file mode 100644
index d2a33d885ee..000
--- a/dev-util/mdds/mdds-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git;
-[[ ${PV} ==  ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing 
algorithm"
-HOMEPAGE="https://gitlab.com/mdds/mdds;
-[[ ${PV} ==  ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2;
-
-LICENSE="MIT"
-SLOT="1/1.2"
-IUSE="valgrind"
-
-[[ ${PV} ==  ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-   valgrind? ( dev-util/valgrind )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
-
-src_prepare(){
-   default
-   eautoreconf
-}
-
-src_configure() {
-   # docs require dev-python/breathe etc., bug #602026
-   econf \
-   --disable-docs \
-   $(use_enable valgrind memory_tests)
-}
-
-src_compile() { :; }
-
-src_test() {
-   tc-export CXX
-   default
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/, dev-util/mdds/files/

2017-05-26 Thread Andreas Sturmlechner 
commit: bd10ea30b77a28eade20300c9cca89b4d53d2107
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 26 20:06:15 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 26 20:30:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd10ea30

dev-util/mdds: 1.2.3 version bump

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-util/mdds/Manifest |  1 +
 dev-util/mdds/files/mdds-1.2.3-buildsystem.patch   | 36 ++
 .../mdds/{mdds-.ebuild => mdds-1.2.3.ebuild}   | 10 +++---
 dev-util/mdds/mdds-.ebuild | 10 +++---
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 409a9f87dc7..4fdbfae649d 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1 +1,2 @@
 DIST mdds-1.2.2.tar.bz2 286185 SHA256 
141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d SHA512 
552cb1b65c03cd18eb679c95821e47c1151e1b3015043de4b3a7bc14d27734772fa4d80fd90ab48998d0bc75385a3d29c4dd7ce826cf84b012685573c623bf01
 WHIRLPOOL 
f0b24a886ad6b275267603b73a95c3b83ce14808f90daa0e680babec966a52de19349ac0991d76b9279818897f783d1768ece74f5f1be1157fa8bff94e5e8a5a
+DIST mdds-1.2.3.tar.bz2 287079 SHA256 
402fec18256f95b89517d54d85f00bce1faa6e517cb3d7c98a720fddd063354f SHA512 
e5935fd99a53df124532cfc8e46349b2ef9ca79f5f184ca2da941c9a77e66ee40e11478e520bf9cb62e1bcea4b69deab5088265e1b89fda04417130aab227c3d
 WHIRLPOOL 
88e154f3e1141d09736a8a9d5b4adf3612cea95a82773f59053d8e83f7fec3a0c292f5453df92627f31ac7e12b2f702dc281c959e7f219de91f2a1acc15cc7b4

diff --git a/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch 
b/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
new file mode 100644
index 000..89b45d826e0
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
@@ -0,0 +1,36 @@
+We want to install (not all of) those files manually.
+
+--- a/Makefile.am  2017-05-24 23:59:15.0 +0200
 b/Makefile.am  2017-05-26 21:52:01.184258647 +0200
+@@ -4,16 +4,12 @@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+-dist_doc_DATA = AUTHORS README.md
+-nodist_doc_DATA = VERSION
+ nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
+ 
+ DISTCLEANFILES = misc/mdds-@API_VERSION@.pc
+ 
+ EXTRA_DIST = \
+   autogen.sh \
+-  CHANGELOG \
+-  LICENSE \
+   doc/conf.py \
+   doc/doxygen.conf \
+   doc/flat_segment_tree.rst \
+@@ -151,14 +147,6 @@
+   trie_map_test_mem.mem
+ endif
+ 
+-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
+ html-local:
+   (cd doc && $(DOXYGEN) doxygen.conf)

diff --git a/dev-util/mdds/mdds-.ebuild b/dev-util/mdds/mdds-1.2.3.ebuild
similarity index 79%
copy from dev-util/mdds/mdds-.ebuild
copy to dev-util/mdds/mdds-1.2.3.ebuild
index cbc8fcb3af6..2205550deef 100644
--- a/dev-util/mdds/mdds-.ebuild
+++ b/dev-util/mdds/mdds-1.2.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git;
-[[ ${PV} ==  ]] && GITECLASS="git-r3 autotools"
+[[ ${PV} ==  ]] && GITECLASS="git-r3"
 
-inherit toolchain-funcs ${GITECLASS}
+inherit autotools toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing 
algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds;
@@ -27,11 +27,11 @@ DEPEND="${RDEPEND}
)
 "
 
-DOCS=() # buildsystem installs docs
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
 src_prepare(){
default
-   [[ ${PV} ==  ]] && eautoreconf
+   eautoreconf
 }
 
 src_configure() {

diff --git a/dev-util/mdds/mdds-.ebuild b/dev-util/mdds/mdds-.ebuild
index cbc8fcb3af6..e87dc4be509 100644
--- a/dev-util/mdds/mdds-.ebuild
+++ b/dev-util/mdds/mdds-.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git;
-[[ ${PV} ==  ]] && GITECLASS="git-r3 autotools"
+[[ ${PV} ==  ]] && GITECLASS="git-r3"
 
-inherit toolchain-funcs ${GITECLASS}
+inherit autotools toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing 
algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds;
@@ -27,11 +27,11 @@ DEPEND="${RDEPEND}
)
 "
 
-DOCS=() # buildsystem installs docs
+PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
 
 src_prepare(){
default
-   [[ ${PV} ==  ]] && eautoreconf
+   eautoreconf
 }