gentoo resync : 25.08.2020

9 files changed, 338 insertions, 108 deletions

diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 0386f664dc41..836581e0f568 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -4,9 +4,14 @@ 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-cmake.patch 2747 BLAKE2B c120bc01ccaffe28d6bacc9135349cd532c708b4d5bca8219768188c86384c9431ad036b42106c03418744b941d6944472e0b134aae564fe4553428f534bbaab SHA512 f4f9246ceb853c9cf63bdb851b354195c2fddef7fc914ceb7b693f36cfb0ce9e6230cf6284fb987185f26f2f46076bc44ea2bb6bb8c40053fa2992cf85831553
+AUX coin-4.0.0-0001-updated-to-cmake-3.14.patch 626 BLAKE2B e6cd00a2f848f9d43d57e615d5c08e273b82e49f26b5a977457305fb254ce00a1b052e29ffed5656861ecec2581da306b66ff5727bf70cb46c63ff1baf1c8e6c SHA512 214be84a016c2625ab43b1948efee36986bf9186b69ec3bec014280a009ff22742b627f8a041b9293d3d7bdacf7b7070b3c5f0742f9739c19b193d0ea6b837d9
+AUX coin-4.0.0-0002-cpack.d-is-now-optional.patch 1388 BLAKE2B 8a9665f3719e7bb4072d75b54e5aa119bdf2ae12c0ca814213fc1ee1364bf2cca0658ef19ff0f22b2661cda4286a251384c559b945613b29ae6ce41b2706929b SHA512 e1655f5d8a0d07c5b91c2c7404834295b40a12c176bea1a386e00a8dea7d1170507f9c209231023c87d560688e4ac8ccd1ee7bf8ea1a80ebbd881f2c88efb1e7
+AUX coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch 3695 BLAKE2B e83118489349d7bbd0048fbbb2515be1b5ffdd8556bb951f44f2689c4616c12991efd6fba230c4372bf634f58d6e2c9e91e3794a2e4f2abff54eb3ddd1841551 SHA512 eccb82613f5801025ee7c63e3482ee5cf90fe3bfebf8b3481e423e22c8a8f3a121f0f4c679127e2ad40cb657d62c857c9956d4175c02a401a58cd3fb42789ee8
+AUX coin-4.0.0-0004-Added-coin-default.cfg.patch 2531 BLAKE2B a0682e9dfaa36412109fe12a8a81381915e71da73582c397b7eb2795ddad6fe706a3c0f2e5e4d02114adbf8d31bac88b6509bcdc96423b59c8d4e5168c158814 SHA512 ed9543421f62f0ebe53ffe819cc7381316215231ab9675f7867f633ed79c47df4d37d4ba35283b55fc6d621f6c65040e9eee0cb19e7708d0653b0e56e4bede55
+AUX coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch 1394 BLAKE2B 40b43a0cce0ab3e3e40723e1ac2c68185b4f10c38a3514e02d18c6ee1232b3116e1b89e6ff2cda3aa5f14eefcbc636f4b83c84d896fa485c416362e72e793bc4 SHA512 0cc392f908b044639bef3fcb960fe398ae045aba72c670b22ca48cba9c754c4a35746888fc7ee2938bb5e0309fc0104e8fe1379175886e438b00410c8f5c3a16
+AUX coin-4.0.0-0006-Fix-underlinking-against-X11.patch 827 BLAKE2B 33aaa8281fc260bb382875a0b41eac83d8099e52709e93a523ba4b048e1f9ab92c1a17cb09e1c5dd091c90878c373ef973c380211f856b32581f97992a8cc83e SHA512 37709b1a853287245b0778297154a8ea15ed86d60558af541ccd60fb0ee369c296947964080bff790595030c8e41964e008b0983bcbf5146d3c5ac81756ff622
 DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
-DIST Coin3D-coin-a4ce638f43bd.tar.bz2 4942450 BLAKE2B b974b8a39d8ef07a2b3465e131bb5ca08d249a99a9ccdd7f9a87bd26c8c901c7042211edf7acf097e56afc0ba80bf156c6864a831fbed4cac18c7ac7495601ff SHA512 90b7697649e18af77805d9aae918ba77958952839375812272d796c4cda4d887465fb9bb94f215509ae969cddf54fb92f38deb961cdd24e24c67b20ffc0f1adf
+DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
 EBUILD coin-3.1.3-r2.ebuild 2518 BLAKE2B 9652bab68031e7b0311861812b6cdf47eab72173971963f1e9b15613b1f9df0a55a2f3e8c262106e9d8fdbe87d893d6cb86e065b290d00cfed0f827905795724 SHA512 56a8baace6f1ce77bd17e1da422f096ad968a78827bd0c5c7ec3ad711a000ffe5a91192ebcdc639e3517ff5c0993c3a252d8e15455ba6f163bf33f6a4f428cea
-EBUILD coin-4.0.0a_pre20191109.ebuild 2446 BLAKE2B 303703fe72bb2d0244784894f077af1ce849868b323eceef27c6347c0d8f20f03e21974a5ba02a7b8d5c2cdb39710018ed069b25a6be0bbb946a05ef08bcd26b SHA512 5ab3137cd754272d4323c967b7f25d281f3f2ee3e75b7ab24ca7056553644b1d5042993ac417d0f067c825c9d095b2ea9a2937c8acf7e42c64f024b125b7f781
+EBUILD coin-4.0.0.ebuild 2767 BLAKE2B 5d9edb1e24187d734e861b5a1ec300d268ec2daf0daa696c9e4028c5c75d052de64db5c72e0dd479b01c02d0cfd23bcd5825b1cb81af7cb4bd7c7e319265611f SHA512 120cea13580b7e3bc54e65cbffef911761ff55ba1e4e2974a073d83584825ea06c2c75e19ecbdeeb53c794a1b5ae1e00068112b74449c3bac304662371996ff8
 MISC metadata.xml 602 BLAKE2B e4f425e15a7cf6879fc709f5cf27abddcc195b824e1158297e529a2fdb2080ff555a90832b5b287c43d73aa038d0d89c62c9f8df2a3e0ebce3c2024f2e5c3126 SHA512 d551b68c2b3f192475ee7fa187e9ab6f6bca52ec3b8c1b58901ea49a61d51ef5680d3b29d784e4c43a8b5fabeb904bdd8582ce32a0055b2420aa9c994299c142
diff --git a/media-libs/coin/coin-4.0.0a_pre20191109.ebuild b/media-libs/coin/coin-4.0.0.ebuild
index 0397a3a736d5..3a0b364937cc 100644
--- a/media-libs/coin/coin-4.0.0a_pre20191109.ebuild
+++ b/media-libs/coin/coin-4.0.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
-MY_P=Coin3D-coin-a4ce638f43bd
+MY_P=${P/coin/Coin}
 
 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"
+HOMEPAGE="https://github.com/coin3d/coin/wiki"
+SRC_URI="https://github.com/coin3d/coin/releases/download/${MY_P}/${P}-src.tar.gz"
 
 LICENSE="|| ( GPL-2 PEL )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -47,10 +47,15 @@ DEPEND="${RDEPEND}
 	)
 "
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.0a-cmake.patch
+	"${FILESDIR}"/${P}-0001-updated-to-cmake-3.14.patch
+	"${FILESDIR}"/${P}-0002-cpack.d-is-now-optional.patch
+	"${FILESDIR}"/${P}-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch
+	"${FILESDIR}"/${P}-0004-Added-coin-default.cfg.patch
+	"${FILESDIR}"/${P}-0005-Slightly-fix-coin.cfg.cmake.in.patch
+	"${FILESDIR}"/${P}-0006-Fix-underlinking-against-X11.patch
 )
 
 DOCS=(
@@ -94,12 +99,12 @@ src_configure() {
 		-DSPIDERMONKEY_RUNTIME_LINKING=ON
 
 		-DCOIN_VERBOSE=$(usex debug)
-		-DHAVE_MULTIPLE_VERSION=ON
+		-DHAVE_MULTIPLE_VERSION=OFF
 
 		-DCOIN_BUILD_SINGLE_LIB=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch b/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch
new file mode 100644
index 000000000000..c33cf4e2b8b1
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch
@@ -0,0 +1,25 @@
+From 962e613609ba93301999f83e283b7f489dfac503 Mon Sep 17 00:00:00 2001
+From: Giampiero Gabbiani <giampiero@gabbiani.org>
+Date: Fri, 10 Jan 2020 14:47:38 +0100
+Subject: [PATCH] updated to cmake 3.14
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f32f6ffe3..3ce3a0d3a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,8 @@
++if (POLICY  CMP0054)
++  # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour
++  cmake_policy(SET CMP0054 NEW)
++endif()
++
+ cmake_minimum_required(VERSION 3.0)
+ 
+ set(COIN_MAJOR_VERSION 4)
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch b/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch
new file mode 100644
index 000000000000..82fceadbd886
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch
@@ -0,0 +1,32 @@
+From be8e3d57aeb5b4df6abb52c5fa88666d48e7d7a0 Mon Sep 17 00:00:00 2001
+From: Giampiero Gabbiani <giampiero@gabbiani.org>
+Date: Tue, 14 Jan 2020 22:03:51 +0100
+Subject: [PATCH] cpack.d is now optional
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ce3a0d3a..755bd9d59 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,6 +95,7 @@ option(SPIDERMONKEY_RUNTIME_LINKING "Enable SpiderMonkey runtime linking when ON
+ 
+ option(COIN_VERBOSE "Add verbose debugging information during the configure process." OFF)
+ option(HAVE_MULTIPLE_VERSION "Forces versioned paths for includes and documentation when ON, usual behaviour otherwise." OFF)
++option(COIN_USE_CPACK "If enabled the cpack subrepo is mandatory" OFF)
+ 
+ cmake_dependent_option(COIN_BUILD_MAC_FRAMEWORK "Build framework instead of dylib on Mac OS X when ON. Only valid if COIN_BUILD_SHARED_LIBS is ON." OFF "APPLE;NOT IOS;COIN_BUILD_SHARED_LIBS" OFF)
+ cmake_dependent_option(COIN_BUILD_MAC_X11 "Build for X11 on Mac OS X when ON. Default is OFF." OFF "APPLE" OFF)
+@@ -820,4 +821,6 @@ endif()
+ 
+ # ############################################################################
+ # New CPACK section, please see the README file inside cpack.d directory.
+-add_subdirectory(cpack.d)
++if (COIN_USE_CPACK)
++  add_subdirectory(cpack.d)
++endif()
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch b/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch
new file mode 100644
index 000000000000..fb1c0d25a814
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch
@@ -0,0 +1,123 @@
+From 9a36b15d66c5e340cd8695415ce5867ad07ee2bb Mon Sep 17 00:00:00 2001
+From: Volker Enderlein <volkerenderlein@hotmail.com>
+Date: Sun, 8 Mar 2020 14:24:29 +0100
+Subject: [PATCH] Partially incorporating coin4.0.0a-patch from gentoo
+
+---
+ CMakeLists.txt | 63 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 33 insertions(+), 30 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 755bd9d59..d23f5bc0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,8 +1,3 @@
+-if (POLICY  CMP0054)
+-  # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour
+-  cmake_policy(SET CMP0054 NEW)
+-endif()
+-
+ cmake_minimum_required(VERSION 3.0)
+ 
+ set(COIN_MAJOR_VERSION 4)
+@@ -22,6 +17,11 @@ math(EXPR COIN_SO_VERSION ${PROJECT_VERSION_MAJOR}*20)
+ set(PROJECT_DESCRIPTION   "A high-level 3D visualization library with Open Inventor 2.1 API")
+ # ############################################################################
+ 
++if(POLICY CMP0054)
++  # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour
++  cmake_policy(SET CMP0054 NEW)
++endif()
++
+ if(POLICY CMP0072)
+   # get rid of OpenGL GLVND warning from CMake 3.11
+   cmake_policy(SET CMP0072 NEW)
+@@ -103,8 +103,8 @@ cmake_dependent_option(COIN_BUILD_MAC_AGL "Build for AGL on Mac OS X when ON. De
+ 
+ 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
+@@ -113,29 +113,29 @@ report_prepare(
+   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
+ )
+@@ -147,8 +147,8 @@ if(HAVE_MULTIPLE_VERSION)
+     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()
+@@ -534,9 +534,12 @@ else()
+   if(HAVE_MACH_O_DYLD_H)
+     check_symbol_exists(NSLookupAndBindSymbol mach-o/dyld.h HAVE_DYLD_RUNTIME_BINDING)
+   endif()
+-  check_library_exists(dl dlopen "" HAVE_DL_LIB)
+-  if(HAVE_DL_LIB)
+-    check_include_file(dlfcn.h HAVE_DLFCN_H)
++  # On FreeBSD, NetBSD and OpenBSD there is no libdl, as the required
++  # functionality is already built into libc. So use ${CMAKE_DL_LIBS} instead.
++  check_include_file(dlfcn.h HAVE_DLFCN_H)
++  if(HAVE_DLFCN_H)
++    set(HAVE_DL_LIB 1)
++    list(APPEND COIN_TARGET_LINK_LIBRARIES ${CMAKE_DL_LIBS})
+   endif()
+   check_library_exists(dld shl_load "" HAVE_DLD_LIB)
+ endif()
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch b/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch
new file mode 100644
index 000000000000..d57f8f3b945e
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch
@@ -0,0 +1,63 @@
+From fd8057eb54fee8aa457cc47abb0004f2b71d1e63 Mon Sep 17 00:00:00 2001
+From: Volker Enderlein <volkerenderlein@hotmail.com>
+Date: Sun, 10 May 2020 15:24:20 +0200
+Subject: [PATCH] Added coin-default.cfg.
+
+---
+ coin.cfg.cmake.in  | 24 ++++++++++++++++++++++++
+ src/CMakeLists.txt |  8 +++++---
+ 2 files changed, 29 insertions(+), 3 deletions(-)
+ create mode 100644 coin.cfg.cmake.in
+
+diff --git a/coin.cfg.cmake.in b/coin.cfg.cmake.in
+new file mode 100644
+index 000000000..6f41c61c7
+--- /dev/null
++++ b/coin.cfg.cmake.in
+@@ -0,0 +1,24 @@
++# prefix is determined in coin-config, making the package "movable"
++# prefix="@prefix@"
++host="@host@"
++exec_prefix="@exec_prefix@"
++version="@COIN_VERSION@"
++cflags="@COIN_EXTRA_CFLAGS@"
++cppflags="@COIN_EXTRA_CPPFLAGS@"
++cxxflags="@COIN_EXTRA_CXXFLAGS@"
++ldflags="@COIN_EXTRA_LDFLAGS@"
++libs="@COIN_EXTRA_LIBS@"
++msvcrt="@COIN_MSVC_LIBC@"
++datadir="@datarootdir@"
++includedir="@includedir@"
++frameworkdir="@frameworkdir@"
++htmldir="@htmldir@"
++compiler="@COIN_COMPILER@"
++objext="@OBJEXT@"
++have_3ds_import=@HAVE_3DS_IMPORT_CAPABILITIES@
++have_vrml97=@HAVE_VRML97@
++have_sound=@HAVE_SOUND@
++have_superglu=@HAVE_SUPERGLU@
++have_threads=@HAVE_THREADS@
++have_threadsafe=@HAVE_THREADSAFE@
++compiler_is_gcc=@ac_compiler_gnu@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4ddc1ecd4..6132335b3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -388,9 +388,11 @@ else()
+   set(COIN_CONFIG_PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION})
+   string(TOLOWER ${PROJECT_NAME} COIN_CONFIG_PACKAGE_BASENAME)
+   if(UNIX OR MINGW)
+-    configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
+-    install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+-    install(FILES ${CMAKE_SOURCE_DIR}/bin/coin-config DESTINATION ${CMAKE_INSTALL_BINDIR})
++    configure_file("${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" @ONLY)
++    install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++    install(PROGRAMS "${CMAKE_SOURCE_DIR}/bin/coin-config" DESTINATION ${CMAKE_INSTALL_BINDIR})
++    configure_file("${CMAKE_SOURCE_DIR}/coin.cfg.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" @ONLY)
++    install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Coin/conf)
+   endif()
+ endif()
+ 
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch b/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch
new file mode 100644
index 000000000000..ae218124618a
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch
@@ -0,0 +1,45 @@
+From d36ee28712eae2f94998845926c6880d6e5a990c Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski <reavertm@gmail.com>
+Date: Wed, 5 Aug 2020 02:03:52 +0200
+Subject: [PATCH] Slightly fix coin.cfg.cmake.in
+
+---
+ coin.cfg.cmake.in | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/coin.cfg.cmake.in b/coin.cfg.cmake.in
+index 6f41c61c7..6ed041ef4 100644
+--- a/coin.cfg.cmake.in
++++ b/coin.cfg.cmake.in
+@@ -7,18 +7,18 @@ cflags="@COIN_EXTRA_CFLAGS@"
+ cppflags="@COIN_EXTRA_CPPFLAGS@"
+ cxxflags="@COIN_EXTRA_CXXFLAGS@"
+ ldflags="@COIN_EXTRA_LDFLAGS@"
+-libs="@COIN_EXTRA_LIBS@"
++libs="@CMAKE_INSTALL_FULL_LIBDIR@"
+ msvcrt="@COIN_MSVC_LIBC@"
+-datadir="@datarootdir@"
+-includedir="@includedir@"
++datadir="@CMAKE_INSTALL_FULL_DATADIR@"
++includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"
+ frameworkdir="@frameworkdir@"
+-htmldir="@htmldir@"
++htmldir="@CMAKE_INSTALL_FULL_DOCDIR@"
+ compiler="@COIN_COMPILER@"
+ objext="@OBJEXT@"
+-have_3ds_import=@HAVE_3DS_IMPORT_CAPABILITIES@
+-have_vrml97=@HAVE_VRML97@
+-have_sound=@HAVE_SOUND@
+-have_superglu=@HAVE_SUPERGLU@
+-have_threads=@HAVE_THREADS@
+-have_threadsafe=@HAVE_THREADSAFE@
++have_3ds_import=@FEAT_HAVE_3DS@
++have_vrml97=@FEAT_HAVE_VRML97@
++have_sound=@FEAT_HAVE_SOUND@
++have_superglu=@FEAT_HAVE_SUPERGLU@
++have_threads=@FEAT_HAVE_THREADS@
++have_threadsafe=@FEAT_HAVE_SAFETHREAD@
+ compiler_is_gcc=@ac_compiler_gnu@
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch b/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch
new file mode 100644
index 000000000000..3a81b380dc79
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch
@@ -0,0 +1,28 @@
+From 58a1b4c3e968f96d3a2091fa5cb625f360ce6811 Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski <reavertm@gmail.com>
+Date: Wed, 5 Aug 2020 02:57:28 +0200
+Subject: [PATCH] Fix underlinking against X11
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3818da7ff..eda2cd2c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,6 +195,11 @@ if(COIN_BUILD_MAC_X11)
+     list(APPEND COIN_TARGET_LINK_LIBRARIES ${X11_LIBRARIES} ${X11_GL_LIB} ${X11_GLU_LIB})
+   endif()
+ else()
++  if(UNIX AND NOT APPLE)
++    find_package(X11 REQUIRED)
++    list(APPEND COIN_TARGET_INCLUDE_DIRECTORIES ${X11_INCLUDE_DIR})
++    list(APPEND COIN_TARGET_LINK_LIBRARIES ${X11_LIBRARIES})
++  endif()
+   find_package(OpenGL REQUIRED)
+   if(OPENGL_FOUND)
+     set(HAVE_OPENGL 1)
+-- 
+2.26.2
+
diff --git a/media-libs/coin/files/coin-4.0.0a-cmake.patch b/media-libs/coin/files/coin-4.0.0a-cmake.patch
deleted file mode 100644
index f47bf9bfb844..000000000000
--- a/media-libs/coin/files/coin-4.0.0a-cmake.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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)