gentoo resync : 15.01.2020

28 files changed, 396 insertions, 362 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 69b3a47c0a66..6b26b2fe4eaf 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 2b4349ed57c4..adfc6ed31252 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,4 +1,4 @@
 AUX freecell-solver-5.14.0-cmake.patch 463 BLAKE2B 12d0f5bd556a2ab70f8795b567d5e11346945828977ec0291b5010c3e6d872a66bb68816d712c444a8aac3c9010fa4052eea3241e0f2d581205b484351b453cc SHA512 61dfa3c7ceed310bf4056a5bb1cfe7775efe170f2ff8b171ef58db76040cc4c490e6bf6d36db5cc31f6aa6e82bc703193f2cbf3a9735f912cb1cd4fb8a6739d9
 DIST freecell-solver-5.14.0.tar.xz 407912 BLAKE2B c9da3557d9d073e017215cb0e0c64bfabeeb001c6e8373cc7e35aac40b2722f18966bb7ebf041e869c9e5c1fdbf0fc24e652fef688707c3ee69b300d8fdc246c SHA512 21c8898673e402514c6d40ae0045d6e9077b1606430465bfb146507fbe098be6ca4f88d976e2dafadbc8e84b5aeb9325b58ce8a384ea4ed6de4f5fec485d51ea
-EBUILD freecell-solver-5.14.0.ebuild 1199 BLAKE2B 576bda54432a7b955eb314d3ca353dc56d03dbeb0150938f10489588c9400be0fe395346f369f1a2f3950de0f903f28c077a585f99ef02d68d81301a3a205141 SHA512 4d1654cda0f554700d205c4c04b5c6ae55a2b406423981ff099aad1eedc3f8b8d698b0fafbd6232668ba1b1df3b1b651044d8d0456330fe54dbfa9d4a2a374f4
+EBUILD freecell-solver-5.14.0.ebuild 1181 BLAKE2B c7db101d095c478ef4e1fdbb22119633e4119c54bd80276b854e907387dc2f3a391126f73400268aa0bc89058d3bd6ecf754a2712f666420e385fe2ccd02370e SHA512 32e19ba6db20fc73ef10a156c12d69b16d7d703c8e9af0fcee575f8204c2efd56eba530c11bc45c0283c5c34040d1d607b695efff5d6c76abc6832e408844be3
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
diff --git a/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
index b74bce4f4335..f3f63a5b4170 100644
--- a/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
 HOMEPAGE="https://fc-solve.shlomifish.org/"
@@ -37,7 +37,7 @@ src_prepare() {
 
 	python_fix_shebang board_gen
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -48,5 +48,5 @@ src_configure() {
 		-DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 1aeecbbd21f1..8e8e82a48357 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,24 +1,20 @@
-AUX ogre-1.10.11-media_path.patch 922 BLAKE2B c39dfa7eec840d5952dfb0b854396268e418d79fcb2de71886e276cc6984c2fd30180bc3b003bac47aa41b02dc0b3125f130325f1d0143ddfd29f5b42814a5e6 SHA512 5d9e8cc0dbd263a6e8044ea908399e5538aad1002af8a61e4c056fcd3ab5f5573caf5082dc428f4be91d6379298c42ee5b478aab5eac4ae1c2261504627368e3
-AUX ogre-1.10.11-resource_path.patch 782 BLAKE2B 9f4647d38880ac9cf29513159113cf2dc4b173846737ae5e0be74e71be0a02c42790260c86b5ed0382e04e43a75ed931702232421e589dc4011f69584ee949d5 SHA512 61e6f341377f0025ba1bcc4a3edcd6600e811e5bef83dad0f7bcbb8ec1f5d8bbcc2c238eee4cc556523eb4f36be833b6ab3d910da9a4d35186377a75fb6bcf89
-AUX ogre-1.10.11-samples.patch 225 BLAKE2B 52965ede36ed80a72f4cee7fb9800146ab95787e8f3bacf5d69d6fe35a29349f674cc5819b576def33bd0f8e4ead8160cb50822100fbd6bb39aaf9f39f53caa4 SHA512 08d94b7b381debcb2f40b7f4bebad76ea4ed8823fc5809a2a01ada75e36ad870c290aada1495f766c7c9cc446b24fcfdaddf7f518411da90edea827c76814528
 AUX ogre-1.10.12-use_system_tinyxml.patch 1617 BLAKE2B 0c0213b9ed63030d2538817ef73bb26d02a02e8e62d5acc923e748d9c1b9a24c4a9868e19816cc15c2b71a0b0c58974147ed0c7a019fbc5d1e5cb3640e9aabbf SHA512 b97040417bd1ec29e2b90a6b6a6ba82ab790786c08c994d77d1440d3c2054e7850b420850584f38d0783aa4c60f13b3ac8fcd32e3fc72f57554f6819e65b0bda
-AUX ogre-1.11.2-fix_sample_source_install.patch 1258 BLAKE2B 36006bb1e543638e1cb45c27f0a22507a98b919e336b795c5f2af33ab23dabefc593bf1cec678d3125f34bff364ade37d97592990b0e0a0c29cbe9c2ebcf3043 SHA512 db2e26199e264c29f1e1dcbf92fc1fdc82c9e01f089b3ebe789ab408e1653ae1261bf53cfaa86aff90083d7cde085e7cb6308d5d6b5786d8ee7a18f1ed62b7ed
-AUX ogre-1.11.2-media_path.patch 927 BLAKE2B b82d5986ca041534f1edfe4e5a1a0b62cab487406bff3f846b7686f37bd01646e384356a0a21c86a788aa603932e9eca24aaabf22b221f49914d55335aef7088 SHA512 20ae6a5599536d0e916fa1b05e4fe84fef1d4988b59af3c3212c796b9c6783680b339e522580381ef9b7f50239f47be701a73bbc4f7d7a7c1b4e2181e159db0b
-AUX ogre-1.11.2-resource_path.patch 589 BLAKE2B 4620819c5e14f0c6b034ea52845c1fb3ded4db08ce39b80a48dc89191c0521499020916a89d720b887bc9f59d3d33b2863d168411543e25889f525b5d43e5fa9 SHA512 2995f2720a188ffa9811f7073d97d3e2bdbaa08d81b3530f28dfb39d682c2934ce16fb7accf7b47a02384167acb01c9fb90900ad7a8ab766b3b8cf5ad75e5086
+AUX ogre-1.12.4-fix_sample_source_install.patch 823 BLAKE2B 1fb07cb5cb48998df9dc338bfd650bf6ff7f4a7a0b50c11d04e115ac1671ea065ba6fd642439fa286d67441ff028f85f68c52063dbdc05bfc606106d3dac37ba SHA512 80b9503caa2bb16514a6484ad0fe19b1ae4c3bc8be212d87363f43b4f33bddb5e9c3628c7772033517b0a61a0a04e5544c7e5689b62c9494a027208f5c1ca538
+AUX ogre-1.12.4-media_path.patch 639 BLAKE2B b7480ae5661df88051b11223bb7fc65ebf4c56f4f015da47fbe3d44714d656b9df3376d5c33845d7306fa2a2fcda1b382a95a87068f2838f21781a2ed3b16597 SHA512 95c0d3b457c289724fd638c6627a50c28745bf54c5524bd70316901387e5e78b90542b1457073f263f7c62fcf184053a1c253733d0699d91550f70ab46fb879b
+AUX ogre-1.12.4-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
-AUX ogre-1.9.0-samples.patch 226 BLAKE2B d6bf78992d23d50d5f913238eeefed1e4e301eee3989dd759d2709db6c43e16826906f2f7492a29f3d4f15d14bcef35a1771b3edada39b5070691c42a2f6c951 SHA512 7e4a90954940ab87b338c680d22666d5c9a70425e02ab314ca925346862385a1e9ace75b4099b1223da5a658b5311f4557a3f846e2d404764153cdfafb7e5b3a
+AUX ogre-1.9.0-samples.patch 225 BLAKE2B 4fc9cead31892e565b04ac35a00739cdbfcd638f65df185d6ebe47e329409c0efa0a25c4685724856b5f914953e9cd46746c13f2117a9a6b9ec31f1d271e71c2 SHA512 089060f157488628c136a7f4f0ac764fcdcd30fbaf6e62a1dcb2b952df2c6753cfe107f3bb5b1fc2424964f1cb423176fd69e098a835ade3f18dc3303b24be96
 AUX ogre-2.1-enhance_config_loading.patch 1303 BLAKE2B f03e3b00ee9f13bbcc4cfa9a8db318aa7e675ed3974751460060f8789f5a1ba38d47e9612eebbc164e81fd7b341c64ba3d2df79b499a05248207a8fbb8df9564 SHA512 c1db8c919d33e7e96b44ad44f0e5a51abc7920178a3b3119fbad5ff42e79f9f986ee3cffb55e6065a6b01dbc5d9b5060b757acd597d77aa9068df476c51eca14
-AUX ogre-2.1-media_path.patch 1212 BLAKE2B 7c34ff08246fc973b5fc99eea37d6cc7c6dd3e5a65ae20a5ce1016da29ae2f6a6adbf49e8c11148447b9279aefbcd078a0f2f67e3cc3029236d53fb573d6c877 SHA512 fa0151327228c3896ab29a5d121d5278a135b48227d390c63eebc148fc0227523bf3f53ea3571e154ea5788eda08f73fedd33c2117c8b92c83725a8a04cec696
-AUX ogre-2.1-resource_path.patch 794 BLAKE2B 4720eb3f7a07f6a654c391766f0f6728d983cf9ebc7b3ab424b48897e08137af806fe3fe2830051a297b5728a3901bfafd0cf099659b5abf43c00502e28c4a46 SHA512 5e0d323c47f6085774dc7f127304bdfced38be2b4b9a9ccdaae9e2bbeab4121afbf1da6a7585c02285b33b8eea7a7c38845582e30e2fe73926a0ce55d0996dda
+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 ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041
-DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2
+DIST imgui-1.74.tar.gz 1224024 BLAKE2B 794bd9aa0fdd1793fe9fa012c4b915731e3fe43ad32315421c2f5da2c2225f5dc6eb2c9618b999e0a4b8922b7a2b74fe2dbc5b5dc19de5aa0b6cee9d2ea67154 SHA512 e49e5cbe55899c0d0abc9b66c4e6e3e9941542af542d0ed3304bd3bde34c769baa2367355b77b91acb7fca56f9bcfd233dfc99881cfc8f5f6a2e2e6839990832
+DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8
 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
-DIST ogre-2.1_pre20180901.tar.bz2 152746767 BLAKE2B 758d31fca2e5e31080c688ba758948fb5998a8fe49b9052f79de6791786501d02d7079e8f55ed37dc1a93f360af1003d2a28a260ba687c60c75a1340b95232a7 SHA512 c3cb5630a35e0ddf8c688a972ab5f2821d62545b4febc013235157eaf5268b3ceac1b94c403d0298131991f3d80d1c9b3800212a49647c652ba02bd176f6cc04
-EBUILD ogre-1.10.12.ebuild 3379 BLAKE2B e617b49260f550f20ebc898168a9a8a274fe94b01297856b431f22e496260a2c8cca3c3bdc3d25777966bb83d51c50fbbfa871ec72bc24c7b8a8552d40c52e26 SHA512 a1c0a60967701eda0168560dd4a0ec33a869c0e751ef0eac078714874d2f4bc4e068b777fc145f35473fdf380f96987c5041e360d305c3d3cd3cabc3e1414667
-EBUILD ogre-1.11.2.ebuild 3988 BLAKE2B d6376d8ab869900c36b7f27761775d5898eb5d59c29b7021ab3fc0bc519b2f68fb0f45fc45a815884ab7ef47eccb81e2c66284db5a2af5a8f63eb2fd508bc647 SHA512 67545f35019f286b6d3b3666bbb2c642d9819276eb3550582e3fcf59ab2e5aff0623f95dee6b62b87212402e6940162686e0e0c38949d06e27de9de9b15a0926
+EBUILD ogre-1.12.4.ebuild 5518 BLAKE2B 84b7d5a2e8b10ae7d063d36a930196ca01d9e99a09917c9504e2283980cfc9ff107fe337066e26259158c3719912c5bfc9437b2c485e91f4be33c20d6f1592c5 SHA512 c61a09921af13186da2e91c70d7d365acfda99240c193f9a3d268c8c5450750f99b8e11d2c5e8950ff6364511638fcd4c58b7df2cd3653039619e6126151ca28
 EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23
-EBUILD ogre-2.1_pre20180901.ebuild 4433 BLAKE2B 473fd9aa0ccb546f8fe0369b69ff9c5f63aeae3e73000b77f2d2343e2cef689f1b84b06186f2f93ef4cbaf374fddf6dad3d02430b407d85a872594862fe6598e SHA512 3cc8d28da6d8578f098765230fc06259c86838e325d10342a3919d3553a8509d2a6ba02fa1289e204e190f407de72e4df6377f7f9f6c8cd6f3a840fbbd4fb149
-MISC metadata.xml 6611 BLAKE2B 1d5eb84a08e6d6fb35363f95fe565e1b128ad85733bdfa2d71a6ded75121d058b0f1229b03808911b7e1b84954c769ea0d6ffc5a120aa38d7f63a13a1bdfdbc4 SHA512 98a6d956819ad294f262d8d8c32d5cf7886984928ca723c296a5c928c4e59241580fe1fd02f15ada30febe134cd7d9b8c8a052436e093c2df3cbb6bee03f3d96
+EBUILD ogre-1.9.0-r2.ebuild 3589 BLAKE2B c52ab761a94ebb2d5e6c8ac232d4071d1062b172d849fab6c6e4a55c21f27100899ee53d2ec9f36f9f78b20540d0b98e1c301d47c91db10a645ecfa045f4710a SHA512 32079693e35a493a3b6f093c1ca17f8602cde92a0dbaef82862258a12e3b92fe12ec4d4a55a59601065a9a5a5a1370e8b2d32983f62d7687338e52dcafba767a
+EBUILD ogre-2.1_pre20191212.ebuild 5255 BLAKE2B bfbd657263121a8ecaa9809d3aa5f537b79ef4469d8cb939c25b3f85df1b04f5a97251e8ea650a42dbd25189717e033fd3229a0947fa4a87a4c47bacb9b95c94 SHA512 d536e0b44787db04e49e34c37ec8645304a7495e605324ff06cfce6a019000c3a27fde4697f1abc748d4e133075cab60c796c5a8a9f28f2e41ebf2f8a7b3bafd
+MISC metadata.xml 6684 BLAKE2B f5355343249d73a92b7173628b45de63c10e210364b7621360e6778906cea444e5d4b2ddb4d30f0d76cbd3c87149c0471cc28bdf3ab283fa51f97415c7f1d188 SHA512 283888d262306fcec97059a8fe3aef74ceb1f67f03af5deae6a4477a296b4d8713a6e17184198e4e9cb36cd791a8cb160e860bc81bd9bc2319682ad25ef54880
diff --git a/dev-games/ogre/files/ogre-1.10.11-media_path.patch b/dev-games/ogre/files/ogre-1.10.11-media_path.patch
deleted file mode 100644
index 4d2547ab75a4..000000000000
--- a/dev-games/ogre/files/ogre-1.10.11-media_path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMake/InstallResources.cmake	2014-10-29 12:43:49.000000000 +0100
-+++ b/CMake/InstallResources.cmake	2014-10-29 12:46:10.017611431 +0100
-@@ -165,10 +165,11 @@
- 
- # CREATE CONFIG FILES - BUILD DIR VERSIONS
- if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
--  set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
--  set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
--  set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
--  set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
-+# No, they were fine already
-+#  set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
-+#  set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
-+#  set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
-+#  set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
- else ()
-   # iOS needs to use relative paths in the config files
-   set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.10.11-resource_path.patch b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch
deleted file mode 100644
index 9c39dfc0762a..000000000000
--- a/dev-games/ogre/files/ogre-1.10.11-resource_path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMake/InstallResources.cmake	2013-12-01 18:28:12.000000000 +0100
-+++ b/CMake/InstallResources.cmake	2014-10-29 12:38:29.963602465 +0100
-@@ -189,10 +189,11 @@
-   set(OGRE_SAMPLES_DIR_REL "")
-   set(OGRE_SAMPLES_DIR_DBG "")
- elseif (UNIX)
--  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
--  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
--  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
--  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
-+# No, this was already configured above, the BINARY paths are wrong!
-+#  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
- endif ()
- 
- if (MSVC AND NOT NMAKE)
diff --git a/dev-games/ogre/files/ogre-1.10.11-samples.patch b/dev-games/ogre/files/ogre-1.10.11-samples.patch
deleted file mode 100644
index 80b989e980c4..000000000000
--- a/dev-games/ogre/files/ogre-1.10.11-samples.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -536,7 +536,9 @@
- endif ()
- 
- # Setup samples
--add_subdirectory(Samples)
-+if (OGRE_BUILD_SAMPLES)
-+    add_subdirectory(Samples)
-+endif ()
- 
- #Add android JNI binding
- if(ANDROID)
diff --git a/dev-games/ogre/files/ogre-1.11.2-media_path.patch b/dev-games/ogre/files/ogre-1.11.2-media_path.patch
deleted file mode 100644
index aea15218c178..000000000000
--- a/dev-games/ogre/files/ogre-1.11.2-media_path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMake/InstallResources.cmake	2018-04-03 19:39:31.586129013 +0200
-+++ b/CMake/InstallResources.cmake	2018-04-03 19:40:28.169128923 +0200
-@@ -170,10 +170,11 @@
- 
- # CREATE CONFIG FILES - BUILD DIR VERSIONS
- if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
--  set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
--  set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
--  set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
--  set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
-+  # No, they are fine already
-+  # set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
-+  # set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
-+  # set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
-+  # set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
- else ()
-   # iOS needs to use relative paths in the config files
-   set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.11.2-resource_path.patch b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
deleted file mode 100644
index 8557d783ec41..000000000000
--- a/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMake/InstallResources.cmake	2018-03-23 10:48:44.371486540 +0100
-+++ b/CMake/InstallResources.cmake	2018-03-23 10:49:08.333486363 +0100
-@@ -184,8 +184,9 @@
-   set(OGRE_PLUGIN_DIR_REL "")
-   set(OGRE_SAMPLES_DIR_REL "")
- elseif (UNIX)
--  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
--  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+# No, this was already configured above, the BINARY paths are wrong!
-+#  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
- endif ()
- 
- if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN)
diff --git a/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch
index 6e4a476fbb4c..616a5e33680b 100644
--- a/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
+++ b/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch
@@ -1,6 +1,8 @@
+The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25)
+
 --- a/Samples/CMakeLists.txt	2018-04-25 07:30:38.211048775 +0200
 +++ b/Samples/CMakeLists.txt	2018-04-25 07:32:32.842049802 +0200
-@@ -97,10 +97,11 @@
+@@ -97,10 +97,6 @@
  	PATTERN "scripts" EXCLUDE
    )
    # install a new CMakeLists.txt file to allow building of samples
@@ -8,11 +10,6 @@
 -  configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY)
 -  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../)
 -  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR})
-+# The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25)
-+#  configure_file(${OGRE_TEMPLATES_DIR}/SDK_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt @ONLY)
-+#  configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY)
-+#  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../)
-+#  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR})
  endif ()
  
  # Install sample headers, some people rely on these
diff --git a/dev-games/ogre/files/ogre-1.12.4-media_path.patch b/dev-games/ogre/files/ogre-1.12.4-media_path.patch
new file mode 100644
index 000000000000..3030cc5b9fad
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.4-media_path.patch
@@ -0,0 +1,14 @@
+Media paths are fine already, the removed lines would screw them up.
+
+--- a/CMake/InstallResources.cmake	2019-11-06 08:09:15.185821495 +0100
++++ b/CMake/InstallResources.cmake	2019-11-06 08:10:41.169819050 +0100
+@@ -145,9 +145,6 @@
+ 
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
+-  set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media")
+-  set(OGRE_CORE_MEDIA_DIR "${PROJECT_SOURCE_DIR}/Media")
+-  set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media")
+ else ()
+   # iOS needs to use relative paths in the config files
+   set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.12.4-resource_path.patch b/dev-games/ogre/files/ogre-1.12.4-resource_path.patch
new file mode 100644
index 000000000000..cf35e2f99e8e
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.4-resource_path.patch
@@ -0,0 +1,13 @@
+These was already configured above, the BINARY paths are wrong!
+
+--- a/CMake/InstallResources.cmake	2019-11-06 08:12:01.271816772 +0100
++++ b/CMake/InstallResources.cmake	2019-11-06 08:13:15.623814658 +0100
+@@ -163,8 +163,6 @@
+   set(OGRE_PLUGIN_DIR_REL "Contents/Frameworks/")
+   set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/")
+ elseif (UNIX)
+-  set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+ endif ()
+ 
+ if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN)
diff --git a/dev-games/ogre/files/ogre-1.9.0-samples.patch b/dev-games/ogre/files/ogre-1.9.0-samples.patch
index d7573d7662b0..0bf886b27d7c 100644
--- a/dev-games/ogre/files/ogre-1.9.0-samples.patch
+++ b/dev-games/ogre/files/ogre-1.9.0-samples.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -519,7 +519,9 @@
  endif ()
  
diff --git a/dev-games/ogre/files/ogre-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch
index 5e7ad276ac09..a51d0576c983 100644
--- a/dev-games/ogre/files/ogre-2.1-media_path.patch
+++ b/dev-games/ogre/files/ogre-2.1-media_path.patch
@@ -1,6 +1,8 @@
+Media paths are fine already, the removed lines would screw them up.
+
 --- a/CMake/InstallResources.cmake	2018-03-23 10:49:24.620486243 +0100
 +++ b/CMake/InstallResources.cmake	2018-03-23 10:50:52.089485597 +0100
-@@ -186,15 +186,16 @@
+@@ -186,15 +186,6 @@
  
  # CREATE CONFIG FILES - BUILD DIR VERSIONS
  if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
@@ -13,16 +15,6 @@
 -	endif()
 -	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
 -	set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
-+# No, they were fine already
-+#	if( NOT APPLE )
-+#		set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
-+#		set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
-+#	else()
-+#		set(OGRE_MEDIA_DIR_REL "Contents/Resources")
-+#		set(OGRE_MEDIA_DIR_DBG "Contents/Resources")
-+#	endif()
-+#	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
-+#	set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
  else ()
  	# iOS needs to use relative paths in the config files
  	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-2.1-resource_path.patch b/dev-games/ogre/files/ogre-2.1-resource_path.patch
index 32cfef0d8d14..32cbc94e7d01 100644
--- a/dev-games/ogre/files/ogre-2.1-resource_path.patch
+++ b/dev-games/ogre/files/ogre-2.1-resource_path.patch
@@ -1,6 +1,8 @@
+These was already configured above, the BINARY paths are wrong!
+
 --- a/CMake/InstallResources.cmake	2018-03-23 10:48:44.371486540 +0100
 +++ b/CMake/InstallResources.cmake	2018-03-23 10:49:08.333486363 +0100
-@@ -226,10 +226,11 @@
+@@ -226,10 +226,6 @@
    set(OGRE_SAMPLES_DIR_REL "")
    set(OGRE_SAMPLES_DIR_DBG "")
  elseif (UNIX)
@@ -8,11 +10,6 @@
 -  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
 -  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
 -  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
-+# No, this was already configured above, the BINARY paths are wrong!
-+#  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+#  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
  endif ()
  
  if (WINDOWS_STORE OR WINDOWS_PHONE)
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 841aaefd7dc8..0821402dc0e5 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>yamakuzure@gmx.net</email>
+    <name>Sven Eden</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
@@ -109,15 +117,12 @@ Exporters
         sensitive lookup. Some demos might not work with this setting.
         (default: case-insensitive + sensitive lookup in all groups)
     </flag>
-    <flag name="resman-strict">
-        Resource Manager STRICT : search in default group if not specified otherwise.
-        Case sensitive lookup. Some demos might not work with this setting.
-        (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 helper tools</flag>
   </use>
   <upstream>
     <remote-id type="bitbucket">sinbad/ogre</remote-id>
+    <remote-id type="github">OGRECave/ogre</remote-id>
+    <remote-id type="github">OGRECave/ogre-next</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-games/ogre/ogre-1.10.12.ebuild b/dev-games/ogre/ogre-1.10.12.ebuild
deleted file mode 100644
index 34a0952245b9..000000000000
--- a/dev-games/ogre/ogre-1.10.12.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
-inherit cmake-utils
-
-DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="https://www.ogre3d.org/"
-SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="MIT public-domain"
-SLOT="0/1.10.0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+cache cg doc double-precision egl examples experimental +freeimage gles2
-	+opengl profile resman-pedantic resman-strict tools"
-
-REQUIRED_USE="
-	|| ( gles2 opengl )
-	?? ( resman-pedantic resman-strict )
-	examples? ( experimental )
-"
-RESTRICT="test" #139905
-
-RDEPEND="
-	dev-games/ois
-	dev-libs/boost:=
-	dev-libs/zziplib
-	media-libs/freetype:2
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXrandr
-	x11-libs/libXt
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	egl? ( media-libs/mesa[egl] )
-	freeimage? ( media-libs/freeimage )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	tools? ( dev-libs/tinyxml[stl] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.11-samples.patch"
-	"${FILESDIR}/${PN}-1.10.11-resource_path.patch"
-	"${FILESDIR}/${PN}-1.10.11-media_path.patch"
-	"${FILESDIR}/${P}-use_system_tinyxml.patch"
-)
-
-src_prepare() {
-	sed -i \
-		-e "s:share/OGRE/docs:share/doc/${PF}:" \
-		Docs/CMakeLists.txt || die
-	# Stupid build system hardcodes release names
-	sed -i \
-		-e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
-		CMake/Utils/OgreConfigTargets.cmake || die
-
-	# Fix some path issues
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOGRE_BUILD_COMPONENT_BITES=$(usex experimental)
-		-DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
-		-DOGRE_BUILD_COMPONENT_JAVA=no
-		-DOGRE_BUILD_COMPONENT_PYTHON=no
-		-DOGRE_BUILD_DEPENDENCIES=no
-		-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
-		-DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl)
-		-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
-		-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
-		-DOGRE_BUILD_SAMPLES=$(usex examples)
-		-DOGRE_BUILD_TESTS=no
-		-DOGRE_BUILD_TOOLS=$(usex tools)
-		-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
-		-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
-		-DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
-		-DOGRE_CONFIG_THREADS=3
-		-DOGRE_CONFIG_THREAD_PROVIDER=std
-		-DOGRE_FULL_RPATH=no
-		-DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
-		-DOGRE_INSTALL_DOCS=$(usex doc)
-		-DOGRE_INSTALL_SAMPLES=$(usex examples)
-		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
-		-DOGRE_NODE_STORAGE_LEGACY=no
-		-DOGRE_PROFILING=$(usex profile)
-		-DOGRE_RESOURCEMANAGER_STRICT=$(\
-			usex resman-pedantic 1 $(\
-			usex resman-strict 2 0))
-		-DOGRE_USE_STD11=yes
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	CONFIGDIR=/etc/OGRE
-	SHAREDIR=/usr/share/OGRE
-
-	# plugins and resources are the main configuration
-	insinto "${CONFIGDIR}"
-	doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
-	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
-	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
-
-	# These are only for the sample browser
-	insinto "${SHAREDIR}"
-	doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
-}
diff --git a/dev-games/ogre/ogre-1.11.2.ebuild b/dev-games/ogre/ogre-1.12.4.ebuild
index e3f452d99e9b..5a8d78edfa97 100644
--- a/dev-games/ogre/ogre-1.11.2.ebuild
+++ b/dev-games/ogre/ogre-1.12.4.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_REMOVE_MODULES="yes"
 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
-inherit cmake-utils
+inherit cmake
+
+IMGUI_PN="imgui"
+IMGUI_PV="1.74"
+IMGUI_P="${IMGUI_PN}-${IMGUI_PV}"
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
 HOMEPAGE="https://www.ogre3d.org/"
-SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ocornut/${IMGUI_PN}/archive/v${IMGUI_PV}.tar.gz -> ${IMGUI_P}.tar.gz"
 
 LICENSE="MIT public-domain"
-SLOT="0/1.11"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/1.12"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
-	gles2 json openexr +opengl pch profile resman-pedantic resman-strict tools"
+	gles2 json openexr +opengl pch profile resman-pedantic tools"
 
 REQUIRED_USE="
 	|| ( gles2 opengl )
-	?? ( resman-pedantic resman-strict )
 "
 
 RESTRICT="test" #139905
 
 RDEPEND="
 	dev-games/ois
+	dev-libs/pugixml
 	dev-libs/zziplib
 	media-libs/freetype:2
 	x11-libs/libX11
@@ -45,21 +49,45 @@ RDEPEND="
 	)
 	tools? ( dev-libs/tinyxml[stl] )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )"
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 
 PATCHES=(
-	"${FILESDIR}/${P}-media_path.patch"
-	"${FILESDIR}/${P}-resource_path.patch"
-	"${FILESDIR}/${P}-fix_sample_source_install.patch"
-	"${FILESDIR}/${PN}-1.10.12-use_system_tinyxml.patch"
+	"${FILESDIR}"/${P}-media_path.patch
+	"${FILESDIR}"/${P}-resource_path.patch
+	"${FILESDIR}"/${P}-fix_sample_source_install.patch
+	"${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch
 )
 
+src_unpack() {
+	unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed"
+
+	# Ogre 1.12.3 includes imgui, but as a submodule, it is not included
+	# in the release.
+	cd "${S}"/Components/Overlay/src || die "Unpack incomplete"
+	unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed"
+
+	# Without this 'rm', mv puts imgui-1.73 *into* imgui/ instead of renaming.
+	rm -rf "${IMGUI_PN}" || die "Removing ${IMGUI_PN} failed"
+	mv "${IMGUI_P}" "${IMGUI_PN}" || die "Moving ${IMGUI_P} to ${IMGUI_PN} failed"
+}
+
 src_prepare() {
+	local broken_png=(
+		Icon@2x-72.png
+		Default-Portrait~ipad.png
+		Default-Portrait@2x~ipad.png
+		Default-Landscape@2x~ipad.png
+	)
+
 	sed -i \
-		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		-e "s:share/doc/OGRE:share/doc/${PF}:" \
 		Docs/CMakeLists.txt || die
 	# In this series, the CMAKE_BUILD_TARGET is hard-wired to the
 	# installation. And only Debug, MinSizeRel and RelWithDebInfo
@@ -67,24 +95,46 @@ src_prepare() {
 	if use debug; then
 		sed -i \
 			-e 's/Debug/Gentoo/g' \
+			CMake/InstallResources.cmake \
+			|| die
+		sed -i \
+			-e 's/Debug/Gentoo/g' \
 			CMake/Utils/OgreConfigTargets.cmake \
 			|| die
 	else
 		sed -i \
 			-e 's/MinSizeRel/Gentoo/g' \
+			CMake/InstallResources.cmake \
+			|| die
+		sed -i \
+			-e 's/MinSizeRel/Gentoo/g' \
 			CMake/Utils/OgreConfigTargets.cmake \
 			|| die
 	fi
+
+	# Fix broken png files
+	einfo "Fixing broken png files."
+	pushd "${S}"/Samples/Common/misc 1>/dev/null 2>&1
+	for png in "${broken_png[@]}"; do
+		pngfix -q --out=out.png ${png}
+		mv -f out.png "${png}" || die
+	done
+	popd 1>/dev/null 2>&1
+	einfo "done ..."
+
 	# Fix some path issues
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_INSTALL_RPATH=yes
 		-DOGRE_BUILD_COMPONENT_BITES=yes
+		-DOGRE_BUILD_COMPONENT_CSHARP=no
 		-DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
 		-DOGRE_BUILD_COMPONENT_JAVA=no
+		-DOGRE_BUILD_COMPONENT_OVERLAY=yes
+		-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes
 		-DOGRE_BUILD_COMPONENT_PAGING=yes
 		-DOGRE_BUILD_COMPONENT_PROPERTY=yes
 		-DOGRE_BUILD_COMPONENT_PYTHON=no
@@ -113,31 +163,44 @@ src_configure() {
 		-DOGRE_INSTALL_SAMPLES=$(usex examples)
 		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
 		-DOGRE_PROFILING=$(usex profile)
-		-DOGRE_RESOURCEMANAGER_STRICT=$(\
-			usex resman-pedantic 1 $(\
-			usex resman-strict 2 0))
+		-DOGRE_RESOURCEMANAGER_STRICT=$(usex resman-pedantic 1 2)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		eninja -C "${BUILD_DIR}" OgreDoc
+	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	CONFIGDIR=/etc/OGRE
 	SHAREDIR=/usr/share/OGRE
 
 	# plugins and resources are the main configuration
 	insinto "${CONFIGDIR}"
-	doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
+	doins "${BUILD_DIR}"/bin/plugins.cfg
+	doins "${BUILD_DIR}"/bin/resources.cfg
 	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
 	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
 
 	# These are only for the sample browser
 	if use examples ; then
 		insinto "${SHAREDIR}"
-		doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
-		doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+		doins "${BUILD_DIR}"/bin/quakemap.cfg
+		doins "${BUILD_DIR}"/bin/samples.cfg
 	fi
 }
+
+pkg_postinst() {
+	elog "If you experience crashes when starting /usr/bin/SampleBrowser,"
+	elog "remove the cache directory at:"
+	elog "  '~/.cache/OGRE Sample Browser'"
+	elog "first, before filling a bug report."
+}
diff --git a/dev-games/ogre/ogre-1.9.0-r2.ebuild b/dev-games/ogre/ogre-1.9.0-r2.ebuild
new file mode 100644
index 000000000000..024f38575f1d
--- /dev/null
+++ b/dev-games/ogre/ogre-1.9.0-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
+
+inherit cmake vcs-snapshot
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT public-domain"
+SLOT="0/1.9.0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# gles1 currently broken wrt bug #418201
+# gles1 does not even build wrt bug #506058
+IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip"
+
+REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) )
+	examples? ( ois )
+	poco? ( threads )
+	tbb? ( threads )
+	gl3plus? ( !gles2 !gles3 )
+	gles3? ( gles2 )
+	gl3plus? ( opengl )"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	media-libs/freetype:2
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	boost? ( dev-libs/boost:= )
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	freeimage? ( media-libs/freeimage )
+	gles2? ( >=media-libs/mesa-9.0.0[gles2] )
+	gles3? ( >=media-libs/mesa-10.0.0[gles2] )
+	gl3plus? ( >=media-libs/mesa-9.2.5 )
+	ois? ( dev-games/ois )
+	threads? (
+		poco? ( dev-libs/poco )
+		tbb? ( dev-cpp/tbb )
+	)
+	tools? ( dev-libs/tinyxml[stl] )
+	zip? ( sys-libs/zlib dev-libs/zziplib )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove_resource_path_to_bindir.patch"
+	"${FILESDIR}/${P}-remove_media_path_to_bindir.patch"
+	"${FILESDIR}/${P}-gcc52.patch"
+	"${FILESDIR}/${P}-samples.patch"
+)
+
+src_prepare() {
+	sed -i \
+		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# Stupid build system hardcodes release names
+	sed -i \
+		-e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
+		CMake/Utils/OgreConfigTargets.cmake || die
+
+	# make sure we're not using the included tinyxml
+	rm -f Tools/XMLConverter/{include,src}/tiny*.*
+
+	# Fix some path issues
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_FULL_RPATH=NO
+		-DOGRE_USE_BOOST=$(usex boost)
+		-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+		-DOGRE_INSTALL_DOCS=$(usex doc)
+		-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+		-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
+		-DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl)
+		-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex gl3plus)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE
+		-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
+		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles3)
+		-DOGRE_PROFILING=$(usex profile)
+		-DOGRE_BUILD_SAMPLES=$(usex examples)
+		-DOGRE_INSTALL_SAMPLES=$(usex examples)
+		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
+		-DOGRE_BUILD_TESTS=FALSE
+		-DOGRE_CONFIG_THREADS=$(usex threads 2 0)
+		-DOGRE_BUILD_TOOLS=$(usex tools)
+		-DOGRE_CONFIG_ENABLE_ZIP=$(usex zip)
+	)
+
+	if use threads ; then
+		local f
+		for f in boost poco tbb ; do
+			use ${f} || continue
+			mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
+			break
+		done
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	CONFIGDIR=/etc/OGRE
+	SHAREDIR=/usr/share/OGRE
+
+	# plugins and resources are the main configuration
+	insinto "${CONFIGDIR}"
+	doins "${BUILD_DIR}"/bin/plugins.cfg
+	doins "${BUILD_DIR}"/bin/resources.cfg
+	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+
+	# These are only for the sample browser
+	insinto "${SHAREDIR}"
+	doins "${BUILD_DIR}"/bin/quakemap.cfg
+	doins "${BUILD_DIR}"/bin/samples.cfg
+}
diff --git a/dev-games/ogre/ogre-2.1_pre20180901.ebuild b/dev-games/ogre/ogre-2.1_pre20191212.ebuild
index 9249788cc201..d4823f71e9b1 100644
--- a/dev-games/ogre/ogre-2.1_pre20180901.ebuild
+++ b/dev-games/ogre/ogre-2.1_pre20191212.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_REMOVE_MODULES="yes"
 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
-inherit cmake-utils
 
-MY_COMMIT="35b083cba64a"
-MY_P="sinbad-${PN}-${MY_COMMIT}"
+inherit cmake flag-o-matic git-r3
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
 HOMEPAGE="https://www.ogre3d.org/"
-SRC_URI="https://bitbucket.org/sinbad/ogre/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+
+EGIT_BRANCH="v2-1"
+EGIT_COMMIT="5b682fb90c9e8e660e2fbf92bbf7797a9246700d"
+EGIT_REPO_URI="https://github.com/OGRECave/ogre-next.git"
+EGIT_SUBMODULES=()
 
 LICENSE="MIT public-domain"
 SLOT="0/2.1"
-KEYWORDS=""
+KEYWORDS="~amd64"
 
-IUSE="+cache debug doc egl examples +freeimage gles2 json +legacy-animations
-	mobile +opengl profile tools"
+IUSE="+cache debug doc egl examples +freeimage gles2 json
+	legacy-animations mobile +opengl profile tools"
 
 # USE flags that do not work, as their options aren't ported, yet.
-#	cg
-#	double-precision
+#      cg
+#      double-precision
 
 REQUIRED_USE="
 	|| ( gles2 opengl )
@@ -51,10 +52,15 @@ RDEPEND="
 "
 # Dependencies for USE flags that do not work, yet.
 #	cg? ( media-gfx/nvidia-cg-toolkit )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )"
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1-samples.patch"
@@ -63,8 +69,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.1-enhance_config_loading.patch"
 )
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
 	sed -i \
 		-e "s:share/OGRE/docs:share/doc/${PF}:" \
@@ -75,7 +79,7 @@ src_prepare() {
 		CMake/Utils/OgreConfigTargets.cmake || die
 
 	# Fix some path issues
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -86,18 +90,22 @@ src_configure() {
 		-DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=$(usex mobile)
 		-DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=yes
 		-DOGRE_BUILD_COMPONENT_SCENE_FORMAT=yes
+		-DOGRE_BUILD_PLATFORM_NACL=no
 		-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
 		-DOGRE_BUILD_RENDERSYSTEM_GLES=no
 		-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
 		-DOGRE_BUILD_SAMPLES2=$(usex examples)
 		-DOGRE_BUILD_TESTS=no
 		-DOGRE_BUILD_TOOLS=$(usex tools)
+		-DOGRE_CONFIG_ALLOCATOR=$(usex debug 5 1)
+		-DOGRE_CONFIG_ENABLE_FINE_LIGHT_MASK_GRANULARITY=yes
 		-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
 		-DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
 		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(\
 			usex gles2 $(\
 			usex mobile no yes) no)
 		-DOGRE_CONFIG_ENABLE_JSON=$(usex json)
+		-DOGRE_CONFIG_MEMTRACK_DEBUG=$(usex debug)
 		-DOGRE_CONFIG_THREADS=2
 		-DOGRE_CONFIG_THREAD_PROVIDER=std
 		-DOGRE_FULL_RPATH=no
@@ -108,10 +116,16 @@ src_configure() {
 		-DOGRE_PROFILING_PROVIDER=$(usex profile none internal)
 		-DOGRE_USE_BOOST=no
 	)
-	# Options that aren't ported, yet:
-	#	-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+
+	# The double-precision mode can not be enabled, yet.
 	#	-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
 
+	# The CgFxScriptLoader doesn't seem to be completely ported, yet.
+	# USE flag disabled.
+	mycmakeargs+=(
+		-DOGRE_BUILD_PLUGIN_CG=no
+	)
+
 	# These components are off by default, as they might not be ported, yet.
 	# When advancing to a newer commit, try whether any of the disabled
 	# components can be activated now.
@@ -125,21 +139,32 @@ src_configure() {
 		-DOGRE_BUILD_COMPONENT_VOLUME=no
 	)
 
-	cmake-utils_src_configure
+	# Take out the warning about deprecated copy, as Ogre emits thousands of
+	# those. But using a deprecated way of doing things isn't an error and
+	# mainly of interest for developers.
+	# (The warning is part of -Wextra and only effects C++ compilation.)
+	append-cxxflags $(test-flags-CXX -Wno-deprecated-copy)
+
+	# The same with the old ways of using memset(0...) on objects. It is
+	# no longer assumed to be a good idea, but a warning about it isn't
+	# of any value to the user. (And it happens many times in Ogre.)
+	append-cxxflags $(test-flags-CXX -Wno-class-memaccess)
+
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	CONFIGDIR=/etc/OGRE
 	SHAREDIR=/usr/share/OGRE
 
 	# plugins and resources are the main configuration
 	insinto "${CONFIGDIR}"
-	doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/plugins_tools.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
-	doins "${CMAKE_BUILD_DIR}"/bin/resources2.cfg
+	doins "${BUILD_DIR}"/bin/plugins.cfg
+	doins "${BUILD_DIR}"/bin/plugins_tools.cfg
+	doins "${BUILD_DIR}"/bin/resources.cfg
+	doins "${BUILD_DIR}"/bin/resources2.cfg
 	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
 	dosym "${CONFIGDIR}"/plugins_tools.cfg "${SHAREDIR}"/plugins_tools.cfg
 	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
@@ -148,6 +173,6 @@ src_install() {
 	# These are only for the Samples
 	if use examples ; then
 		insinto "${SHAREDIR}"
-		doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+		doins "${BUILD_DIR}"/bin/samples.cfg
 	fi
 }
diff --git a/dev-games/openscenegraph-qt/Manifest b/dev-games/openscenegraph-qt/Manifest
index 550577305963..97f1f6214b69 100644
--- a/dev-games/openscenegraph-qt/Manifest
+++ b/dev-games/openscenegraph-qt/Manifest
@@ -3,5 +3,5 @@ AUX openscenegraph-qt-3.5.5-qt-5.11b3.patch 1115 BLAKE2B 0a90b65caf3209d51ec6994
 DIST osgQt-3.5.5.tar.gz 1003973 BLAKE2B 4646fc0d01a5fc3023acb4be9d8b9e9982faf3849b9c7dbe775ff06642b9540559ef67189f31ebcf6a2fe49d24066d744ce9cfd409e76c9143ac16867648a620 SHA512 50faee9a1539c1e29bb1c244fa32194b22cbe43f43980b7c270aa45cd225ac5e3fe9445d63b1efb767c8a2ce8e5ffa417783d1a446ed965b23a06100a241d498
 DIST osgQt-3.5.7.tar.gz 1000217 BLAKE2B f0279b122fc9492d29ea0c55afa81376d2ad4a35c42b301312137ca6d375fd2ef519efacfaf2f77b9dc3a7a26313b3d3213fc0589359c89695835f12488e6efb SHA512 5698b824f6e747eaf19b970784dce6e38fbe50176e6c5d0cab86dab417c8831036c0f050fc52f1ab2a79925f8356dd43559aa123aab4b70a4df28273125e4d03
 EBUILD openscenegraph-qt-3.5.5.ebuild 970 BLAKE2B ad265f5b646fd029a3a40038fdf39262a93a3e7da58b44a09bc2a183327cd2f4e71e2c201dcb12891c141b25197616a4ff6b1f870acdc0673b76e144123ace04 SHA512 88d9a8a78277e6335dc8a064fb6f05e7f63c687cd1436c68bba56c03e9005bd42cfecdb418d87d9c82b35440d4cfcaec84c67178c02afeb8ce29b5937c3d411a
-EBUILD openscenegraph-qt-3.5.7.ebuild 1039 BLAKE2B 2d83a99ef43d380461edb7b10547abaabb89899367688a6811c433f869d9761a3c85ef648449f5ba4942f0885ce461f0f416c037695891a10ddcd169ad2fd096 SHA512 d3bb5ddcc7157e3aed63c403fc5867b3b95b375190e597f689bb6e80d204c6a9eb21570985f31cc8ed8b396a75aa858243a53a438731e280ec0c7a860d6121a8
+EBUILD openscenegraph-qt-3.5.7.ebuild 1021 BLAKE2B e6f851f78d277d2e5c26dc904645981ed24b8c82a44efc65e8445742ead8b82c24f142b278c1d4bdc80d63d1095d36c82ecdb982ab1a913a0cc8c761bfddf4d8 SHA512 4be723ff4427e90cb62d8718f68a77d66bdf7144dc2c9339387247d87d5ef88b2dfc935666bbfc32b64a37a34ab8de51944220281074ee829b1c8eadd6667f5f
 MISC metadata.xml 997 BLAKE2B fbb3c9765491c15ebd269fde3aa01ef177d038f1a0f1d1f189adfb457aab8dfd69774c074235a7f95d6d02c53dfa6ba5872d50cdcbafc03141a8b5ba44d823dd SHA512 3b5f9b2f408f6f68a28f3427d463d0036d1b6286df549d189ed4d88ebe0a607a3d570f98fa11035f440e684f55f6d7d3f1383b281c37a1be3f611cfb8d530169
diff --git a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild
index 1a1be79e4194..fd7f48f62dbc 100644
--- a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild
+++ b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN="osgQt"
 MY_P=${MY_PN}-${PV}
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt support for OpenSceneGraph"
 HOMEPAGE="http://www.openscenegraph.org/"
@@ -41,8 +41,8 @@ src_configure() {
 		-DDYNAMIC_OPENSCENEGRAPH=ON
 		-DDESIRED_QT_VERSION=5
 		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake_use_find_package webkit Qt5WebKitWidgets)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 0af7bcebc39d..576f19ecfce2 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -4,6 +4,6 @@ AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107b
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
 DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19
-EBUILD openscenegraph-3.5.5.ebuild 3735 BLAKE2B c5c689c98f6246042225f7b85e4695d0d610b65ea86def9500a1ccaa9f5bef419d33cc653d3553ff9149da58a625e2d9d179397303ff6cf0b0c0af0299f900fc SHA512 8b49334b93e1ad3033ffbec3a486705492d2275b266fd942a591b0709d854d24b5cfe65c56a1f3f47d6ddd3d308d646b126e46a4e80a60c7cc44f33b538d21c0
-EBUILD openscenegraph-3.6.4.ebuild 4367 BLAKE2B 1930c78b3acd013db72e0da9aaac68bb3cfbab3d22e61e3d8cebdadf0418272164239aaca4a9b8b0c2116966f8d63239360b18798f0d5d79a6297b03b7b3c7d4 SHA512 0eb995ab288bb43232abe95bc36423cb89bcf7292bb2b6c07a4a5aae279270602fd95556e58e1e4046d158ec6c929ad2aa5160861a299c6da567d987db8905f3
+EBUILD openscenegraph-3.5.5.ebuild 3694 BLAKE2B 0a9e624b716e34af2dd99f76cc7e5a638b559db2cabf34aa8d5a775c6a4bc0a700245030fa0a5d63614bec67d0e065c2ef0e23c69d43329afc2ea0576b9b3ab5 SHA512 6ba1a7f5086288253738bbda9990170f50a9c04f8b50142521456c4152e1c185938e173622688692364178a9992241748ce4394812b446814bb30905cd990916
+EBUILD openscenegraph-3.6.4.ebuild 4144 BLAKE2B 99e37784f69d6f1b72e089e6b8762bd73413fe2272d420f17b0af84b84cc57e07c1cb21f637345ede7c474a5c4d58718d8f54989dcf8be95c3f392bac2d0f2a1 SHA512 bf8bedefbed0474fa104ec2bd57a62f5bfa2735dd26ca35e901d03884c94986fe5d090d7fe2bb8e48c3619db58fe0d4febbfed65e780da7a3ceb09ba66161d1e
 MISC metadata.xml 1759 BLAKE2B 6cdfd94a0888ac7716c282b7a473fdc23b00542bf55fe0b7b271d81dac36e1dbe6ef6923a3f6a48d6730b27fccbe6a197ebdce0c3611d736cd6674aec9ae35a8 SHA512 48f68b29d2d8ab7aeb31bdd7322ba39f1c5f9c4c14a301c828c084a774e80a818e2366bbaf2728d1a32a9d20b62bda2a45ab49a331c160d4359c1175787a9999
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
index 29582ffe9098..ab15331d995c 100644
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86"
-IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
+IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer jpeg
 las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
 truetype vnc wxwidgets xine xrandr zlib"
 
@@ -34,7 +34,6 @@ RDEPEND="
 		fltk? ( x11-libs/fltk:1[opengl] )
 		fox? ( x11-libs/fox:1.6[opengl] )
 		glut? ( media-libs/freeglut )
-		gtk? ( x11-libs/gtkglext )
 		sdl2? ( media-libs/libsdl2 )
 		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
 	)
@@ -109,7 +108,7 @@ src_configure() {
 		-DWITH_GIFLIB=$(usex gif)
 		-DWITH_GStreamer=$(usex gstreamer)
 		-DWITH_GLIB=$(usex gstreamer)
-		-DWITH_GtkGl=$(usex gtk)
+		-DWITH_GtkGl=OFF
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_Jasper=OFF
 		-DWITH_LIBLAS=$(usex las)
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
index 1f0f59ca8e4f..2cf82085b9d3 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="OpenSceneGraph"
 MY_P=${MY_PN}-${PV}
 WX_GTK_VER="3.0"
-inherit cmake-utils flag-o-matic wxwidgets
+inherit cmake flag-o-matic wxwidgets
 
 DESCRIPTION="Open source high performance 3D graphics toolkit"
 HOMEPAGE="http://www.openscenegraph.org/"
@@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
-gstreamer gtk jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2
+gstreamer jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2
 svg tiff truetype vnc wxwidgets xrandr +zlib"
 
 REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )"
@@ -39,7 +39,6 @@ RDEPEND="
 		fltk? ( x11-libs/fltk:1[opengl] )
 		fox? ( x11-libs/fox:1.6[opengl] )
 		glut? ( media-libs/freeglut )
-		gtk? ( x11-libs/gtkglext )
 		sdl2? ( media-libs/libsdl2 )
 		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
 	)
@@ -101,51 +100,51 @@ src_configure() {
 		-DOSG_ENVVAR_SUPPORTED=ON
 		-DOSG_PROVIDE_READFILE=ON
 		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-		$(cmake-utils_use_find_package asio Asio)
-		$(cmake-utils_use_find_package curl CURL)
+		$(cmake_use_find_package asio Asio)
+		$(cmake_use_find_package curl CURL)
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake-utils_use_find_package dicom DCMTK)
-		$(cmake-utils_use_find_package egl EGL)
+		$(cmake_use_find_package dicom DCMTK)
+		$(cmake_use_find_package egl EGL)
 		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package gdal GDAL)
-		$(cmake-utils_use_find_package gif GIFLIB)
-		$(cmake-utils_use_find_package gstreamer GLIB)
-		$(cmake-utils_use_find_package gstreamer GStreamer)
-		$(cmake-utils_use_find_package gtk GtkGl)
-		$(cmake-utils_use_find_package jpeg JPEG)
+		$(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-utils_use_find_package las LIBLAS)
-		$(cmake-utils_use_find_package lua Lua51)
+		$(cmake_use_find_package las LIBLAS)
+		$(cmake_use_find_package lua Lua51)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package openinventor Inventor)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package openinventor Inventor)
 		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(cmake-utils_use_find_package pdf Poppler-glib)
-		$(cmake-utils_use_find_package png PNG)
-		$(cmake-utils_use_find_package sdl SDL)
-		$(cmake-utils_use_find_package sdl2 SDL2)
-		$(cmake-utils_use_find_package svg RSVG)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package truetype Freetype)
-		$(cmake-utils_use_find_package vnc LibVNCServer)
+		$(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-utils_use_find_package zlib ZLIB)
+		$(cmake_use_find_package zlib ZLIB)
 	)
 	if use examples; then
 		mycmakeargs+=(
-			$(cmake-utils_use_find_package fltk FLTK)
-			$(cmake-utils_use_find_package fox FOX)
-			$(cmake-utils_use_find_package glut GLUT)
-			$(cmake-utils_use_find_package wxwidgets wxWidgets)
+			$(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
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
 }
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index 22778e0e1699..85c3ac3cf591 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,4 +1,4 @@
 DIST physfs-3.0.2.tar.bz2 194888 BLAKE2B 67b6b04e3822c2528a31a2c60345238cb5f25ad031e32a6c3416b91bad6347af9f02dcfb8dc29a71c2bfc2b7cec7f0749ffbbd0dcadbc35703576ad895f568d9 SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472
-EBUILD physfs-3.0.2.ebuild 1388 BLAKE2B 1224a71b98f93bd214fd33a67e495599edba42990a41ea57e04492f7986da4b64cdcc8a0b05031c369d1fc633547888fa0d9e5107f273e577ee6e60b7cd2ef27 SHA512 5d95d358a50ad4c3dbfcf3676350c310939ab0f43105ed57dc48c30b2b15fd28e5e5d69c283245546e42d6d826fb5b2898c5205ad3d22d1dcd051bc9de6a5d2c
-EBUILD physfs-9999.ebuild 1391 BLAKE2B f6331d2606e147242d341cf0c01feb4012097a93bcf8882f72021be73745013ae033d812785972840c7118773e8e094d2f998742a5ffdb73b054c8a0e885ce01 SHA512 f423f487ea1d64c5daaaf33d1e0287067382e2dc5bdcfb6efa2106aed77073bb3e5bca05be93f104f4456216d382b95099c0424b4dc9ac3b9c8f928406745f54
+EBUILD physfs-3.0.2.ebuild 1389 BLAKE2B 62d97d821c2ffa0d7318ded77aa904bbb8a4694ac33d1f847314de9114ed8e477b09309c0ec892152bacc958fa4a48d0260d4a422a6c4b05856bab70c4980201 SHA512 394beacefe5187064af59a5cc76c1589fd396db3ff5a8f129f2a6877328b2b205d2af9dee11474a5ef221077c6ca75670cf7756d4d11355ec9c1ed2ad4b740a3
+EBUILD physfs-9999.ebuild 1392 BLAKE2B a2249bfdc755962c8c4b86766a184bc1a51a14a0d2fbe980218085b5d8c090811b40260eb7403b36685031be97c4b05b584595edfc54dce00ebf04b264ddc645 SHA512 fe51a76fa5f2c2b0c3742b91f3c8f3fa42e358b13e156379f21c928a48993fa7e27b4bead6018b72da5a8b619bb010ca078d09ab0dfc2f847be9c6a5a9799f67
 MISC metadata.xml 2046 BLAKE2B 0bc4d4b847a4749f128b4a01d9a956182cd6b3b8bbb7c523ec62e4d9ab727e583e5265ea49fc835c32c3a43b4561d204b4fd07b93d2f09d5b6c19dc092734554 SHA512 93ef7139120382d372585bf5b9584c13ab9f8d40c4d99ad51fbf413490ca8451c12fae5be99e1740bf589401e49f2bddc9e804072f3b1bba9b3bee2fa91f5b80
diff --git a/dev-games/physfs/physfs-3.0.2.ebuild b/dev-games/physfs/physfs-3.0.2.ebuild
index 37c14d9804c5..774fa791efd5 100644
--- a/dev-games/physfs/physfs-3.0.2.ebuild
+++ b/dev-games/physfs/physfs-3.0.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Abstraction layer for filesystem and archive access"
@@ -40,14 +41,14 @@ multilib_src_configure() {
 		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
 		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_compile docs
+		cmake_src_compile docs
 		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	fi
 }
diff --git a/dev-games/physfs/physfs-9999.ebuild b/dev-games/physfs/physfs-9999.ebuild
index dbaa669aacc9..9490039a10a7 100644
--- a/dev-games/physfs/physfs-9999.ebuild
+++ b/dev-games/physfs/physfs-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Abstraction layer for filesystem and archive access"
@@ -40,14 +41,14 @@ multilib_src_configure() {
 		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
 		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_compile docs
+		cmake_src_compile docs
 		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	fi
 }