gentoo Easter resync : 12.04.2020

5 files changed, 162 insertions, 9 deletions

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 3c7ea6e09d8c..7688d5b6ca46 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,5 +1,10 @@
 AUX mdds-1.4.3-buildsystem.patch 893 BLAKE2B 7884c16fcf8b6f1ddde0dbae6e4059e121fed73e7dcbffdf730e1623d0e7b7d0748f06c07433d73a73a7b4729ce32a6742125c8baac946db62a856149b468173 SHA512 0cd8c83f1a354a97871bb0d9bd7662d73765639f3ec4dcd6b922574062e2f1b33c259c322ff6e60c4c9f55e0c581c022b7546a05e0b551ad11123bb1a9dc7b53
+AUX mdds-1.5.0-buildsystem.patch 1006 BLAKE2B a6205a749a5a619443a060912bd863c93f74eb88cc68e62b077bdbab0a3e67e2f9ab35774ec5fcd23599b5b10478f529ebd2f89806fe926786d63967f83a9075 SHA512 eb03daf08605c9e54326621af3be39214659627fc4922c9cd3f031073f78a0823c2f1bb7267eb671c189b0326f9ff5d1fe3f60cda14fe9a7ac58d293972d67b9
 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
 EBUILD mdds-1.4.3.ebuild 945 BLAKE2B 8c945f2c3cd18546b58277c5d8089518b7ab92b2ecfd2241b14e0c4023fd4aef722da5cc0a95950d925925a2a47e1966f529a5539e4ecd8fae79ed2c14f450f6 SHA512 858233cb5c378ea314d01c808baf8dae428d4420ecb49eb7d34983eb7892d17ba9b736526faa03008e48515a0172969b8edd57e5e9c96c08d11eb98eefd8ae08
-EBUILD mdds-9999.ebuild 955 BLAKE2B c3650b390950e15ed23c484f03109071a308d82edecf8f91bd346fc975fdd123946d7bea3602670cf6c79ae72c09272e176104ef072d481ea9bb22a5f7e1094c SHA512 8d0f822ed67dca2929466191a5cdf1d4bdc50d082ff120281abd5b438788b28b087df409599384d4e4add09fd6f9d01d8c172f75c8e7524312aa720716f1b7ba
+EBUILD mdds-1.5.0.ebuild 1001 BLAKE2B 33712cf9f867d9e257c03a57c3d05bbac176ef660bd596e1e3561b037a3dc870fc325c19b3e8b71e630a51f231e8046fb90339871fb240ce0ad56615ed8fb821 SHA512 6fdf56616f78cc9e9e1325ad90a71756a554bbb2f020ed3c41be9369e5228dccbc40846a3452cb565fd429389d10e7017f6f56a7745dcf7b9f15ea521c19c979
+EBUILD mdds-1.6.0.ebuild 1003 BLAKE2B ee9ffa2044258a1e866d05e96c39935476bfbe74a182ea31857943ac2e4d3e86b4681939e6df259b2ffaececf60c7efea9947f80edd3cd567b245a10c6ab9054 SHA512 c1647a6b6418b8ce585efdb0343e7cc64d32a1733fc19ae490e05eeec5894d2405f479d97dcd79fca0c82fa76dd0d56f97246e41ef7724eff3e5f3d96556e960
+EBUILD mdds-9999.ebuild 1046 BLAKE2B 35163f18579cab3525c9c18d53fdbc40f6500ee444dbcf989acc010145feb33dae930a9e7d72da28f4ed2f5db3c11c1e48c5863b3b9beaa209b70eb510c5c3fc SHA512 d488d16176ce95b4e4846053b220a24e7e1f301e677e24ea601c74c7a5361eb9295e0132ce977ffab91d313fd9bde1e25f7e822991dbf8af205eef4f0f4cf649
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
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 000000000000..113581a8de63
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.5.0-buildsystem.patch
@@ -0,0 +1,39 @@
+# Nils Freydank <holgersson@posteo.de> (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.000000000 +0100
++++ b/Makefile.am	    2020-02-08 20:00:00.000000001 +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 000000000000..3b7f1556f29a
--- /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} == *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.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
+}
diff --git a/dev-util/mdds/mdds-1.6.0.ebuild b/dev-util/mdds/mdds-1.6.0.ebuild
new file mode 100644
index 000000000000..dce25723cffd
--- /dev/null
+++ b/dev-util/mdds/mdds-1.6.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} == *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.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"
+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}/${PN}-1.5.0-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
+}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 2709004f0637..1bede682c2d9 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
 	inherit git-r3
 else
@@ -16,8 +16,9 @@ DESCRIPTION="A collection of multi-dimensional data structure and indexing algor
 HOMEPAGE="https://gitlab.com/mdds/mdds"
 
 LICENSE="MIT"
-SLOT="1/${PV%.*}"
-IUSE="doc valgrind"
+SLOT="1/${PV%.*}" # Check API version on version bumps!
+IUSE="doc valgrind test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? (
@@ -29,22 +30,24 @@ BDEPEND="
 DEPEND="dev-libs/boost:="
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.4.3-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable doc docs) \
+	local myeconfargs=(
+		$(use_enable doc docs)
 		$(use_enable valgrind memory_tests)
+	)
+	econf "${myeconfargs[@]}"
 }
 
-src_compile() { :; }
-
 src_test() {
 	tc-export CXX
+
 	default
 }