gentoo resync : 22.10.2018

19 files changed, 503 insertions, 8 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 7b6ffe048706..f8042fea7788 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 245492a5f57c..000da8f64be4 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -3,4 +3,4 @@ DIST Aseprite-v1.1.6-Source.zip 11801981 BLAKE2B f20186a1669d7f9ab1453a2104a5422
 DIST Aseprite-v1.1.7-Source.zip 11801711 BLAKE2B 282492c29ece6b5b5bed029c7f27aa0a287bcb475f60066b6c34f54607b2714f35540e4d6ef4737818712776c2202162ce47c5713ba26b756d9e1c1d8af9c904 SHA512 9a92853042c7de567a7eb33d10ddd38c6d6bd53acfe4b93dc96e11408a7bda39ef7503c159934c483f0455700933c541dfdc0cb4c505d3385778e40686e474e6
 EBUILD aseprite-1.1.6.ebuild 2137 BLAKE2B 25892ae8c493a1798ec344a840fe2f5dcb04e60441020095d00b294be7fb7af634138a715a36cb6135b9413b0a26ab21d25b42204e8c371d15e113acb1fcb0dd SHA512 41724723ae7a318ceff10178795709cfc2c9b8bc87836c02404f5af3ff03a5cdbc204ace11ca81f3699b649bdfda7471b4692eb6f1f3a6bf324965fd075a696f
 EBUILD aseprite-1.1.7.ebuild 2525 BLAKE2B 01c1954bf6a9ed76400da5c639a3efbdaa55117878febd7c049e38116245a8ee8602d693fbdcf8428692b5c7480b9603d6dbfebcb09dbf98da5ce4e765bf9da1 SHA512 d1fd7b3edcb428398aaeb794442aad5da944ddc03cc0a31ea5fc74bbe2fb9acce5f58b628b9789cbeb9fed54682336a5e4805d907d99e7ae9658b593d13442c9
-MISC metadata.xml 796 BLAKE2B f4d58bec1834431cd95364d44c0a61d5ed81c12a7b4d45d854fd69be57dbcd450936d0653c8a84640a4e23a2d59bf2e34d329db78c1c41943e6b835f0cf5ed50 SHA512 a85107e1261336c570d11265e0ede9eb9c6724c5f891786aadc509bc52e593cc61f6fc77022b928c56ef4dfe51b2f9d3f3eb603ffb2d0f4e6586fbc4d1794984
+MISC metadata.xml 736 BLAKE2B f51c9318ee809968234ec305c754f6eff180bb0117605e814d92729fd0c0b0b875977474451eec53883fdde4b6d619772b6d8180f8550a339bff0bc8e47492a2 SHA512 49d18653948b0426c33d0b85c0e6c827c0dd67fd8c4353d2b56ba4ab2dd3f891e6dd2f57c31591cd36a48c546b520a9937184e198103ebe6ebe59b1f92dc55cc
diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 67070f03bd3e..e5313dbe03f0 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="bundled-libs">Use the upstream provided bundled version of allegro 4.4.2</flag>
 		<flag name="gtk3">Enable support for the experimental native GTK File Dialog</flag>
-		<flag name="webp">Enable webp image format support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">aseprite/aseprite</remote-id>
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 6c2750a4555d..1aeecbbd21f1 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -2,12 +2,23 @@ AUX ogre-1.10.11-media_path.patch 922 BLAKE2B c39dfa7eec840d5952dfb0b854396268e4
 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.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-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-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 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.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23
-MISC metadata.xml 6139 BLAKE2B 7ec570cd9bf0e99b7ba2420526f6ede529dc3bfa35f3c2f169d768b7e2e425c81ef3bb1d75a20e96c3ff6215c27b82864df9d157a9fcb489183aa01532fde2ae SHA512 566077f56b9e7d92683c23745c46b19335e03044df87e19b8749396443d9f63087a703bc26f5651241536af2658e02c3d616f1610d350918be17ea4cc466a5a0
+EBUILD ogre-2.1_pre20180901.ebuild 4433 BLAKE2B 473fd9aa0ccb546f8fe0369b69ff9c5f63aeae3e73000b77f2d2343e2cef689f1b84b06186f2f93ef4cbaf374fddf6dad3d02430b407d85a872594862fe6598e SHA512 3cc8d28da6d8578f098765230fc06259c86838e325d10342a3919d3553a8509d2a6ba02fa1289e204e190f407de72e4df6377f7f9f6c8cd6f3a840fbbd4fb149
+MISC metadata.xml 6611 BLAKE2B 1d5eb84a08e6d6fb35363f95fe565e1b128ad85733bdfa2d71a6ded75121d058b0f1229b03808911b7e1b84954c769ea0d6ffc5a120aa38d7f63a13a1bdfdbc4 SHA512 98a6d956819ad294f262d8d8c32d5cf7886984928ca723c296a5c928c4e59241580fe1fd02f15ada30febe134cd7d9b8c8a052436e093c2df3cbb6bee03f3d96
diff --git a/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
new file mode 100644
index 000000000000..6e4a476fbb4c
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
@@ -0,0 +1,18 @@
+--- 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 @@
+ 	PATTERN "scripts" EXCLUDE
+   )
+   # install a new CMakeLists.txt file to allow building of samples
+-  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})
++# 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.11.2-media_path.patch b/dev-games/ogre/files/ogre-1.11.2-media_path.patch
new file mode 100644
index 000000000000..aea15218c178
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.11.2-media_path.patch
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 000000000000..8557d783ec41
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
@@ -0,0 +1,14 @@
+--- 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-2.1-enhance_config_loading.patch b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch
new file mode 100644
index 000000000000..365aa7c69d61
--- /dev/null
+++ b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch
@@ -0,0 +1,29 @@
+--- a/OgreMain/src/OgreConfigFile.cpp	2018-07-27 07:52:31.121337386 +0200
++++ b/OgreMain/src/OgreConfigFile.cpp	2018-07-27 07:59:51.301317661 +0200
+@@ -62,8 +62,25 @@
+     //-----------------------------------------------------------------------
+     void ConfigFile::load(const String& filename, const String& separators, bool trimWhitespace)
+     {
+-        loadDirect(filename, separators, trimWhitespace);
++        // Try automatic loading first
++        try {
++            loadDirect(filename, separators, trimWhitespace);
++        } catch (Exception &e) {
++            // Try /etc/OGRE/<file> next
++            try {
++                loadDirect("/etc/OGRE/" + filename, separators, trimWhitespace);
++                return;
++            } catch (...) { /* was just a test */ }
++            // Try /usr/share/OGRE/<file> last
++            try {
++                loadDirect("/usr/share/OGRE/" + filename, separators, trimWhitespace);
++                return;
++            } catch (...) { /* was just a test */ }
++            /* dammit... */
++            throw e;
++        }
+     }
++
+     //-----------------------------------------------------------------------
+     void ConfigFile::load(const String& filename, const String& resourceGroup, 
+         const String& separators, bool trimWhitespace)
diff --git a/dev-games/ogre/files/ogre-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch
new file mode 100644
index 000000000000..5e7ad276ac09
--- /dev/null
+++ b/dev-games/ogre/files/ogre-2.1-media_path.patch
@@ -0,0 +1,28 @@
+--- 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 @@
+ 
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
+-	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")
++# 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
new file mode 100644
index 000000000000..32cfef0d8d14
--- /dev/null
+++ b/dev-games/ogre/files/ogre-2.1-resource_path.patch
@@ -0,0 +1,18 @@
+--- 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 @@
+   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 (WINDOWS_STORE OR WINDOWS_PHONE)
diff --git a/dev-games/ogre/files/ogre-2.1-samples.patch b/dev-games/ogre/files/ogre-2.1-samples.patch
new file mode 100644
index 000000000000..6d12fb4fed11
--- /dev/null
+++ b/dev-games/ogre/files/ogre-2.1-samples.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt	2018-03-23 10:48:02.309486850 +0100
++++ b/CMakeLists.txt	2018-03-23 10:48:04.157486836 +0100
+@@ -614,7 +614,9 @@
+ endif ()
+ 
+ # Setup samples
+-add_subdirectory(Samples)
++if (OGRE_BUILD_SAMPLES2)
++    add_subdirectory(Samples)
++endif ()
+ 
+ # Add android JNI binding
+ if(ANDROID AND OGRE_BUILD_ANDROID_JNI_SAMPLE)
+--- a/CMake/InstallResources.cmake	2018-04-06 19:18:45.095348540 +0200
++++ b/CMake/InstallResources.cmake	2018-04-06 19:20:00.342345608 +0200
+@@ -62,8 +62,8 @@
+   set(OGRE_TEST_MEDIA_DIR_DBG "${CMAKE_INSTALL_PREFIX}/Tests/Media")
+   set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE")
+   set(OGRE_PLUGIN_DIR_DBG "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE")
+-  set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples")
+-  set(OGRE_SAMPLES_DIR_DBG "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples")
++  set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/share/OGRE/Samples")
++  set(OGRE_SAMPLES_DIR_DBG "${CMAKE_INSTALL_PREFIX}/share/OGRE/Samples")
+   set(OGRE_CFG_INSTALL_PATH "share/OGRE")
+ endif ()
+ 
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 9e726e9a8d33..841aaefd7dc8 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -82,7 +82,10 @@ Exporters
     <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="experimental">Build experimental BETA components 'Bites' and 'HLMS'</flag>
+    <flag name="experimental" restrict="&lt;dev-games/ogre-1.11">
+        Build experimental BETA components 'Bites' and 'HLMS'
+    </flag>
+    <flag name="experimental">Build experimental BETA component 'HLMS'</flag>
     <flag name="freeimage">Support images via media-libs/freeimage</flag>
     <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
     <flag name="gles2" restrict="&gt;dev-games/ogre-1.10">
@@ -90,8 +93,17 @@ Exporters
     </flag>
     <flag name="gles2">Build OpenGL ES 2.x RenderSystem</flag>
     <flag name="gles3">Enable OpenGL ES 3.x Features</flag>
+    <flag name="json">Use dev-libs/rapidjson (needed by Hlms JSON materials)</flag>
+    <flag name="legacy-animations">
+        Use the skeletal animation from 1.x. It's much slower, but the new system
+        is still experimental.
+    </flag>
     <flag name="ois">Pull in Object-oriented Input System library dev-games/ois for samples</flag>
     <flag name="poco">When USE=threads, use poco for threading</flag>
+    <flag name="mobile">
+        Build for OpenGL ES 2.0 only and use the mobile variants of the PBS and
+        unlit material systems.
+    </flag>
     <flag name="resman-pedantic">
         Resource Manager PEDANTIC : require an explicit resource group. Case
         sensitive lookup. Some demos might not work with this setting.
@@ -104,7 +116,6 @@ Exporters
     </flag>
     <flag name="tbb">When USE=threads, use tbb for threading</flag>
     <flag name="tools">Build and install helper tools</flag>
-    <flag name="zip">Support zip archives</flag>
   </use>
   <upstream>
     <remote-id type="bitbucket">sinbad/ogre</remote-id>
diff --git a/dev-games/ogre/ogre-1.11.2.ebuild b/dev-games/ogre/ogre-1.11.2.ebuild
new file mode 100644
index 000000000000..e3f452d99e9b
--- /dev/null
+++ b/dev-games/ogre/ogre-1.11.2.ebuild
@@ -0,0 +1,143 @@
+# 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.11"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
+	gles2 json openexr +opengl pch profile resman-pedantic resman-strict tools"
+
+REQUIRED_USE="
+	|| ( gles2 opengl )
+	?? ( resman-pedantic resman-strict )
+"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-games/ois
+	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] )
+	json? ( dev-libs/rapidjson )
+	openexr? ( media-libs/openexr:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	tools? ( dev-libs/tinyxml[stl] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	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"
+)
+
+src_prepare() {
+	sed -i \
+		-e "s:share/OGRE/docs: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
+	# are supported.
+	if use debug; then
+		sed -i \
+			-e 's/Debug/Gentoo/g' \
+			CMake/Utils/OgreConfigTargets.cmake \
+			|| die
+	else
+		sed -i \
+			-e 's/MinSizeRel/Gentoo/g' \
+			CMake/Utils/OgreConfigTargets.cmake \
+			|| die
+	fi
+	# Fix some path issues
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH=yes
+		-DOGRE_BUILD_COMPONENT_BITES=yes
+		-DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
+		-DOGRE_BUILD_COMPONENT_JAVA=no
+		-DOGRE_BUILD_COMPONENT_PAGING=yes
+		-DOGRE_BUILD_COMPONENT_PROPERTY=yes
+		-DOGRE_BUILD_COMPONENT_PYTHON=no
+		-DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=yes
+		-DOGRE_BUILD_COMPONENT_TERRAIN=yes
+		-DOGRE_BUILD_COMPONENT_VOLUME=yes
+		-DOGRE_BUILD_DEPENDENCIES=no
+		-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+		-DOGRE_BUILD_PLUGIN_FREEIMAGE=$(usex freeimage)
+		-DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr)
+		-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_GL_STATE_CACHE_SUPPORT=$(usex cache)
+		-DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no)
+		-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2)
+		-DOGRE_CONFIG_THREADS=3
+		-DOGRE_CONFIG_THREAD_PROVIDER=std
+		-DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch)
+		-DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
+		-DOGRE_INSTALL_DOCS=$(usex doc)
+		-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))
+	)
+
+	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
+	if use examples ; then
+		insinto "${SHAREDIR}"
+		doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
+		doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+	fi
+}
diff --git a/dev-games/ogre/ogre-2.1_pre20180901.ebuild b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
new file mode 100644
index 000000000000..9249788cc201
--- /dev/null
+++ b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
@@ -0,0 +1,153 @@
+# 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
+
+MY_COMMIT="35b083cba64a"
+MY_P="sinbad-${PN}-${MY_COMMIT}"
+
+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"
+
+LICENSE="MIT public-domain"
+SLOT="0/2.1"
+KEYWORDS=""
+
+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
+
+REQUIRED_USE="
+	|| ( gles2 opengl )
+	mobile? ( egl gles2 !opengl )"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-games/ois
+	dev-libs/zziplib
+	media-libs/freetype:2
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	egl? ( media-libs/mesa[egl] )
+	freeimage? ( media-libs/freeimage )
+	gles2? ( media-libs/mesa[gles2] )
+	json? ( dev-libs/rapidjson )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	tools? ( dev-libs/tinyxml[stl] )
+"
+# Dependencies for USE flags that do not work, yet.
+#	cg? ( media-gfx/nvidia-cg-toolkit )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1-samples.patch"
+	"${FILESDIR}/${PN}-2.1-resource_path.patch"
+	"${FILESDIR}/${PN}-2.1-media_path.patch"
+	"${FILESDIR}/${PN}-2.1-enhance_config_loading.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+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_HLMS_PBS=$(         usex mobile no yes)
+		-DOGRE_BUILD_COMPONENT_HLMS_PBS_MOBILE=$(  usex mobile)
+		-DOGRE_BUILD_COMPONENT_HLMS_UNLIT=$(       usex mobile no yes)
+		-DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=$(usex mobile)
+		-DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=yes
+		-DOGRE_BUILD_COMPONENT_SCENE_FORMAT=yes
+		-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_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_THREADS=2
+		-DOGRE_CONFIG_THREAD_PROVIDER=std
+		-DOGRE_FULL_RPATH=no
+		-DOGRE_INSTALL_DOCS=$(usex doc)
+		-DOGRE_INSTALL_SAMPLES=$(usex examples)
+		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
+		-DOGRE_LEGACY_ANIMATIONS=$(usex legacy-animations)
+		-DOGRE_PROFILING_PROVIDER=$(usex profile none internal)
+		-DOGRE_USE_BOOST=no
+	)
+	# Options that aren't ported, yet:
+	#	-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+	#	-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+
+	# 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.
+	mycmakeargs+=(
+		-DOGRE_BUILD_COMPONENT_PAGING=no
+		-DOGRE_BUILD_COMPONENT_PROPERTY=no
+		-DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=no
+		-DOGRE_BUILD_RTSHADERSYSTEM_CORE_SHADERS=no
+		-DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=no
+		-DOGRE_BUILD_COMPONENT_TERRAIN=no
+		-DOGRE_BUILD_COMPONENT_VOLUME=no
+	)
+
+	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/plugins_tools.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
+	doins "${CMAKE_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
+	dosym "${CONFIGDIR}"/resources2.cfg "${SHAREDIR}"/resources2.cfg
+
+	# These are only for the Samples
+	if use examples ; then
+		insinto "${SHAREDIR}"
+		doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+	fi
+}
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index a0985e090d54..36d7a36b7104 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -5,4 +5,4 @@ EBUILD physfs-2.0.3-r2.ebuild 1434 BLAKE2B e90dfa9de136d2d0c6df7247b7681cfae7dec
 EBUILD physfs-3.0.1-r1.ebuild 1357 BLAKE2B ccc70d74bc537f05b2ebe2cd64e0b6376e3791380d5d00a367f30d1f6169c0281addfa0e26b713c6ed74ff2882193f0dc84edd1d17b16582834f52a4dc898895 SHA512 f7a3c0d29d45754ceca70388d1fc93ae218bcce727006951089df7744038f88823cce3767e079ce41d6cb2bf7837731cd9f04e3e4417f0df2b64e254f72f2cfd
 EBUILD physfs-3.0.1.ebuild 1149 BLAKE2B 4d1741230adecf1df5380d3a15cc00d1fa1a2d21b5b5b5efa31e2dd11b7fdb44ebaf062bd4c8124bdfeed05f330edabd401e62720a432d4ff895dd7be635edfb SHA512 34a700288cb901ba432c748e47203e8234e0f1ba68af56edf490ea798c2afabf6f905cc8d95f602fe8fa66518e2e82d051b95ec7004a913e394bb525478f6dff
 EBUILD physfs-9999.ebuild 1458 BLAKE2B 903117df8a7c78a3e08aadaba7d418666ab387dd14172a48e5a63bf4a277c73fc96f2f49a3f81faad62a4aeed47304b64e72ad55253d238ed480568b785c04a8 SHA512 fd7fa508248f2e917cc11cf165da5c6b6fdde20d3d0340410de44ecc175dcfce8a9035b20a971998eb4733125860ad52aed9f6e34b0401266fff02dc7f15d84b
-MISC metadata.xml 2053 BLAKE2B 72bacd7ea9c8484446c109a062ca9f68eaa4e7d481d6b0d1e32eb3c7c1afc093c0550a20cb4280a7d3ce60929b204cde0499e20262fe591ca97c0c697e8e9bce SHA512 178d6468849870d0e557c04f899edf8513c3e695df0ce1b543de90ca57f87629a2a6c2ebdefeaf00ffe7891dcc9e340200136f94de0579e2e7f43897b138f3a2
+MISC metadata.xml 2002 BLAKE2B 4b4c48bdbb19836f3a2e5b09c737c1c0390dba6d2cdccb126a0f8caa6e593e0861b9ddf1d3d70b1da00385b323b86c2842482ccfa10de421a6ea57251fab703b SHA512 4a06786fe7cd30dc87225656ae0b09322f23f19fdd3919695629f76c54d7abb6ee970b8a67c59ef5895e460c5e65074ec7ffb06680f1572898aa15f2fb78fbdc
diff --git a/dev-games/physfs/metadata.xml b/dev-games/physfs/metadata.xml
index 62272a610b69..4c12a220b846 100644
--- a/dev-games/physfs/metadata.xml
+++ b/dev-games/physfs/metadata.xml
@@ -32,6 +32,5 @@ etc.
 <flag name="vdf">Enable Gothic/Gothic II VDF archive support</flag>
 <flag name="wad">Enable Doom WAD archive support</flag>
 <flag name="qpak">Enable Quake I/II QPAK archive support</flag>
-<flag name="zip">Enable ZIP archive support</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index a5681b9196eb..dec0b71d0f70 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,5 +1,6 @@
+AUX tiled-1.2.0-qt-5.11.patch 611 BLAKE2B a2113dcb7170c9a750372e6e3e07a56bde77ced34d4c62a5d31e4b93dcef2fb149330614be5f962193e537559efb897214163209c48cafe2ed5319f8bda3cad7 SHA512 5eacb68e75ec3595411cf79d9d565ad7480977df6d0814be27da2eeac83e6b1af106f5b707f6f5e2bc07adb2b139ef9731c88c432228870b32a0a0bcb3ab3f42
 DIST tiled-1.1.6.tar.gz 16051699 BLAKE2B 61e33682cbd0d3045c12b20fc852ec8ae81103fc1d9818a7e17222615676dd2d3889033d6d6ba536e63e069a44aaeebeaaffb96b94a2cbcb8f1793553a466703 SHA512 d1083a938bbbd87897c5897fe79d424706e719a4319680ed907be481773daea656fc5b3230ba6b674e5ea044e22ee0044df2a07a7c91c56f9521e32b86847830
 DIST tiled-1.2.0.tar.gz 17007687 BLAKE2B 6bb5a34a19868574801a69015f6a05b299dd5b34df865cacf5d2a747a62ae731b80778fe49a432c5487cbfa3d30186dc80011cc8882cb86ac347fb35a7421cbc SHA512 9c0c151348a90344b355e9bc8a7c9d38e2203d48474e8cf496e2c08cc75f764042e4355db2827f0e3518a1c03bfbcc79be7ba643c44c50430c7ecec09fbb8563
 EBUILD tiled-1.1.6.ebuild 1276 BLAKE2B 31c9ef74b458163b5ecbed4c307b1a32ebec6d5d635d4cb8373add7b3e3749057a307550fe68b35d0694fbf566cabc04d5c3abf1cb4ac2e7d9449c91f61c61ff SHA512 cbc32e28411d3cbcd7973e6072d1f9874997b467fc3760fa2ca54e8595e7bcd5599fe5b85db3cf6b1b78da1a393d48843f749713a647a2c8d6df63aacfb2a9df
-EBUILD tiled-1.2.0.ebuild 1274 BLAKE2B f52201c15fa94aae73e1e886a7fc770d62e9aa7228be3c1d3dee4f7dde1960f3bf58b9a596ede03e5b9fc146f5c298e2d071bcb330a1cf293069294e3145347e SHA512 8728f63f29bd82807db88b77e061a9648616864e09277c4478563c6b99dafc1d777c525dfdb26bd9a2cab309b228a926f354ad8e2a63247ea075ffd9139712a2
+EBUILD tiled-1.2.0.ebuild 1319 BLAKE2B 3dca6a8a8ba1407d0069e5c34694f1a2c7b254c00a7389c41578a6542ea390985fe0240770d651c19bfbfd6068a89411733779638237c62153ca0bb09f0e3ccc SHA512 d5c104765d08958e3898402e38c11c9aac1612d633eeaabdca6ed93c5720c070e9bc4f93c59ace7cfe2e2bb4d9a919f8bd5cbf12bb72c60447f17f71d366fd5e
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
new file mode 100644
index 000000000000..43b3c64659c4
--- /dev/null
+++ b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/667000
+
+From 1f039bc40c730cdd93df8213795bbb0fcb634dfe Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 22:51:03 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/tiled/newsfeed.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tiled/newsfeed.cpp b/src/tiled/newsfeed.cpp
+index ddf988c3..2e2e12b9 100644
+--- a/src/tiled/newsfeed.cpp
++++ b/src/tiled/newsfeed.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "preferences.h"
+ 
++#include <QDebug>
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+ #include <QSettings>
+-- 
+2.18.1
+
diff --git a/dev-games/tiled/tiled-1.2.0.ebuild b/dev-games/tiled/tiled-1.2.0.ebuild
index fb9cfdad6b97..75a12ed885f7 100644
--- a/dev-games/tiled/tiled-1.2.0.ebuild
+++ b/dev-games/tiled/tiled-1.2.0.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( AUTHORS COPYING NEWS.md README.md )
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup