gentoo resync : 15.12.2019

5 files changed, 148 insertions, 46 deletions

diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 10ffbfd077b0..9d4172ff1326 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -4,9 +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
+AUX coin-4.0.0a-cmake.patch 2747 BLAKE2B c120bc01ccaffe28d6bacc9135349cd532c708b4d5bca8219768188c86384c9431ad036b42106c03418744b941d6944472e0b134aae564fe4553428f534bbaab SHA512 f4f9246ceb853c9cf63bdb851b354195c2fddef7fc914ceb7b693f36cfb0ce9e6230cf6284fb987185f26f2f46076bc44ea2bb6bb8c40053fa2992cf85831553
 DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
-DIST Coin3D-coin-8d1ca1a6ea23.tar.bz2 4925310 BLAKE2B 3c9aab5e68b79db4878e5d27773537acb7d658580a8deea059565dfa78ee791cb7ee23f159e077408c3307e2647e628357daaa4f2f5a4fc4a125c8d1663ee718 SHA512 f0c4d39a89b1dc3e183c2c8cffad6be30f9d27e50b3735c1b261addc55376aceb8f81c916fbdfeb42b852071692febaf6e3839373095bcf2b7046c773fcc809c
+DIST Coin3D-coin-a4ce638f43bd.tar.bz2 4942450 BLAKE2B b974b8a39d8ef07a2b3465e131bb5ca08d249a99a9ccdd7f9a87bd26c8c901c7042211edf7acf097e56afc0ba80bf156c6864a831fbed4cac18c7ac7495601ff SHA512 90b7697649e18af77805d9aae918ba77958952839375812272d796c4cda4d887465fb9bb94f215509ae969cddf54fb92f38deb961cdd24e24c67b20ffc0f1adf
 EBUILD coin-3.1.3-r2.ebuild 2534 BLAKE2B 38f1000733493542aff3953b7b7265d0622c66b49bbab780e23e090378c6c048ac901c6a8d48c1a1edcf87fa08f4fbd9111b0de7718fd6083c39d8739fe4a74d SHA512 44dc45645ca3b834be9c88063346f1931e6cd67fec999c6515ce0610910d6359d6415ceaef5486de26cf5a231edf69828b01bf5940b98da6693c2f89cd189902
-EBUILD coin-4.0.0a_pre20180416.ebuild 1948 BLAKE2B c9ef483cc14628bc324ce598dad1d3863d4c60b10d757da16496c3d056e3079dbf5eb1ff271071e0af12f17adf8494f27ac2efb22804b5bc39631eaa53a9cac1 SHA512 d77ec8ac2d0c7f71371b9360d1a07293dd306ee35fe5b869f2956a76a0d93671da8c6d97ec3235b66413ebbd22ee3522a3768b7d2167f5dd1c299e4adea9f7a1
-MISC metadata.xml 483 BLAKE2B 4b4e0a4e69a83b8cfa2be1298873b2ca28cde6dbc431a967c9c37839d17647c052cf8a465894451c23a75fea7be3cadd5954e3cff69de2b3f0bd5ef333251ba2 SHA512 e4419aa5e2ed7e0637f0c971b3b6d0937d4b7e0238b567ecef8bff4c8512ad88e6e04ca3f539f09b7c1f6fe6e2727b555b291e7ed5029776a7efef078bb88a1b
+EBUILD coin-4.0.0a_pre20191109.ebuild 2446 BLAKE2B 303703fe72bb2d0244784894f077af1ce849868b323eceef27c6347c0d8f20f03e21974a5ba02a7b8d5c2cdb39710018ed069b25a6be0bbb946a05ef08bcd26b SHA512 5ab3137cd754272d4323c967b7f25d281f3f2ee3e75b7ab24ca7056553644b1d5042993ac417d0f067c825c9d095b2ea9a2937c8acf7e42c64f024b125b7f781
+MISC metadata.xml 602 BLAKE2B e4f425e15a7cf6879fc709f5cf27abddcc195b824e1158297e529a2fdb2080ff555a90832b5b287c43d73aa038d0d89c62c9f8df2a3e0ebce3c2024f2e5c3126 SHA512 d551b68c2b3f192475ee7fa187e9ab6f6bca52ec3b8c1b58901ea49a61d51ef5680d3b29d784e4c43a8b5fabeb904bdd8582ce32a0055b2420aa9c994299c142
diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20191109.ebuild
index 815c8aa67e80..0397a3a736d5 100644
--- a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
+++ b/media-libs/coin/coin-4.0.0a_pre20191109.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils flag-o-matic
 
-MY_P=Coin3D-coin-8d1ca1a6ea23
+MY_P=Coin3D-coin-a4ce638f43bd
 
 DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
 HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
@@ -14,13 +14,20 @@ 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"
+IUSE="debug doc +exceptions javascript man openal qthelp test threads"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	man? ( doc )
+	qthelp? ( doc )
+"
 
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/expat
 	media-libs/fontconfig
 	media-libs/freetype:2
+	media-libs/simage
 	sys-libs/zlib
 	virtual/opengl
 	virtual/glu
@@ -28,25 +35,26 @@ RDEPEND="
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXext
-	javascript? ( dev-lang/spidermonkey:0 )
+	javascript? ( dev-lang/spidermonkey:60 )
 	openal? ( media-libs/openal )
-	simage? ( media-libs/simage )
 "
 DEPEND="${RDEPEND}
+	dev-libs/boost:0
 	x11-base/xorg-proto
 	doc? (
 		app-doc/doxygen
 		qthelp? ( dev-qt/qthelp:5 )
 	)
 "
+
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.0a-gcc-7.patch
+	"${FILESDIR}"/${PN}-4.0.0a-cmake.patch
 )
 
 DOCS=(
-	AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS docs/HACKING
+	AUTHORS FAQ FAQ.legal NEWS THANKS docs/HACKING
 )
 
 src_configure() {
@@ -54,31 +62,48 @@ src_configure() {
 
 	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_BUILD_DOCUMENTATION=$(usex doc)
+
+		-DCOIN_BUILD_INTERNAL_DOCUMENTATION=OFF
+		-DCOIN_BUILD_DOCUMENTATION_MAN=$(usex man)
+		-DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qthelp)
+		-DCOIN_BUILD_DOCUMENTATION_CHM=OFF
+
 		-DCOIN_THREADSAFE=$(usex threads)
-		-DCOIN_VERBOSE=$(usex debug)
-		-DHAVE_3DS_IMPORT_CAPABILITIES=ON
+		-DHAVE_VRML97=ON
+		-DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
+		-DHAVE_NODEKITS=ON
 		-DHAVE_DRAGGERS=ON
-		-DHAVE_MAN=OFF
 		-DHAVE_MANIPULATORS=ON
-		-DHAVE_NODEKITS=ON
 		-DHAVE_SOUND=$(usex openal)
-		-DHAVE_VRML97=ON
-		-DSIMAGE_RUNTIME_LINKING=OFF
+		-DHAVE_3DS_IMPORT_CAPABILITIES=ON
 		-DUSE_EXTERNAL_EXPAT=ON
+		-DUSE_EXCEPTIONS=$(usex exceptions)
+		-DUSE_SUPERGLU=OFF
+
+		-DFONTCONFIG_RUNTIME_LINKING=OFF
+		-DFREETYPE_RUNTIME_LINKING=OFF
+		-DLIBBZIP2_RUNTIME_LINKING=OFF
+		-DOPENAL_RUNTIME_LINKING=OFF
+		-DSIMAGE_RUNTIME_LINKING=OFF
+		-DZLIB_RUNTIME_LINKING=OFF
+		-DGLU_RUNTIME_LINKING=OFF
+		-DSPIDERMONKEY_RUNTIME_LINKING=ON
+
+		-DCOIN_VERBOSE=$(usex debug)
+		-DHAVE_MULTIPLE_VERSION=ON
+
+		-DCOIN_BUILD_SINGLE_LIB=ON
 	)
 
 	cmake-utils_src_configure
 }
 
 src_test() {
-	pushd "${BUILD_DIR}/testsuite" > /dev/null || die
-	./CoinTests || die "Tests failed."
+	pushd "${BUILD_DIR}/bin" > /dev/null || die
+	./CoinTests -r detailed || die "Tests failed."
 	popd > /dev/null || die
 }
diff --git a/media-libs/coin/files/coin-4.0.0a-cmake.patch b/media-libs/coin/files/coin-4.0.0a-cmake.patch
new file mode 100644
index 000000000000..f47bf9bfb844
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0a-cmake.patch
@@ -0,0 +1,96 @@
+diff -ruN Coin3D-coin-a4ce638f43bd/CMakeLists.txt my/CMakeLists.txt
+--- Coin3D-coin-a4ce638f43bd/CMakeLists.txt	2019-11-09 14:39:34.000000000 +0100
++++ my/CMakeLists.txt	2019-11-21 00:19:43.563521948 +0100
+@@ -97,8 +97,8 @@
+ 
+ report_prepare(
+   COIN_BUILD_SHARED_LIBS
+-  COIN_BUILD_TESTS 
+-  COIN_BUILD_DOCUMENTATION 
++  COIN_BUILD_TESTS
++  COIN_BUILD_DOCUMENTATION
+   COIN_BUILD_INTERNAL_DOCUMENTATION
+   COIN_BUILD_DOCUMENTATION_MAN
+   COIN_BUILD_DOCUMENTATION_QTHELP
+@@ -107,29 +107,29 @@
+   HAVE_VRML97
+   COIN_HAVE_JAVASCRIPT
+   HAVE_NODEKITS
+-  HAVE_DRAGGERS 
+-  HAVE_MANIPULATORS 
+-  HAVE_SOUND 
++  HAVE_DRAGGERS
++  HAVE_MANIPULATORS
++  HAVE_SOUND
+   HAVE_3DS_IMPORT_CAPABILITIES
+   USE_EXTERNAL_EXPAT
+-  USE_EXCEPTIONS 
+-  USE_SUPERGLU 
+-  FONTCONFIG_RUNTIME_LINKING   
+-  FREETYPE_RUNTIME_LINKING     
+-  LIBBZIP2_RUNTIME_LINKING     
+-  OPENAL_RUNTIME_LINKING       
+-  SIMAGE_RUNTIME_LINKING       
+-  ZLIB_RUNTIME_LINKING         
+-  GLU_RUNTIME_LINKING          
+-  SPIDERMONKEY_RUNTIME_LINKING 
+-  HAVE_MULTIPLE_VERSION 
++  USE_EXCEPTIONS
++  USE_SUPERGLU
++  FONTCONFIG_RUNTIME_LINKING
++  FREETYPE_RUNTIME_LINKING
++  LIBBZIP2_RUNTIME_LINKING
++  OPENAL_RUNTIME_LINKING
++  SIMAGE_RUNTIME_LINKING
++  ZLIB_RUNTIME_LINKING
++  GLU_RUNTIME_LINKING
++  SPIDERMONKEY_RUNTIME_LINKING
++  HAVE_MULTIPLE_VERSION
+   IF_APPLE
+-    COIN_BUILD_MAC_FRAMEWORK 
+-    COIN_BUILD_MAC_X11 
+-    COIN_BUILD_MAC_AGL 
++    COIN_BUILD_MAC_FRAMEWORK
++    COIN_BUILD_MAC_X11
++    COIN_BUILD_MAC_AGL
+   IF_MSVC
+     COIN_BUILD_MSVC_STATIC_RUNTIME
+-    COIN_BUILD_SINGLE_LIB 
++    COIN_BUILD_SINGLE_LIB
+     MSVC_VERSION
+     COIN_BUILD_MSVC_MP
+ )
+@@ -141,8 +141,8 @@
+     CMAKE_INSTALL_DATADIR
+     CMAKE_INSTALL_FULL_DATADIR
+     CMAKE_INSTALL_INCLUDEDIR
+-    CMAKE_INSTALL_FULL_INCLUDEDIR 
+-    CMAKE_INSTALL_DOCDIR 
++    CMAKE_INSTALL_FULL_INCLUDEDIR
++    CMAKE_INSTALL_DOCDIR
+     CMAKE_INSTALL_FULL_DOCDIR
+   )
+ else()
+@@ -165,7 +165,7 @@
+   list(APPEND COIN_TARGET_LINK_LIBRARIES Boost::boost)
+ endif()
+ 
+-if(COIN_BUILD_MAC_X11)
++if(COIN_BUILD_MAC_X11 OR UNIX)
+   find_package(X11 REQUIRED)
+   # On Mac OS X, GLX is provided as a separate OpenGL implementation, different
+   # from the standard OpenGL framework which provides support for GLUT and native
+@@ -530,6 +530,7 @@
+   endif()
+   check_library_exists(dl dlopen "" HAVE_DL_LIB)
+   if(HAVE_DL_LIB)
++    list(APPEND COIN_TARGET_LINK_LIBRARIES dl)
+     check_include_file(dlfcn.h HAVE_DLFCN_H)
+   endif()
+   check_library_exists(dld shl_load "" HAVE_DLD_LIB)
+@@ -815,4 +816,4 @@
+ 
+ # ############################################################################
+ # New CPACK section, please see the README file inside cpack.d directory.
+-add_subdirectory(cpack.d)
++# not needed add_subdirectory(cpack.d)
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
deleted file mode 100644
index 89829b59b27d..000000000000
--- a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 aa4affdefe9d..11c05aeb8175 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -5,6 +5,8 @@
     <email>reavertm@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="exceptions">Compile with C++ exceptions</flag>
+    <flag name="man">Build and install man pages</flag>
     <flag name="qthelp">Build API documentation in QtHelp format</flag>
     <flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
   </use>