old

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

5 files changed, 7 insertions, 205 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 9b707c31f7fe..477cffe1cde8 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.92 2013/01/09 17:26:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.93 2013/01/31 00:00:32 mr_bones_ Exp $
+
+  31 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/ogre-1.8.0-flags.patch, -files/ogre-1.8.0-threading.patch,
+  -ogre-1.8.0.ebuild:
+  old
 
   09 Jan 2013; Julian Ospald <hasufell@gentoo.org> ogre-1.8.1.ebuild,
   +files/ogre-1.8.1-gles2.patch:
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 7966e9125861..6dacd9e5f345 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,25 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-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-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_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.8.0.ebuild 2531 SHA256 35461dae6a7e96231ee4b9fd14d94703be68b813b049fc958dcfddc3d32165da SHA512 3b6dc2bc4da220dbd212e0a9037f358345415110cdadf7231a5cfef8686de20078886a0136caca7a4eb0398b6654978afc52d4e32ac487f79ef8d6aa5ebd6fe2 WHIRLPOOL b89e45bb2586508400461c7fd635045045f4112e264de72027d15bf1a27a6f2e078585c774fae11505c0f20932e91a9dbced4a4aee125e1f2648460484e3eeaa
 EBUILD ogre-1.8.1.ebuild 2720 SHA256 4471284330eb1f1951c07fc3c48300300c3d04dd59dcdd4e06ce74ab658ddbc9 SHA512 66b693b72a19f3305e5b57e113d6c722fbf4e09736310306ae4326e1c77efd4945d0af208b2cab366c3c6d04504a1889cc23d944525920cb5e057b658c8a1291 WHIRLPOOL 00404193542b03e5e77d8ddc2a3e90c73ce30f6ac409b9a4ab1226b35c92a8779eb5d8cfaccf3d81f67565f0718855f968c1797ddfcfe2be22b427d62546a4b3
-MISC ChangeLog 13183 SHA256 dbea658a6cdfb08634385dcb82909e0fc587ce0dc9d925ee453056971a057771 SHA512 90dce454016cecd7b300ff7b9f10e2ea103594e97d78e7b79d01927e03409db8dfc002fe769c68f585042dd72d15574919e6fedfafcd2e83db9881b64f756a97 WHIRLPOOL eb598c496b47355e39d00134efce60f7a02a440f3c4b4031b0e7ac8dfbddae863d847e7d01d7c24e4806c64ccacc6e7cd36c4ccb3baeb47039a1e6a413078612
+MISC ChangeLog 13336 SHA256 ec20b235379574f7105f18825b21b4d693b3a2fa16981928fe494fbedb0c6506 SHA512 d8ecf154a8033a04bda482c190fa118327dd44b7f2108a49eb2d4e3b918589518ca921df85ee4cf42e356ecdbcd5460719c66fa3ed445299d319d8dc0b5d84ad WHIRLPOOL a5812e1a54146f80e3f69905efd17d40bd62952db0265ed3de33f0c784c8c6099624f70eadeac7eb35245b035b5feac0e710172965a271581b12d17331125f9f
 MISC metadata.xml 4897 SHA256 45a214db2ff7ecfbc7c9d4949cba75af450a8cf1c65ab44a57d6cc74d3ae4be6 SHA512 7cf77c7422fec1116e163f8035aa8a8aaedfafaee05ee1d315f667e902169066eadf5f5fa8960e1fd4b311a029212fb9766b7e6b343ad250c3e0390d360fc323 WHIRLPOOL 13507b98e0eadb961effc15eab2859933944873fb51439761211a76fd40947129ce1e6a69035727b1c66d6e981818eb357ef116af4f18522a21faed7fbaadb1e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQ7ag+AAoJEFpvPKfnPDWzJ/oH/RhRxCTOXXvQqylCYpMOcsD1
-y+sUY5W7+3bXeqLFbjowAYWOZvdicLHUnsdBzGVoLPSI68iTfGlGn9tspVPGsHtr
-sNbBb3SGrAKNdgXPqECFOrI29edJV7fYFGe59bqCGyIsQbGeTxQNVIcqBX4+rGyH
-X18Hp3zoqOQxa1nzmsMmcggIk8LnbbR8nt1QN6K66ID8+eggsCPcMZgZXgRX9lgt
-h2l14hA8oA+dfjB0jpOgAQWxVQkW6EjtOfko+fhZf8JeUdh/bcOdfdYUgDnaQpg6
-P/P/LQYCQKHaDHV+WQzbGfbHFnrj7XjyUy6t8Ijio+1xYoAloq0Z7B0QafiO8Zs=
-=+mNW
------END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/ogre-1.8.0-flags.patch b/dev-games/ogre/files/ogre-1.8.0-flags.patch
deleted file mode 100644
index 3f8e89a21a33..000000000000
--- a/dev-games/ogre/files/ogre-1.8.0-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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.0-threading.patch b/dev-games/ogre/files/ogre-1.8.0-threading.patch
deleted file mode 100644
index 13cf5634e53d..000000000000
--- a/dev-games/ogre/files/ogre-1.8.0-threading.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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.0.ebuild b/dev-games/ogre/ogre-1.8.0.ebuild
deleted file mode 100644
index aa73ecad7fd0..000000000000
--- a/dev-games/ogre/ogre-1.8.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.0.ebuild,v 1.6 2012/08/04 09:44:02 ago 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
-}