version bump (bug #440074)

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 198 insertions, 16 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index cd920fdefc67..5d46d89231b6 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.84 2012/08/04 09:44:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.85 2012/11/01 17:34:50 mr_bones_ Exp $
+
+*ogre-1.8.1 (01 Nov 2012)
+
+  01 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ogre-1.8.1-flags.patch, +files/ogre-1.8.1-threading.patch,
+  +ogre-1.8.1.ebuild:
+  version bump (bug #440074)
 
   04 Aug 2012; Agostino Sarubbo <ago@gentoo.org> ogre-1.8.0.ebuild:
   Stable for amd64, wrt bug #427056
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 6a6ec744ee2e..2fb9bb7460d6 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX ogre-1.6.5-as-needed.patch 437 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a SHA512 5a436cb9353dc8cb9bb6e4b85553697955600b0108b987d1ce3467a9acf73a9c208eddef140341d8bbb09a5715be331f95370bafceb00705b2275ce215e7ac3b WHIRLPOOL 2123094b054db90d4e22fb0390a66877a43dfddb6929d5dfefa0f67e4eca3eafbef74cb078d830c5564c1390fc3036908721ee85a33686ff46872cbc04dfee99
 AUX ogre-1.6.5-automake.patch 534 SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f SHA512 5e65414b377426930112411ed9f7ebcedd95896e0698f2dbe456574c6229cfd7421a400a207b7c360bb2c44c06874c604b637208666baa9f9be48226c17b073f WHIRLPOOL d11df31239a8d37c0ff2f556c2f4d8008a66589a612a921ece5ee11ee3a16adbdda73687613a7fd0208f91c6c3d6043fa006d2b1abddc2319eefe967a29226a9
 AUX ogre-1.6.5-boost.patch 374 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc SHA512 5bcfd77816d752ab9d493806e19ed739e824aa4224baf82d1479d0e70813f0c11c868b4ce417ffebde2a0245ca564dc172c4e8dce484a4a49d0c63a5fc1621b7 WHIRLPOOL 5a41cc7c8c60229f6f1070e33ce0498f9aff69b2fe34beeafb3644951f468acc923b1a280a807138ac6033837d4d49957d20d209e92606ef2edbab0675223ac3
@@ -10,22 +7,15 @@ AUX ogre-1.7.4-gcc46.patch 277 SHA256 fd07978db495bd6bce7117e35c9a79bb43a831ef10
 AUX ogre-1.7.4-threading.patch 2060 SHA256 5404ac5abd128fbe0d6a54344d82cdc1587ef12932c7f152454ef5e60cec0212 SHA512 0da8baa8369154d9e31bbaacf88a7249839bc53bf576c437e54d26221bac10f6113f65d92cea814ccaaa1bcf49e575a700911741dd5c03bef9aec87d66943248 WHIRLPOOL 8abe68d9393d36a0226a46c005547dc296e3bba7f8aca95a123833f3f7e2cd6998e479765175e932f7a5a2901f71def51aa094c936dc6b2da37b5359dc635b7a
 AUX ogre-1.8.0-flags.patch 791 SHA256 ee88c072c45e4ccefe956c8bbfacba4c7ddcac3328b74c04159c37c3f6c53378 SHA512 b2c15e79e265b8b1c8386f1ab264f19542fb4e30e4e53455b4b64ae53e69fbb863a91a6f2347e09c5e39a4b53f2a5e61189b1e417e896c3f37d8d22dbd2652ed WHIRLPOOL f309a1f9f06121fb8a5e2072278143eaad8731c4ad57bd09817e6d884254ed3aa99f485cb7ebf6e348cbf4113a682d94111d26177ae9d50184bd27205c5dc8d9
 AUX ogre-1.8.0-threading.patch 2060 SHA256 5404ac5abd128fbe0d6a54344d82cdc1587ef12932c7f152454ef5e60cec0212 SHA512 0da8baa8369154d9e31bbaacf88a7249839bc53bf576c437e54d26221bac10f6113f65d92cea814ccaaa1bcf49e575a700911741dd5c03bef9aec87d66943248 WHIRLPOOL 8abe68d9393d36a0226a46c005547dc296e3bba7f8aca95a123833f3f7e2cd6998e479765175e932f7a5a2901f71def51aa094c936dc6b2da37b5359dc635b7a
+AUX ogre-1.8.1-flags.patch 791 SHA256 ee88c072c45e4ccefe956c8bbfacba4c7ddcac3328b74c04159c37c3f6c53378 SHA512 b2c15e79e265b8b1c8386f1ab264f19542fb4e30e4e53455b4b64ae53e69fbb863a91a6f2347e09c5e39a4b53f2a5e61189b1e417e896c3f37d8d22dbd2652ed WHIRLPOOL f309a1f9f06121fb8a5e2072278143eaad8731c4ad57bd09817e6d884254ed3aa99f485cb7ebf6e348cbf4113a682d94111d26177ae9d50184bd27205c5dc8d9
+AUX ogre-1.8.1-threading.patch 2060 SHA256 5404ac5abd128fbe0d6a54344d82cdc1587ef12932c7f152454ef5e60cec0212 SHA512 0da8baa8369154d9e31bbaacf88a7249839bc53bf576c437e54d26221bac10f6113f65d92cea814ccaaa1bcf49e575a700911741dd5c03bef9aec87d66943248 WHIRLPOOL 8abe68d9393d36a0226a46c005547dc296e3bba7f8aca95a123833f3f7e2cd6998e479765175e932f7a5a2901f71def51aa094c936dc6b2da37b5359dc635b7a
 DIST ogre-v1-6-5.tar.bz2 41785065 SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5 SHA512 6af2092b0dff25563cbadf2081e26bbdad7bbb915b6be0ee5b114fbfa7a271222a3637080a9005d3a032bb151e7276f52482358ae1fa18bd18ca4c7be2e2d164 WHIRLPOOL c8565f798e90770cbb2609d6112a6c33e9494b6cff4f235adc4248f65cf0a3f422d3f7484a863176ddc0229eedc9cea2c8d35678228c77af884185ecbab394f3
 DIST ogre_src_v1-7-4.tar.bz2 67391570 SHA256 afa475803d9e6980ddf3641dceaa53fcfbd348506ed67893c306766c166a4882 SHA512 7153c75652c74e97e617d38ec91891146a77c11560cc9de82fb984692b52ee935494b5411d3767ca8a19ca77099399120b8784ec9d6f48c0a6b6b2dfdad5a92c WHIRLPOOL 95d2d885f58570ebfb65221dcb7e179a9048f53d4119bc73f424a778e18c13992f1f7528435e1a2c17f3840fd5bfc1a90e2ec68dc0842ced4e67328b13dc5865
 DIST ogre_src_v1-8-0.tar.bz2 88682669 SHA256 2f59de73b0717c5d2084285f2594a045a9240a8a53e5b38203419c4e715c8ba6 SHA512 fd382a6c6da90c5f7e99531ddc784375e83e0b7eacaa2da3e749fb837ca85673415ebc788a3898d0d4026e2e0b0208ae32f1972ad229d1d07e0d9fb89e5295cd WHIRLPOOL cb750c4f7eb92559467d234d926b56f79994f6652ab83340e05a7b89dbc3bf2528ec6885fc2e811560db788c65f62c32c0e140c71d32905270e7cb877be15fe2
+DIST ogre_src_v1-8-1.tar.bz2 88619968 SHA256 da908ac934265d25e378d336d648327afe569a758ef262029acd357d506f6aab SHA512 0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2 WHIRLPOOL 7325effb6421710ff0e21ab0e29443404fed151cc2aeaf481c597fd098278bb6223b9e2115abbd175f305e909491766c2d7b871b028d5b46f8028269b25c161d
 EBUILD ogre-1.6.5.ebuild 2528 SHA256 ee511ad5a6254238644a2ffa61f9b8889fecdf0ed7b946fb302ba6e3881bb510 SHA512 ce42069a0fe5a301f5da477232cc0ae06cd21b8746104b783cd4f0841df17793330ea048339a1a5ea1b74fa868028d5f8dd41a7b0f2091f7986553d447dbdc50 WHIRLPOOL 44dd38dd95ca801870e6e221bca09f3745ebc2f040f059d00ee6c80c3b7e88a93058973a87eb2932586af48aab0ce93d8c40c9da494f7a600cc325261e942481
 EBUILD ogre-1.7.4-r1.ebuild 2322 SHA256 aa1f19ad2e33588cfb65c994044b9630496158c21851044ed7dbf8a32293695b SHA512 6f8ea117ece24e424fe12a7e324b8e47cf481e6db768834cc2c868670d14e9e4ff3627d879d52aa631ff8310a15fa4a92ffce2877f3026c616a246910509aa50 WHIRLPOOL ba09e487dd739097812c82a72cf0864324fd67f4a9c18f8140259d998d994cebc0882c2d030c5d4157eccae5cefd655f36356c69ea59389a94bdde3f81fb27a9
 EBUILD ogre-1.8.0.ebuild 2531 SHA256 35461dae6a7e96231ee4b9fd14d94703be68b813b049fc958dcfddc3d32165da SHA512 3b6dc2bc4da220dbd212e0a9037f358345415110cdadf7231a5cfef8686de20078886a0136caca7a4eb0398b6654978afc52d4e32ac487f79ef8d6aa5ebd6fe2 WHIRLPOOL b89e45bb2586508400461c7fd635045045f4112e264de72027d15bf1a27a6f2e078585c774fae11505c0f20932e91a9dbced4a4aee125e1f2648460484e3eeaa
-MISC ChangeLog 12107 SHA256 fa3486f257d2b12994aecaca8dbb3632d7a9cba90e02c14ed65965dc64dc7018 SHA512 660ec855cca7fe54490770cc99a8d286a8d85d6717d1650c6ddc35a88de5af5e720a64380e5b9a8563425fe153e1ffe4ec04fdee0edd733b0e5218380d7c7a15 WHIRLPOOL 296ed4d9294100e00a03579cfd2918ed27646b6fd5a1c6e1ec98cf1fdae7b9951e8c6b55ec7510d9b988942340cd12cb9c06459716c5c0624041b3b845e854c0
+EBUILD ogre-1.8.1.ebuild 2539 SHA256 633c81e4e931142b7fd813eef1d1fd0313ad9ad08bd3fd7c41e8a2a6d7160e73 SHA512 33ebc2f1313a47d7f6eb35928a003bc673284b69a6fee1c2c1b547708ebef9882a65d53eb4377a0ec27367526b99f7d77b33f2820ccbe98f3178b1c952c3cdfe WHIRLPOOL b7bf288cbc36907e982ef6741669929e6773e45a029869f024edf82778d68d8ac1bac0cf316ce8eca072373e9a36d81edc9d68f554d0ae4cff432ae73185d7ae
+MISC ChangeLog 12315 SHA256 3d80c5227eef72d080f3bb34adc7283427e07f91994352984849718043fb47cb SHA512 7df248a9c4f575727db90ec6a2c90b1ed1b1d724dd4d261ca81098511b3c0581005311392bf5ba163db4f2b920d68c77516ff6324a688d15b81ff03e868f5cff WHIRLPOOL a545ae585937e9bdff75074715d63fcddca9e66df31348fa3d2515fb26a090051a21a3e875fa0943a6327c8cd1b496e3618ac9c85cc25b8ac1e02f6cab5003c7
 MISC metadata.xml 5014 SHA256 7ea0c9b0e56cadc41e0e1ac195ee058ac8abb176a3ac5b8ffb8363af12fd54d8 SHA512 ab9114f285632a0f09c4dfcdcda221a0ac07fcfda9744f8acc974f0d6f2f511864f16369a8345ad1b402fa98e6e421bdcbac57e3eb3c764cf89db8eeac072543 WHIRLPOOL c9425c564de5b2983d6484c6202e4938623ef2cf4c5d1735dd3ef5aaa3e632b664068e81c4d30eccf0a56e50eb7a9e7a1feeb4cfd8aaca3660aef9f9fd29de94
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCgAGBQJQHO7oAAoJEOTDgjZ80txd7MIIAI7cLQujbecsrBp9vSDkRRCP
-zVh672R3CLay0FUi5Qo0aEH6GenY18pQoRbrU7G6g8twXzQw7B/Zz1/n3+qz/nvS
-mi2KnaTatUjXyh6ycauWDXvOcRu59fyNHMBvjrCk+j+dROsIqMGg4r5yxPPFU2Mz
-mKFKALUDXqNy4XFvgZtZqMALmde5p1cuytCWbtQBotznzAMsliPDMiqdBNmYrPsI
-8l8Zj29m6CiYXw9IdyPoQ4rSgNN//5L/B1NEk0EVDJhR3CFrrF/4LrmLH5XaP00v
-xNHJH4DIjkFQQ+GHx6DaCDXoIqtqTYaWaRAaD6xUZWiMZb7K+ZACWvBUA3HdIDM=
-=7NTO
------END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/ogre-1.8.1-flags.patch b/dev-games/ogre/files/ogre-1.8.1-flags.patch
new file mode 100644
index 000000000000..3f8e89a21a33
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.8.1-flags.patch
@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed May 30 13:45:46 UTC 2012
+Subject: build system
+
+remove pre-set flags
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -97,12 +97,6 @@
+   if (OGRE_GCC_HAS_SSE)
+     add_definitions(-msse)
+   endif ()
+-  # This is a set of sensible warnings that provide meaningful output
+-  set(OGRE_WARNING_FLAGS "-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -pedantic -Wshadow -Wno-missing-field-initializers -Wno-long-long")
+-  if (NOT APPLE)
+-      set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS} -Wno-unused-but-set-parameter")
+-  endif ()
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OGRE_WARNING_FLAGS}")
+ endif ()
+ if (MSVC)
+   if (CMAKE_BUILD_TOOL STREQUAL "nmake")
diff --git a/dev-games/ogre/files/ogre-1.8.1-threading.patch b/dev-games/ogre/files/ogre-1.8.1-threading.patch
new file mode 100644
index 000000000000..13cf5634e53d
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.8.1-threading.patch
@@ -0,0 +1,77 @@
+http://www.ogre3d.org/mantis/view.php?id=425
+
+--- ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
+@@ -31,6 +31,7 @@
+ #include <signal.h>
+ #include "OgrePrerequisites.h"
+ #include "OgreException.h"
++#include "Threading/OgreThreadHeaders.h"
+ 
+ namespace Ogre {
+ 
+--- ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
+@@ -42,6 +42,8 @@
+ #   pragma GCC visibility pop
+ #endif
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 	/** \addtogroup Core
+ 	*  @{
+--- ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
+@@ -31,6 +31,7 @@
+ 
+ #include "OgrePrerequisites.h"
+ #include "OgrePolygon.h"
++#include "Threading/OgreThreadHeaders.h"
+ 
+ 
+ namespace Ogre
+@@ -58,9 +59,7 @@
+ 
+ 		// Static 'free list' of polygons to save reallocation, shared between all bodies
+ 		static PolygonList msFreePolygons;
+-#if OGRE_THREAD_SUPPORT
+ 		OGRE_STATIC_MUTEX(msFreePolygonsMutex)
+-#endif
+ 
+ 	public:
+ 		ConvexBody();
+--- ogre_src_v1-7-4/OgreMain/include/OgreLog.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreLog.h
+@@ -32,6 +32,8 @@
+ #include "OgrePrerequisites.h"
+ #include "OgreString.h"
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 
+ 	/** \addtogroup Core
+--- ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
+@@ -30,6 +30,8 @@
+ 
+ #include "OgrePrerequisites.h"
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 	/** \addtogroup Core
+ 	*  @{
+--- ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
++++ ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
+@@ -44,9 +44,7 @@
+ 	// Statics
+ 	//-----------------------------------------------------------------------
+ 	ConvexBody::PolygonList ConvexBody::msFreePolygons;
+-#if OGRE_THREAD_SUPPORT
+ 	OGRE_STATIC_MUTEX_INSTANCE(ConvexBody::msFreePolygonsMutex)
+-#endif
+ 	//-----------------------------------------------------------------------
+ 	void ConvexBody::_initialisePool()
+ 	{
diff --git a/dev-games/ogre/ogre-1.8.1.ebuild b/dev-games/ogre/ogre-1.8.1.ebuild
new file mode 100644
index 000000000000..8d0b37fb2487
--- /dev/null
+++ b/dev-games/ogre/ogre-1.8.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.8.1.ebuild,v 1.1 2012/11/01 17:34:50 mr_bones_ Exp $
+
+EAPI=4
+inherit eutils cmake-utils
+
+MY_PV=${PV//./-}
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
+
+LICENSE="MIT"
+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="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[gles] >=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 )"
+
+S=${WORKDIR}/${PN}_src_v${MY_PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-threading.patch \
+		"${FILESDIR}"/${P}-flags.patch
+	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.*::' \
+		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)
+		-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
+}