gentoo resync : 25.11.2020

10 files changed, 4 insertions, 246 deletions

diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 836581e0f568..c6e6d7049466 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,17 +1,9 @@
-AUX coin-3.1.0-javascript.patch 1259 BLAKE2B abf0edc35ad7e8f31da5d952d8c75cd9c465b421beec14ee454ee295961a40a54430bcf6a23b39079fe93bc5d53dd2b30574455545a23c4b5c098ca7490e6d45 SHA512 4b7142dae7f463616b695058b6deeac9a6d116a4647430fb6b234b30915ed5fea5d657ee49a8af553c5a946d8a04c93a5cbf98cb92fa10080c1b72ff8ac8b895
-AUX coin-3.1.3-freetype251.patch 767 BLAKE2B ff0fef5f0c91f0ae9f803f363bb6777d4f8b19510bb23b7ed2635ecd9b765532377351ed28163d8184b8c827f8d0ea54168ca05c49d1564b2f26c4b9166fc0af SHA512 f8ea66a6a21c3b20b221b4b7830feb411295e5207d0f5419183c85bfd8ae52b923f2b202f070482f1c61d4acb86b1f74d4a1ee77b09f6b86d95602db4e2c2406
-AUX coin-3.1.3-gcc-4.7.patch 347 BLAKE2B 4129b651164fd35e18469143c0728e67456ecdc04fc54899d5084212c125ff753a6240ce9e05936dc00934f76bdcd2f60607f3cbd7a6f3114616a2c947a624c5 SHA512 d6f93526203a5c2f787cb03ea34214921daf49e324f867745d6bdc1c24c78359c305396d86cdbf8590b7f1610ef558390b6aba6c488052435896f089ea71d590
-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.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 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.0.ebuild 2767 BLAKE2B 5d9edb1e24187d734e861b5a1ec300d268ec2daf0daa696c9e4028c5c75d052de64db5c72e0dd479b01c02d0cfd23bcd5825b1cb81af7cb4bd7c7e319265611f SHA512 120cea13580b7e3bc54e65cbffef911761ff55ba1e4e2974a073d83584825ea06c2c75e19ecbdeeb53c794a1b5ae1e00068112b74449c3bac304662371996ff8
-MISC metadata.xml 602 BLAKE2B e4f425e15a7cf6879fc709f5cf27abddcc195b824e1158297e529a2fdb2080ff555a90832b5b287c43d73aa038d0d89c62c9f8df2a3e0ebce3c2024f2e5c3126 SHA512 d551b68c2b3f192475ee7fa187e9ab6f6bca52ec3b8c1b58901ea49a61d51ef5680d3b29d784e4c43a8b5fabeb904bdd8582ce32a0055b2420aa9c994299c142
+EBUILD coin-4.0.0.ebuild 2763 BLAKE2B 50e79002571255b544aa0e69151ed5b7e86fc916f6c4ba5f500aa2ad3a006817017ef2fe85653d801fc6a8927ca386664a9807f8a52636c501b4bf09ca00e0ce SHA512 68be6c6a83e9ca4b6f5b644d8744b88b28ce5d81801652f90ff0e5067c8c2f7715bdef818557b41ede049d9adf0d5f9ca51e8253f996723244c1d60a9fc6bb10
+MISC metadata.xml 511 BLAKE2B 0efdd7dbb4a2bbc64ba41ae5ef9da8b09b448bfdf895d86623b219bdaed02b973483e68c52933728f023695c8d26a0bfab41f40ea7d278781b55904dc50777d5 SHA512 549388ebbc1b58b66025dbce92805952de633ac4db11cd9ca7a5416671b18a2fbe7aa71a1e1f02bf2d9da4e81e4c7cb132741e28f91424f330007e2e4f16e252
diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
deleted file mode 100644
index 6e2dfe73f617..000000000000
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-MY_P=${P/c/C}
-
-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://bitbucket.org/Coin3D/coin/downloads/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="bzip2 debug doc javascript openal simage static-libs threads zlib"
-
-# NOTE: expat is not really needed as --enable-system-expat is broken
-RDEPEND="
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/freetype:2
-	virtual/opengl
-	virtual/glu
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	bzip2? ( app-arch/bzip2 )
-	javascript? ( dev-lang/spidermonkey:0 )
-	openal? ( media-libs/openal )
-	simage? ( media-libs/simage )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-javascript.patch
-	"${FILESDIR}"/${P}-pkgconfig-partial.patch
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-	"${FILESDIR}"/${P}-freetype251.patch
-	"${FILESDIR}"/${P}-memhandler-initialization.patch
-	"${FILESDIR}"/${P}-gcc-7.patch
-)
-
-DOCS=(
-	AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS
-	docs/{ChangeLog.v${PV},HACKING,oiki-launch.txt}
-)
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/freetype2"
-	# Prefer link-time linking over dlopen
-	local myeconfargs=(
-		htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-dl-fontconfig
-		--disable-dl-freetype
-		--disable-dl-libbzip2
-		--disable-dl-openal
-		--disable-dl-simage
-		--disable-dl-zlib
-		--disable-dyld
-		--disable-loadlibrary
-		--disable-man
-		--disable-java-wrapper
-		--enable-3ds-import
-		--enable-compact
-		--enable-dl-glu
-		--enable-dl-spidermonkey
-		--enable-system-expat
-		--includedir="${EPREFIX}/usr/include/${PN}"
-		--with-fontconfig
-		--with-freetype
-		$(use_with bzip2)
-		$(use_enable debug)
-		$(use_enable debug symbols)
-		$(use_enable doc html)
-		$(use_enable javascript javascript-api)
-		$(use_with javascript spidermonkey)
-		$(use_enable openal sound)
-		$(use_with openal)
-		$(use_with simage)
-		$(use_enable threads threadsafe)
-		$(use_with zlib)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	# Remove Coin from Libs.private
-	sed -e '/Libs.private/s/ -lCoin//' -i "${BUILD_DIR}"/Coin.pc || die
-
-	autotools-utils_src_install
-}
diff --git a/media-libs/coin/coin-4.0.0.ebuild b/media-libs/coin/coin-4.0.0.ebuild
index 3a0b364937cc..c67bb1304313 100644
--- a/media-libs/coin/coin-4.0.0.ebuild
+++ b/media-libs/coin/coin-4.0.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="debug doc +exceptions javascript man openal qthelp test threads"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/coin/files/coin-3.1.0-javascript.patch b/media-libs/coin/files/coin-3.1.0-javascript.patch
deleted file mode 100644
index f45d9cd78cf6..000000000000
--- a/media-libs/coin/files/coin-3.1.0-javascript.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: src/vrml97/JS_VRMLClasses.h
-===================================================================
---- src/vrml97/JS_VRMLClasses.h	(revision 13505)
-+++ src/vrml97/JS_VRMLClasses.h	(revision 13506)
-@@ -28,6 +28,7 @@
- #error this is a private header file
- #endif /* ! COIN_INTERNAL */
- 
-+#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
- /* ********************************************************************** */
- 
- class SoJavaScriptEngine;
-@@ -37,5 +38,6 @@
- void JS_addVRMLclasses(SoJavaScriptEngine * engine);
- 
- /* ********************************************************************** */
-+#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT
- 
- #endif /* !COIN_JS_VRMLCLASSES_H */
-Index: src/vrml97/JS_VRMLClasses.cpp
-===================================================================
---- src/vrml97/JS_VRMLClasses.cpp	(revision 13505)
-+++ src/vrml97/JS_VRMLClasses.cpp	(revision 13506)
-@@ -2,7 +2,7 @@
- #include "config.h"
- #endif // HAVE_CONFIG_H
- 
--#ifdef HAVE_VRML97
-+#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
- 
- /**************************************************************************\
-  *
-@@ -2097,4 +2097,4 @@
-     MFVec3dHandler::jsval2field);
- }
- 
--#endif // HAVE_VRML97
-+#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT
diff --git a/media-libs/coin/files/coin-3.1.3-freetype251.patch b/media-libs/coin/files/coin-3.1.3-freetype251.patch
deleted file mode 100644
index 44e8eefb1f63..000000000000
--- a/media-libs/coin/files/coin-3.1.3-freetype251.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Coin-3.1.3/src/glue/freetype.cpp
-+++ Coin-3.1.3/src/glue/freetype.cpp
-@@ -52,9 +52,9 @@
- #ifdef HAVE_FREETYPE /* In case we're _not_ doing runtime linking. */
- #define FREETYPEGLUE_ASSUME_FREETYPE 1
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
- #endif /* FREETYPEGLUE_ASSUME_FREETYPE */
- 
- #include <Inventor/C/basic.h>
---- Coin-3.1.3/src/glue/freetype.h
-+++ Coin-3.1.3/src/glue/freetype.h
-@@ -87,8 +87,8 @@
- 
- #ifdef HAVE_FREETYPE
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
- #else /* HAVE_FREETYPE */
- 
- #include <Inventor/C/basic.h>
diff --git a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch b/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
deleted file mode 100644
index fd2430903802..000000000000
--- a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- coin3-3.1.3.orig/include/Inventor/SbBasic.h
-+++ coin3-3.1.3/include/Inventor/SbBasic.h
-@@ -24,6 +24,7 @@
-  *
- \**************************************************************************/
- 
-+#include <Inventor/C/errors/debugerror.h>
- #include <Inventor/C/basic.h>
- 
- /* ********************************************************************** */
diff --git a/media-libs/coin/files/coin-3.1.3-gcc-7.patch b/media-libs/coin/files/coin-3.1.3-gcc-7.patch
deleted file mode 100644
index c1f1f560d851..000000000000
--- a/media-libs/coin/files/coin-3.1.3-gcc-7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN Coin-3.1.3.orig/src/3ds/SoStream.cpp Coin-3.1.3/src/3ds/SoStream.cpp
---- Coin-3.1.3.orig/src/3ds/SoStream.cpp	2010-03-02 16:20:09.000000000 +0300
-+++ Coin-3.1.3/src/3ds/SoStream.cpp	2017-07-23 15:04:43.808204691 +0300
-@@ -176,7 +176,7 @@
-   if (!gotNum) { setBadBit(); return FALSE; } \
-  \
-   char *ce; \
--  s = '\0'; \
-+  s = NULL; \
-   _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
-  \
-   if (ce != s) \
-@@ -273,7 +273,7 @@
- gotAll: \
-   \
-   char *ce; \
--  s = '\0'; \
-+  s = NULL; \
-   double tempVal = _convertFunc_(buf, &ce); \
-  \
-   if (ce != s) \
diff --git a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch b/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch
deleted file mode 100644
index 892882b6a3db..000000000000
--- a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378
-Patch http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/tree/0012-memhandler-initialization.patch?id=ca89ec7227943bdec800ee51b920f578fab87b05
-
---- a/src/misc/SbHash.h
-+++ b/src/misc/SbHash.h
-@@ -89,6 +89,8 @@
-     cc_memalloc_deallocate(entry->memhandler, ptr);
-   }
-   SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
-+  SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
-+		: key(key), obj(obj), memhandler(memhandler) {}
-
-   Key key;
-   Type obj;
-@@ -218,7 +220,7 @@
-     /* Key not already in the hash table; insert a new
-      * entry as the first element in the bucket
-      */
--    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
-+    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
-     entry->next = this->buckets[i];
-     this->buckets[i] = entry;
-
diff --git a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
deleted file mode 100644
index 3fd3bca726d4..000000000000
--- a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru ../Coin-3.1.3/Coin.pc.in ./Coin.pc.in
---- Coin.pc.in	2010-03-02 14:20:09.000000000 +0100
-+++ Coin.pc.in	2010-06-28 19:27:59.634534460 +0200
-@@ -10,7 +10,8 @@
- Version: @COIN_VERSION@
- Requires:
- Conflicts:
--Libs: -L${libdir} @COIN_EXTRA_LDFLAGS@ @COIN_EXTRA_LIBS@
-+Libs: -L${libdir} -lCoin
-+Libs.private: -L${libdir} @COIN_EXTRA_LIBS@
- Cflags: -I${includedir} @COIN_EXTRA_CFLAGS@ @COIN_EXTRA_CPPFLAGS@
- 
- coin_host=@host@
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index 11c05aeb8175..f76f33813aaf 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -8,9 +8,8 @@
     <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>
   <upstream>
-    <remote-id type="bitbucket">Coin3D/coin</remote-id>
+    <remote-id type="github">coin3d/coin</remote-id>
   </upstream>
 </pkgmetadata>