fix bug #506058, thanks to Sven Eden

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

6 files changed, 181 insertions, 18 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index b2e2a71ee850..2b34d8e3b6c8 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.97 2014/03/08 23:22:37 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.98 2014/11/05 19:37:37 hasufell Exp $
+
+*ogre-1.9.0-r1 (05 Nov 2014)
+
+  05 Nov 2014; Julian Ospald <hasufell@gentoo.org> +ogre-1.9.0-r1.ebuild,
+  +files/ogre-1.9.0-remove_media_path_to_bindir.patch,
+  +files/ogre-1.9.0-remove_resource_path_to_bindir.patch, metadata.xml:
+  fix bug #506058, thanks to Sven Eden
 
   08 Mar 2014; Julian Ospald <hasufell@gentoo.org> ogre-1.8.1.ebuild,
   ogre-1.9.0.ebuild:
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 3218bae182de..fc4624857400 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -4,28 +4,31 @@ Hash: SHA256
 AUX ogre-1.8.1-flags.patch 791 SHA256 ee88c072c45e4ccefe956c8bbfacba4c7ddcac3328b74c04159c37c3f6c53378 SHA512 b2c15e79e265b8b1c8386f1ab264f19542fb4e30e4e53455b4b64ae53e69fbb863a91a6f2347e09c5e39a4b53f2a5e61189b1e417e896c3f37d8d22dbd2652ed WHIRLPOOL f309a1f9f06121fb8a5e2072278143eaad8731c4ad57bd09817e6d884254ed3aa99f485cb7ebf6e348cbf4113a682d94111d26177ae9d50184bd27205c5dc8d9
 AUX ogre-1.8.1-gles2.patch 898 SHA256 7f097e7c8319352ed2c1db7979cbe38d303093881173351145b52f51092934ce SHA512 da163643260be3293f9aae667d1b937dff343c38820fc01caa4e90e253c741c263f42408669063a5bb49139f3406da618532f4dc414e2844bb03699bf4bb7617 WHIRLPOOL 5845a040d2e85dacc2abcab6e8ceb776f58589c710d0836afddfe5c94b1e7a57690c2c1506ea6053b8b74c21894d873f6952aac922ff48c15d81dbf61087bf2e
 AUX ogre-1.8.1-threading.patch 2060 SHA256 5404ac5abd128fbe0d6a54344d82cdc1587ef12932c7f152454ef5e60cec0212 SHA512 0da8baa8369154d9e31bbaacf88a7249839bc53bf576c437e54d26221bac10f6113f65d92cea814ccaaa1bcf49e575a700911741dd5c03bef9aec87d66943248 WHIRLPOOL 8abe68d9393d36a0226a46c005547dc296e3bba7f8aca95a123833f3f7e2cd6998e479765175e932f7a5a2901f71def51aa094c936dc6b2da37b5359dc635b7a
+AUX ogre-1.9.0-remove_media_path_to_bindir.patch 617 SHA256 1bda0f31de7711e7a33c5a36f74431a2e02f91916b18e85679cef5322baf3805 SHA512 49baf3c7c3e230771e87927a15efc0d307edc18e86ad0569edf9e548a3fb83ef452be8a63f469fcfea170d400ae3f5f47d123857d8756a230f8a312d697a21be WHIRLPOOL 86345549787c78b9ef445599662d3fa80dce06ff8c9340ff1f4c99db88f157dc7501e422b9f8634fc1fb38e558525cdbc712cce7d1d447075ebff139c120efb9
+AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 524 SHA256 95fc1c6c1128eace78e1fe3c3bb85805d1546c8cca7beb7a5d26aa1e5cbb884f SHA512 57130cba16cdbaa8f2fbd2465ea93ebff05e8e4e195afc132fe54d30c1fe087c22ad206d6f98e5e8b6106413134de6bd7c0016507279d6e17b96799f62f0d5bf WHIRLPOOL 621acb1df61cf294dcd7d78cad58dbeac8ae45704305ee398cb300d952d7526026d28dc6fa402d4688d2842a78ba28a22c593dd800b9ff7b5689fa455c7a7dd4
 DIST ogre-1.9.0.tar.bz2 128098305 SHA256 3072df52b2bed2a1b52e969f140ae9a4373ec931029d3eaa032e7c609a91ef82 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde WHIRLPOOL 625cc09ba5a76757b47764c41583584f538eb9561e5bfd546192e06da504aa3924d7070a7dfbe420c4db3edf5870baf5e8b77cc611aa4185806508f79302d6cd
 DIST ogre_src_v1-8-1.tar.bz2 88619968 SHA256 da908ac934265d25e378d336d648327afe569a758ef262029acd357d506f6aab SHA512 0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2 WHIRLPOOL 7325effb6421710ff0e21ab0e29443404fed151cc2aeaf481c597fd098278bb6223b9e2115abbd175f305e909491766c2d7b871b028d5b46f8028269b25c161d
 EBUILD ogre-1.8.1.ebuild 2794 SHA256 950bfc4f9ed09ac45d875ad931344941118a0e4d9fba24d08484c91874b85d11 SHA512 577c11d253e01ad84dc9f55ee0ef054978c7a339133c9e61f3e03023c2f3c95b2c24d354298220434080c61c64db09e733213dc59d06ce956e7a6ba195bec308 WHIRLPOOL 68611bd6cd696ddc4bd63fbf19c623eeb7e5f5138b4d1623ffca9391512489beb5f1777accab0bc86e287923b1507ec52758b7f2fead6a3c72988e22f8a80d8a
+EBUILD ogre-1.9.0-r1.ebuild 3692 SHA256 6324ec8cda219239547df97c90472f5a3deb99ccdfb5419ce7be06ce5d3a6886 SHA512 9e5bbf254e8da7a8c62328f18c409f60c9ddbaa3505c67e90686cc279456d76689ac10066c433ce73b6614ae93bbdb68b6a82949b6aa94b3cb9ea8cc6f28b87d WHIRLPOOL 25b715efed1b2157ffb2442988c1b3ae370eb8def2b478c3ac3b05decd7c21fe808464dfa328f3a8f40bc6c3498e52ed323cb348a5b8f76c5183f20d6c9b4e7a
 EBUILD ogre-1.9.0.ebuild 2703 SHA256 3fc6342887886b41f8e5ac4408881a7703c19e18f610c1b0c01a76d201a269b2 SHA512 21f645ae564f6b3e2d37167aebb7a9668037aac1d910066a813397d0f4b9d8c8642231216045a4bcbd8536c4cae060af38da433f0894d52d8d11da8dae10e8ca WHIRLPOOL 3d7f18e1032e56f0e005b97622fec71170ade0a944356c86449d4390eb2465fec8d1a193ec6d0e480b75eef6461504b81e70fb965fd78120303c332df2f056bf
-MISC ChangeLog 13805 SHA256 9dcbc584a149b133114b2ac5feb8f56681761d87d78061d3110205889a695321 SHA512 a0f64c9bdce48f32929cb27e3ac1373c2303a0d6dfba07966404868fc0c3aa2c7815337981ffb638e243ea95586c5099964e3e7bb5acff0a188396cac56157a2 WHIRLPOOL f4b6355ea9f48b16ed51f3eccad88c4f5f080e989aae62f45caa6524dc1c6a9d1eec6cca07ee7705ddc104a7f00cc08aa4bd0155d1a6a3e20795573ca4aea113
-MISC metadata.xml 4897 SHA256 45a214db2ff7ecfbc7c9d4949cba75af450a8cf1c65ab44a57d6cc74d3ae4be6 SHA512 7cf77c7422fec1116e163f8035aa8a8aaedfafaee05ee1d315f667e902169066eadf5f5fa8960e1fd4b311a029212fb9766b7e6b343ad250c3e0390d360fc323 WHIRLPOOL 13507b98e0eadb961effc15eab2859933944873fb51439761211a76fd40947129ce1e6a69035727b1c66d6e981818eb357ef116af4f18522a21faed7fbaadb1e
+MISC ChangeLog 14076 SHA256 11cdadb6795b01ad52a2f617e8181af47e8e6223b7c8fc9824f4b664c62dc259 SHA512 8139dce2a419985b43731fa34b2a1ac65cacb29fbef3a1c157e30621032744f52ee9b9c21e9b4cd2193f261b29238ce43b1c492b6f7e6f52ee3eb47b844aa61c WHIRLPOOL d0ea0f85a70af817f2b5e3557f9d879a2c603b7d19e7ca912702e625d863ce202422e8b59db1b7f4f84203f3b58da56bbe08592c82b7f2256e0e97fc52a50a78
+MISC metadata.xml 5027 SHA256 d7eefe3cf5c25a5f7fed26277ea771bed386b56d5e45a5126000e8588662245b SHA512 45c6f2b47aad3aca08c273be97a3a1f933a5f85bf4f538e1e0383c2223dd1eff72d4240c159d151839e60ae9d62a011e134d08ae11e34c1edb6584ea543d3f15 WHIRLPOOL 54d46098a887c9d7776aa6e95944a4f81a3babb716f7faab95b698b5f9211d747fa82b965f803e347917b580e7ba74733327d71305f8b19248e969aaaba72dbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTG6ZGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUWnyFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg+FIQAJ1+3u3o7TcE/yBZVU0yKjkj
-t2Rd9t6QzgJ1rjfAMCEuhpx003pbhrXgGDNlMEruIkkITG9vxAIDhqVpnowvQvz3
-TiEoIK3DcdroZoRlsxB1Lg7J8VMrzc1jwZfbYYpfWa/2BXZ5W59O1H9GPBzRyEJB
-4Pej7u+bxc/rhPpsj+3uqbh6PPDcD8emFveFl3H6M3mqvLivfW0dF2oQfUPDtelD
-f0F1yBnm+tl8m5f9dBgw4yKaYv0oykXmYoxezlOPbljAXqpiI5+Rbb1jePqkMnHU
-ur2n4Hcdtd02EkAJyHtas1k2K3Q/lwETa3LpoOsP1Cf0EEmKLyvv4HLob8qS0ULt
-+dxXTCkz3XHYElsuZK1WsakoaH+X/hLqn8qSsRMHsSRLYYs6eh7ixz8e7MMPlhZM
-K5tkuFacShWP0it270JazO5+H/gGHrBToV/lFMBFPqgUdW29btEuAOQYyPZHvccA
-FF9GKlBqwzfnF+ftPPqZPwW6oN857YxKM/Tl/DvH6WFwEEk378VqiuHc24NjcVc7
-YbmfjicbarTj3nwwXJt1mZOb7QZWZ46OPyVy2YJRTo8zDvARsLqOglWRE2mbod/i
-Ig3oFI40JETfkxiSPI8dvugBXnz5bYsY/ryrJ3jzHOOtZe2fwYgs3ERP4k2VOgTw
-T5qyGCVnUyv/ENAgaJvi
-=k3x9
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg31kP/0lSz8zY3HHjRG+eSEo4xs1i
+W2QbHAKFvMPRastxeoajfw5ymKiPIEScNfvrvRC6bYHiRq5eg2UdkpwXbcKEoS0Z
+94AhK2W7q3l2SCcIdNTVOQ7DD2mHobnQfGIn73A2jNWz5IIlUrBAo0ZoSoCqZvau
+1fPN75yZiTbajCd9qIPp0BEsTO72fPFrcqB+uJLcjvQe4wGbsKIXQEteviIa1I0j
+3IuoT5nPVtrkfITDZmEUPenCUTGguR/19VYhULRACQQMjfcVNtNWwyrNMOGNH2Aa
+pdAdGqasp4bLdCQJYmmJ4TWy/aW8Z5jlkDVWbbu0/mu+6PrpM5sMrU1MepetCIIF
+cG8uoy8eku0SQPIT/Vf5a2FA3Q6RP5eZWkwHpyVL2ZN1INe1GvEzVwx13m5gxL57
+8LmBUMP4Sz7c5CIpfeIpMn3GE4iTDl+h5kchIN3g2nkkbuhFh1xnGq3xVdWBJM09
+0xSgTOhH5ICCXDwVu2nRI6Xy02Zt24U2luU/kDRfBjcyW6vekqT8Nwdufs83trSd
+OL1i/yNaLxQTgIN07q/DAzwHnE1hvMw6jmzdnSC8IflnEjF0AVglZPNuOXtGpV0q
+cO8TvMB/1NPEmtkyLUecdY9ee7HsE5ujghBXGbJhdH4n6Ki+URq1+zOzobQrFP43
+8FXcpRxhK2D0DhNHFAtD
+=r0qT
 -----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
new file mode 100644
index 000000000000..9af7685c7d77
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
@@ -0,0 +1,13 @@
+--- a/CMake/InstallResources.cmake	2014-10-29 12:43:49.000000000 +0100
++++ b/CMake/InstallResources.cmake	2014-10-29 12:46:10.017611431 +0100
+@@ -178,10 +178,6 @@
+ 
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
+-  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.9.0-remove_resource_path_to_bindir.patch b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
new file mode 100644
index 000000000000..d73762859081
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
@@ -0,0 +1,14 @@
+--- a/CMake/InstallResources.cmake	2013-12-01 18:28:12.000000000 +0100
++++ b/CMake/InstallResources.cmake	2014-10-29 12:38:29.963602465 +0100
+@@ -201,11 +201,6 @@
+   set(OGRE_PLUGIN_DIR_DBG "")
+   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")
+ endif ()
+ 
+ if (MSVC AND NOT NMAKE)
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 11af873f20b3..c9f8ae738ba8 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -78,7 +78,9 @@ Exporters
     <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="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</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>
diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..260348d71d98
--- /dev/null
+++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild,v 1.1 2014/11/05 19:37:37 hasufell Exp $
+
+EAPI=5
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindFreetype"
+
+inherit eutils cmake-utils vcs-snapshot
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://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 ~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 ) )
+	poco? ( threads )
+	tbb? ( threads )
+	?? ( gl3plus ( || ( gles2 gles3 ) ) )
+	gles3? ( gles2 )
+	gl3plus? ( opengl )"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-libs/tinyxml
+	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 )
+	)
+	zip? ( sys-libs/zlib dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+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
+	epatch "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \
+		"${FILESDIR}/${P}-remove_media_path_to_bindir.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_FULL_RPATH=NO
+		$(cmake-utils_use boost OGRE_USE_BOOST)
+		$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
+		$(cmake-utils_use doc OGRE_INSTALL_DOCS)
+		$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
+		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
+		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
+		$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
+		$(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE
+		$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
+		$(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT)
+		$(cmake-utils_use profile OGRE_PROFILING)
+		$(cmake-utils_use examples OGRE_BUILD_SAMPLES)
+		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE)
+		-DOGRE_BUILD_TESTS=FALSE
+		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
+		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
+		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_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-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
+}