dev-games/ogre : 1.10.12 is in the tree now.

13 files changed, 98 insertions, 246 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index dd61692..48c36f4 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,3 +1,2 @@
-DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041
-DIST ogre-1.11.1.zip 127416797 BLAKE2B 74bbfe394a9e9d9cfcb1335cb0edbcc7ff619078e1133c2ff295869a2bc96ac19649e49207bc7229ed801ef1651c5d1a6607799cef54db577b12d08e0947ca46 SHA512 661443166bec11dda9b8b752a16ca8528e772071cde85fcfb436aed915b5d43d77707a96351014a80c3a34137dc6c3c843c2217602ded751f83eb1e10c221af3
-DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
+DIST ogre-1.11.2.zip 127409383 SHA256 30486251081daa89770dc8d00dde7ca7ebe89cf65c3b87f1653991b110645574 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2 WHIRLPOOL 91bd16dd580fef5ad57a542eec5125a06439bddb82b5dc1eb2d291852523fed9fa3c1990cfcbe8ff59946658f96045d28b6e6fec47266f6dc3b07050040bbfd8
+DIST ogre-2.1_pre20180901.tar.bz2 152746767 SHA256 23b24257ca6bc0506b99fae6c9cc59115714e7841677a7776619e24695af31da SHA512 c3cb5630a35e0ddf8c688a972ab5f2821d62545b4febc013235157eaf5268b3ceac1b94c403d0298131991f3d80d1c9b3800212a49647c652ba02bd176f6cc04 WHIRLPOOL 1a153e9d4d631863f7c081946d4091d9bf3e7dcef32ae0de2e6cb57d5b86559b8eeb8ab3d2284fc8f58e8a136495a1ecdbba8c43dfc655ab1ebfda8297dcda1b
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 4d2547a..0000000
--- 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 9c39dfc..0000000
--- 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 80b989e..0000000
--- 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.10.12-use_system_tinyxml.patch b/dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch
new file mode 100644
index 0000000..ef15931
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch
@@ -0,0 +1,42 @@
+--- a/CMake/Dependencies.cmake	2018-09-04 07:50:49.091120793 +0200
++++ b/CMake/Dependencies.cmake	2018-09-04 07:51:55.429118519 +0200
+@@ -383,6 +383,10 @@
+ find_package(Softimage)
+ macro_log_feature(Softimage_FOUND "Softimage" "Softimage SDK needed for building XSIExporter" FALSE "6.0" "")
+ 
++# Find TinyXML
++find_package(TinyXML)
++macro_log_feature(TINYXML_FOUND "TinyXML" "TinyXML needed for building OgreXMLConverter" FALSE "" "")
++
+ #######################################################################
+ # Tests
+ #######################################################################
+--- /dev/null	2018-09-03 08:18:52.571907158 +0200
++++ b/CMake/Packages/FindTinyXML.cmake	2018-09-04 19:15:06.392129319 +0200
+@@ -0,0 +1,26 @@
++# - Find TinyXML
++# Find the native TinyXML includes and library
++#
++#   TINYXML_FOUND       - True if TinyXML found.
++#   TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
++#   TINYXML_LIBRARIES   - List of libraries when using TinyXML.
++#
++
++IF( TINYXML_INCLUDE_DIR )
++    # Already in cache, be silent
++    SET( TinyXML_FIND_QUIETLY TRUE )
++ENDIF( TINYXML_INCLUDE_DIR )
++
++FIND_PATH( TINYXML_INCLUDE_DIR "tinyxml.h"
++           PATH_SUFFIXES "tinyxml" )
++
++FIND_LIBRARY( TINYXML_LIBRARIES
++              NAMES "tinyxml"
++              PATH_SUFFIXES "tinyxml" )
++
++# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE( "FindPackageHandleStandardArgs" )
++FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )
++
++MARK_AS_ADVANCED( TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )
diff --git a/dev-games/ogre/files/ogre-1.11.1-samples.patch b/dev-games/ogre/files/ogre-1.11.1-samples.patch
deleted file mode 100644
index eec05cc..0000000
--- a/dev-games/ogre/files/ogre-1.11.1-samples.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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_SAMPLES)
-+    add_subdirectory(Samples)
-+endif ()
- 
- # Add android JNI binding
- if(ANDROID AND OGRE_BUILD_ANDROID_JNI_SAMPLE)
diff --git a/dev-games/ogre/files/ogre-1.11.1-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
index 6e4a476..6e4a476 100644
--- a/dev-games/ogre/files/ogre-1.11.1-fix_sample_source_install.patch
+++ b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
diff --git a/dev-games/ogre/files/ogre-1.11.1-media_path.patch b/dev-games/ogre/files/ogre-1.11.2-media_path.patch
index aea1521..aea1521 100644
--- a/dev-games/ogre/files/ogre-1.11.1-media_path.patch
+++ b/dev-games/ogre/files/ogre-1.11.2-media_path.patch
diff --git a/dev-games/ogre/files/ogre-1.11.1-resource_path.patch b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
index 8557d78..8557d78 100644
--- a/dev-games/ogre/files/ogre-1.11.1-resource_path.patch
+++ b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 12f4186..5db91d3 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -77,18 +77,16 @@ Exporters
     * Maya (meshes)
   </longdescription>
   <use>
-    <flag name="beta-components" restrict="&lt;dev-games/ogre-1.11">
-        Build BETA components 'Bites' and 'HLMS'
-    </flag>
-    <flag name="beta-components" restrict="&lt;dev-games/ogre-2.1">
-        Build BETA component 'HLMS'
-    </flag>
-    <flag name="boost">enable boost support</flag>
+    <flag name="boost">Enable boost support</flag>
     <flag name="cache">Enable GL state cache support</flag>
     <flag name="cg">NVIDIA toolkit plugin</flag>
-    <flag name="double-precision">more precise calculations at the expense of speed</flag>
+    <flag name="double-precision">More precise calculations at the expense of speed</flag>
     <flag name="egl">Use egl instead of glx</flag>
-    <flag name="freeimage">support images via freeimage</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">
         Build OpenGL ES 2.x RenderSystem plus ES 3.x features if available.
@@ -96,32 +94,29 @@ Exporters
     <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" restrict="&gt;=dev-games/ogre-2.1">
+    <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="mobile" restrict="&gt;=dev-games/ogre-2.1">
+    <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="ois">pull in Object-oriented Input System library for samples</flag>
-    <flag name="poco">when USE=threads, use poco for threading</flag>
-    <flag name="resman-legacy" restrict="&lt;dev-games/ogre-2.1">
-        Resource Manager LEGACY : search in all groups twice - for case sensitive
-        and insensitive lookup. This is the default as some demos might not work
-        with more stricter settings.
-    </flag>
-    <flag name="resman-pedantic" restrict="&lt;dev-games/ogre-2.1">
+    <flag name="resman-pedantic">
         Resource Manager PEDANTIC : require an explicit resource group. Case
-        sensitive lookup.
+        sensitive lookup. Some demos might not work with this setting.
+        (default: case-insensitive + sensitive lookup in all groups)
     </flag>
-    <flag name="resman-strict" restrict="&lt;dev-games/ogre-2.1">
+    <flag name="resman-strict">
         Resource Manager STRICT : search in default group if not specified otherwise.
-        Case sensitive lookup.
+        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+install helper tools</flag>
-    <flag name="zip">support zip archives</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.10.12.ebuild b/dev-games/ogre/ogre-1.10.12.ebuild
deleted file mode 100644
index d7c6def..0000000
--- a/dev-games/ogre/ogre-1.10.12.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="beta-components +cache cg doc double-precision egl examples +freeimage
-	gles2 ois +opengl profile +resman-legacy resman-pedantic resman-strict
-	tools"
-
-REQUIRED_USE="
-	|| ( gles2 opengl )
-	^^ ( resman-legacy resman-pedantic resman-strict )
-	examples? (
-		beta-components
-		ois
-	)"
-
-RESTRICT="test" #139905
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/zziplib
-	media-libs/freetype:2
-	virtual/glu
-	opengl? ( virtual/opengl )
-	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] )
-	ois? ( dev-games/ois )"
-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"
-)
-
-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 beta-components)
-		-DOGRE_BUILD_COMPONENT_HLMS=$(usex beta-components)
-		-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.1.ebuild b/dev-games/ogre/ogre-1.11.2.ebuild
index fd2bdb9..e2ad3e7 100644
--- a/dev-games/ogre/ogre-1.11.1.ebuild
+++ b/dev-games/ogre/ogre-1.11.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
 inherit cmake-utils
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
@@ -13,18 +15,18 @@ LICENSE="MIT public-domain"
 SLOT="0/1.11"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="beta-components +cache cg debug doc double-precision egl examples
-	+freeimage gles2 json ois openexr +opengl pch profile +resman-legacy
-	resman-pedantic resman-strict tools"
+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-legacy resman-pedantic resman-strict )
-	examples? ( ois )"
+	?? ( resman-pedantic resman-strict )
+"
 
 RESTRICT="test" #139905
 
 RDEPEND="
+	dev-games/ois
 	dev-libs/zziplib
 	media-libs/freetype:2
 	x11-libs/libX11
@@ -36,12 +38,13 @@ RDEPEND="
 	freeimage? ( media-libs/freeimage )
 	gles2? ( media-libs/mesa[gles2] )
 	json? ( dev-libs/rapidjson )
-	ois? ( dev-games/ois )
-	openexr? ( media-libs/openexr )
+	openexr? ( media-libs/openexr:= )
 	opengl? (
 		virtual/glu
 		virtual/opengl
-	)"
+	)
+	tools? ( dev-libs/tinyxml[stl] )
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto
@@ -50,8 +53,8 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-media_path.patch"
 	"${FILESDIR}/${P}-resource_path.patch"
-	"${FILESDIR}/${P}-samples.patch"
 	"${FILESDIR}/${P}-fix_sample_source_install.patch"
+	"${FILESDIR}/${PN}-1.10.12-use_system_tinyxml.patch"
 )
 
 src_prepare() {
@@ -69,8 +72,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH=yes
 		-DOGRE_BUILD_COMPONENT_BITES=yes
-		-DOGRE_BUILD_COMPONENT_HLMS=$(usex beta-components)
+		-DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
 		-DOGRE_BUILD_COMPONENT_JAVA=no
 		-DOGRE_BUILD_COMPONENT_PAGING=yes
 		-DOGRE_BUILD_COMPONENT_PROPERTY=yes
@@ -95,7 +99,6 @@ src_configure() {
 		-DOGRE_CONFIG_THREADS=3
 		-DOGRE_CONFIG_THREAD_PROVIDER=std
 		-DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DOGRE_FULL_RPATH=no
 		-DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
 		-DOGRE_INSTALL_DOCS=$(usex doc)
 		-DOGRE_INSTALL_SAMPLES=$(usex examples)
@@ -108,8 +111,8 @@ src_configure() {
 
 	# Ogre-1.11+ is making use of "CMAKE_INSTALL_CONFIG_NAME MATCHES ..."
 	# and sets it to BUILD_TYPE. Only RelWithDebInfo, MinSizeRel and Debug
-	# are supported.
-	CMAKE_BUILD_TYPE="$(usex debug Debug RelWithDebInfo)"
+	# are supported. Setting CMAKE_INSTALL_CONFIG_NAME does not work.
+	CMAKE_BUILD_TYPE="$(usex debug Debug MinSizeRel)"
 
 	cmake-utils_src_configure
 }
diff --git a/dev-games/ogre/ogre-2.1-r20180724.ebuild b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
index 46849ee..9249788 100644
--- a/dev-games/ogre/ogre-2.1-r20180724.ebuild
+++ b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
@@ -3,21 +3,23 @@
 
 EAPI=6
 
-inherit eutils cmake-utils mercurial
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
+inherit cmake-utils
 
-DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="http://www.ogre3d.org/"
+MY_COMMIT="35b083cba64a"
+MY_P="sinbad-${PN}-${MY_COMMIT}"
 
-EHG_REPO_URI="https://bitbucket.org/sinbad/ogre"
-EHG_REVISION="b9f5f58b4f84cbf5b8f4923de4061e1f78dd1f78"
-SRC_URI=""
+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 ois +opengl profile tools"
+	mobile +opengl profile tools"
 
 # USE flags that do not work, as their options aren't ported, yet.
 #	cg
@@ -25,12 +27,12 @@ IUSE="+cache debug doc egl examples +freeimage gles2 json +legacy-animations
 
 REQUIRED_USE="
 	|| ( gles2 opengl )
-	examples? ( ois )
 	mobile? ( egl gles2 !opengl )"
 
 RESTRICT="test" #139905
 
 RDEPEND="
+	dev-games/ois
 	dev-libs/zziplib
 	media-libs/freetype:2
 	x11-libs/libX11
@@ -41,11 +43,12 @@ RDEPEND="
 	freeimage? ( media-libs/freeimage )
 	gles2? ( media-libs/mesa[gles2] )
 	json? ( dev-libs/rapidjson )
-	ois? ( dev-games/ois )
 	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}
@@ -54,15 +57,13 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-samples.patch"
-	"${FILESDIR}/${P}-resource_path.patch"
-	"${FILESDIR}/${P}-media_path.patch"
-	"${FILESDIR}/${P}-enhance_config_loading.patch"
+	"${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"
 )
 
-src_unpack() {
-	mercurial_src_unpack
-}
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	sed -i \
@@ -124,11 +125,6 @@ src_configure() {
 		-DOGRE_BUILD_COMPONENT_VOLUME=no
 	)
 
-	# Ogre3D is making use of "CMAKE_INSTALL_CONFIG_NAME MATCHES ..." and
-	# sets it to BUILD_TYPE. Only RelWithDebInfo, MinSizeRel and Debug
-	# are supported.
-	CMAKE_BUILD_TYPE="$(usex debug Debug RelWithDebInfo)"
-
 	cmake-utils_src_configure
 }