gentoo resync : 20.03.2022

4 files changed, 84 insertions, 278 deletions

diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index 953ad1ce698a..2e8eac014c91 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1,9 +1,8 @@
+AUX openscenegraph-3.6-openexr3.patch 2014 BLAKE2B a01e4c96bccd4d898a281298b829bfe81021df88e437a7c722ea788e3550883e34636c49fe8deabd1c4e07a4750757887ae16482eb814041c177f9d319aebef0 SHA512 3b6042ae480a99e7f9a427fa2599c7e05d34ea59b28668c10f5d714a5348ecab908aa080d9d045c62c02267d45d9c384aeef34d66cca85370a32514107bd9e54
 AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107bd429564248fd72c6f4d70c1622b2933273e02f294d5fd3b2529fdbbdef65cdba41db7b441b7334b6180995896b52f8212 SHA512 2905fa5031641f2d3a8cec46c32c1cbf8adfb34b7c460c22eaecca66f5cc0b73c2bda4ed68dca3bda12a5f49385c2257bd5b4f3271b13eb979298eeaefb45789
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
-AUX openscenegraph-3.6.5-use_boost_asio.patch 6995 BLAKE2B 0b0c0af9980b59e1cfd4cc5256720d0e69d5e3a65173c9364036e42efa34377beb00811fc4a0aee0cead870abe0c33feaaebe57c22cbefac43d4dcf65a1d19e1 SHA512 fa7c702eaf69c7b7890cf44e5293f9c8ea73ac441af1e4573dadd62f3ca797ccbbc2fbafd8c946a936192f7331fa16d8d4247de8b657db77791d5137207c23b6
-DIST openscenegraph-openmw-3.6_p20210610.tar.gz 5788655 BLAKE2B fdf345502ee7bb742741da758ae212028882544766a6acba3309d27e2fffa230e4a07626c9a39dbdf1310374b765b3941c915d7b6d527fc7cb75ba028230b4a0 SHA512 1964b12fedf297b8baf77d4db2eb4ce6732925bb3974fb4d8d20b1dec751400ceb57faf0b069c2a5cf45728cad83ea434356edbcb19413d650717c3d2ac39a03
 DIST openscenegraph-openmw-3.6_p20211017.tar.gz 5788414 BLAKE2B d5ec3c7834bc8138b417d9bf8d92dde201a94f0158560aca477755752fd886378bfdffbd8c2e878ec1c6d35b572a60368c09695a93be9d83e26712de176b6824 SHA512 8985c6abedf2cbbf524aacc4f51e0217a8bd5eb17bae04774afc960b5cf21a6fb22941e08efcbd37e538c3e44cb044ca5cfa02380a75b4c87fe606c6fdfa8155
-EBUILD openscenegraph-openmw-3.6_p20210610.ebuild 4385 BLAKE2B 897e4d02b9ddd0ee34c23bc76abb41a6d65cf6e6401ce81b7dab7bd1e5428deec587048b8194fb961f3605407fe2e031ecd888e7b3dc0dcb50832defdcf197eb SHA512 494f54b9161299cbb397e8656d5a6323965e601afab75b73a8978d1c2fc8afbb2b4ef2baf4d5e34267030aa663596425aa1d3caf2ac9fc6d7590ded54994c827
+EBUILD openscenegraph-openmw-3.6_p20211017-r1.ebuild 4446 BLAKE2B 375282d25f6c7c9dc41b2e742d9d7fa9f261d68f0de64178fa1fa756150c28975011923bb8c7e880fa847043f1891d43f6629c8a2fec48f113a96b9e60deac1a SHA512 fe793c2cd75312899ba539d7e78bc231d7c57338ac9b757236e69f62b712c4e41ac4395a7fc416ab07e8cc77df4c5e0e9e194a942e117809a2249c533e2fd2b9
 EBUILD openscenegraph-openmw-3.6_p20211017.ebuild 4397 BLAKE2B afab21c4ad17e418478b7c3198e04522af21d200e0775806332672c4056d46c367cc6a6c8fde6d6db14061374d7bd20b339df60fe4a630b63b456ee11880d4a2 SHA512 6129ed3a0c787ea8fa4a22aebbb329b627bd7da42696bafe5de517f54fe49652e551b926196673df319ff7760edacceb0a53a87d2d2de615c6820f2a0a189408
 MISC metadata.xml 2088 BLAKE2B 8a6d83cb201e765310d776e4fae427d16f611cd2800c1d9bb3a315cbf3e37f21eea39604730405f18732203b509ab6f9ccde4c9ae54349c0f1be7b228fd8c44f SHA512 8e0b6cc0489b1651c7e0d67af7cf8e31da2916b3df6e27253beddb5cf0a8bb94224611b559c6ef3a52297964b9258de8f2fac72690aa7894c797cedab28031cd
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6-openexr3.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6-openexr3.patch
new file mode 100644
index 000000000000..1cfab7715f10
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6-openexr3.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/833492
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -752,7 +752,6 @@ ELSE()
+-    FIND_PACKAGE(ilmbase)
+     FIND_PACKAGE(Inventor)
+     FIND_PACKAGE(Jasper)
+-    FIND_PACKAGE(OpenEXR)
++    FIND_PACKAGE(OpenEXR CONFIG)
+     FIND_PACKAGE(OpenCascade)
+     FIND_PACKAGE(COLLADA)
+     FIND_PACKAGE(FBX)
+--- a/src/osgPlugins/CMakeLists.txt
++++ b/src/osgPlugins/CMakeLists.txt
+@@ -105,7 +105,7 @@ ENDIF()
+ IF(JASPER_FOUND)
+     ADD_PLUGIN_DIRECTORY(jp2)
+ ENDIF()
+-IF(OPENEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
++IF(OpenEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+     ADD_PLUGIN_DIRECTORY(exr)
+ ENDIF()
+ IF(GIFLIB_FOUND)
+--- a/src/osgPlugins/exr/CMakeLists.txt
++++ b/src/osgPlugins/exr/CMakeLists.txt
+@@ -1,9 +1,7 @@
+-INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/OpenEXR )
+-INCLUDE_DIRECTORIES( ${OPENEXR_INCLUDE_DIR}/OpenEXR )
+-
+ SET(TARGET_SRC ReaderWriterEXR.cpp )
+ 
+-SET(TARGET_LIBRARIES_VARS ${OPENEXR_LIBRARIES_VARS} ${ILMBASE_LIBRARIES_VARS} ZLIB_LIBRARIES)
++SET(OPENEXR_LIBRARIES_VARS OpenEXR::OpenEXR)
++SET(TARGET_LIBRARIES_VARS OPENEXR_LIBRARIES_VARS ZLIB_LIBRARIES)
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+     REMOVE_CXX_FLAG(-Wshadow)
+--- a/src/osgPlugins/exr/ReaderWriterEXR.cpp
++++ b/src/osgPlugins/exr/ReaderWriterEXR.cpp
+@@ -41,11 +41,11 @@ public:
+       {
+         return _inStream->read(c,n).good();
+       };
+-      virtual Int64    tellg ()
++      virtual uint64_t    tellg ()
+       {
+           return _inStream->tellg();
+       };
+-      virtual void    seekg (Int64 pos)
++      virtual void    seekg (uint64_t pos)
+       {
+         _inStream->seekg(pos);
+       };
+@@ -69,11 +69,11 @@ public:
+       {
+         _outStream->write(c,n);
+       };
+-      virtual Int64    tellp ()
++      virtual uint64_t    tellp ()
+       {
+         return _outStream->tellp();
+       };
+-      virtual void seekp (Int64 pos)
++      virtual void seekp (uint64_t pos)
+       {
+         _outStream->seekp(pos);
+       };
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
deleted file mode 100644
index f9a32c0dc601..000000000000
--- a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
+++ /dev/null
@@ -1,263 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -764,7 +764,7 @@
-     FIND_PACKAGE(DirectInput)
-     FIND_PACKAGE(NVTT)
-     IF (NOT WIN32)
--        FIND_PACKAGE(Asio)
-+        FIND_PACKAGE(Boost)
-     ENDIF()
-     FIND_PACKAGE(ZeroConf)
- 
---- a/CMakeModules/FindAsio.cmake
-+++ b/CMakeModules/FindAsio.cmake
-@@ -1,22 +0,0 @@
--# Locate ASIO-headers (http://think-async.com/Asio)
--# This module defines
--# ASIO_FOUND, if false, do not try to link to gdal
--# ASIO_INCLUDE_DIR, where to find the headers
--#
--# Created by Stephan Maximilian Huber
--
--FIND_PATH(ASIO_INCLUDE_DIR
--  NAMES
--    asio.hpp
--  PATHS
--    /usr/include
--    /usr/local/include
--)
--
--SET(ASIO_FOUND "NO")
--IF(ASIO_INCLUDE_DIR)
--    FIND_PACKAGE( Boost 1.37 )
--    IF(Boost_FOUND)
--        SET(ASIO_FOUND "YES")
--    ENDIF()
--ENDIF()
---- a/src/osgPlugins/CMakeLists.txt
-+++ b/src/osgPlugins/CMakeLists.txt
-@@ -299,13 +299,13 @@
- #
- # Device integration plugins
- #
--IF   (SDL_FOUND)
-+IF(SDL_FOUND)
-     ADD_PLUGIN_DIRECTORY(sdl)
--ENDIF(SDL_FOUND)
-+ENDIF()
- 
--IF(ASIO_FOUND)
-+IF(Boost_FOUND)
-     ADD_PLUGIN_DIRECTORY(RestHttpDevice)
--ENDIF(ASIO_FOUND)
-+ENDIF()
- 
- 
- IF(ZEROCONF_FOUND)
---- a/src/osgPlugins/RestHttpDevice/CMakeLists.txt
-+++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt
-@@ -1,6 +1,5 @@
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
--INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR})
--    
-+
- SET(TARGET_SRC
-     connection.cpp
-     io_service_pool.cpp
-@@ -26,7 +25,7 @@
-     RestHttpDevice.hpp
- )
- 
--SET(TARGET_ADDED_LIBRARIES osgPresentation )
-+SET(TARGET_ADDED_LIBRARIES osgPresentation)
- 
- #### end var setup  ###
- SETUP_PLUGIN(resthttp)
---- a/src/osgPlugins/RestHttpDevice/connection.cpp
-+++ b/src/osgPlugins/RestHttpDevice/connection.cpp
-@@ -37,14 +37,14 @@
- void connection::start()
- {
-   OSG_DEBUG << "RestHttpDevice :: connection::start" << std::endl;
--  
-+
-   socket_.async_read_some(asio::buffer(buffer_),
-       boost::bind(&connection::handle_read, shared_from_this(),
-         asio::placeholders::error,
-         asio::placeholders::bytes_transferred));
- }
- 
--void connection::handle_read(const asio::error_code& e,
-+void connection::handle_read(const boost::system::error_code& e,
-     std::size_t bytes_transferred)
- {
-   if (!e)
-@@ -82,12 +82,12 @@
-   // handler returns. The connection class's destructor closes the socket.
- }
- 
--void connection::handle_write(const asio::error_code& e)
-+void connection::handle_write(const boost::system::error_code& e)
- {
-   if (!e)
-   {
-     // Initiate graceful connection closure.
--    asio::error_code ignored_ec;
-+    boost::system::error_code ignored_ec;
-     socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
-   }
- 
---- a/src/osgPlugins/RestHttpDevice/connection.hpp
-+++ b/src/osgPlugins/RestHttpDevice/connection.hpp
-@@ -11,7 +11,7 @@
- #ifndef HTTP_SERVER_CONNECTION_HPP
- #define HTTP_SERVER_CONNECTION_HPP
- 
--#include <asio.hpp>
-+#include <boost/asio.hpp>
- #include <boost/array.hpp>
- #include <boost/noncopyable.hpp>
- #include <boost/shared_ptr.hpp>
-@@ -21,6 +21,8 @@
- #include "request_handler.hpp"
- #include "request_parser.hpp"
- 
-+using namespace boost;
-+
- namespace http {
- namespace server {
- 
-@@ -42,11 +44,11 @@
-   ~connection();
- private:
-   /// Handle completion of a read operation.
--  void handle_read(const asio::error_code& e,
-+  void handle_read(const boost::system::error_code& e,
-       std::size_t bytes_transferred);
- 
-   /// Handle completion of a write operation.
--  void handle_write(const asio::error_code& e);
-+  void handle_write(const boost::system::error_code& e);
- 
-   /// Socket for the connection.
-   asio::ip::tcp::socket socket_;
---- a/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
-+++ b/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
-@@ -11,7 +11,7 @@
- #include "server.hpp"
- #include <stdexcept>
- #include <boost/bind.hpp>
--#include <boost/shared_ptr.hpp>
-+#include <boost/thread.hpp>
- 
- namespace http {
- namespace server {
-@@ -36,17 +36,14 @@
- void io_service_pool::run()
- {
-   // Create a pool of threads to run all of the io_services.
--  std::vector<boost::shared_ptr<asio::thread> > threads;
-+  std::vector<thread> threads;
-   for (std::size_t i = 0; i < io_services_.size(); ++i)
--  {
--    boost::shared_ptr<asio::thread> thread(new asio::thread(
--          boost::bind(&asio::io_service::run, io_services_[i])));
--    threads.push_back(thread);
--  }
-+    threads.emplace_back(thread(boost::bind(&asio::io_service::run,
-+                                            io_services_[i])));
- 
-   // Wait for all threads in the pool to exit.
-   for (std::size_t i = 0; i < threads.size(); ++i)
--    threads[i]->join();
-+    threads[i].join();
- }
- 
- void io_service_pool::stop()
---- a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
-+++ b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
-@@ -11,11 +11,13 @@
- #ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP
- #define HTTP_SERVER_IO_SERVICE_POOL_HPP
- 
--#include <asio.hpp>
-+#include <boost/asio.hpp>
- #include <vector>
- #include <boost/noncopyable.hpp>
- #include <boost/shared_ptr.hpp>
- 
-+using namespace boost;
-+
- namespace http {
- namespace server {
- 
---- a/src/osgPlugins/RestHttpDevice/reply.hpp
-+++ b/src/osgPlugins/RestHttpDevice/reply.hpp
-@@ -13,9 +13,11 @@
- 
- #include <string>
- #include <vector>
--#include <asio.hpp>
-+#include <boost/asio.hpp>
- #include "header.hpp"
- 
-+using namespace boost;
-+
- namespace http {
- namespace server {
- 
---- a/src/osgPlugins/RestHttpDevice/server.cpp
-+++ b/src/osgPlugins/RestHttpDevice/server.cpp
-@@ -23,7 +23,7 @@
-     request_handler_(doc_root)
- {
-   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
--  asio::ip::tcp::resolver resolver(acceptor_.get_io_service());
-+  asio::ip::tcp::resolver resolver(io_service_pool_.get_io_service());
-   asio::ip::tcp::resolver::query query(address, port);
-   asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
-   acceptor_.open(endpoint.protocol());
-@@ -47,7 +47,7 @@
-   io_service_pool_.stop();
- }
- 
--void server::handle_accept(const asio::error_code& e)
-+void server::handle_accept(const boost::system::error_code& e)
- {
-   if (!e)
-   {
---- a/src/osgPlugins/RestHttpDevice/server.hpp
-+++ b/src/osgPlugins/RestHttpDevice/server.hpp
-@@ -11,7 +11,7 @@
- #ifndef HTTP_SERVER_SERVER_HPP
- #define HTTP_SERVER_SERVER_HPP
- 
--#include <asio.hpp>
-+#include <boost/asio.hpp>
- #include <string>
- #include <vector>
- #include <boost/noncopyable.hpp>
-@@ -20,6 +20,8 @@
- #include "io_service_pool.hpp"
- #include "request_handler.hpp"
- 
-+using namespace boost;
-+
- namespace http {
- namespace server {
- 
-@@ -38,12 +40,12 @@
- 
-   /// Stop the server.
-   void stop();
--  
-+
-   void setCallback(request_handler::Callback* cb) { request_handler_.setCallback(cb); }
- 
- private:
-   /// Handle completion of an asynchronous accept operation.
--  void handle_accept(const asio::error_code& e);
-+  void handle_accept(const boost::system::error_code& e);
- 
-   /// The pool of io_service objects used to perform asynchronous operations.
-   io_service_pool io_service_pool_;
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r1.ebuild
index 21e4584df2bd..c0e8f55f2dbd 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20211017-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 
 WX_GTK_VER="3.0-gtk3"
 inherit cmake flag-o-matic lua-single wxwidgets
 
-MY_COMMIT="b02abe200c4847e73b887b064a89ea1758a5b733"
+MY_COMMIT="bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"
 
 DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
 HOMEPAGE="https://github.com/OpenMW/osg"
@@ -19,9 +19,9 @@ LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/162" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="
-	collada curl dicom debug doc egl examples ffmpeg fltk fox gdal
-	gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png
-	sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib
+	+collada curl dicom debug doc egl examples +ffmpeg fltk fox gdal
+	gif glut gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
+	+sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib
 "
 
 REQUIRED_USE="
@@ -39,6 +39,8 @@ BDEPEND="
 "
 RDEPEND="
 	!dev-games/openscenegraph
+	dev-libs/glib:2
+	media-libs/fontconfig
 	media-libs/mesa[egl(+)?]
 	virtual/glu
 	virtual/opengl
@@ -64,15 +66,15 @@ RDEPEND="
 	las? ( >=sci-geosciences/liblas-1.8.0 )
 	lua? ( ${LUA_DEPS} )
 	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
+		dev-libs/imath:=
+		>=media-libs/openexr-3:=
 	)
 	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
+	pdf? ( app-text/poppler:=[cairo] )
 	png? ( media-libs/libpng:0= )
 	sdl? ( media-libs/libsdl )
 	svg? (
-		gnome-base/librsvg
+		gnome-base/librsvg:2
 		x11-libs/cairo
 	)
 	tiff? ( media-libs/tiff:0 )
@@ -82,15 +84,14 @@ RDEPEND="
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-	dev-libs/boost
 	x11-base/xorg-proto
 "
 
 PATCHES=(
 	"${FILESDIR}"/openscenegraph-3.6.3-cmake.patch
 	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
-	"${FILESDIR}"/openscenegraph-3.6.5-use_boost_asio.patch
 	"${FILESDIR}"/openscenegraph-3.6.5-cmake_lua_version.patch
+	"${FILESDIR}"/openscenegraph-3.6-openexr3.patch
 )
 
 pkg_setup() {
@@ -141,6 +142,7 @@ src_configure() {
 		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
 		$(cmake_use_find_package zlib ZLIB)
 		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+		-DCMAKE_RELWITHDEBINFO_POSTFIX=
 	)
 
 	if use examples; then