gentoo resync : 18.11.2018

4 files changed, 34 insertions, 34 deletions

diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index d12ab171c1f6..33d126bdc88f 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,8 +1,8 @@
 AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca11909267230e7986e4e2439b8e98d7bedb076bad415a75846db038166583c1f3395cd71affb60959956062c293929378 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f
-AUX mdds-1.4.1-buildsystem.patch 898 BLAKE2B 716559741402b82537d91698ebe78815c26e47ecb844bed37f0c188efbfa5c9fd7bd9be501afb4d3653840961fa7ace17d215eb035ec9a028bf775589f9dadf8 SHA512 0e5b735232b8409194f6d9fc1b1b171dc333d6388ab858cb79be4908ff1cbdcee276146365b3c6c70b192559489896ba50384b5d78a22fc8c1fa78d683d89b7e
+AUX mdds-1.4.3-buildsystem.patch 893 BLAKE2B 7884c16fcf8b6f1ddde0dbae6e4059e121fed73e7dcbffdf730e1623d0e7b7d0748f06c07433d73a73a7b4729ce32a6742125c8baac946db62a856149b468173 SHA512 0cd8c83f1a354a97871bb0d9bd7662d73765639f3ec4dcd6b922574062e2f1b33c259c322ff6e60c4c9f55e0c581c022b7546a05e0b551ad11123bb1a9dc7b53
 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
 EBUILD mdds-1.3.1.ebuild 981 BLAKE2B d56dee445b3d1c55fa2d2eb6c742c45574db99784ea41e26d0b24eb12ef439eb6522385f1c9b1e539373d5b88a7361f412cc192b2b7a297fb689d576c06bd3ad SHA512 9564ee7663255f1757c86325bc80b78c6b05375a5a35a9a46b4567c7a307b8c3cc0d7e4e86349fa7074d65bb321bde88e9a625ed2ecb668f0574899d80e48c88
-EBUILD mdds-1.4.2.ebuild 1009 BLAKE2B 20c3dc414fc64ec899a3d6d36a66bcc264b0b50b371187801628a68e30a52bde2759bed4c24ec2e941c1dc0e1ebf2ce8af12fde0d5792895bb78c5b7f0a005e4 SHA512 f4bdd079f5928633624b4147db170eadd6e4952f26e1a3cc737a2355138c1f9a382889996aea245529faf0a8a0b35f007fa355af0f1e8c44376cc53260f85da8
-EBUILD mdds-9999.ebuild 996 BLAKE2B 9c0e219edb41aa5a8aa9d7f0fe38182d0a45322c614932ff0fda9d6888c9e89eb75208b4c6d77b1ac3a082015a81f77d6dd2ab96f312eb69d14c13ff3f3e1278 SHA512 d2b7462575b484f8dd4002addfb075189419495b1e744a4c818f7e87be3768ca39284a3d9579a64ef450b19468952d865c8e2019cdbb5602ed1f99d8f15c8f43
+EBUILD mdds-1.4.3.ebuild 950 BLAKE2B a258610a5f66f8c6d79619a24e18dbd757d0d186269509eaa7b96a92e987e53976c63d461581d8f18825c792b40c55f07f4d16eb763572b2ea7b201e0fe7a305 SHA512 696a2d9c38dfb6103d0e358d514864c48ac06f0cdde9c31c8d82d7439d9ed8f40b141809525ee57e8c87de6b7961e3ca36804f1272109ac13f5f9d64305bbeae
+EBUILD mdds-9999.ebuild 955 BLAKE2B 75a8c7ae5b5c447112991d5b31f57fda4fb48b7b1ee0a5f7f676ec50e1f2036f89181b3f33ca4a5d72a0f332171b947b582f4e2bd374e846ff9a6e928cf6e775 SHA512 e7c89d121a11aabaf28c1940975b868e5b0b98df4fe71bfa248edc046ef6b9047f7d0364d7347c321fd879fdc22c6f853734e3eb576f07cd5f91707208d4785a
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch b/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch
index 212587e9dacd..ef3616d6f2fb 100644
--- a/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch
+++ b/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch
@@ -2,16 +2,15 @@ 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 @@
+@@ -4,7 +4,6 @@
  
- AM_CPPFLAGS = -I$(top_srcdir)/include
+ AM_CPPFLAGS = -I$(top_srcdir)/include $(CXXFLAGS_UNITTESTS)
  
 -dist_doc_DATA = AUTHORS README.md
--nodist_doc_DATA = VERSION
  nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
  
  DISTCLEANFILES = \
-@@ -15,8 +13,6 @@
+@@ -15,8 +14,6 @@
  
  EXTRA_DIST = \
  	autogen.sh \
@@ -20,7 +19,7 @@ We want to install (not all of) those files manually.
  	doc/conf.py \
  	doc/doxygen.conf \
  	doc/flat_segment_tree.rst \
-@@ -164,14 +160,6 @@
+@@ -164,14 +161,6 @@
  	rtree_test_bulkload_mem.mem
  endif
  
diff --git a/dev-util/mdds/mdds-1.4.2.ebuild b/dev-util/mdds/mdds-1.4.3.ebuild
index bb6e3ab3edf1..8ca6d8fc087e 100644
--- a/dev-util/mdds/mdds-1.4.2.ebuild
+++ b/dev-util/mdds/mdds-1.4.3.ebuild
@@ -1,27 +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} == 9999 ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
+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"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1/${PV%.*}"
 IUSE="doc valgrind"
 
-[[ ${PV} == 9999 ]] || \
-KEYWORDS=""
-#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
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.4.1-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
 src_prepare(){
 	default
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 65b5df3e9c0e..facdbc17f0d4 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.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} == 9999 ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
+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"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1/${PV%.*}"
 IUSE="doc valgrind"
 
-[[ ${PV} == 9999 ]] || \
-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