dev-libs/collada-dom: Bump to 2.4.4 and backport upstream patch to build with gcc6.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index bd9fdb062959ed3b64fe12a15026400a14067274..e610b226269d10d99057c0b5476533cccbdbb802 100644 (file)
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,2 +1,3 @@
 DIST collada-dom-2.4.0.tgz 42517651 SHA256 5ca2d12f744bdceff0066ed3067b3b23d6859581fb0d657f98ba4487d8fa3896 SHA512 6de67dc0e631cd02c4bc5567667e7bcee4a41a137310326d5b8290e088a757f7313454028473df3e198f73b3c2db7572a437f7256e666b44ed34fe81d44229c1 WHIRLPOOL fedb8e8d8adeafdd8b4b6bf7860a005153d05fdcaed99949b8913ce51582f2bc5d4e4ff223ea012c2bba84eb889a7e5fb3c8752ad1ae0884fd0127a2a1e1b44f
 DIST collada-dom-2.4.3_pre20150112.tar.xz 2272092 SHA256 be928859dc71491420433aa86df03b14576bf97b0fa6982cde201b7dac120d98 SHA512 46c237c123a9d1b9cc8e07bf992b4386c064a3382b44be1347ab4bc6dce85f75ad59da0a5740f97c879c982e5a1119dcec5ced82d4dd725efd789021b0ead7f1 WHIRLPOOL a7e6266895ba6528ef680f5dbcecc8dd3a3c0d9227f9e53fdc31729dc5538b6aebbc110b9a9b6ba2aa77cf7ed863e0301c55db72a0b4766b780e900b8125a860
+DIST collada-dom-2.4.4.tar.gz 4507681 SHA256 0dfa494827faa971310c871535b319cadbd0c2d6958ee11b303c61a55a5a437a SHA512 3a89357cca0e219d1af3830f85fe1e09928e469e90b5c124be9e0cc5acfa3ab897b484b225f572cf26435c9b4671c97eb5ea5d156b99b03e13f120d3ba1f1dcb WHIRLPOOL 2ee0b2430a16254dfb0d111896ee9c057f139b09bc82fe57c2f0e8abb34b7f12d9614b16f6e2a93ceaa7a28e3572a65cddc6a9c960cf53ab2f92932f5b2e972b

diff --git a/dev-libs/collada-dom/collada-dom-2.4.4.ebuild b/dev-libs/collada-dom/collada-dom-2.4.4.ebuild
new file mode 100644 (file)
index 0000000..e9aa25a
--- /dev/null
+++ b/dev-libs/collada-dom/collada-dom-2.4.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index b6bdc594536624475ed928e9f7289b07b5cfe05d..8c6c0abe2cb3f5214760d70550faa74b1f95034e 100644 (file)
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,6 +15,10 @@ 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"

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
new file mode 100644 (file)
index 0000000..48cdcd2
--- /dev/null
+++ b/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch
@@ -0,0 +1,19 @@
+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;
+