version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 108 insertions, 9 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index b578469bd7b2..a3193a45f2d7 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.94 2013/12/10 19:45:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.95 2013/12/30 21:22:28 hasufell Exp $
+
+*ogre-1.9.0 (30 Dec 2013)
+
+  30 Dec 2013; Julian Ospald <hasufell@gentoo.org> +ogre-1.9.0.ebuild:
+  version bump
 
   10 Dec 2013; Julian Ospald <hasufell@gentoo.org> ogre-1.8.1.ebuild:
   bump eapi, use system version of FindFreetype.cmake
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 1ce3d153eaf4..ae9f43ab04e0 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -4,18 +4,20 @@ 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
+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 2788 SHA256 deb0121970bb39fbda6e229b275ba5f07e942da1b836f2ef1241ddc1c4b3f1c0 SHA512 4113a4bbcd0d09025dbfeb1a855250508f077b5b8857e813753b2902a292a3d527edb965159d4333657ca4f153ee20669238bb04fc0cdd3e39b69b09cb15f2fc WHIRLPOOL bbad7ddbb9e5c53cd57ad968be85db011a2d59f837b1b5f2be1b3a2256378e46f5ad0af87e4a27c4d4c84402b1a9f273cce8feb32b3b7bdd079cb62ea037c7f2
-MISC ChangeLog 13460 SHA256 d30cc7551e2d0897d862be41ddb110e1e0d0c1a0c9e56e1dbf058c205ecdf786 SHA512 5b1ef0ff1fe19a5faf0c2e0d56164f21ba4d637841581ce6bbaafeac9fd38ad50abe2f620dd7a4bb4c6b6ef7bf0c10cd0eec5450ee0aa2beb43fed026577738e WHIRLPOOL 47ecd005178e7c5a75d23a93f7829fed6f2bddc4a8228508e40cdde74d3bec3d4146ffc2e6fa41bf794fba1a29c32962137324ea65324f612ac0f9a7334876a1
+EBUILD ogre-1.9.0.ebuild 2660 SHA256 7895aac1c78aa1e1a3fda741c0e9acdd5fe963da4834ae4ed17e421d1b04e19e SHA512 cab19ceb77e4f51af0fcee9ac6ae1ac7349012c344dd1564d7d63ef6464e6bed55dc518c7149315c56cff2c1df0aab5f20756017e1ed05624959be8d26a20dc5 WHIRLPOOL 54b85ed098af578a387d2e15bee982a4815e58441c010c07b002992e936aecf819b791a70180e33525197c3668c32c17ba80a869f0982bb47112cb74b199ed3e
+MISC ChangeLog 13574 SHA256 2b539ccfee6900f894242196b87ce8e43c8d3e4d4e8c2b7c540af6478913501f SHA512 ef8e2075c6a8e9f25808b8a731f6efd4d2fc7d736eabe3ae992e3ae1927881024f547b85f5d53778752a74214471a58e9e915d4cd5473c99dda3d865a5f29a37 WHIRLPOOL 1472939ec0fe14592f593e1b31a724dd11401a6064e17f205dc689303ed9a89df4c6ba1f3cb5160fd85eeec400848aa82544148f64ca16724e1de66082f45abf
 MISC metadata.xml 4897 SHA256 45a214db2ff7ecfbc7c9d4949cba75af450a8cf1c65ab44a57d6cc74d3ae4be6 SHA512 7cf77c7422fec1116e163f8035aa8a8aaedfafaee05ee1d315f667e902169066eadf5f5fa8960e1fd4b311a029212fb9766b7e6b343ad250c3e0390d360fc323 WHIRLPOOL 13507b98e0eadb961effc15eab2859933944873fb51439761211a76fd40947129ce1e6a69035727b1c66d6e981818eb357ef116af4f18522a21faed7fbaadb1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSp299AAoJEFpvPKfnPDWzGtsH/RfuhQFe+PadxZwdxZN3DBK3
-uSLI3bC/pgD1OaMkQ71XuW8hQ4QNbJ4WKH0CaCHzLYAFTS/5aBWy1258owg4kXLd
-SAPJt1mf25k512RRNOL+hVNIkebMeOXSlh+RkXX5g84K9ZXYVIDyJxwvwsU0lPI5
-FoWViL9oj9/yBJ4SwmDR/W8MG1WgO3cG10lVBE0Ss8+Pi/mYO42mdFy4hmpegrwo
-bsxgQ7JMTzAPBJvxN2QMY4JtpMoeIf670JMsi51Fw+gSH1+wwQWvyznnwzlnc2vc
-JKANFYw65n5Pqv4sX7VrPesmQVL2RA4IZOGi3OZpwk3y5K0FKRmMwAoNdTBBa1k=
-=N6iV
+iQEcBAEBCAAGBQJSweQdAAoJEFpvPKfnPDWz8Y4H/25HDd79rpCgke7fBSGLt+8I
+dBYDjf1JkrGRchH1Rt0NZIg2jsb8y3rJXrxOsGoB7ERBn3TyphYzKqVsD15WhVYb
+E2sdUCV0BKZ2Co1UAbXinH3BPGm43bj0fm7lNMSSaVHDbp9DZBTDpJhEpGH8TBht
+cFz5cqg14cQK/c5MBKbCHfOTN5lSYxz11ACnodaDPXAwFGnR+yNPcfxskNUgf6wv
++pz2UUrXPE95JLzenbUcprVP8u0YvZTPc0o0sYKQRQKALjTODOb3L3d2bdegc7Yr
+Muz2hcb7zXs5dD2oWhLPMGHU4sZFwjmwJlzhP/sL1Nam3gRBvUhm867+JJ0q+m4=
+=AjyA
 -----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/ogre-1.9.0.ebuild b/dev-games/ogre/ogre-1.9.0.ebuild
new file mode 100644
index 000000000000..ff12497d5aee
--- /dev/null
+++ b/dev-games/ogre/ogre-1.9.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 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.ebuild,v 1.1 2013/12/30 21:22:28 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb threads tools +zip"
+REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
+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-8.0.0[gles2] )
+	ois? ( dev-games/ois )
+	threads? (
+		poco? ( dev-libs/poco )
+		tbb? ( dev-cpp/tbb )
+	)
+	zip? ( sys-libs/zlib dev-libs/zziplib )"
+# gles1 currently broken wrt bug #418201
+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
+}
+
+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)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
+		$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
+		$(cmake-utils_use profile OGRE_PROFILING)
+		$(cmake-utils_use examples OGRE_BUILD_SAMPLES)
+		-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
+	docinto examples
+	dodoc "${CMAKE_BUILD_DIR}"/bin/*.cfg
+}