gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-games
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
34 files changed, 464 insertions, 829 deletions
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 49a7e296751a..e6f9b6c5593f 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index ada888cbe082..6e2242d875a8 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,6 +1,4 @@
 AUX aseprite-1.1.7_type-punned_pointer.patch 836 BLAKE2B ca46926a87411fa74c7d66830bd4fc43dc3ae5130342bbb4300398c11a810949ccc530a8a7e66ae6265b2f89fe0bd667557ee7c647491e93d52768d74a340554 SHA512 c01ca8dc6bcee6276f3f4c7f7f141d8528372f0cbbb33c036b89ba64e639966d9b9955a78ec917ef7ebeda2148abc817bc4df7c1fe02818734f51cd7452df9ca
-DIST Aseprite-v1.1.6-Source.zip 11801981 BLAKE2B f20186a1669d7f9ab1453a2104a54228c22e2ef1703bba200f44c965b3fb3d9310c1ddd343db9c27ddca3564e4245352476c5228e171f1c0e74c553e5a59d419 SHA512 d87bcc5ece64cbc772ea5d4dc1edf29943d9038221905c0263511852afbb4e9119ce82468502a78c286729bb91389d08e3a8b7f358e4f6f8fe88507e7e69c9ac
 DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
-EBUILD aseprite-1.1.6.ebuild 2163 BLAKE2B db8c6737c94eefcea7a8397dad51960526755aec103477d47eae34d7ba80b98a22562adc334a4c5f25b57dc4fbc04c483e75abfae8dd81282bab867ee0040f36 SHA512 724ee33f91a9ac4395d5e945932b355550e5f7361e481f1c9b8f672c9cb716eb14813c646dc1cf85fcefd728adf579f62e869a8908ddbc72b90b33688160f647
 EBUILD aseprite-1.1.9.ebuild 2751 BLAKE2B 6c5780619c95e893e181291c0fbce2f826f8ac6ba2cc559fd33c1461432e2498461f02496031b0ffc50bd974dc64ae47301c4546d600c823d809a7f162c74e64 SHA512 4178e2fb7f9c8b6b267cae0bc83d9887718057c99c4f6dd9acf7c2f41f484e463e75df78a60fbd7f8699de5ae2ee221e476148bf2bb5e93e7c064b66f6b1ac2e
 MISC metadata.xml 684 BLAKE2B a1ad6d72f940738634ce874c50abaadaee4f897a1a694170da97d4403a9fa69383934fff7392c1417b9b954c3c98a4f138a9da1921e01171a8ebf1ab91d9f256 SHA512 a4d1efc2228d170e868d8328d64a8195fec01807ca4a4424e44f55354d57ab1949c827dbadf6b8a2037979fa684cb6445d95feb37a61b4d3ac637620699f9a77
diff --git a/dev-games/aseprite/aseprite-1.1.6.ebuild b/dev-games/aseprite/aseprite-1.1.6.ebuild
deleted file mode 100644
index aab455bf61f3..000000000000
--- a/dev-games/aseprite/aseprite-1.1.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop flag-o-matic
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="https://www.aseprite.org"
-SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip"
-
-# See https://github.com/aseprite/aseprite#credits
-# Some bundled third-party packages built-in:
-# gtest duktape modp_b64 simpleini
-LICENSE="BSD GPL-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug kde gtk3 test webp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/tinyxml
-	media-libs/allegro:0[X,png]
-	media-libs/freetype
-	media-libs/giflib:=
-	webp? ( media-libs/libwebp )
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/pixman
-	gtk3? ( dev-cpp/gtkmm:3.0 )
-	kde? (
-		dev-qt/qtcore:5
-		kde-frameworks/kio:5 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	gtk3? ( virtual/pkgconfig )
-	webp? ( virtual/pkgconfig )"
-
-DOCS=( docs/files/ase.txt
-	docs/files/fli.txt
-	docs/files/msk.txt
-	docs/files/pic.txt
-	docs/files/picpro.txt
-	README.md )
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Fix to make flag-o-matic work.
-	if use debug ; then
-		sed -i '/-DNDEBUG/d' CMakeLists.txt || die
-	fi
-
-	# Fix shebang in thumbnailer
-	sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' desktop/aseprite-thumbnailer || die
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUGMODE -D_DEBUG
-
-	local mycmakeargs=(
-		-DENABLE_UPDATER=OFF
-		-DFULLSCREEN_PLATFORM=ON
-		-DUSE_SHARED_ALLEGRO4=ON
-		-DUSE_SHARED_CURL=ON
-		-DUSE_SHARED_FREETYPE=ON
-		-DUSE_SHARED_GIFLIB=ON
-		-DUSE_SHARED_JPEGLIB=ON
-		-DUSE_SHARED_LIBLOADPNG=ON
-		-DUSE_SHARED_LIBPNG=ON
-		-DUSE_SHARED_PIXMAN=ON
-		-DUSE_SHARED_TINYXML=ON
-		-DUSE_SHARED_ZLIB=ON
-		-DUSE_SHARED_LIBWEBP=ON
-		-DWITH_DESKTOP_INTEGRATION=ON
-		-DWITH_GTK_FILE_DIALOG_SUPPORT="$(usex gtk3)"
-		-DWITH_QT_THUMBNAILER="$(usex kde)"
-		-DWITH_WEBP_SUPPORT="$(usex webp)"
-		-DENABLE_TESTS="$(usex test)"
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	newicon "${S}/data/icons/ase64.png" "${PN}.png"
-	cmake-utils_src_install
-}
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index fd9b7f0efc41..21d9a7254906 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -2,5 +2,5 @@ AUX cegui-0.8.7-icu-59.patch 444 BLAKE2B 7ba31c1a856638be317c0d3166159bea14be9f3
 AUX cegui-0.8.7-musl.patch 2017 BLAKE2B a7735ce19c17505be2ba1da5c0aa8fde00ed6cca9926a1586a426a6b56d0fa9bb402a54a8c99b79f58a8adde3edfb79856a2766ca28f8ac92930d4e4004b4dc1 SHA512 c9bece96a6f7600cc59b94391b774acc016e2f33fb608d33aa25ef603b5782f47d338cad6ad244224c861fa00a8ebc0f80f7aa1df4800a7c8347029f2b5e996d
 AUX cegui-0.8.7-python3.patch 1045 BLAKE2B 702c30e85d08e117888d56adaf2c131f9c6410916f08b03ac66efd69230e14b53ee05975e04489f3526fba964a372b340b86acf5a31dda36ddbab40d7f65d944 SHA512 9870e996697775938ca9ba6708dc93d5e59e8a640dd2542c1e8cc8b903ebd1738b11e733f2e9d012f932558a6f77ee8014f0d98133252e2cee2025e664a38e61
 DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
-EBUILD cegui-0.8.7-r100.ebuild 3331 BLAKE2B 88f36754a909efa8589c34a9ea956f2e641df6b938ea6e8404e7f2eb76744cccacab8d5eec3a43b8fdc2e08914b1bd6fea621c4a667d7f2049635d52b1a33be8 SHA512 ffad30c3b4a8f8e28f964ffbb4c2b5c68f46a0040b276c3ccc340deb39de9643bc8057a807655c406ac3a41f886f38b6ad8143679ecf39388eb4dede99d17357
+EBUILD cegui-0.8.7-r100.ebuild 3333 BLAKE2B 60882e72a1a6dbc571ab9b2acdfadaf3f844ca7bf922a758799276bb087dfd52d1425e0fb158069b424ee4222ce19df47c1376b56a042379bd0b65d2b3658aec SHA512 5526abfff45ebe815dfc8d886ca9689afbec7ab947477df5580f719ba015cdc2b978d83e841eee6f161f30f242212ec0ebdc677ef09f4c66c01bcdd20370fd6a
 MISC metadata.xml 804 BLAKE2B bf686a6008a733ff5e216a3a8476e48c0241c2daeab45a28bdc8319c453d2810ae95ca952874a1f8506bfe6052b483e6af4177af91ad94e6a0602cf3f722f07f SHA512 c570dbb7a334e3a37c8b609ccdb655cfd07f56b95e6afbeb045c149de104626d42b1952ae9e765bcb0792200b6fdb6aa6937aa37f64a91c7cd7909bb51e7d155
diff --git a/dev-games/cegui/cegui-0.8.7-r100.ebuild b/dev-games/cegui/cegui-0.8.7-r100.ebuild
index 808eccd66654..0fa81c36501e 100644
--- a/dev-games/cegui/cegui-0.8.7-r100.ebuild
+++ b/dev-games/cegui/cegui-0.8.7-r100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # TODO: multiple ABI?
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit flag-o-matic cmake lua-single python-single-r1
 
 DESCRIPTION="Crazy Eddie's GUI System"
diff --git a/dev-games/irrlicht-mt-headers/Manifest b/dev-games/irrlicht-mt-headers/Manifest
new file mode 100644
index 000000000000..76de4b14e36c
--- /dev/null
+++ b/dev-games/irrlicht-mt-headers/Manifest
@@ -0,0 +1,3 @@
+DIST irrlicht-mt-1.9.0.4.tar.gz 4158897 BLAKE2B e03c3ca28ae93e5fa565069b67ae7f60e7e023a3b5434fbd8c080be719e40a67f115e4459f082b7a27181ff81cc591e527120747aaf91efaafe93d997f5dbc9e SHA512 6f6fef27d534a0046a04cb504992586f5f20a757f2c3a35ea6e1fb31d2781e3d81ee0172b03e2913ddd894fb937d6830005613eaed77a29bb9e91aa6d248fab8
+EBUILD irrlicht-mt-headers-1.9.0.4-r1.ebuild 754 BLAKE2B 82533b71b4dee184373642086df9d4a934c60293453102635a8e430e0af9a931dc9878c33047d66d52955287bc3e12d4464601cdc553994754c19584cbe2d239 SHA512 a7bb5b25a96242497fcc7c63f5022f93e0da8f7c8e7a0809ffc767892ada10cb79694180b6bfb8150ac5be987b48a479d7bcc2b2e04661792bdc8cdd05206386
+MISC metadata.xml 328 BLAKE2B 65f1524f204dce6e817727e3870a3154eb1333d68d92241b17ea9a9089081d56947e7cd0dae6e4addd55594953cf27661e02774814f814465363df184842d37d SHA512 dddf11f78c1fcc61b3b98246ed7c73ae7c0e3f1765b60fbbc8513d706edec666c405479f45a2259c513f3bf298bd1d0810f756110aa7757b393045c4c18e17d8
diff --git a/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.4-r1.ebuild b/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.4-r1.ebuild
new file mode 100644
index 000000000000..684ebba730ab
--- /dev/null
+++ b/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-mt-headers}"
+MY_PV="$(ver_rs 3 'mt')"
+MY_P="${MY_PN}-${MY_PV}"
+# These two should be kept in sync with dev-games/irrlicht-mt
+SRC_PN="${PN%-headers}"
+SRC_P="${SRC_PN}-${PV}"
+
+DESCRIPTION="Header files for Minetest's fork of dev-games/irrlicht"
+HOMEPAGE="https://github.com/minetest/irrlicht"
+SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${SRC_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="!<dev-games/irrlicht-mt-1.9.0.4-r1"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/include/${SRC_PN/-/}
+	doins include/*
+}
diff --git a/dev-games/irrlicht-mt-headers/metadata.xml b/dev-games/irrlicht-mt-headers/metadata.xml
new file mode 100644
index 000000000000..cd29c13fee92
--- /dev/null
+++ b/dev-games/irrlicht-mt-headers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">minetest/irrlicht</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/irrlicht-mt/Manifest b/dev-games/irrlicht-mt/Manifest
index bfaf1fe6aa04..7712d626dfdc 100644
--- a/dev-games/irrlicht-mt/Manifest
+++ b/dev-games/irrlicht-mt/Manifest
@@ -1,3 +1,3 @@
 DIST irrlicht-mt-1.9.0.4.tar.gz 4158897 BLAKE2B e03c3ca28ae93e5fa565069b67ae7f60e7e023a3b5434fbd8c080be719e40a67f115e4459f082b7a27181ff81cc591e527120747aaf91efaafe93d997f5dbc9e SHA512 6f6fef27d534a0046a04cb504992586f5f20a757f2c3a35ea6e1fb31d2781e3d81ee0172b03e2913ddd894fb937d6830005613eaed77a29bb9e91aa6d248fab8
-EBUILD irrlicht-mt-1.9.0.4.ebuild 625 BLAKE2B e04335daaa266a2a33de0dc090685436c86d28e180a2337c74473caa23f263d9ab2b0b7c773673ead87ee2bbb70cd57f54cf1e473a882b4865ae3aaa9826253d SHA512 783f438bcd64602056e60817e84b0dc215845150bf4451a2014da99ffe39aa40eacf40ecb60f8af4b0deec86f830f1e067b0b87f18f99214c890517c72236717
+EBUILD irrlicht-mt-1.9.0.4-r1.ebuild 827 BLAKE2B 894755743b1dcd236387ce19afce386b2ef095bf3bcc0985506a8156dab995b1202d02c7475262c4338a37f0094a7ed5ff06fee996e9d6ac7e4043e36b3be5b7 SHA512 e44160558d062415e31a436f1b0e632b012c69f77d2a88d6d645624e8a4cf305d7d853af460474952bc1f7357be8f6857b3859ddc623f777ebb09e13508ea467
 MISC metadata.xml 328 BLAKE2B 65f1524f204dce6e817727e3870a3154eb1333d68d92241b17ea9a9089081d56947e7cd0dae6e4addd55594953cf27661e02774814f814465363df184842d37d SHA512 dddf11f78c1fcc61b3b98246ed7c73ae7c0e3f1765b60fbbc8513d706edec666c405479f45a2259c513f3bf298bd1d0810f756110aa7757b393045c4c18e17d8
diff --git a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4.ebuild b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4-r1.ebuild
index 34b915793472..15ffef6d4c61 100644
--- a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4.ebuild
+++ b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4-r1.ebuild
@@ -17,7 +17,8 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-RDEPEND="media-libs/libpng:0=
+RDEPEND="~dev-games/irrlicht-mt-headers-${PV}
+	media-libs/libpng:0=
 	sys-libs/zlib
 	virtual/jpeg:0
 	virtual/opengl
@@ -26,4 +27,11 @@ RDEPEND="media-libs/libpng:0=
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}"/${MY_P}
+
+src_install() {
+	cmake_src_install
+
+	# We package these separately
+	rm -r "${ED}"/usr/include/${PN/-/} || die "Failed to exclude header files from installation"
+}
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
index f4b94dff10e8..e369fbf2c657 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -1,11 +1,5 @@
-AUX mygui-3.2.2-FHS.patch 1209 BLAKE2B 7bd14cfe0653ac74df4ab5ac6be69a9d95837795820baf5e0e6a11a03448f57cf761f240d3fa62e2f1ef121ac2e9b48b802edf74905fdf68f6744773f612cbe9 SHA512 21aba7d654a7197423bdeaa06fa79219d850c76248546227ece1f4916072289f0ebf68a9ad9a4569a1d5dfc15cf86762db3c0d4d58f4c233c1b4293ffb35e50e
-AUX mygui-3.2.2-build.patch 2801 BLAKE2B c414f7249f63c5addd0c616df3a0ac0979fc7c8565b9c12c8f81007f152c129d868ec9359641ce59abca4b9958bc3fa39bb906b221d66fef4e9df53135bf18da SHA512 954f95759967a1a4f4eb6952f6abbabbe3157703d5d0014299a8cd5060cd5fb0c7faa635ad10e5c23e0bc0c8d8089c29c14952058a7bdcc2643f06c226f5524d
-AUX mygui-3.2.2-c++17.patch 824 BLAKE2B d70fb25cffd51ac28aa0d443d0162ed76f11624e311fdbf71f1fd0321670203b9925fb9494586e9f289f9781faee3822073b06ac0ebd61a739350b7fdf38c401 SHA512 cf532e56e9324ac956745639a1a625cd54a494dafe1aa0bb086ce851428d758c71f13c77e415f2e0611b6772335902b225e128f15883c7adfd4d7c11a625c6ed
-AUX mygui-3.2.2-underlinking.patch 398 BLAKE2B 0e4ebdf58228ac6b6368202c40137feadf5f3adeb4f2e20020d2ed8db6db17a1ca0715e1018a5e851cc8a38163e4607e9f705f20f3190fa09de9de0eb7ab3099 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9
 AUX mygui-3.4.1-FHS.patch 684 BLAKE2B 393855309d895c2a30565ff05ec32ff8b78d47d1073038be9ad5110473be05ee9e93773f845f076b52e4aeda1b704d91f13218d58c0c4b723249ed395fb388f2 SHA512 1afabf04b4365e51a74d49d54b8a44b8f4d03e244bf04fd44de1b1d53cffc5ab2b31f9ef1eda6ee52446bde0ecd11b1174abe3d16b7e5ae8ef87a477f75cb255
 AUX mygui-3.4.1-build.patch 2056 BLAKE2B 7b7c304f3c5df023c1836df0d60d52b4d56a84134e2a8f4e4180317f54f6d3407f7c2fac7a138dfb70c4b7e6ad99a86047fd80316fcae9d8c8d821a648f5963f SHA512 a745eaf7f605c93d59781615cf1e0cbba0dbf2dd67de2ab04e25e96bc4fbd3a602c9460f9e0a73e9f7781cf355ebcc69e38f1530c7ec01d2ec630eff43c062e8
-DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4
 DIST mygui-3.4.1.tar.gz 22433198 BLAKE2B 400f88a63df1bff5554236a0aeb58218fdb6100aa84f9eb1ac111adabfa45ae7eb1c3124bb04f3ef57587566e716d3242daa9cb5866d7ccc43a56c9605952411 SHA512 9d36272345b1a755db88848c8a0919feb6f8ae09d048efa3b8ed833bb5ddb9c65e1e7e0d26ad39eecd2a4de53fb654f4099c555e9ebd21ce9541a1a74580ef05
-EBUILD mygui-3.2.2.ebuild 3771 BLAKE2B 8adb10657584c8cf1b702ba9d0f0a440b4ff04e18fdf2279ac0eb12a8c91c9180a247e583edafd16357a46d497648ff287e0870d6ef820ab143df7efbd077281 SHA512 6b0c73741a810d27b3e804ffd32bc99d3d58ee2539b0fa4196d7d40d7af75755c5a1a45e2c94a64f0679c0d19d45359c211629fb797ba86839951088ab63cca7
-EBUILD mygui-3.4.1.ebuild 3640 BLAKE2B 5fc4ad05dc30911521924ce35ce864eb162f38a0c0ed7c63a253337270c1f9858b8790853eff4e8b06a4733f16c3fb56f960b0ff7bc0fa2d591441d0321e5e08 SHA512 46f13ae757d37a29c8be7d031000b22f39cfdbac6f5ed1c2d27feb0ca3c442c23db0de5841dbcc60169919b1ff4e2d8b1a355795a290130347cf8911a43b285f
+EBUILD mygui-3.4.1.ebuild 3638 BLAKE2B 8cc3248b6f44fc5cdd96fc09d456936ad5d805a7240c3f3a983688c28d2f1ef8cb45b91dd39efd27ef19b5727c40945fb8140d1a98fa9aedc093f20b2fc2990f SHA512 3cd260f39d8c30c7a231e9bbf64d38fdf8c1f352517713dbc026d1cea390922d487e0fdb67960edacfe9ee1fd12811d97b2458b159ab87c0b1022d12dbf7a55e
 MISC metadata.xml 2013 BLAKE2B a3c0a6ee33840e2c70951ec6ede217ef546cd584c241f79f98a0eb5396fa2e6011f01b23452907bec397395fdb3b6b5f3ed03c8738cf377ced9fa0aef930a859 SHA512 0906364e391e490e1be617f64e7b67dc08675f6106c21b46fff53f2ac94e3fc36658c2f8f926eae66689dfc5b6dc34b4931fd24548554df63629dd38b5560f5d
diff --git a/dev-games/mygui/files/mygui-3.2.2-FHS.patch b/dev-games/mygui/files/mygui-3.2.2-FHS.patch
deleted file mode 100644
index 14d21626ff7b..000000000000
--- a/dev-games/mygui/files/mygui-3.2.2-FHS.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Oct 27 22:39:31 UTC 2012
-Subject: FHS
-
-paths hardcoded until upstream fixed the logic
-
---- mygui-MyGUI3.2.2.orig/CMake/InstallResources.cmake
-+++ mygui-MyGUI3.2.2/CMake/InstallResources.cmake
-@@ -24,7 +24,7 @@
- 	else ()
- 		install(FILES
- 			${MYGUI_BINARY_DIR}/bin/${FILENAME}
--			DESTINATION "bin"
-+			DESTINATION "/etc/MYGUI"
- 		)
- 	endif ()
- endfunction(install_file)
-@@ -53,7 +53,7 @@
- 	if (WIN32)
- 		set(MYGUI_MEDIA_DIR "../../Media")
- 	elseif (UNIX)
--		set(MYGUI_MEDIA_DIR "../share/MYGUI/Media")
-+		set(MYGUI_MEDIA_DIR "${CMAKE_INSTALL_PREFIX}/share/MYGUI/Media")
- 	else ()
- 		set(MYGUI_MEDIA_DIR "../../Media")
- 	endif ()
---- mygui-MyGUI3.2.2.orig/Common/Base/Ogre/BaseManager.cpp
-+++ mygui-MyGUI3.2.2/Common/Base/Ogre/BaseManager.cpp
-@@ -49,13 +49,13 @@
- 		mWindow(nullptr),
- 		mExit(false),
- 		mPluginCfgName("plugins.cfg"),
--		mResourceXMLName("resources.xml"),
-+		mResourceXMLName("/etc/MYGUI/resources.xml"),
- 		mResourceFileName("MyGUI_Core.xml")
- 	{
- 		#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
- 			mResourcePath = macBundlePath() + "/Contents/Resources/";
- 		#else
--			mResourcePath = "";
-+			mResourcePath = "/etc/MYGUI/";
- 		#endif
- 	}
- 
diff --git a/dev-games/mygui/files/mygui-3.2.2-build.patch b/dev-games/mygui/files/mygui-3.2.2-build.patch
deleted file mode 100644
index a16b27c285b7..000000000000
--- a/dev-games/mygui/files/mygui-3.2.2-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ru mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake
---- mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake	2015-01-26 10:32:35.000000000 -0500
-+++ mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake	2015-03-14 01:09:40.743621643 -0400
-@@ -4,6 +4,8 @@
- # also prepare package files for pkg-config and CMake.
- #######################################################################
- 
-+include(GNUInstallDirs)
-+
- # should we build static libs?
- if (MYGUI_STATIC)
-   set(MYGUI_LIB_TYPE STATIC)
-@@ -47,7 +49,7 @@
-   else ()
-     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
-   endif ()
--  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
-+  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
-   # configure additional packages
-   
-diff -ru mygui-MyGUI3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake mygui-MyGUI3.2.2/CMake/Utils/MyGUIConfigTargets.cmake
---- mygui-MyGUI3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake	2015-01-26 10:32:35.000000000 -0500
-+++ mygui-MyGUI3.2.2/CMake/Utils/MyGUIConfigTargets.cmake	2015-03-14 01:08:44.905791784 -0400
-@@ -1,6 +1,8 @@
- # Configure settings and install targets
- # FIXME: Copypasted from Ogre and need lots of changes
- 
-+include(GNUInstallDirs)
-+
- if (WIN32)
- 	set(MYGUI_RELEASE_PATH "/Release")
- 	set(MYGUI_RELWDBG_PATH "/RelWithDebInfo")
-@@ -60,6 +62,12 @@
- # install targets according to current build type
- function(mygui_install_target TARGETNAME SUFFIX)
- 	install(TARGETS ${TARGETNAME}
-+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" CONFIGURATIONS Gentoo ""
-+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo ""
-+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo ""
-+		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Gentoo ""
-+	)
-+	install(TARGETS ${TARGETNAME}
- 		RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- 		LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- 		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-@@ -171,7 +179,13 @@
- 		endif ()
- 		add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
- 	endif ()
--	set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
-+
-+	# rename demo target^M
-+	if (${SOLUTIONFOLDER} STREQUAL "Demos")
-+		set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER} OUTPUT_NAME MYGUI-${PROJECTNAME})
-+	else()
-+		set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
-+	endif()
- 	
- 	add_dependencies(${PROJECTNAME} MyGUIEngine Common)
- 
diff --git a/dev-games/mygui/files/mygui-3.2.2-c++17.patch b/dev-games/mygui/files/mygui-3.2.2-c++17.patch
deleted file mode 100644
index 1cdf7babeb12..000000000000
--- a/dev-games/mygui/files/mygui-3.2.2-c++17.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/MyGUI/mygui/commit/ced30dac10082ff9593a2c971d26b3aebce6b2be.patch
-https://bugs.gentoo.org/732778
-
-Part of:
-
-From ced30dac10082ff9593a2c971d26b3aebce6b2be Mon Sep 17 00:00:00 2001
-From: George Evmenov <george.evmenov@geocv.com>
-Date: Fri, 26 Jun 2015 12:25:26 +0300
-Subject: [PATCH] do not use nullptr define
-
---- a/MyGUIEngine/include/MyGUI_Prerequest.h
-+++ b/MyGUIEngine/include/MyGUI_Prerequest.h
-@@ -19,13 +19,7 @@
- #define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch)
- 
- #ifndef MYGUI_DONT_REPLACE_NULLPTR
--#	if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
--#		ifndef _MANAGED
--#			ifndef _NATIVE_NULLPTR_SUPPORTED
--#				define nullptr 0
--#			endif
--#		endif
--#	else
-+#	if __cplusplus < 201103L && !defined(_NATIVE_NULLPTR_SUPPORTED)
- #		define nullptr 0
- #	endif
- #endif
diff --git a/dev-games/mygui/files/mygui-3.2.2-underlinking.patch b/dev-games/mygui/files/mygui-3.2.2-underlinking.patch
deleted file mode 100644
index 2d1026856f03..000000000000
--- a/dev-games/mygui/files/mygui-3.2.2-underlinking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun 15 10:42:42 UTC 2012
-Subject: build system
-
-fix underlinking
-
---- MyGUIEngine/CMakeLists.txt
-+++ MyGUIEngine/CMakeLists.txt
-@@ -48,7 +48,10 @@
- if (MYGUI_USE_FREETYPE)
- 	target_link_libraries(${PROJECTNAME}
- 		${FREETYPE_LIBRARIES}
--	)
-+		dl)
-+else()
-+	target_link_libraries(${PROJECTNAME}
-+		dl)
- endif()
- 
- # platform specific dependencies
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
deleted file mode 100644
index 55a3ccd96db5..000000000000
--- a/dev-games/mygui/mygui-3.2.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindFreetype"
-inherit eutils cmake-utils flag-o-matic multilib
-
-MY_PN=MyGUI
-MY_P=${MY_PN}${PV}
-
-DESCRIPTION="A library for creating GUIs for games"
-HOMEPAGE="http://mygui.info/"
-SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug doc +ogre opengl plugins samples static-libs test tools l10n_ru"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="ogre? ( !opengl )
-	opengl? ( !ogre )"
-
-RDEPEND="
-	media-libs/freetype:2
-	ogre? (
-		dev-games/ogre:=[freeimage,opengl]
-		samples? ( dev-games/ois )
-	)
-	opengl? ( virtual/opengl
-		media-libs/glew )
-	tools? ( dev-games/ois )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/mygui-${MY_P}
-STATIC_BUILD=${WORKDIR}/${P}_build_static
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-FHS.patch
-	"${FILESDIR}"/${P}-c++17.patch
-)
-
-pkg_setup() {
-	if use samples && use !ogre ; then
-		ewarn "Samples disabled, because they only work with ogre!"
-		ewarn "Enable ogre USE flag if you want to use samples."
-	fi
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG
-
-	local mycmakeargs=()
-
-	# static configuration
-	if use static-libs ; then
-		mycmakeargs=( -DMYGUI_STATIC=ON
-			-DMYGUI_BUILD_DOCS=OFF
-			-DMYGUI_INSTALL_DOCS=OFF
-			-DMYGUI_USE_FREETYPE=ON
-			$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
-			-DMYGUI_BUILD_DEMOS=OFF
-			-DMYGUI_INSTALL_SAMPLES=OFF
-			-DMYGUI_BUILD_TOOLS=OFF
-			-DMYGUI_INSTALL_TOOLS=OFF
-			-DMYGUI_BUILD_WRAPPER=OFF
-			-DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") )
-
-		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_configure
-		unset mycmakeargs
-	fi
-
-	# main configuration
-	mycmakeargs=( -DMYGUI_STATIC=OFF
-		$(cmake-utils_use doc MYGUI_BUILD_DOCS)
-		$(cmake-utils_use doc MYGUI_INSTALL_DOCS)
-		-DMYGUI_USE_FREETYPE=ON
-		$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
-		$(usex ogre "$(cmake-utils_use samples MYGUI_BUILD_DEMOS)" "-DMYGUI_BUILD_DEMOS=OFF")
-		$(usex ogre "$(cmake-utils_use samples MYGUI_INSTALL_SAMPLES)" "-DMYGUI_INSTALL_SAMPLES=OFF")
-		$(cmake-utils_use tools MYGUI_BUILD_TOOLS)
-		$(cmake-utils_use tools MYGUI_INSTALL_TOOLS)
-		$(cmake-utils_use opengl MYGUI_USE_SYSTEM_GLEW)
-		-DMYGUI_BUILD_WRAPPER=OFF
-		-DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") )
-
-	if use tools || (use samples && use ogre) ; then
-		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=ON )
-	else
-		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# build system does not support building static and shared at once,
-	# run a double build
-	if use static-libs ; then
-		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_compile
-	fi
-
-	cmake-utils_src_compile
-
-	use doc && emake -C "${CMAKE_BUILD_DIR}"/Docs api-docs
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use static-libs ; then
-		find "${STATIC_BUILD}" -name "*.a" \! -name "libCommon.a" -exec dolib.a '{}' \;
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins "${STATIC_BUILD}"/pkgconfig/MYGUIStatic.pc
-	fi
-
-	if use doc ; then
-		dohtml -r "${CMAKE_BUILD_DIR}"/Docs/html/*
-
-		if use l10n_ru ; then
-			docompress -x /usr/share/doc/${PF}/Papers
-			dodoc -r Docs/Papers
-		fi
-	fi
-
-	keepdir /etc/MYGUI
-	fperms o+w /etc/MYGUI
-
-	# test media not needed at runtime
-	rm -rf "${ED%/}"/usr/share/MYGUI/Media/UnitTests || die
-	# wrapper not available for linux, remove related media
-	rm -rf "${ED%/}"/usr/share/MYGUI/Media/Wrapper || die
-}
-
-pkg_postinst() {
-	elog
-	elog "ogre.cfg and Ogre.log are created as"
-	elog "${EROOT%/}/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log"
-	elog
-}
diff --git a/dev-games/mygui/mygui-3.4.1.ebuild b/dev-games/mygui/mygui-3.4.1.ebuild
index 6bedba772b6d..182b5dbdf3cd 100644
--- a/dev-games/mygui/mygui-3.4.1.ebuild
+++ b/dev-games/mygui/mygui-3.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST="FindFreetype"
-inherit cmake flag-o-matic multilib
+inherit cmake flag-o-matic
 
 MY_PN=MyGUI
 MY_P=${MY_PN}${PV}
@@ -24,7 +24,7 @@ REQUIRED_USE="ogre? ( !opengl )
 RDEPEND="media-libs/freetype:2
 	sys-libs/zlib
 	ogre? (
-		dev-games/ogre:0=[freeimage,opengl]
+		>=dev-games/ogre-1.12:0=[freeimage,opengl]
 		samples? ( dev-games/ois )
 	)
 	opengl? (
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 7473fd598959..baf910b97a76 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -22,5 +22,5 @@ DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f0
 DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5
 EBUILD ogre-1.12.9-r1.ebuild 5882 BLAKE2B 75d665bedf08195ce640b68db92363724aabc9c4e7bc2864e8adb44a97381342e1413a968dd076533989dc9eef2f2566c68f14ddd7bfb94d57f1fae557c59e17 SHA512 f63f23e66c0e05b6f11f8d4600ba2faeaf297425f32773fc3eb2911337501a6274abc19601fca4d6f5f23fa6575df48afabdfb902adeb0ac376c31a41c07c446
 EBUILD ogre-1.9.0-r3.ebuild 3676 BLAKE2B 89fb29fe7d180b619f4b77593899ec0af648d94e1e0b36a99d7388ba3f336e6818ba0bf25d4f0891d55cb35bf55e9f36f38a16c529a27ea8e1d4ac4ad071d4f7 SHA512 e1c7d37d97b5621a1360b48cfa5f165710433558c45f69a2acd44e52cca740fcc8de55e63753e3367ef8e02082cdf1ec82a8693429002b25faaa51854b0cb005
-EBUILD ogre-2.1-r1.ebuild 5952 BLAKE2B 5b1b2f0fd60be1ad34dd5879b5960ec5d09a4c0934181e50a1a59622c344f1a21c42387b0338c32466117799c26a6701b2c8725dba4a8d95e0edcbf703bbe33b SHA512 b911bbcc7bdea34b50e29fdf48c760a81f5569a9ea2a8b33a2c32c394036cd5db6ddb8f7d60307c92fdb66444f6c8b22e448668861ba8d6f7e2cf79274c572fc
+EBUILD ogre-2.1-r1.ebuild 5957 BLAKE2B 25a60819172e9040e97ca28b43160066960031f870edf5c9515dd0158130ef1ec7a3f2aef717aa6691194146c7594b61d4b17b441b05b2648e8cf8bd22f653a8 SHA512 fe4c7a80cda3b880104b4670b51cfeb3e60b6840bcd7cffeab36cc9589522514a2bf97d76fcb70b30ff4ad7ca773c24bc70bc65ab5264c390d657cdc314bf027
 MISC metadata.xml 6850 BLAKE2B 09b018c447f618b91d62c1ae8c9ccd04de4dd51af951101d4a7cda7a9b9f43e6bd446a33140956213d088f8f0dbdffddbdcc33c52867780a2a2fd204c36c2d5f SHA512 e8421706eba7db126edf91040062edd5d2cee9c1d19bf1525b50f8d1d33044e8d35191810b8c3426a06b00e088c6ba724110aab10305f7f0dfc347b467b34e05
diff --git a/dev-games/ogre/ogre-2.1-r1.ebuild b/dev-games/ogre/ogre-2.1-r1.ebuild
index 2bf0d553581a..7757566b9317 100644
--- a/dev-games/ogre/ogre-2.1-r1.ebuild
+++ b/dev-games/ogre/ogre-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/OGRECave/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT public-domain"
 SLOT="0/2.1"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="+cache debug doc double-precision egl examples fine-granularity +freeimage json
 	legacy-animations +opengl profile tools"
diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest
index d59db5b81c7e..087321eebb04 100644
--- a/dev-games/ois/Manifest
+++ b/dev-games/ois/Manifest
@@ -1,10 +1,3 @@
-AUX ois-1.3-automake-1.13.patch 228 BLAKE2B c15d551e4b62a11435699c9ea8a5fc4632a5c6dd7af06f911288de2af20335e05bccb1546b806f4f3618cc34ca7be5c240dcf282df9cc90f35878c83bf75304d SHA512 af4d4e28abfe273517114cb6802f96091a0d0df0e36bbbdca39129e45b74c8af7d07cbcca25e03a1d7492704c271c64a17228eeefb7abe0cf764e261b1422ff5
-AUX ois-1.3-gcc47.patch 1225 BLAKE2B beaf1557e034d88cdcfea1e13112858494fb5a5276b3156398add5a4b756f5c6ff92adfc37fd8bec2c2471df1160da3d33369bbd406640782ee0d6e8b9495bca SHA512 4ef6ebfc4d2d446b221d576ba850cae4bdc2e3dce3d9c59c9e07421982a3d9ab9c663f3db8c7a45ce5411866f2670d920f27a022ff66be886f73c26154263df7
-AUX ois-1.5-libdir.patch 759 BLAKE2B 76d81ea7ee45bfcdb508fd83707e7509925610376134e3a97143533309752b1225b72ac6be873d78c1e1d66eef419c80c6bb331c7deb703b88890ec21d8e5b82 SHA512 069649b25d3eab86f78a9c65aace43d45c954b0857ee814d45b67130dac880c7393720281a0bddbd3e310ab7df1c21f2605be4860521f6f91c9da1eef3c74649
 DIST ois-1.5.1.tar.gz 554124 BLAKE2B a975cbd629b86618a607b275bfcd35fedfd897c8aec00ab1caad992762d2fef4197af5eb052ffd122c135b610f5611c76c9cce937ca002668e3c313bf08a1d4a SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340
-DIST ois-1.5.tar.gz 552786 BLAKE2B 2ac2d1d74c03804cdc1c0b8cd1e2a3661d9edfc8ae230d036f108dbffd6d8aa5778e2f708b468fd3364c0ba403d07b04c1744eb5a11b39d658ef5a21943a9df3 SHA512 5ab1dda7c25c1959ccbbb758ea3fda36bd62ad65f46e2c6b418317a5eb39e0bace52a44ae079dfb69fc58c90df54f8e50d589daae1100ec615325363c9d77513
-DIST ois_v1-3.tar.gz 136739 BLAKE2B 88dd3af2c8b253d9cacc5c65510c150ba50c6a47c1c2cd241bf366f38fba0560a7cef08392e338984e8b172020c4a4c37e5eab024fabc695b2f06f93393850ed SHA512 48b7355a9be9c66233691aa5461192fb6e537d284e4366ebf931a76ee3be30f2cf17a4aa350fce6b433eaecf4259414062b9dd5854eaf872b9a18294cfc640c3
-EBUILD ois-1.3-r1.ebuild 613 BLAKE2B 7f3c42b517ec592d693c0ce54a7cf0582ca181a3f8049f466b8465e0e9edcecfdf67d3092707e4c7a1f1eb1b7ee394bdb26ef5b9b8da0bc466e221f34869f119 SHA512 b7afdadc166810462135c61a1b067c11637688392765a7e874cf548129073a467d6a2b53ea731a3ba91c8f67259ccfe9c62fca2ef65d8f01328e7df34c5cfba5
 EBUILD ois-1.5.1.ebuild 479 BLAKE2B 6026fc130cd85aa9832bd5b4b367e9ca978fc078957ebe3aca60d20517bac69634370360d710dc7d5dde9356d8303dfc0baca549705dcf0486554bff08ff9166 SHA512 744662aea0a97364d8ac4d7a764babaab30e271db2d4a76a9835eb8d89d852e109e940e46c338595c779b504096429a56a80050a9eaf1d3806cf7ea5e50b9c98
-EBUILD ois-1.5.ebuild 498 BLAKE2B d15400a1caf013163870b17c3fe1848e7173a6f302854baa4d91b0f179452276248c22888e695ac80cd47cbae5b20f303f6f1e41e0754d9315cbc97f8298efb8 SHA512 d1bc5f379067bf033896fd43e943d6aa1976965cd93b35cfea808572e64ad0f52ae7a520c8b80bc96e3bd8a6dc36b9d3c493dc2ae7a20055d13163568b752afc
 MISC metadata.xml 378 BLAKE2B b17db51054c90cfc4dc19c8ffd9852ff2219853a08949995894cdc8a7f4291db4b5c93c923b0e6ab2abbcdf6e36e1ce46246e97e726432d853ee60e6942e5905 SHA512 95aa21ac48ec86ebc59b047a6bcc9b5116110ba169bbd46f5706223ecc7875e60464ad8780d091c7277e34316ff58717ed56d97d1c4a0649248fe398c97a3375
diff --git a/dev-games/ois/files/ois-1.3-automake-1.13.patch b/dev-games/ois/files/ois-1.3-automake-1.13.patch
deleted file mode 100644
index af7aa641e6ae..000000000000
--- a/dev-games/ois/files/ois-1.3-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,7 +5,7 @@
- 
- AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE( [OIS], 1.3.0 )
--AM_CONFIG_HEADER([includes/config.h])
-+AC_CONFIG_HEADERS([includes/config.h])
- 
- dnl Check for programs
- AC_PROG_CC
diff --git a/dev-games/ois/files/ois-1.3-gcc47.patch b/dev-games/ois/files/ois-1.3-gcc47.patch
deleted file mode 100644
index 71c7565e17df..000000000000
--- a/dev-games/ois/files/ois-1.3-gcc47.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/demos/FFConsoleDemo.cpp.old	2012-07-17 08:41:33.667876985 +0200
-+++ b/demos/FFConsoleDemo.cpp	2012-07-17 08:42:01.415928693 +0200
-@@ -7,6 +7,7 @@
- #include <ios>
- #include <sstream>
- #include <vector>
-+#include <unistd.h>
- 
- using namespace std;
- 
---- a/demos/OISConsole.cpp.old	2012-07-17 08:43:44.637681119 +0200
-+++ b/demos/OISConsole.cpp	2012-07-17 08:44:06.653135337 +0200
-@@ -12,6 +12,7 @@
- #include <iostream>
- #include <vector>
- #include <sstream>
-+#include <unistd.h>
- 
- ////////////////////////////////////Needed Windows Headers////////////
- #if defined OIS_WIN32_PLATFORM
---- a/src/linux/LinuxJoyStickEvents.cpp.old	2012-07-17 08:37:56.065155660 +0200
-+++ b/src/linux/LinuxJoyStickEvents.cpp	2012-07-17 08:38:33.236545721 +0200
-@@ -33,6 +33,7 @@
- #include <fcntl.h>        //Needed to Open a file descriptor
- #include <cassert>	
- #include <linux/input.h>
-+#include <unistd.h>
- 
- 
- #include <sstream>
---- a/src/linux/LinuxForceFeedback.cpp.old	2012-07-17 08:40:02.633268854 +0200
-+++ b/src/linux/LinuxForceFeedback.cpp	2012-07-17 08:40:28.642442655 +0200
-@@ -26,6 +26,7 @@
- #include <cstdlib>
- #include <errno.h>
- #include <memory.h>
-+#include <unistd.h>
- 
- using namespace OIS;
- 
diff --git a/dev-games/ois/files/ois-1.5-libdir.patch b/dev-games/ois/files/ois-1.5-libdir.patch
deleted file mode 100644
index 71157bca59cc..000000000000
--- a/dev-games/ois/files/ois-1.5-libdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/wgois/OIS/commit/0536741549a157627d4306f6e19f1cc5cb52cef8
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -229,7 +229,13 @@ if (OIS_BUILD_DEMOS)
- 
- endif()
- 
--set(LIB_INSTALL_DIR "lib")
-+if(UNIX)
-+	include(GNUInstallDirs)
-+	set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
-+else()
-+	set(LIB_INSTALL_DIR "lib")
-+endif()
-+
- set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
- 
- file(GLOB PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/includes/*.h")
-@@ -240,8 +246,8 @@ install(FILES ${PUBLIC_HEADERS}
- 
- install(TARGETS OIS
-   RUNTIME DESTINATION bin
--  LIBRARY DESTINATION lib
--  ARCHIVE DESTINATION lib
-+  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-   FRAMEWORK DESTINATION Library/Frameworks
- )
diff --git a/dev-games/ois/ois-1.3-r1.ebuild b/dev-games/ois/ois-1.3-r1.ebuild
deleted file mode 100644
index 7f4570d22647..000000000000
--- a/dev-games/ois/ois-1.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=${PN}-v${PV/./-}
-DESCRIPTION="Object-oriented Input System - A cross-platform C++ input handling library"
-HOMEPAGE="https://sourceforge.net/projects/wgois/"
-SRC_URI="mirror://sourceforge/wgois/${MY_P/-/_}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static-libs"
-
-DEPEND="x11-libs/libXaw
-	x11-libs/libX11"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-automake-1.13.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/dev-games/ois/ois-1.5.ebuild b/dev-games/ois/ois-1.5.ebuild
deleted file mode 100644
index a19595f71612..000000000000
--- a/dev-games/ois/ois-1.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Object-oriented Input System - A cross-platform C++ input handling library"
-HOMEPAGE="https://github.com/wgois/OIS"
-SRC_URI="https://github.com/wgois/OIS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^^}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-DEPEND="
-	x11-libs/libXaw
-	x11-libs/libX11
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libdir.patch"
-)
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
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 0992132918ed..03436147875c 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,8 +1,10 @@
 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-openexr3.patch 2014 BLAKE2B ea9d75986ea68519ca9d5dab066273cb8a5eb8a492c96131240d023660c939d948276c459a617413ba55b80767a945bfec038ac4ada7ca6f46185aeccdc949a4 SHA512 6cd446c69d99b68da6bf39862cdc81d51be534ed35cea9f2858dc7771dd189a9ee5f5c1f76ea1247680b03eff5b7ec3f2331c2e9505c17d5a6a3f3cac4d2ed1e
 AUX openscenegraph-3.6.5-use_boost_asio.patch 6995 BLAKE2B 0b0c0af9980b59e1cfd4cc5256720d0e69d5e3a65173c9364036e42efa34377beb00811fc4a0aee0cead870abe0c33feaaebe57c22cbefac43d4dcf65a1d19e1 SHA512 fa7c702eaf69c7b7890cf44e5293f9c8ea73ac441af1e4573dadd62f3ca797ccbbc2fbafd8c946a936192f7331fa16d8d4247de8b657db77791d5137207c23b6
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
 EBUILD openscenegraph-3.6.5-r101.ebuild 4242 BLAKE2B 678e3f538596a337bd4155770df526481c282bb1879e2a396d68603184795918cb7f2f6781ba5f62dd8447de26e48e13225456c4a5a53d7e4737ba016c1a5d62 SHA512 b3cf5a83ece032638e6afc2144ac97542e8e7575c4f985c7cde99e7d3f3ac5d5d63105310a3f59d801d348c8b3cda66ecb7467db0ecf05c2f4572f1e22743e5d
 EBUILD openscenegraph-3.6.5-r110.ebuild 4320 BLAKE2B 5897bfe924eb829b3ee64bfcba5ccd8ff26a4079270c5bcff2f004fc14fd07d957c312143feb2afc7915cccc0f048940afac28feb70f7b61efd5c65e90296157 SHA512 35a4645a916096f148639549406e69675fa6e874845e0e8b8cf4631270527236b21e7539238027e28e2ca211a7c07758faadd2a3ad1b2537160c6cb84cb80839
+EBUILD openscenegraph-3.6.5-r112.ebuild 4359 BLAKE2B 7729f57c54b8aa785388641a192a02adf2ffb6cf52be7c4fe08807e699ac663b0be5621b6a1c12dadc5a7ba199cfbf86707e523327d056449d878657771137ca SHA512 df653429e25a7919bf013021eed85fed5ab8243990d5ff1b7fcea383f1077a28e0aa84bc331949cd9a6582d80c162e70c03f8c37d51edb2c52e2e5ac1e648606
 MISC metadata.xml 1866 BLAKE2B 9165a16faa78d3298365ca0d0814f7e4f1a1f8d514d7dfb1dbe613f7ab2212e30ae7e8518dc430d2626967be779330179023f445d9214ac4b2062a08df1298b2 SHA512 7b9abb010e2021656bb4e48c84bd8d0879606f05ce9213323159e6f415cea1226cd6a3c2b7290dcb68c1a99dafce5295fd18b4ad542e2d888ac8d06ed0c4f03e
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch b/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch
new file mode 100644
index 000000000000..6a6aa57950d6
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/833491
+
+--- 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/openscenegraph-3.6.5-r112.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r112.ebuild
new file mode 100644
index 000000000000..2482729135aa
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r112.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="amd64 ~arm64 ~hppa ppc64 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
+"
+
+REQUIRED_USE="
+	dicom? ( zlib )
+	lua? ( ${LUA_REQUIRED_USE} )
+	openexr? ( zlib )
+	sdl2? ( sdl )
+"
+
+# TODO: FBX, GTA, NVTT, OpenVRML, Performer
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	media-libs/mesa[egl(+)?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	collada? ( dev-libs/collada-dom:= )
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	las? ( >=sci-geosciences/liblas-1.8.0 )
+	lua? ( ${LUA_DEPS} )
+	openexr? (
+		dev-libs/imath:=
+		>=media-libs/openexr-3:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
+	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
+	"${FILESDIR}"/${PN}-3.6.5-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-3.6.5-openexr3.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		setup-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		$(cmake_use_find_package collada COLLADA)
+		$(cmake_use_find_package curl CURL)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		$(cmake_use_find_package dicom DCMTK)
+		$(cmake_use_find_package egl EGL)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package gif GIFLIB)
+		$(cmake_use_find_package gstreamer GLIB)
+		$(cmake_use_find_package gstreamer GStreamer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
+		$(cmake_use_find_package jpeg JPEG)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		$(cmake_use_find_package las LIBLAS)
+		$(cmake_use_find_package lua Lua)
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package openinventor Inventor)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		$(cmake_use_find_package pdf Poppler-glib)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package sdl SDL)
+		$(cmake_use_find_package sdl2 SDL2)
+		$(cmake_use_find_package svg RSVG)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package truetype Freetype)
+		$(cmake_use_find_package vnc LibVNCServer)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		$(cmake_use_find_package zlib ZLIB)
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+	)
+
+	if use examples; then
+		mycmakeargs+=(
+			$(cmake_use_find_package fltk FLTK)
+			$(cmake_use_find_package fox FOX)
+			$(cmake_use_find_package glut GLUT)
+			$(cmake_use_find_package wxwidgets wxWidgets)
+		)
+	fi
+
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_VERSION="$(lua_get_version)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 4632ced9a826..975bd504e213 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,3 +1,5 @@
 DIST tiled-1.7.2.tar.gz 16743422 BLAKE2B 0d8ae95b2fc68326d0a4989b26535cd72900ddf9674ad892c287f9d7df2f551fc46c9fa9c8991315f55ae90663a9a5b9c4239fd2ed61c240a36a60102b2710b3 SHA512 6d766adbfcb642279eb0ba27410858c54a29ed8e697445b6fb96ce210d0b1433b1ed4715e1d78af3aea8ec71a87b24eea52216bf6236159e0c8fdf87a2339a59
+DIST tiled-1.8.2.tar.gz 17032015 BLAKE2B 92919e76f4753e3f8a3a98d421376ad35fe35fd1272e64cb40f382ea57020da63b6ea553529805b3bc356043bbfc18962c2874ee4e81b9a38b8629eb0ac8e1a7 SHA512 698add45d425d16a7b68c9b4d847cafb1d2b0633157614cbcec5f4dba23c1a65597bd2211b8c9f6b37af8ea2a4ca967fc71662672d79a8ea209dd9b0e3863413
 EBUILD tiled-1.7.2.ebuild 1428 BLAKE2B d526566cb012670ad4afa0bcca268649007485903bded989a9724d9896a501ca8e5f9f8e1af305eee652941105d6283862393c5f5532da2850c643eee7741f05 SHA512 40e9d5d96c02e7ea4fcb84f31554ea4eb925af949d6d136af1a396a3102505044d4e6c75af3bd9b6efffe995ffd972db747327597c87923bfd1771dbe16176c2
+EBUILD tiled-1.8.2.ebuild 1427 BLAKE2B 0e303d0160b01d416165ba1e803e2df8ded49cb61efdccd5cb16482cb2ff77fbcb429579705ad681f8fa140c9ab7ac06ae934739f05970e400c153ea5e3e3d2b SHA512 0440d0f65fc9c434b3f933540a40617f6fae6635aaa50bc87f5bb8e263e2ffe471dcf02cb47351fb026a29198a8acecbbab28ddd0e8ad2894da88f61ffcd506c
 MISC metadata.xml 298 BLAKE2B b8e8a5e1a77555a31c9ed843b75be176be5bee398cf3c15ca991b6a016183927ead361a2bd460f2df3474b589e6ba569a9cd1ca44c5496a95f5276ee12d8d6da SHA512 762d37280c2078d639da4bc2020b88acff3372868d89302dce385252bd535ce86c6fc8f97b75fed879d6ee07d7de8636b2ea01fe796751d79ed632a5f824ff15
diff --git a/dev-games/tiled/tiled-1.8.2.ebuild b/dev-games/tiled/tiled-1.8.2.ebuild
new file mode 100644
index 000000000000..fe51e31d02f0
--- /dev/null
+++ b/dev-games/tiled/tiled-1.8.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-arch/zstd:=
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtdeclarative-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtnetwork-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 \
+		LIBDIR="/usr/$(get_libdir)" \
+		PREFIX="/usr" \
+		SYSTEM_ZSTD="yes" \
+		DISABLE_PYTHON_PLUGIN="$(usex !python)" \
+		USE_FHS_PLUGIN_PATH="true"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /dev-games
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)