gentoo resync : 24.02.2018

7 files changed, 29 insertions, 169 deletions

diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index a9d725585711..4b3ae11e06e1 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,12 +1,5 @@
-AUX collada-dom-2.4.4-gcc6.patch 589 BLAKE2B d2981573de9e3902081b2cfffb25f5ce06f50ad9f689cf311322366a55a3dabf106d93802145fbd838ac74ba25ff395aaed003fbcc5e169ff0743af41ccb4e02 SHA512 cb9c948ee5fc36b20852d4afc487aae3cba849e03f0f0e72a86891d7c4a5a132ae9b1b7f35f093b84781e123c07c682268dc8c2d1e1e6685908326ad33302d05
 AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448b5ab2b6d28a1baae28cce45a6c0e051bf190217ccd29539c6c40db9690b0845f9c797e7e2929f8fb1 SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487
-DIST collada-dom-2.4.0.tgz 42517651 BLAKE2B 4bc0997d762a6626b78ef6a80d4ca01e98f1209d1628cd58b9734b5cb3a93fdd47826b08aa70e8334cb85f713bf36c9a93ca93219406d2bb5f77a2a077fba1fd SHA512 6de67dc0e631cd02c4bc5567667e7bcee4a41a137310326d5b8290e088a757f7313454028473df3e198f73b3c2db7572a437f7256e666b44ed34fe81d44229c1
-DIST collada-dom-2.4.3_pre20150112.tar.xz 2272092 BLAKE2B 0d6077fd4877a60fb02ab29a4a2e301f70e91316e390474a9ec37a528d69ec6273bc995961816be43679dd601ad2857f4c71775e639ae1e311d837793164cc98 SHA512 46c237c123a9d1b9cc8e07bf992b4386c064a3382b44be1347ab4bc6dce85f75ad59da0a5740f97c879c982e5a1119dcec5ced82d4dd725efd789021b0ead7f1
-DIST collada-dom-2.4.4.tar.gz 4507681 BLAKE2B 3a5c0c4813202e2a14b54dd72b2a5ef6564b58ab6dbbe56625eb3ea09d2fb6c06dd23edc9a5d3de7f9c1a6ea9aeadc30089499748eabb5b9f334d7ec30b420fe SHA512 3a89357cca0e219d1af3830f85fe1e09928e469e90b5c124be9e0cc5acfa3ab897b484b225f572cf26435c9b4671c97eb5ea5d156b99b03e13f120d3ba1f1dcb
 DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
-EBUILD collada-dom-2.4.0.ebuild 490 BLAKE2B a8d73153fa630cbfa17e43001841a389db976a3e90be40cdab9e92f64fb700085fb32e09e4bf176dbc28e2bfc164a35236be2c27c1d31f9e9ff2ef01bfca32de SHA512 172680175df2c855767e51664ed37c3bdac37b73c0bd26aa8b40ce2b956995091520b02c98d86e105184c2b32777717b1fb4b0ccec0f21454c941c2464132ce5
-EBUILD collada-dom-2.4.3_pre20150112.ebuild 845 BLAKE2B 1b4aeb94df0d5d3333ae6858a0d84d73e30e874ebd4f51941f9059e7789f4b1bfb5fef96c5fdf637b415dabcd4a8d8f58f047c6dffd1fb54fb5a266847652ec7 SHA512 7559773cef187902ddc80eb6189e60323de517c5ec6bb4acb2761b93f769f508f7cf7e2982d414fe2c2df95e6844fb69fa8b60f4e33109da9750fa67b4082e1d
-EBUILD collada-dom-2.4.4.ebuild 888 BLAKE2B 5b22f503f455b4f9c8a7a293d1abded2992c4e661ff545d9cdb322d0435321918aa8948f46defc7b006709a787a1914c127d735a02390bcde8cb191f739651fe SHA512 561bdcf5c01267268a9252bdcda385a85f0430f0ee468ec63228f24443503eb23bc82fb51f6474ffe24e8d33af66d6e7c395f148179a048f17aef337b60b6582
-EBUILD collada-dom-2.5.0.ebuild 848 BLAKE2B 001756b73b333782ff89489b0a0a3016593898dfd151a08a649898becdea37f2c6fac109a92cf3e2e3a7f8524ba109e829c8f9501f9ff5c0f338fa7e2d63a6e0 SHA512 2b094bed950e0efc432372ea7ac139172ddda6c84858585d265c5ebea4cfc7efc9696cd5720931aed6e1c1bdb27bf5ce0e0cdd4057347a8f9ca67f1c63aab987
-EBUILD collada-dom-9999.ebuild 848 BLAKE2B 001756b73b333782ff89489b0a0a3016593898dfd151a08a649898becdea37f2c6fac109a92cf3e2e3a7f8524ba109e829c8f9501f9ff5c0f338fa7e2d63a6e0 SHA512 2b094bed950e0efc432372ea7ac139172ddda6c84858585d265c5ebea4cfc7efc9696cd5720931aed6e1c1bdb27bf5ce0e0cdd4057347a8f9ca67f1c63aab987
+EBUILD collada-dom-2.5.0.ebuild 749 BLAKE2B 6ab334a195a197efa817e5ebb9cdb04ddc152b3f34e35805d64143598976df51a4bcca92d833343d7ec8de090c75c8fb33225eda87f3350f6a3e3989a757390d SHA512 c934e13ba97dcbd6a021aed0beaa4ac00f8f5503beddff5da598b22d8d36a5dfd06f27996c757827ee198bc0724ba8335e414c19ee9b91a0a4696eb203ef1c25
+EBUILD collada-dom-9999.ebuild 753 BLAKE2B 11fcf22dab12fb6d9c371e5f536e767d8843bdc2ce019a8737c82323ce1e6f28474094ab2cd1c7e324063cdb95e458b62a5274b72acdb41230aefae02b58a597 SHA512 6480ac09fb6b199ffe0226b5274c4ac23a1b61bf95758d484fcef735e6f6fcdd6e95ba251bb089a209f1342d8d809739e20aa939a1d44f70509d059df53ff28f
 MISC metadata.xml 402 BLAKE2B 34446b3bb91ea6d424455de22a994a55c33f3ce088c7e8ff4307a25816c0d685d632c4b5628c939dbf5901cbcef7d2e143bcf45f64f7046c3419f0b7fd121935 SHA512 7798cc43db032d2cee13b739812802e530b3ea9ba6c4ef5439a439bb77884d68ddae6d0c6e11d491b44e7598fad936e5ac455ca5d7bd39ce5e1689ad2c2555e4
diff --git a/dev-libs/collada-dom/collada-dom-2.4.0.ebuild b/dev-libs/collada-dom/collada-dom-2.4.0.ebuild
deleted file mode 100644
index 7d1012ee9354..000000000000
--- a/dev-libs/collada-dom/collada-dom-2.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
-HOMEPAGE="http://collada-dom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collada-dom/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/dev-libs/collada-dom/collada-dom-2.4.3_pre20150112.ebuild b/dev-libs/collada-dom/collada-dom-2.4.3_pre20150112.ebuild
deleted file mode 100644
index a06ea26cc2df..000000000000
--- a/dev-libs/collada-dom/collada-dom-2.4.3_pre20150112.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
-	# snapshot
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
-HOMEPAGE="https://github.com/rdiankov/collada-dom"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/dev-libs/collada-dom/collada-dom-2.4.4.ebuild b/dev-libs/collada-dom/collada-dom-2.4.4.ebuild
deleted file mode 100644
index a783fc2ae1e8..000000000000
--- a/dev-libs/collada-dom/collada-dom-2.4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
-	# snapshot
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
-HOMEPAGE="https://github.com/rdiankov/collada-dom"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
index 46cc5b8cffbf..4086834d6c40 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -1,23 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
+inherit cmake-utils flag-o-matic
 
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
-	# snapshot
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
 	KEYWORDS="~amd64 ~arm"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -34,7 +24,13 @@ RDEPEND="
 	dev-libs/boost:=
 	sys-libs/zlib:=[minizip]
 	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
+	dev-libs/libpcre[cxx]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+
+src_configure() {
+	# bug 618960
+	append-cxxflags -std=c++14
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index 46cc5b8cffbf..bb015f58bab1 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -1,23 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
+inherit cmake-utils flag-o-matic
 
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
-	# snapshot
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
 	KEYWORDS="~amd64 ~arm"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -33,8 +23,14 @@ IUSE=""
 RDEPEND="
 	dev-libs/boost:=
 	sys-libs/zlib:=[minizip]
-	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
+	dev-libs/libxml2:=
+	dev-libs/libpcre:=[cxx]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+
+src_configure() {
+	# bug 618960
+	append-cxxflags -std=c++14
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch b/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch
deleted file mode 100644
index 48cdcd20c1e9..000000000000
--- a/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 8e65676c1cbecde1c0c4d8c2e1cfb20fc49c410b
-Author: rosen <rosen.diankov@mujin.co.jp>
-Date:   Wed Feb 24 12:49:14 2016 +0900
-
-    fix return type thanks to #22
-
-diff --git a/dom/src/dae/daeMetaGroup.cpp b/dom/src/dae/daeMetaGroup.cpp
-index 25fd9cc..c34ac4c 100644
---- a/dom/src/dae/daeMetaGroup.cpp
-+++ b/dom/src/dae/daeMetaGroup.cpp
-@@ -26,7 +26,7 @@ daeElement *daeMetaGroup::placeElement( daeElement *parent, daeElement *child, d
- 	(void)offset;
- 	daeString nm = child->getElementName();
- 	if ( findChild( nm ) == NULL ) {
--		return false;
-+		return NULL;
- 	}
- 	daeElementRef el;
-