old

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

6 files changed, 7 insertions, 244 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 80d83bc59e78..ee722c3c74b3 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.103 2015/05/13 09:28:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.104 2015/05/13 16:31:25 mr_bones_ Exp $
+
+  13 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/ogre-1.8.1-flags.patch, -files/ogre-1.8.1-gles2.patch,
+  -files/ogre-1.8.1-threading.patch, -ogre-1.8.1.ebuild:
+  old
 
   13 May 2015; Agostino Sarubbo <ago@gentoo.org> ogre-1.9.0-r1.ebuild:
   Stable for x86, wrt bug #548492
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index fe60736b0206..923672a90e1d 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,31 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 3805 SHA256 ee00114e354c9d647e506d7eb510d495d9ce1e7981bc2ebf71db5539f8785955 SHA512 f1f7a106e908797e443464e3b53cc60867697a237e03f18878a22e6cc4860a95ad4abe2f5ecfa7cf3aa3d567d458af77190deac1c6377f70a43564ec3b4439dc WHIRLPOOL fcc23a8de2f1cb14a95bc5343bc6d25023970b8d298d23844a643947672a80833c8198fbfd5884bb943de443825cc537bf52cf284dc5548d997edceb1cb1b7f2
-MISC ChangeLog 14580 SHA256 0b45f671670a3fe799e9f243393d8739434182d63d70eeedb20bfcf09748a620 SHA512 9c8775450b069f599b25788374920ba4b81c7f6eff79b463877ffaf31f0ff01fb1d8f77085ac3be4c0b21147e5f3d06848682e9a20d35c3db4b5662839868579 WHIRLPOOL 8f15e2e3241134c2111a97a7c124402a6b7d4707aff8092e53d2851a72568e487fca784beebf3b2a709b3c2dcd19989020e986edb05344ec9df10b3c4bc8b771
+MISC ChangeLog 14769 SHA256 f5e52631051f0c33054b4a97d4da67c61136b80807fef520738f2bac700961ba SHA512 c9c8f40e0a8507c1b07ed6a8ea871628f9fd5eb279304e3d56d078a95da282b3b73a1eb775fb4b6cbc89130fe11d7c3c49ea67cb1faab3a1d6acd7e457b51a73 WHIRLPOOL a1ad7516ddd1d5df84a3d8b5bfded71d4c57fa419392f5af75315e8b1ac5ab6b1e85ea01a9486dad651f886bdd8266522389fc2d44ab8f5c6cad2408af555e99
 MISC metadata.xml 5027 SHA256 d7eefe3cf5c25a5f7fed26277ea771bed386b56d5e45a5126000e8588662245b SHA512 45c6f2b47aad3aca08c273be97a3a1f933a5f85bf4f538e1e0383c2223dd1eff72d4240c159d151839e60ae9d62a011e134d08ae11e34c1edb6584ea543d3f15 WHIRLPOOL 54d46098a887c9d7776aa6e95944a4f81a3babb716f7faab95b698b5f9211d747fa82b965f803e347917b580e7ba74733327d71305f8b19248e969aaaba72dbe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVUxk9AAoJELp701BxlEWfqJIQALnrDyXjCuFpoDiv7Q0IEs5q
-aH0MblvzS4NCGx7igKl3UXioutulpjUYCflw1JFkaChjie4SW+mhlu4NhVbpbcUq
-06c24P3nxgce8GPJB94GsdP67P4KqWTQrphHSpecT/SvxNRUeWQFkZKP2fLNqJfN
-Cg90HfHeSbK5hgshInDifY8YjxArpbDkSPcrfmni7CbpWl1WiMEizxk93vW5urw+
-Ct21ofkl7KfCIQVNgtnTew7YfC/irhWw8Nk/FAFVIHeDFvpT8xk7kqS+xW6PSoWo
-0R1ronlpC1TN4nQG7knqruV2dEHxro/YkwQg2YMRfg8EDkH717SwYIIjrPcXxlTs
-MkF5MIyQBEbcUHyTdssGe2BHpbBy9g50r2aHiAXR2waAVT33YFxsdReszYgFnlSd
-+hqjSVqO2IJSKCvK0eAieAzF0SPxc3Il97V8HtVf6LSFwJOzvejuN5fJkj1xQpGc
-4tPqNkPiGOFJRj3nFuxTSBS4OcBN0y+ybApNlhmZvNkUA+YnW8yd4dbwn2xsegN7
-kcZL6xOlPM6CoZqbIBbEGpa0G88tsjCj8LhPdApapthSwmzWrya8rYnYNhPlPZOC
-wLS7kd73B5vEy1+wT6GnI3r9MTNREFtph74voPCe8OsCY//5c9l+bqOTip2cIjg6
-ZOKwIR/el+/clyDJzQ3D
-=Mafi
------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
deleted file mode 100644
index 3f8e89a21a33..000000000000
--- a/dev-games/ogre/files/ogre-1.8.1-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.1-gles2.patch b/dev-games/ogre/files/ogre-1.8.1-gles2.patch
deleted file mode 100644
index 6c9a3f33b2a5..000000000000
--- a/dev-games/ogre/files/ogre-1.8.1-gles2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bitbucket.org/sinbad/ogre/commits/6e2e797877491fa9bea169e063a9663834977d8e
-
---- RenderSystems/GLES2/src/GLSLES/src/OgreGLSLESProgramPipeline.cpp
-+++ RenderSystems/GLES2/src/GLSLES/src/OgreGLSLESProgramPipeline.cpp
-@@ -138,7 +138,7 @@
- 				GLint binaryLength = 0;
- 
- #if GL_OES_get_program_binary
--				glGetProgramiv(mGLHandle, GL_PROGRAM_BINARY_LENGTH_OES, &binaryLength);
-+				glGetProgramiv(mGLProgramHandle, GL_PROGRAM_BINARY_LENGTH_OES, &binaryLength);
-                 GL_CHECK_ERROR;
- #endif
- 
-@@ -148,7 +148,7 @@
- 
- #if GL_OES_get_program_binary
- 				// Get binary
--				glGetProgramBinaryOES(mGLHandle, binaryLength, NULL, (GLenum *)newMicrocode->getPtr(), newMicrocode->getPtr() + sizeof(GLenum));
-+				glGetProgramBinaryOES(mGLProgramHandle, binaryLength, NULL, (GLenum *)newMicrocode->getPtr(), newMicrocode->getPtr() + sizeof(GLenum));
-                 GL_CHECK_ERROR;
- #endif
- 
diff --git a/dev-games/ogre/files/ogre-1.8.1-threading.patch b/dev-games/ogre/files/ogre-1.8.1-threading.patch
deleted file mode 100644
index 13cf5634e53d..000000000000
--- a/dev-games/ogre/files/ogre-1.8.1-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.1.ebuild b/dev-games/ogre/ogre-1.8.1.ebuild
deleted file mode 100644
index f7689bd1b5bd..000000000000
--- a/dev-games/ogre/ogre-1.8.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.8.1.ebuild,v 1.7 2014/03/08 23:22:37 hasufell Exp $
-
-EAPI=5
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindFreetype"
-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/1.8.1"
-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 \
-		"${FILESDIR}"/${P}-gles2.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)
-		$(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
-}