gentoo resync 08.09.2018

5 files changed, 111 insertions, 74 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 98a96b37a7da..6c2750a4555d 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,13 +1,13 @@
-AUX ogre-1.10.11-fix_double_precision-88f0d5b.patch 1525 BLAKE2B fbb01668cc0d67f8417a1c244b9cab2ee839e97b89a479c93ae01d61befac735c6a57ae62eeac47b7647d01f2db99ff1527ad5bcb0b92288f7f8f9f0bd253ee9 SHA512 f9b6daa26032f77bd93a76734282b74883870ebc79b3bcbe5f6e8ae65f5e938ff473d9c7152488ee36bced43fd0d7245e39e660e835c214602d1f722e39ea302
 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.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
-DIST ogre-1.10.11.zip 133064317 BLAKE2B 88c64061377d8257853378219fb5906919d251f5b3c500f70bc1c04bc36e3083dc3dac4babb14d983c8b6fbb63ea3eecf698e3a0134f963db058055edd5dc4c4 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54
+DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041
 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
-EBUILD ogre-1.10.11.ebuild 3168 BLAKE2B ee7bf2ae427c66f32d19c8d7924e7f45d75e265fa582ea57a7ca281f884957c0b24354840463d612a533a8663ddb0b2abac8f50f076e2b649ee599ff2a623045 SHA512 924da46b4bd78df10edfc2f8b7f40f556f93f38562e9f68c87eba79ffa7283290fd9cd961e6c2cbb56e1c28288d028eb72e10ef68a23501803cc2380d6cabe76
+EBUILD ogre-1.10.12.ebuild 3379 BLAKE2B e617b49260f550f20ebc898168a9a8a274fe94b01297856b431f22e496260a2c8cca3c3bdc3d25777966bb83d51c50fbbfa871ec72bc24c7b8a8552d40c52e26 SHA512 a1c0a60967701eda0168560dd4a0ec33a869c0e751ef0eac078714874d2f4bc4e068b777fc145f35473fdf380f96987c5041e360d305c3d3cd3cabc3e1414667
 EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23
-MISC metadata.xml 5223 BLAKE2B 20cd8b976d6a46dd1bc9cc9a8a075c5638e45cdc5d4ae043837e21baf9a7191f2b60230c426e7ee4e66e7a153af44ccf9b323c2422462aa1cf78d486f29a4a63 SHA512 0dc362c5fda467f45c1910baaa4bf51dc48dc01bcb7ae9230008d868d5556227b77c030a0d2110646bcbff8318d4c0c1c2a3a7b112b3f63c0132bcb1adaa61fe
+MISC metadata.xml 6139 BLAKE2B 7ec570cd9bf0e99b7ba2420526f6ede529dc3bfa35f3c2f169d768b7e2e425c81ef3bb1d75a20e96c3ff6215c27b82864df9d157a9fcb489183aa01532fde2ae SHA512 566077f56b9e7d92683c23745c46b19335e03044df87e19b8749396443d9f63087a703bc26f5651241536af2658e02c3d616f1610d350918be17ea4cc466a5a0
diff --git a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch
deleted file mode 100644
index 53d7a0925d51..000000000000
--- a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User niparx <koliap@gmail.com>
-# Date 1515160111 -7200
-# Node ID 88f0d5be23c521e7504e3f6cb2a153428efcf159
-# Parent  bc4fb04c1de686c23c6207eee69ae0ca9fddcb7c
-[OGRE-592] RTShaderSystem compile error when using double precision (#622)
-
-RTShaderSystem: compile error when using double precision
-
-https://ogre3d.atlassian.net/browse/OGRE-592
-
-diff --git a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
---- a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
-+++ b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
-@@ -654,8 +654,12 @@
-             curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(alphaValue)), Operand::OPS_IN);
-         }
-         else
--        {               
--            curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(colourValue.ptr())), Operand::OPS_IN);
-+        {
-+            curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4((Real)colourValue.r,
-+                                                                                      (Real)colourValue.g,
-+                                                                                      (Real)colourValue.b,
-+                                                                                      (Real)colourValue.a)),
-+                                           Operand::OPS_IN);
-         }
-         
-         curFuncInvocation->pushOperand(arg, Operand::OPS_OUT);
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 000000000000..ef15931940da
--- /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/metadata.xml b/dev-games/ogre/metadata.xml
index 42d8eb1e79bb..9e726e9a8d33 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -77,18 +77,34 @@ Exporters
     * Maya (meshes)
   </longdescription>
   <use>
-    <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="freeimage">support images via freeimage</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="freeimage">Support images via media-libs/freeimage</flag>
     <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
-    <flag name="gles2">build OpenGL ES 2.x RenderSystem</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="ois">pull in Object-oriented Input System library for samples</flag>
-    <flag name="poco">when USE=threads, use poco for threading</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="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="resman-pedantic">
+        Resource Manager PEDANTIC : require an explicit resource group. Case
+        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>
+    <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.11.ebuild b/dev-games/ogre/ogre-1.10.12.ebuild
index 3094851d1f67..34a0952245b9 100644
--- a/dev-games/ogre/ogre-1.10.11.ebuild
+++ b/dev-games/ogre/ogre-1.10.12.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,41 +15,45 @@ LICENSE="MIT public-domain"
 SLOT="0/1.10.0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl profile tools"
-
-REQUIRED_USE="examples? ( ois )
-	gles3? ( gles2 )
-	gl3plus? ( opengl )"
+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-libs/boost
+	dev-games/ois
+	dev-libs/boost:=
 	dev-libs/zziplib
 	media-libs/freetype:2
-	virtual/glu
-	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 )
-	gl3plus? ( >=media-libs/mesa-9.2.5 )
-	gles2? ( >=media-libs/mesa-9.0.0[gles2] )
-	gles3? ( >=media-libs/mesa-10.0.0[gles2] )
-	ois? ( dev-games/ois )
-	tools? ( dev-libs/tinyxml[stl] )"
+	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}/${P}-samples.patch"
-	"${FILESDIR}/${P}-resource_path.patch"
-	"${FILESDIR}/${P}-media_path.patch"
-	"${FILESDIR}/${P}-fix_double_precision-88f0d5b.patch"
+	"${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() {
@@ -59,38 +65,40 @@ src_prepare() {
 		-e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
 		CMake/Utils/OgreConfigTargets.cmake || die
 
-	# make sure we're not using the included tinyxml
-	# Update for 1.10.11: Unfortunately the build system does not
-	#   search for a system wide tinyxml at this moment. However,
-	#   TinyXML is meant to be built into and not linked to a using
-	#   project anyway.
-	# rm -f Tools/XMLConverter/{include,src}/tiny*.*
-
 	# Fix some path issues
 	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DOGRE_BUILD_COMPONENT_JAVA=NO
-		-DOGRE_BUILD_COMPONENT_PYTHON=NO
-		-DOGRE_BUILD_DEPENDENCIES=NO
+		-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=FALSE
+		-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_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_NODE_STORAGE_LEGACY=no
 		-DOGRE_PROFILING=$(usex profile)
-		-DOGRE_RESOURCEMANAGER_STRICT=strict
-		-DOGRE_USE_STD11=YES
+		-DOGRE_RESOURCEMANAGER_STRICT=$(\
+			usex resman-pedantic 1 $(\
+			usex resman-strict 2 0))
+		-DOGRE_USE_STD11=yes
 	)
 
 	cmake-utils_src_configure