Drop ogre 1.7 as it's the same as available in gamerlay

3 files changed, 4 insertions, 79 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 91ed659..313ed2d 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jun 2011; <cbrill@gentoo.org> -ogre-1.7.2.ebuild:
+  Drop ogre 1.7 as it's the same as available in gamerlay
+
   22 Mar 2011; <cbrill@gentoo.org> ogre-1.7.2.ebuild:
   Fix bug that caused the Cg plugin not to be built
 
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 248264d..de14302 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -2,8 +2,6 @@ AUX ogre-1.6.4-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f67
 AUX ogre-1.6.4-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
 AUX ogre-1.6.4-python-ogre.patch 3242 RMD160 3207e7f23c82731656591327caba937475ed1204 SHA1 a3441eb48be64e18a2b6a6eb1a4c16c4febbd283 SHA256 f5dae62f6acd2b0734904ac1803f68adba1c74f76d65df7f921b8ab580dc4221
 DIST ogre-v1-6-4.tar.bz2 41792925 RMD160 1c7e5f83df812671bcdc6bcf5dfa6a38fc69c93f SHA1 8d0c3edd2c8e289675555d10692407203e9e8a4a SHA256 af348dc278ff53f5eec966073d1eb8a87ad5c29215339713ce91eda1501bf12e
-DIST ogre_src_v1-7-2.tar.bz2 63654208 RMD160 ab6c5280c6b98f291cde5c585c836d4b29df066c SHA1 d9c18e8d4b114433fa411fcf9f368827e67b75d4 SHA256 054a8486234b5a551195a4bcbd4ba4bbc046563e061b7f93e68a684150970883
 EBUILD ogre-1.6.4.ebuild 2373 RMD160 c8cadb92c657e4b6efc1cff6a137af0e0d384370 SHA1 a695e144db5d75572ecfcdf463210c9c87a3bf25 SHA256 0b9db92448b36719f87c6be52a7d11241f836161908f7edbcc28df3e5b6bf509
-EBUILD ogre-1.7.2.ebuild 2571 RMD160 9745bc51838c2fa7adc50eededac40892a6ea4fa SHA1 7f35abdfd9b4bc32391a5312d4a55636eafc539f SHA256 0dd89661ac189e824552d4f76e6ddbd183d89a54ddfeca27b9a410a927c7e55a
-MISC ChangeLog 556 RMD160 023c7cb044b6f3b5446288fcfb17e05bd5932928 SHA1 cee590047c7c18a95d51f1b1a436138acd15c00d SHA256 890f1b43cfdfdd83d42537f85715cfe85cdf8cc520bf018bc8356ae9e152977b
+MISC ChangeLog 670 RMD160 3e185fcda7d5db225eac0b922b083e58bfd50e8e SHA1 1cd83ed92b6101570d83fd4248156f0798a20df8 SHA256 93e84c38c917bdee9f0489a6f671eea41dada03a3aadbe5d40e09d4fca0c9a6f
 MISC metadata.xml 225 RMD160 4c506d7c9b24eec779d50ce5ede69834a7f6178a SHA1 a318096995ed1f48d6657e4b08a13371852b12de SHA256 4e2111c4227c34a36c3477bb355a39b8716e982e6ccdb67df1359a3a5f25d655
diff --git a/dev-games/ogre/ogre-1.7.2.ebuild b/dev-games/ogre/ogre-1.7.2.ebuild
deleted file mode 100644
index 9229c56..0000000
--- a/dev-games/ogre/ogre-1.7.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.3 2009/12/21 20:44:22 mr_bones_ Exp $
-
-EAPI=2
-inherit multilib 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 +boost-threads doc cg double-precision examples +freeimage +ois poco-threads test tbb-threads tools +zip"
-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 )
-	boost-threads? ( dev-libs/boost )
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	freeimage? ( media-libs/freeimage )
-	ois? ( dev-games/ois )
-	poco-threads? ( dev-libs/poco )
-	tbb-threads? ( dev-cpp/tbb )
-	zip? ( sys-libs/zlib dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	dev-util/cmake
-	dev-util/pkgconfig
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/${PN}_src_v${MY_PV}"
-
-src_configure() {
-	#-DOGRE_STATIC=ON
-	local mycmakeargs="
-		-DOGRE_LIB_DIRECTORY="$(get_libdir)"
-		$(cmake-utils_use boost OGRE_USE_BOOST)
-		$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
-		$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
-		$(cmake-utils_use doc OGRE_INSTALL_DOCS)
-		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
-		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
-		$(cmake-utils_use test OGRE_BUILD_TESTS)
-		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
-		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)"
-
-	use cg && [ -d /opt/nvidia-cg-toolkit ] && mycmakeargs="${mycmakeargs} -DCg_HOME=/opt/nvidia-cg-toolkit"
-	use freeimage && LDFLAGS="$LDFLAGS $(pkg-config --libs freeimage)"
-
-	if use boost-threads; then
-		einfo "Enabling boost as Threading provider"
-		mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"boost\""
-	elif use poco-threads; then
-		einfo "Enabling poco as Threading provider"
-	    mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"poco\""
-	elif use tbb-threads; then
-		einfo "Enabling tbb as Threading provider"
-	    mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"tbb\""
-	else
-		echo
-		ewarn "Threading support is disabled!"
-		echo
-		mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=OFF"
-	fi
-	CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}