dev-games/ogre: Sync with enhancements for the PR.

5 files changed, 31 insertions, 21 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 615f01b..dd61692 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,2 +1,3 @@
-DIST ogre-1.10.12.zip 133067192 SHA256 43ddecf937191aae46acfb6bf73ef107b7366b0336bf0cfe49dea4b1bfc24ed9 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 WHIRLPOOL d52a0c2a157431a4339edb9538e5f9317219ce10b25383beb54d9936995e11d89760bc782da5d253ecb87d0a3ee6f778cb44aed2a70ca85cb114dcd868e3e77f
-DIST ogre-1.11.1.zip 127416797 SHA256 d83025d2b79c7f9acd4efbdcba48d4d8ba80996ec056c39e567232df5de53919 SHA512 661443166bec11dda9b8b752a16ca8528e772071cde85fcfb436aed915b5d43d77707a96351014a80c3a34137dc6c3c843c2217602ded751f83eb1e10c221af3 WHIRLPOOL 6b03f628f1a9b5f6c1d6e4bec7c3d15a43680177ab017ab9a2c1f44535b50372704f99d796753c9cc14641b8d38959e9e70e7aeb29e66c080587371523258b34
+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
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index e13ff59..12f4186 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -83,25 +83,29 @@ Exporters
     <flag name="beta-components" restrict="&lt;dev-games/ogre-2.1">
         Build BETA component 'HLMS'
     </flag>
-    <flag name="beta-components">
-        Build BETA components (if any)
-    </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="gles2">Build OpenGL ES 2.x RenderSystem plus ES 3.x features if available.</flag>
+    <flag name="freeimage">support images via 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.
+    </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" restrict="&gt;=dev-games/ogre-2.1">
         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 for samples</flag>
     <flag name="mobile" restrict="&gt;=dev-games/ogre-2.1">
         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
@@ -115,7 +119,9 @@ Exporters
         Resource Manager STRICT : search in default group if not specified otherwise.
         Case sensitive lookup.
     </flag>
-    <flag name="tools">Build and install helper tools</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>
   </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
index 95d5bfe..d7c6def 100644
--- a/dev-games/ogre/ogre-1.10.12.ebuild
+++ b/dev-games/ogre/ogre-1.10.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
 
 LICENSE="MIT public-domain"
 SLOT="0/1.10.0"
-KEYWORDS="~amd64 ~x86"
+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
diff --git a/dev-games/ogre/ogre-1.11.1.ebuild b/dev-games/ogre/ogre-1.11.1.ebuild
index 29669a9..fd2bdb9 100644
--- a/dev-games/ogre/ogre-1.11.1.ebuild
+++ b/dev-games/ogre/ogre-1.11.1.ebuild
@@ -27,8 +27,6 @@ RESTRICT="test" #139905
 RDEPEND="
 	dev-libs/zziplib
 	media-libs/freetype:2
-	virtual/glu
-	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXaw
 	x11-libs/libXrandr
@@ -39,7 +37,11 @@ RDEPEND="
 	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
+	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto
@@ -104,8 +106,8 @@ src_configure() {
 			usex resman-strict 2 0))
 	)
 
-	# Ogre3D is making use of "CMAKE_INSTALL_CONFIG_NAME MATCHES ..." and
-	# sets it to BUILD_TYPE. Only RelWithDebInfo, MinSizeRel and Debug
+	# 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)"
 
@@ -125,9 +127,8 @@ src_install() {
 	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
 	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
 
-	# Unfortunately make install forgets the samples.
+	# These are only for the sample browser
 	if use examples ; then
-		# 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-2.1-r20180724.ebuild b/dev-games/ogre/ogre-2.1-r20180724.ebuild
index 7c0eaa4..46849ee 100644
--- a/dev-games/ogre/ogre-2.1-r20180724.ebuild
+++ b/dev-games/ogre/ogre-2.1-r20180724.ebuild
@@ -33,8 +33,6 @@ RESTRICT="test" #139905
 RDEPEND="
 	dev-libs/zziplib
 	media-libs/freetype:2
-	virtual/glu
-	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXaw
 	x11-libs/libXrandr
@@ -43,7 +41,11 @@ RDEPEND="
 	freeimage? ( media-libs/freeimage )
 	gles2? ( media-libs/mesa[gles2] )
 	json? ( dev-libs/rapidjson )
-	ois? ( dev-games/ois )"
+	ois? ( dev-games/ois )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)"
 # Dependencies for USE flags that do not work, yet.
 #	cg? ( media-gfx/nvidia-cg-toolkit )
 DEPEND="${RDEPEND}