gentoo resync : 06.05.2018

4 files changed, 110 insertions, 1 deletions

diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 9ac81b48f345..744b2657838e 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -4,6 +4,9 @@ AUX coin-3.1.3-gcc-4.7.patch 347 BLAKE2B 4129b651164fd35e18469143c0728e67456ecdc
 AUX coin-3.1.3-gcc-7.patch 575 BLAKE2B 5bdb1d8c2b6c63cba4224506199e26bb91d47feda853903a8461929e12ef32b13395cb78926ddac86bf25ca740ab67ac66f37a085e041272a8e520916c21b8da SHA512 c4ea88ce111dd7dba1d8b1dd30cf325e91d5617540c5cbcdbe2be95e892641015071dc61830307188cfc16ecbdf58e89129b93621e0dd43ae05f7ad754df7b53
 AUX coin-3.1.3-memhandler-initialization.patch 906 BLAKE2B 421dea48d77870d324fa333bac19c6e00ad7ca576929bf029bd9b0be193462adb23cbadaf71d96fd30025db3780408a294db2d9ae3a52232798b677dd8e62c46 SHA512 f67c7179b1a023a938a55d82cfb1c18ffabc7586211e8e89a4fb4f8a4925f9c98240fffaa9c8dc46febd528e0d0b91607a417f290c0e0c06adbafb171ba1bf6b
 AUX coin-3.1.3-pkgconfig-partial.patch 431 BLAKE2B af57c0a4ec1985351db67f8f8f1d978c9ec3765e5d0d6e304e479314be3cc5cd48212094f87d8126ce84143a671fc7e000081cd0b38d149633515f121ce5f16d SHA512 6747ed14dca25017b6126ee2e542bec8cdf36cc634a8f0df059715f022a5f6c6f7126b9ea3c01e099a5564c634921fdc829c7561754df8c2dbf915659c7edb53
+AUX coin-4.0.0a-gcc-7.patch 581 BLAKE2B 2ee051f14c8c4e264cc887f51e49d817c7b08be735dcc4c3be8574fb1f4b5db2b41ad46d22c7adfd2283986a0ff87948b9f03783bb80a2b423c8040872fa9933 SHA512 6ebfca69557c867218526cbe9937a37a6a4936448353410586b24f60efbc19000003c67cb04e1b9dfa5cfe950fde3e9c9aec1762292b5c26169c963682630480
 DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
+DIST Coin3D-coin-8d1ca1a6ea23.tar.bz2 4925310 BLAKE2B 3c9aab5e68b79db4878e5d27773537acb7d658580a8deea059565dfa78ee791cb7ee23f159e077408c3307e2647e628357daaa4f2f5a4fc4a125c8d1663ee718 SHA512 f0c4d39a89b1dc3e183c2c8cffad6be30f9d27e50b3735c1b261addc55376aceb8f81c916fbdfeb42b852071692febaf6e3839373095bcf2b7046c773fcc809c
 EBUILD coin-3.1.3-r2.ebuild 2527 BLAKE2B 45061a6697b1bc6c7b5f7a38fd1a1310c609abad681b8cbcb496ec898d049e23e7658bc39eeb5b0e1db0142d5f6c968ef036bcb010fd60306498e918a9c372d1 SHA512 6b7754a385f0107c5cf5a755734bfb0f30d00589cf26434d2b237f147fd7cb79f868bbabbf36ae85bf4e181db61aeea83dab1d3f1232f056e70da55848246f5a
-MISC metadata.xml 411 BLAKE2B d6ca31e82e4637fa533835bf2eeaf7d0b1f8943f85655df00f238c10457fc8bb08a66088a56bf1aea171e2b89d8089b850a41c12398d1d66fa86f7bbd1e032c1 SHA512 f72e31a46ab6e7416016be928e63a9c2a8f7aa6d11f7cee64021113c84345b7f8975242cba579eb8294d9890aeadb246fba21f094fb7136b02a20d251964e847
+EBUILD coin-4.0.0a_pre20180416.ebuild 1948 BLAKE2B 96330bd2e6622866130ed549269cf0de9ec89991292448a33b4996a2929ce96716d57eaca8c31a0f3e1e8a6b3d8ade514362b3e23b5c5e7811e1476acf792c61 SHA512 0edf5ef311c9113ddf61d1337baeec5d21505285b453b90551214937bca2dfad363a612d998e88692b1fb446c35c1d4383df900134ced56cd749d0755439764c
+MISC metadata.xml 483 BLAKE2B 4b4e0a4e69a83b8cfa2be1298873b2ca28cde6dbc431a967c9c37839d17647c052cf8a465894451c23a75fea7be3cadd5954e3cff69de2b3f0bd5ef333251ba2 SHA512 e4419aa5e2ed7e0637f0c971b3b6d0937d4b7e0238b567ecef8bff4c8512ad88e6e04ca3f539f09b7c1f6fe6e2727b555b291e7ed5029776a7efef078bb88a1b
diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
new file mode 100644
index 000000000000..da490ba09d21
--- /dev/null
+++ b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+MY_P=Coin3D-coin-8d1ca1a6ea23
+
+DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
+HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
+SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 PEL )"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="debug doc javascript openal qthelp simage test threads"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	javascript? ( dev-lang/spidermonkey:0 )
+	openal? ( media-libs/openal )
+	simage? ( media-libs/simage )
+"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	doc? (
+		app-doc/doxygen
+		qthelp? ( dev-qt/qthelp:5 )
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.0a-gcc-7.patch
+)
+
+DOCS=(
+	AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS docs/HACKING
+)
+
+src_configure() {
+	use debug && append-cppflags -DCOIN_DEBUG=1
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCOIN_BUILD_DOCUMENTATION=$(usex doc)
+		-DCOIN_BUILD_SHARED_LIBS=ON
+		-DCOIN_BUILD_SINGLE_LIB=ON
+		-DCOIN_BUILD_TESTS=$(usex test)
+		-DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
+		-DCOIN_MULTIPLE_VERSION=OFF
+		-DCOIN_QT_HELP=$(usex doc)
+		-DCOIN_THREADSAFE=$(usex threads)
+		-DCOIN_VERBOSE=$(usex debug)
+		-DHAVE_3DS_IMPORT_CAPABILITIES=ON
+		-DHAVE_DRAGGERS=ON
+		-DHAVE_MAN=OFF
+		-DHAVE_MANIPULATORS=ON
+		-DHAVE_NODEKITS=ON
+		-DHAVE_SOUND=$(usex openal)
+		-DHAVE_VRML97=ON
+		-DSIMAGE_RUNTIME_LINKING=OFF
+		-DUSE_EXTERNAL_EXPAT=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}/testsuite" > /dev/null || die
+	./CoinTests || die "Tests failed."
+	popd > /dev/null || die
+}
diff --git a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch b/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
new file mode 100644
index 000000000000..89829b59b27d
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
@@ -0,0 +1,21 @@
+diff -ruN Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp my/src/3ds/SoStream.cpp
+--- Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp	2018-04-16 23:14:36.000000000 +0200
++++ my/src/3ds/SoStream.cpp	2018-05-06 06:56:42.104728484 +0200
+@@ -185,7 +185,7 @@
+   if (!gotNum) { setBadBit(); return FALSE; } \
+  \
+   char *ce; \
+-  *s = '\0'; \
++  *s = NULL; \
+   _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
+  \
+   if (ce != s) \
+@@ -282,7 +282,7 @@
+ gotAll: \
+   \
+   char *ce; \
+-  *s = '\0'; \
++  *s = NULL; \
+   double tempVal = _convertFunc_(buf, &ce); \
+  \
+   if (ce != s) \
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index b9eaa9f26554..aa4affdefe9d 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -5,6 +5,7 @@
     <email>reavertm@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="qthelp">Build API documentation in QtHelp format</flag>
     <flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
   </use>
   <upstream>