gentoo resync : 07.01.2018

3 files changed, 45 insertions, 3 deletions

diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index 4306d72a5166..a9d725585711 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -3,8 +3,10 @@ AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448
 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-9999.ebuild 845 BLAKE2B 73afad1e26810c3dab3c2267fa8b9ab34693f9f7746a0676b2a7ef2acfb58995f1156047ab339f4a4f87669fedd26e413100c176db1a74a4ba67aa78d42df84f SHA512 eab966f777bc89031f2c1e79625607e1247f69a0b5ce99136296bc23fb03dbc28a923c66ce598424734764b1eadbdf8dd53506f45f2dc8ab1ffe9ef1ae5d0213
+EBUILD collada-dom-2.5.0.ebuild 848 BLAKE2B 001756b73b333782ff89489b0a0a3016593898dfd151a08a649898becdea37f2c6fac109a92cf3e2e3a7f8524ba109e829c8f9501f9ff5c0f338fa7e2d63a6e0 SHA512 2b094bed950e0efc432372ea7ac139172ddda6c84858585d265c5ebea4cfc7efc9696cd5720931aed6e1c1bdb27bf5ce0e0cdd4057347a8f9ca67f1c63aab987
+EBUILD collada-dom-9999.ebuild 848 BLAKE2B 001756b73b333782ff89489b0a0a3016593898dfd151a08a649898becdea37f2c6fac109a92cf3e2e3a7f8524ba109e829c8f9501f9ff5c0f338fa7e2d63a6e0 SHA512 2b094bed950e0efc432372ea7ac139172ddda6c84858585d265c5ebea4cfc7efc9696cd5720931aed6e1c1bdb27bf5ce0e0cdd4057347a8f9ca67f1c63aab987
 MISC metadata.xml 402 BLAKE2B 34446b3bb91ea6d424455de22a994a55c33f3ce088c7e8ff4307a25816c0d685d632c4b5628c939dbf5901cbcef7d2e143bcf45f64f7046c3419f0b7fd121935 SHA512 7798cc43db032d2cee13b739812802e530b3ea9ba6c4ef5439a439bb77884d68ddae6d0c6e11d491b44e7598fad936e5ac455ca5d7bd39ce5e1689ad2c2555e4
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
new file mode 100644
index 000000000000..46cc5b8cffbf
--- /dev/null
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 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/25"
+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-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index 83ffeacb1b62..46cc5b8cffbf 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.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=5
@@ -27,7 +27,7 @@ DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
 HOMEPAGE="https://github.com/rdiankov/collada-dom"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/25"
 IUSE=""
 
 RDEPEND="