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

2020-10-31 Thread Andreas Sturmlechner 
commit: bbfb176d2d634bfd8747e014b8006d2fd0e98b4a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct 30 17:04:30 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 31 22:40:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfb176d

dev-util/mdds: 1.7.0 version bump

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

 dev-util/mdds/Manifest |  1 +
 dev-util/mdds/files/mdds-1.7.0-bashism.patch   | 75 ++
 .../mdds/{mdds-.ebuild => mdds-1.7.0.ebuild}   | 14 ++--
 dev-util/mdds/mdds-.ebuild |  5 +-
 4 files changed, 86 insertions(+), 9 deletions(-)

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index efa7eb91720..4483da3da7c 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1 +1,2 @@
 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.7.0-bashism.patch 
b/dev-util/mdds/files/mdds-1.7.0-bashism.patch
new file mode 100644
index 000..3e94f32e8f8
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.7.0-bashism.patch
@@ -0,0 +1,75 @@
+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/mdds-.ebuild b/dev-util/mdds/mdds-1.7.0.ebuild
similarity index 76%
copy from dev-util/mdds/mdds-.ebuild
copy to dev-util/mdds/mdds-1.7.0.ebuild
index 64e78d4d68f..56bc179c30b 100644
--- a/dev-util/mdds/mdds-.ebuild
+++ b/dev-util/mdds/mdds-1.7.0.ebuild
@@ -3,20 +3,20 @@
 
 EAPI=7
 
-if [[ ${PV} == * ]]; then
+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;
+   SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz;
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"
+DESCRIPTION="Collection of multi-dimensional data structure and indexing 
algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds;
 
 LICENSE="MIT"
-SLOT="1/${PV%.*}" # Check API version on version bumps!
+SLOT="1/1.5" # Check API version on version bumps!
 IUSE="doc openmp valgrind

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

2020-05-31 Thread Andreas Sturmlechner 
commit: b6781ecdbfde7f1ffe86909f3a136002f92aada1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 31 21:05:46 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 31 21:08:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6781ecd

dev-util/mdds: Drop 1.4.3 and 1.5.0

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

 dev-util/mdds/Manifest   |  2 -
 dev-util/mdds/files/mdds-1.4.3-buildsystem.patch | 36 
 dev-util/mdds/mdds-1.4.3.ebuild  | 50 --
 dev-util/mdds/mdds-1.5.0.ebuild  | 53 
 4 files changed, 141 deletions(-)

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 52cda54666a..efa7eb91720 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,3 +1 @@
-DIST mdds-1.4.3.tar.bz2 334515 BLAKE2B 
3a42b7858346b2907040b8e42b1fae56626fc0881737ed04e20ffe4f9a23d2a2459c45e4244ac77745d2b1c7e3ff1642fe883b16def36e56c5c3d15077445793
 SHA512 
fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c
-DIST mdds-1.5.0.tar.bz2 346888 BLAKE2B 
c5c33649b6d8ba7d289eafe39c00c4334caa04f2a619d396e4f2499db9d66f48cb3ad0081805e7cef93bda49c24e6ce1a50c85a5e738120ee575c319959f6129
 SHA512 
9ed434dbc00285defbf3e0989396a1b52439bfdda01e5fd5822fef5e42e2c9b0b9436dd11b99af84a09a1965191ec106114e4046834f5b733474759f43bbfd95
 DIST mdds-1.6.0.tar.bz2 350406 BLAKE2B 
70a99d779f318140f37bb3f873f1845c153f389a9e671a4d9ee4d1f0e762db312d536392061923c3c02494df6945a5a7743480eca1020d9cda6f3495888d7b00
 SHA512 
7c66894748e998f24374a5c6ea342ae2736e4bdba53be89510a1674690517ed7303786e1290fcfa26b07f236788c192ad29790129c228074397ab43699cdb290

diff --git a/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch 
b/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch
deleted file mode 100644
index ef3616d6f2f..000
--- a/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-We want to install (not all of) those files manually.
-
 a/Makefile.am  2018-08-29 13:23:49.434860594 +0200
-+++ b/Makefile.am  2018-08-29 13:25:52.125789186 +0200
-@@ -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 = \
-@@ -15,8 +14,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.4.3.ebuild b/dev-util/mdds/mdds-1.4.3.ebuild
deleted file mode 100644
index 9be142ebbdb..000
--- a/dev-util/mdds/mdds-1.4.3.ebuild
+++ /dev/null
@@ -1,50 +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/${PV%.*}"
-IUSE="doc valgrind"
-
-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() {
-   econf \
-   $(use_enable doc docs) \
-   $(use_enable valgrind memory_tests)
-}
-
-src_compile() { :; }
-
-src_test() {
-   tc-export CXX
-   default
-}

diff --git a/dev-util/mdds/mdds-1.5.0.ebuild b/dev-util/mdds/mdds-1.5.0.ebuild
deleted file mode 100644
index 3b7f1556f29..000
--- a/dev-util/mdds/mdds-1.5.0.ebuild
+++ /dev/null
@@ -1,53 +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

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

2020-05-28 Thread Andreas Sturmlechner 
commit: 145fbf100e4f0e9d75f24b08f403dcc43137d2f8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 28 16:42:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 28 17:09:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145fbf10

dev-util/mdds: Fix bashisms in configure.ac

Reported-by: Matt Whitlock  mattwhitlock.name>
Closes: https://bugs.gentoo.org/723094
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/mdds/files/mdds-1.6.0-bashism.patch | 75 
 dev-util/mdds/mdds-1.6.0.ebuild  |  5 +-
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/dev-util/mdds/files/mdds-1.6.0-bashism.patch 
b/dev-util/mdds/files/mdds-1.6.0-bashism.patch
new file mode 100644
index 000..4fa155c653f
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.6.0-bashism.patch
@@ -0,0 +1,75 @@
+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
index a8ee00cd56b..9364d50feb9 100644
--- a/dev-util/mdds/mdds-1.6.0.ebuild
+++ b/dev-util/mdds/mdds-1.6.0.ebuild
@@ -30,7 +30,10 @@ BDEPEND="
 DEPEND="dev-libs/boost:="
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-1.5.0-buildsystem.patch"
+   "${FILESDIR}/${P}-bashism.patch" # bug 723094
+)
 
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

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

2018-11-15 Thread Andreas Sturmlechner 
commit: afc2581816d9da3a8411de65c8edfb56f2db2e1d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 15 23:09:43 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 15 23:12:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc25818

dev-util/mdds: Drop 1.4.2

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

 dev-util/mdds/Manifest   |  1 -
 dev-util/mdds/files/mdds-1.4.1-buildsystem.patch | 37 --
 dev-util/mdds/mdds-1.4.2.ebuild  | 50 
 3 files changed, 88 deletions(-)

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

diff --git a/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch 
b/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch
deleted file mode 100644
index 212587e9dac..000
--- a/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-We want to install (not all of) those files manually.
-
 a/Makefile.am  2018-08-29 13:23:49.434860594 +0200
-+++ b/Makefile.am  2018-08-29 13:25:52.125789186 +0200
-@@ -4,8 +4,6 @@
- 
- 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 = \
-@@ -15,8 +13,6 @@
- 
- EXTRA_DIST = \
-   autogen.sh \
--  CHANGELOG \
--  LICENSE \
-   doc/conf.py \
-   doc/doxygen.conf \
-   doc/flat_segment_tree.rst \
-@@ -164,14 +160,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.4.2.ebuild b/dev-util/mdds/mdds-1.4.2.ebuild
deleted file mode 100644
index bb6e3ab3edf..000
--- a/dev-util/mdds/mdds-1.4.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 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"
-
-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/${PV%.*}"
-IUSE="doc valgrind"
-
-[[ ${PV} ==  ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-   doc? (
-   app-doc/doxygen
-   dev-python/sphinx
-   )
-   valgrind? ( dev-util/valgrind )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.1-buildsystem.patch" )
-
-src_prepare(){
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable doc docs) \
-   $(use_enable valgrind memory_tests)
-}
-
-src_compile() { :; }
-
-src_test() {
-   tc-export CXX
-   default
-}

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

2018-11-15 Thread Andreas Sturmlechner 
commit: 3785c594bec3e9e3ae518ad1f13cf7bca16c1f69
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 15 22:49:43 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 15 23:12:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3785c594

dev-util/mdds: EAPI-7 bump

Rebase buildsystem patch.

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

 dev-util/mdds/files/mdds-1.4.3-buildsystem.patch | 36 
 dev-util/mdds/mdds-.ebuild   | 25 
 2 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch 
b/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch
new file mode 100644
index 000..ef3616d6f2f
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch
@@ -0,0 +1,36 @@
+We want to install (not all of) those files manually.
+
+--- a/Makefile.am  2018-08-29 13:23:49.434860594 +0200
 b/Makefile.am  2018-08-29 13:25:52.125789186 +0200
+@@ -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 = \
+@@ -15,8 +14,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-.ebuild b/dev-util/mdds/mdds-.ebuild
index 65b5df3e9c0..facdbc17f0d 100644
--- a/dev-util/mdds/mdds-.ebuild
+++ b/dev-util/mdds/mdds-.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git;
-[[ ${PV} ==  ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
+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;
-[[ ${PV} ==  ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2;
 
 LICENSE="MIT"
 SLOT="1/${PV%.*}"
 IUSE="doc valgrind"
 
-[[ ${PV} ==  ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
 RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
doc? (
app-doc/doxygen
dev-python/sphinx
@@ -28,7 +29,7 @@ DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.4.1-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.4.3-buildsystem.patch" )
 
 src_prepare(){
default

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

2018-08-29 Thread Andreas Sturmlechner 
commit: 14e8298bf763833cc7ba5342a5e859489ad829f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 29 11:28:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 29 13:11:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e8298b

dev-util/mdds: Fix buildsystem.patch

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 dev-util/mdds/files/mdds-1.4.1-buildsystem.patch | 37 
 dev-util/mdds/mdds-.ebuild   |  4 +--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch 
b/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch
new file mode 100644
index 000..212587e9dac
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch
@@ -0,0 +1,37 @@
+We want to install (not all of) those files manually.
+
+--- a/Makefile.am  2018-08-29 13:23:49.434860594 +0200
 b/Makefile.am  2018-08-29 13:25:52.125789186 +0200
+@@ -4,8 +4,6 @@
+ 
+ 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 = \
+@@ -15,8 +13,6 @@
+ 
+ EXTRA_DIST = \
+   autogen.sh \
+-  CHANGELOG \
+-  LICENSE \
+   doc/conf.py \
+   doc/doxygen.conf \
+   doc/flat_segment_tree.rst \
+@@ -164,14 +160,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-.ebuild b/dev-util/mdds/mdds-.ebuild
index 8059254bb67..65b5df3e9c0 100644
--- a/dev-util/mdds/mdds-.ebuild
+++ b/dev-util/mdds/mdds-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.4.1-buildsystem.patch" )
 
 src_prepare(){
default

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

2016-07-03 Thread Andreas Hüttel 
commit: 61f75fc670bbfde60dee8ad7de53369312fdd9de
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Jun  5 11:15:39 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Jul  3 20:27:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f75fc6

dev-util/mdds: Drop old

Package-Manager: portage-2.2.28

 dev-util/mdds/Manifest |  3 --
 ...-0.11.2-include_algorithm_unconditionally.patch | 33 ---
 dev-util/mdds/mdds-0.10.3.ebuild   | 34 ---
 dev-util/mdds/mdds-0.11.2-r1.ebuild| 38 --
 dev-util/mdds/mdds-0.12.0.ebuild   | 34 ---
 5 files changed, 142 deletions(-)

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index b394d50..246867c 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,5 +1,2 @@
 DIST mdds-1.2.0.tar.bz2 284962 SHA256 
f44fd0635de94c7d490f9a65f74b5e55860d7bdd507951428294f9690fda45b6 SHA512 
433787dcb406cdce9025f32b93d8a9bec6cacf84292d05aaa32df0cb06926cf1b804a19a42c133e152e64688b4f0bff0b20818ca6571de6a5cdee0d2d0055bdd
 WHIRLPOOL 
9767a5165b63fbf971d050cb3f0dafa2e6f286b4561274a14872fe19824705bf3e4b173e3bc404f064b94dad9db0bbe8275dfba083ea6c8e1cb4a11ba0d1b69e
-DIST mdds_0.10.3.tar.bz2 151389 SHA256 
db10932dbe7e9b5b9b3f513bc8165ab7e29c3bf75702b3c3cfff6956c521e0c2 SHA512 
52be0fe4eedc8a44f61944e078d8f0d2490bfea27451c5d4772b6d46d71562702d3b90b34c5721d8bdf6de2ea32a4a9126e310614bb36e0d573c047dfc9f3fcb
 WHIRLPOOL 
17a461cf01f286ccb0e8b351e627dc870db5676a3698cf99f1520b01562138a8d74fa99ccca901d81b5f354abf95ff35d2a7957a3bf2dae16d92aee12e62f8b1
-DIST mdds_0.11.2.tar.bz2 15 SHA256 
cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab SHA512 
b0e00d50be9b8319dabfe7e607849af27a52be9b46d770849b919444b905bf198d99edcefe1be15e6018b79839443b3a709fe22b84ac11e2267f02bec5139633
 WHIRLPOOL 
a505c4b746c7ffefe3ea74fd0eb7c2ae46b4c598e1136cf9e9cfe44a4c48db2bb1b84528a5f0a86cc1b7a5c9d5b7d82522bd7836ed5e4de61d9664a863e1b014
-DIST mdds_0.12.0.tar.bz2 152285 SHA256 
2a22de23ca828886625120e9d40fccd6333458a1934a13d2c982b6f9403e5981 SHA512 
462f6e3701eb7cce872ce0a76d826886eedccf5ca20293d03744b6d6d5ff1ef16770c6abce1c9118829e252e90783e206d281006d0d4e7e9b328ed9ae37264c1
 WHIRLPOOL 
f86314644d80ae1b75a4cc1af6ebc4a3df3b65eac4244abc0fbf69893020509abae3be7e758d90a07eafffb866d67dcb75968b38a411e747d7f361a7d2905f0b
 DIST mdds_0.12.1.tar.bz2 153265 SHA256 
23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d SHA512 
852f58e1f3c18aef78646c2bd6b34dc544fc06cba7ef6bda2a44fd5e681bf47bbf7389505061ddd81797b0bdf343e55f060397a1ccc582c73990bc74d36575a6
 WHIRLPOOL 
d4f144e59806310c6a719600b88b4a0d9816d94dd48298458f459bc696b97ab4e82152ac7e4d9dcb3e8aa66a5fd67377c82c6bb161bf93135e0c6b73d01fb02e

diff --git 
a/dev-util/mdds/files/mdds-0.11.2-include_algorithm_unconditionally.patch 
b/dev-util/mdds/files/mdds-0.11.2-include_algorithm_unconditionally.patch
deleted file mode 100644
index 9b0f097..000
--- a/dev-util/mdds/files/mdds-0.11.2-include_algorithm_unconditionally.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c45e0499dded11dc2aacea40b470ab1431ea535a Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Thu, 29 Jan 2015 10:04:56 +0100
-Subject: [PATCH]  is needed unconditionally
-

- include/mdds/multi_type_vector_types.hpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/mdds/multi_type_vector_types.hpp 
b/include/mdds/multi_type_vector_types.hpp
-index db8d584..0a36333 100644
 a/include/mdds/multi_type_vector_types.hpp
-+++ b/include/mdds/multi_type_vector_types.hpp
-@@ -32,6 +32,8 @@
- #include "compat/unique_ptr.hpp"
- #include "global.hpp"
- 
-+#include 
-+
- #ifdef MDDS_MULTI_TYPE_VECTOR_USE_DEQUE
- #include 
- #else
-@@ -40,7 +42,6 @@
- #include 
- 
- #if defined(MDDS_UNIT_TEST) || defined (MDDS_MULTI_TYPE_VECTOR_DEBUG)
--#include 
- #include 
- #include 
- using std::cout;
--- 
-2.2.2
-

diff --git a/dev-util/mdds/mdds-0.10.3.ebuild b/dev-util/mdds/mdds-0.10.3.ebuild
deleted file mode 100644
index 792d73d..000
--- a/dev-util/mdds/mdds-0.10.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing 
algorithm"
-HOMEPAGE="https://code.google.com/p/multidimalgorithm/;
-SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2;
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="https://code.google.com/p/multidimalgorithm/;
-SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2;
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/-/_}