gentoo resync : 23.09.2020

15 files changed, 48 insertions, 28 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 79859ad7cad8..24c677d4f91f 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/irrlicht-headers/Manifest b/dev-games/irrlicht-headers/Manifest
index 0fc076453b3e..77aec2b1e0b0 100644
--- a/dev-games/irrlicht-headers/Manifest
+++ b/dev-games/irrlicht-headers/Manifest
@@ -1,4 +1,4 @@
 DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602
 DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
-EBUILD irrlicht-headers-1.8.4.ebuild 827 BLAKE2B da0b2b2c12d8aba08783bb1c23529b3c2677611709ee0dd3d058c977c01b69b29385285bf9636b3216cc64bed740084c43a889accf4d3e068722a320742e5b1f SHA512 dd8ef4bfecc9e059ac155e33c1dc1383f05b7a6c50831fe54597c0d19534387668fc71200fdc47e251303517a64542a1b9a315992c0814cff1ca7372edcbd4bc
+EBUILD irrlicht-headers-1.8.4.ebuild 830 BLAKE2B 204eda8aca77fb4d33d337fadc82007e92c37a9fb4cd009eac4a108e4cb601f9f17dfe5fd03b7cc7df7f18d9122d711fd1e194ad21f85e10993ad1dc611ac688 SHA512 61c42bc1ed9efe55fd70223078930484497680ada9596aedbdb31a86d80137d300196c9269bd128545f1c0a82625478465d1f097801047136ca32511e7645f71
 MISC metadata.xml 331 BLAKE2B b63a7cd01d0d4551df887c59d80e625c665f58ac441ed4c6880be77ec10da835a773595e6f2a636086e32fd5e33c525587d466d35755ed858daa9a6a77624d15 SHA512 0632da2209b151f36b672ec200a4a60412489d9d40d1e42de49706f07232377c60b817be2815a22682dc4c39d1797e1c88b0f9bbf0a40466d7578da7a9695c67
diff --git a/dev-games/irrlicht-headers/irrlicht-headers-1.8.4.ebuild b/dev-games/irrlicht-headers/irrlicht-headers-1.8.4.ebuild
index ab9daf82d8e7..2996e70be608 100644
--- a/dev-games/irrlicht-headers/irrlicht-headers-1.8.4.ebuild
+++ b/dev-games/irrlicht-headers/irrlicht-headers-1.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils
+inherit edos2unix
 
 MY_PN="irrlicht"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 8d0cf0254b14..410aba461f9c 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,8 +1,9 @@
 AUX ogre-1.10.12-use_system_tinyxml.patch 1617 BLAKE2B 0c0213b9ed63030d2538817ef73bb26d02a02e8e62d5acc923e748d9c1b9a24c4a9868e19816cc15c2b71a0b0c58974147ed0c7a019fbc5d1e5cb3640e9aabbf SHA512 b97040417bd1ec29e2b90a6b6a6ba82ab790786c08c994d77d1440d3c2054e7850b420850584f38d0783aa4c60f13b3ac8fcd32e3fc72f57554f6819e65b0bda
-AUX ogre-1.12.8-fix_Simple_demo.patch 538 BLAKE2B bfdefb5064efe77db364f43eb6b212ac02eccdc1ff2053db9bb644d348448fbb536ae5e61fb8717b85db63fd6c27d270ca564a3619b3e51ad602d9d9ffefbd31 SHA512 4d67d349c566ace6ba310abdf53d36981f21cf1e176e003f3945afd34cde4d2728112f41c823c15b869e69df11390c3b45a898b3ca4ab92174dca9c613d24a27
-AUX ogre-1.12.8-media_path.patch 639 BLAKE2B b7480ae5661df88051b11223bb7fc65ebf4c56f4f015da47fbe3d44714d656b9df3376d5c33845d7306fa2a2fcda1b382a95a87068f2838f21781a2ed3b16597 SHA512 95c0d3b457c289724fd638c6627a50c28745bf54c5524bd70316901387e5e78b90542b1457073f263f7c62fcf184053a1c253733d0699d91550f70ab46fb879b
-AUX ogre-1.12.8-resource_path.patch 518 BLAKE2B 06b0bdc7d5cde392ff59c4f2af0a6351740b0e08ed6816eb9b286573fae5201e9f502280815971eec9e957ee694871e10ea4274a1a532c867fb8fbd1ff6931fe SHA512 7b112f2a4d57159eff028e95a23aa615ad4a47280f2516cee1c5d38e5e476bba6acb0117cc716051cddb016c5b3a4218b283c60654bf3f80a1808a4d653b34ec
-AUX ogre-1.12.8-upgrade_imgui.patch 1147 BLAKE2B 430764b1bbf91c47694cf986f70b22eed2d2be21d2d1f5341077248ce630089ffb7020be52fbb00129853505dc8669906f60f611a8f59cb7aaecc40d1b4ad280 SHA512 aea86520d72d0f85e1176ca08be1d3c15048f26cd4f27323f9cf3b11ded4e0056a2463b9ce3cc6803755258c00de2c7adc72fffa6b0d6b4f3ddb6054c674e459
+AUX ogre-1.12.9-fix_Simple_demo.patch 538 BLAKE2B bfdefb5064efe77db364f43eb6b212ac02eccdc1ff2053db9bb644d348448fbb536ae5e61fb8717b85db63fd6c27d270ca564a3619b3e51ad602d9d9ffefbd31 SHA512 4d67d349c566ace6ba310abdf53d36981f21cf1e176e003f3945afd34cde4d2728112f41c823c15b869e69df11390c3b45a898b3ca4ab92174dca9c613d24a27
+AUX ogre-1.12.9-fix_config_window_height.patch 648 BLAKE2B a7a6670ed4f068ac5fc02ddb40522e6399d829fa48dc1a46a4f5505b1e21285ed4b8795056814d4ae72f56ba01e3a557049ed9da75cfc4cd676628be87a51a35 SHA512 ed041cfe5b2c7694afed6e8ee0b4f232f950703cc589c3df796dc3d66257099ab46a324b09e24e518ea14bdc48805a86747bce40b836bb4018b6b0af1dd712a8
+AUX ogre-1.12.9-gentoolize_imgui_inclusion.patch 1084 BLAKE2B b1e47e13e33fb5f379d4af271f63f0e1b1c94aadef0c2b0c59c6d20fc3dcc43611522ec917c61f7574c3f10a1465bc98b466889b8355b59caccf9d0cdc3cc05e SHA512 3e24e1602b30db3bc06b5fb820669a57b53465a74a09203e64bc8a55d9c6df9b2ecc3cb71d9ad7cf1a268d17f4a017373c457ca95b21178eb60dca2521f622d9
+AUX ogre-1.12.9-media_path.patch 639 BLAKE2B b7480ae5661df88051b11223bb7fc65ebf4c56f4f015da47fbe3d44714d656b9df3376d5c33845d7306fa2a2fcda1b382a95a87068f2838f21781a2ed3b16597 SHA512 95c0d3b457c289724fd638c6627a50c28745bf54c5524bd70316901387e5e78b90542b1457073f263f7c62fcf184053a1c253733d0699d91550f70ab46fb879b
+AUX ogre-1.12.9-resource_path.patch 518 BLAKE2B 06b0bdc7d5cde392ff59c4f2af0a6351740b0e08ed6816eb9b286573fae5201e9f502280815971eec9e957ee694871e10ea4274a1a532c867fb8fbd1ff6931fe SHA512 7b112f2a4d57159eff028e95a23aa615ad4a47280f2516cee1c5d38e5e476bba6acb0117cc716051cddb016c5b3a4218b283c60654bf3f80a1808a4d653b34ec
 AUX ogre-1.9.0-gcc52.patch 2392 BLAKE2B 3d41e4a6726dabd2f4861774c962a0b5e38cdc5403f3bd457b2ec4b003de6d3c59511a6b9590baee376b543520a00acd3df0839e5d045966d6aac8ba49c6a3dc SHA512 ade6885334698ea2df8a678b3b9058f2cd06aa6c32dd57645e5b28e3f22cbaacc4821bbd661e97ecc426f216114dd9595d9b98c9368061561afea82779a942c7
 AUX ogre-1.9.0-remove_media_path_to_bindir.patch 545 BLAKE2B 162ca81d22dfa100f624f3c62095bb3cd8bfff884e0754991904fbbe37ab60177d920872ea4955d4c8e3fd95a81f6488ed6ba6894dd1b0c7fe0b376ac62d9105 SHA512 7248e6dba4837765ebf0bc1cd06c07891ea785a415ecbd279f1d6adc88b4a8aae0a12993635d9139697771e8b94739e709e2410754e0e004571d1a48a1bf614d
 AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 452 BLAKE2B ef6aedfe4ee2bc1e17106164fec1d82a7fe927d5240e90c1db8a579dbf4fedc11e6b3cacb5138172fa198bf5681df09309412b6a48079353bd14568b667d5db4 SHA512 57cef0efbbbe791234b117556c6f56051ebeee90a1b1802a9fc8e106edabbfa53f96a2e43d4c332a8631b04954e87676444cdca417bcc8957f860d041f80d2b9
@@ -15,12 +16,12 @@ AUX ogre-2.1-fix_warnings.patch 873 BLAKE2B ab0aaff5855a7da70a42c4ee15e4e210b00e
 AUX ogre-2.1-media_path.patch 857 BLAKE2B 76b02d1aebd737dff20ac7616d324d28129e122f94d714c758e5f112fb2c52127ad76b47ebe8c96827d83dbb5130d3e75caed7466872385e6b2a482dc08efd29 SHA512 77fd07c9c1b51fc6925183eb0a62bc5c4690f964b4072c1f5d6864e436563ece25e498fba8d0b83126dfb56c967aca5b098cff219a2480b5c0c0f63646f62376
 AUX ogre-2.1-resource_path.patch 570 BLAKE2B f37d65d0a9b0abccd487b150b48950f2d7cd885ee2aea2f7015a51af316dc28ba357f3e163af9bd1ddd3d982eb40e54ae065419cd8cc50599b12b6dffd233080 SHA512 b5f476e2fc8b48dc1e98794d443ffb4f9c485593f1d3357a0892a8d3bfa46a7a42cd6c7470383cae051d7c54f154f2f6e2e4db70094963085c5eceaa4d813494
 AUX ogre-2.1-samples.patch 1108 BLAKE2B 0b3b5bdb93f58952993a9a92c52b6057ef37e308fa93cbf1833a564f1188448c7eccb725eb37a591c18a7d4bc6f752454e52d08308be231e8602669720019730 SHA512 586b18f301906a82acad1d8211c8f63a2fd0e587dfe160dbddf0821893f17b7b1f772f1d5116e1adedc62017eb27eedc5fc30e0e861ae1c2ba12bd3bcc662372
-DIST imgui-1.76.tar.gz 1256126 BLAKE2B 801e94e1007e41c5b7281bb30fc7da76ddf0e755bf3ec2c4eb90d730dd9c68685f3e4819f32acc2154fbcd4e32da9d1de6dac36b0cd8885a93457475576b4336 SHA512 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa
-DIST ogre-1.12.8.tar.gz 125932831 BLAKE2B ffd4a443e374ad3f209b4f8a5e18a41b3dbfbb528d20581f48a4d31447e1e20a3b1cdde588b6345bd07d864c9b72ce1e51374de52523e7c4477408c01778af69 SHA512 c446c58b57874d3e2522f7e0315771b7a9f5ac8888449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2
+DIST imgui-1.77.tar.gz 1269147 BLAKE2B be0db9b77903664db0fadf1672ec23983dc89292fd261a1e89c1eab88b82e95de7c2af37eb7ef43cc994b889fdf7d7fb2dd1282b93c1f3b1166c7fe0d2dccaf5 SHA512 d5ebf4bb5e1ce83b226f2e68b3afe0f0abaeb55245fedf754e5453afd8d1df4dac8b5c47fc284c2588b40d05a55fc191b5e55c7be279c5e5e23f7c5b70150546
+DIST ogre-1.12.9.tar.gz 125955067 BLAKE2B 5676690d2d9db8c4c903b7bf3e7660ddf5c0675eb11e1b34f08a5a50739d6212e986c7b500173ad5edab4835d96c705f86cc0fd37e1ff1e64a161ab1ce8968df SHA512 a80525a4924a430ccac3f01f93a5f36b4b9d2f7671ef0629d7dd21d3651ea7a698d5cc520eb814c6ee4c0ee7efcd3f6a8f16688773300a25537636bb61eba286
 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
 DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5
-EBUILD ogre-1.12.8.ebuild 5814 BLAKE2B 4e669001578ceee0c14018bf865cc2586758bf0703f902e19c2427132a4d8c9695105990fe49ef17a62d1414f4da99568c1c10e100562984755ff9ec70868ea4 SHA512 4fdd4bb4336fcd1e5e6d7a6e54c9e6b9c4dddcc544301ea22c123f91293e891b11cdc51e09a8d200881a11ba2cbbbf7f33dda0764c3828b2eb2ce68e8df57052
+EBUILD ogre-1.12.9.ebuild 5879 BLAKE2B 40ca82f07bade00a108b257ca17e04e14b96f1455e7145a67a93258c06e7f649c786503a4c2a6cd7362f576f33e33ce41088d17d87e27bfc936963ec41d08c08 SHA512 2ebd8d777ff2145fbd6987835dbd57be177aca764cf213c04d3547ecc069fa00eeda5ea1bd7bec20d22a6d0bd42140340c800427ed2b78a4aba39449a7aab1b9
 EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23
 EBUILD ogre-1.9.0-r2.ebuild 3589 BLAKE2B c52ab761a94ebb2d5e6c8ac232d4071d1062b172d849fab6c6e4a55c21f27100899ee53d2ec9f36f9f78b20540d0b98e1c301d47c91db10a645ecfa045f4710a SHA512 32079693e35a493a3b6f093c1ca17f8602cde92a0dbaef82862258a12e3b92fe12ec4d4a55a59601065a9a5a5a1370e8b2d32983f62d7687338e52dcafba767a
 EBUILD ogre-2.1.ebuild 5949 BLAKE2B 26522e0c5d3ca1e01a9a533a1fb21d8ca21632abb3d05f26993a32a6c60aba27af8626cb88d537e968981f18429aaa3d2a400447baf4ddaafb962297ca269298 SHA512 50fd86fdc82b252c7ef9fab7c8c2bf99319d838efe4e8e124719658122a4c35213e723ec2d89dba0a8ae06c706867806caf4ae5e11920844a81bbc5323457769
-MISC metadata.xml 6671 BLAKE2B 5153819b38f65ae518bfaf3c7272ac3002113a393f6a8eb220d3e503fa630e09e746b964f74c9a33e8b9db7cb746202fdcaf43a5a2ef808b310ca98812edd5bd SHA512 1c390764a7697a74ff402a580f42087f1fa569cb6570194de9e56851bab9a075c17488490a60a793f2f59f3b243daf336f700faf3de0f70a1feddf6df7621213
+MISC metadata.xml 6849 BLAKE2B 078f3c5dbe0c558dab497c79b1698e3f9244b0cefadd7f0e2aa2126cc44a98b4dcc8059250765d2e8c662286de5519b7705e7167fd18fb2f4ba59b2dc2ed2c53 SHA512 0b41e4fe3601f07ca51954dd902d33ccc61b07834f8b98539e2f9b039bc9f9371ee58dd69736263a3f517063143fc9cffd0c985dde8696812e1a077bc213cf41
diff --git a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch
index 49ed0190e0a1..49ed0190e0a1 100644
--- a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch
+++ b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch
diff --git a/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch b/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch
new file mode 100644
index 000000000000..12b4ce86a86f
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch
@@ -0,0 +1,11 @@
+--- a/Components/Bites/src/OgreGLXConfigDialog.cpp	2020-09-21 15:17:33.783741691 +0200
++++ b/Components/Bites/src/OgreGLXConfigDialog.cpp	2020-09-21 15:17:35.948741768 +0200
+@@ -74,7 +74,7 @@
+ class GLXConfigurator {
+     /* GUI constants */
+     static const int wWidth = 500;      // Width of window
+-    static const int wHeight = 380;     // Height of window
++    static const int wHeight = 340;     // Height of window
+     static const int col1x = 20;        // Starting x of column 1 (labels)
+     static const int col2x = 230;       // Starting x of column 2 (options)
+     static const int col1w = 200;       // Width of column 1 (labels)
diff --git a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch
index 4c7803a0a2f2..765a53d4695c 100644
--- a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch
+++ b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch
@@ -1,17 +1,16 @@
---- a/Components/Overlay/CMakeLists.txt	2020-08-16 17:45:59.605165822 +0200
-+++ b/Components/Overlay/CMakeLists.txt	2020-08-16 17:48:45.796175402 +0200
+--- a/Components/Overlay/CMakeLists.txt	2020-09-20 16:13:41.280993468 +0200
++++ b/Components/Overlay/CMakeLists.txt	2020-09-20 16:14:52.468997571 +0200
 @@ -19,14 +19,14 @@
  file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
  
  if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
--  set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.73" CACHE PATH "")
-+  set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.76" CACHE PATH "")
+-  set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "")
++  set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.77" CACHE PATH "")
    if(NOT EXISTS ${IMGUI_DIR})
      message(STATUS "Dowloading imgui")
      file(DOWNLOAD
--        https://github.com/ocornut/imgui/archive/v1.73.tar.gz
+         https://github.com/ocornut/imgui/archive/v1.77.tar.gz
 -        ${PROJECT_BINARY_DIR}/imgui.tar.gz)
-+        https://github.com/ocornut/imgui/archive/v1.76.tar.gz
 +        ${PROJECT_SOURCE_DIR}/imgui.tar.gz)
      execute_process(COMMAND ${CMAKE_COMMAND}
 -        -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -19,7 +18,7 @@
    endif()
    list(APPEND SOURCE_FILES
      ${IMGUI_DIR}/imgui.cpp
-@@ -84,4 +84,4 @@
+@@ -80,4 +80,4 @@
  )
  install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip"
    DESTINATION "${OGRE_MEDIA_PATH}/packs/"
diff --git a/dev-games/ogre/files/ogre-1.12.8-media_path.patch b/dev-games/ogre/files/ogre-1.12.9-media_path.patch
index 3030cc5b9fad..3030cc5b9fad 100644
--- a/dev-games/ogre/files/ogre-1.12.8-media_path.patch
+++ b/dev-games/ogre/files/ogre-1.12.9-media_path.patch
diff --git a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch
index cf35e2f99e8e..cf35e2f99e8e 100644
--- a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch
+++ b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 43330db8ca14..db70daa77363 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -77,12 +77,13 @@ Exporters
     * Maya (meshes)
   </longdescription>
   <use>
+    <flag name="assimp" restrict="~dev-games/ogre-1.12.9">Use media-libs/assimp to import assets from 3D files</flag>
     <flag name="boost">Enable boost support</flag>
     <flag name="cache">Enable GL state cache support</flag>
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="double-precision">More precise calculations at the expense of speed</flag>
     <flag name="egl">Use egl instead of glx</flag>
-    <flag name="deprecated" restrict="~dev-games/ogre-1.12.6">
+    <flag name="deprecated" restrict="~dev-games/ogre-1.12.9">
         Build deprecated component 'HLMS' and nodeless positioning of Lights and Cameras.
     </flag>
     <flag name="fine-granularity" restrict="~dev-games/ogre-2.1">
@@ -112,7 +113,9 @@ Exporters
         (default: case-insensitive + sensitive lookup in all groups)
     </flag>
     <flag name="tbb">When USE=threads, use tbb for threading</flag>
-    <flag name="tools">Build and install MeshUpgrader, VRMLConverter and XMLConverter</flag>
+    <flag name="tools">
+        Build and install AssimpConverter (assimp USE flag is enabled), MeshUpgrader, VRMLConverter and XMLConverter
+    </flag>
   </use>
   <upstream>
     <remote-id type="bitbucket">sinbad/ogre</remote-id>
diff --git a/dev-games/ogre/ogre-1.12.8.ebuild b/dev-games/ogre/ogre-1.12.9.ebuild
index d7a634ba0da9..74d3cd557a69 100644
--- a/dev-games/ogre/ogre-1.12.8.ebuild
+++ b/dev-games/ogre/ogre-1.12.9.ebuild
@@ -7,7 +7,7 @@ CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
 inherit cmake
 
 IMGUI_PN="imgui"
-IMGUI_PV="1.76"
+IMGUI_PV="1.77"
 IMGUI_P="${IMGUI_PN}-${IMGUI_PV}"
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
@@ -19,7 +19,7 @@ LICENSE="MIT public-domain"
 SLOT="0/1.12"
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="+cache cg debug deprecated doc double-precision egl examples +freeimage
+IUSE="assimp +cache cg debug deprecated doc double-precision egl examples +freeimage
 	json openexr +opengl pch profile resman-pedantic tools"
 
 # Note: gles2 USE flag taken out for now. It seems like the Ogre Devs now rely
@@ -50,6 +50,7 @@ RDEPEND="
 	x11-libs/libXaw
 	x11-libs/libXrandr
 	x11-libs/libXt
+	assimp? ( media-libs/assimp )
 	cg? ( media-gfx/nvidia-cg-toolkit )
 	egl? ( media-libs/mesa[egl] )
 	freeimage? ( media-libs/freeimage )
@@ -75,18 +76,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-media_path.patch
 	"${FILESDIR}"/${P}-resource_path.patch
 	"${FILESDIR}"/${P}-fix_Simple_demo.patch
-	"${FILESDIR}"/${P}-upgrade_imgui.patch
+	"${FILESDIR}"/${P}-gentoolize_imgui_inclusion.patch
+	"${FILESDIR}"/${P}-fix_config_window_height.patch
 	"${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch
 )
 
 src_unpack() {
 	unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed"
 
-	# Ogre 1.12.8 includes imgui, but as a submodule, it is not included
+	# Ogre 1.12.9 includes imgui, but as a submodule, it is not included
 	# in the release. The build system tries to download it, that may
-	# a) fail and
-	# b) uses an old release 1.73
-	# So we are doing it ourselves.
+	# fail and so we are doing it ourselves.
 	cd "${S}" || die "Unpack incomplete"
 	unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed"
 }
diff --git a/dev-games/openscenegraph-qt/Manifest b/dev-games/openscenegraph-qt/Manifest
index eecdd3894130..a4ca5133db6d 100644
--- a/dev-games/openscenegraph-qt/Manifest
+++ b/dev-games/openscenegraph-qt/Manifest
@@ -2,4 +2,4 @@ AUX openscenegraph-qt-3.5.5-cmake.patch 3190 BLAKE2B c8a52a2d0b626e7a12b3f683380
 AUX openscenegraph-qt-3.5.5-qt-5.11b3.patch 1115 BLAKE2B 0a90b65caf3209d51ec699490dd6b1863fc965c54cb5fac5dcfa2efc4997225563d44842c9fffa07b6b2c75d62fe9577f56fcb067966bbf1cd9031c8677f41be SHA512 9223a53ae700fc25aaa02a0feef5f69313c94d05415c0372d55f56a9996ab3edb6712ea19b07bc507d7b1c8db21e4c9dda177eeaad094d94fc04133cdeb7ac10
 DIST osgQt-3.5.7.tar.gz 1000217 BLAKE2B f0279b122fc9492d29ea0c55afa81376d2ad4a35c42b301312137ca6d375fd2ef519efacfaf2f77b9dc3a7a26313b3d3213fc0589359c89695835f12488e6efb SHA512 5698b824f6e747eaf19b970784dce6e38fbe50176e6c5d0cab86dab417c8831036c0f050fc52f1ab2a79925f8356dd43559aa123aab4b70a4df28273125e4d03
 EBUILD openscenegraph-qt-3.5.7.ebuild 1019 BLAKE2B 0287159f2698e4598331872367545f89090fa65d3470dd907ab2076b230167bafa0d2fbd716f0ab724550debc5fceef8a8e35001936936ee6e5c7e9e5525349a SHA512 9a2520187e86889d3217ec603764d6ff9dd61a84a0082e6e0cbfa27f762e8a7d3f52c6852a290e99c8e2555edb6bcf858124e0c683afce736b686d91f10ba0ec
-MISC metadata.xml 997 BLAKE2B fbb3c9765491c15ebd269fde3aa01ef177d038f1a0f1d1f189adfb457aab8dfd69774c074235a7f95d6d02c53dfa6ba5872d50cdcbafc03141a8b5ba44d823dd SHA512 3b5f9b2f408f6f68a28f3427d463d0036d1b6286df549d189ed4d88ebe0a607a3d570f98fa11035f440e684f55f6d7d3f1383b281c37a1be3f611cfb8d530169
+MISC metadata.xml 1082 BLAKE2B b03aba1cb34ba9e0a98819db75093c9e8ee5a58ff97b33a236eae5d5653779ddae020be745207df5a13b4e12db8fd81a8828cc9ccc7d210d6f566aa807add29f SHA512 7c1fc8c502e4068f5bdc19543146fedad0cee507fc478c653d15798678422c2010463d2fb0859911646b69543f6d040f9b21b01ed3e1c8f45ea1a3d633279b47
diff --git a/dev-games/openscenegraph-qt/metadata.xml b/dev-games/openscenegraph-qt/metadata.xml
index 53e9ef1d7edc..8357d9c234b6 100644
--- a/dev-games/openscenegraph-qt/metadata.xml
+++ b/dev-games/openscenegraph-qt/metadata.xml
@@ -12,4 +12,7 @@
 	<longdescription lang="en">
 		The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries. This package is a module for Qt support.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">openscenegraph/osgQt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index de671a8ee191..391ce0d6fd1c 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -4,4 +4,4 @@ DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab2514782
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
 EBUILD openscenegraph-3.6.4.ebuild 4084 BLAKE2B 1cdcd148184400626cace2503ca2d0606584c35f945dd510fd5a3588dc14f002b15bb3bbad765af147a3d520ff25cbf6b858f043e4b9741043110c798aef1e3a SHA512 662490b464497b06b3b210327244c71b820dc20502ff1b7f32d0effe788de74d325935860f84a4f32f04de62cf24e2f241cacbe0da6e92f306050bb3e975135b
 EBUILD openscenegraph-3.6.5.ebuild 3999 BLAKE2B 164e857edb269a18453ce00da9d7c80ff8f4cf4c3daf765a10eaae2ed4f46bfdb3841a4fbbb10170139417a664b5aa1fcff5270889f6283a7e8e494a845da9ac SHA512 af11df69e1e7c948ddca05c59653534f99c7644887ce0c4340b83b69873e5e81a0fa0701496b38df30a3e65d6ddde052525b2f52f02cb6bc75e1d070f8a10dc7
-MISC metadata.xml 1759 BLAKE2B 6cdfd94a0888ac7716c282b7a473fdc23b00542bf55fe0b7b271d81dac36e1dbe6ef6923a3f6a48d6730b27fccbe6a197ebdce0c3611d736cd6674aec9ae35a8 SHA512 48f68b29d2d8ab7aeb31bdd7322ba39f1c5f9c4c14a301c828c084a774e80a818e2366bbaf2728d1a32a9d20b62bda2a45ab49a331c160d4359c1175787a9999
+MISC metadata.xml 1853 BLAKE2B 038f64d567fb10f67d1b004d704ed6cc43e95bd5396f10b486e98e95dfb61bb21c15081044c07faa95397f7f57220e7575113507f5a3d0eff256a06b6b791b18 SHA512 1fb1aa5e600d15060f84e68748b8c86266788f859f847a6789896aad1129b88e546f631fc38532d5c4f95d1eeec6195a8eb7137c45701cb4b84e0e72ce234f99
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index fca914ad5596..9345e47b8272 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -24,4 +24,7 @@
 		<flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> additionally to <pkg>media-libs/libsdl</pkg></flag>
 		<flag name="xrandr">Enable support for the X xrandr extension</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">openscenegraph/OpenSceneGraph</remote-id>
+	</upstream>
 </pkgmetadata>