old

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

3 files changed, 5 insertions, 87 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 1625761bad73..93a61b921064 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,9 @@
 # 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.79 2012/06/12 22:42:19 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.80 2012/06/13 07:03:30 mr_bones_ Exp $
+
+  13 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> -ogre-1.7.4.ebuild:
+  old
 
   12 Jun 2012; Julian Ospald <hasufell@gentoo.org> ogre-1.8.0.ebuild:
   fix patch
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index beeb0079676b..1a2413fe5c6d 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -12,7 +12,6 @@ DIST ogre_src_v1-7-4.tar.bz2 67391570 RMD160 4259b45dc4b3c4f930053e0de5e4366eaf1
 DIST ogre_src_v1-8-0.tar.bz2 88682669 RMD160 0eaa5e6bd631b34326a0e49b351dbeece92aa9ab SHA1 0fa7afd1bd7915f33df0a7f96a0f55c2b01297ec SHA256 2f59de73b0717c5d2084285f2594a045a9240a8a53e5b38203419c4e715c8ba6
 EBUILD ogre-1.6.5.ebuild 2528 RMD160 d87bfb3747006d0d7efe6ceb7e54d4362159391e SHA1 21959afb4d5fbdd37e55c36927492d82a95aa05e SHA256 ee511ad5a6254238644a2ffa61f9b8889fecdf0ed7b946fb302ba6e3881bb510
 EBUILD ogre-1.7.4-r1.ebuild 2367 RMD160 8d5881353dacfcc8fa840c3d01e135a6f22cd603 SHA1 f54ea9f7e84dfbf99b4c70097d6cec740579110d SHA256 bfe3afc9e1a66936f184dac0e3e680b7654da07620865a296934f2d9fd9c2582
-EBUILD ogre-1.7.4.ebuild 2343 RMD160 38c7e2b30189f527be347fccfd67e7ed4e055130 SHA1 88ad31fea83e307bdad90a91482cec1eb8eadeaf SHA256 02b0974ff1d7442af99b2be3a1869a494eb445febbe360960e3b3e33d01b5b09
 EBUILD ogre-1.8.0.ebuild 2588 RMD160 cd5e368178fd8d919ba36b2bae43b7b6a2d95d2e SHA1 e3748229babbff688eabb9cb7799e6ededc19b8a SHA256 1911b3f6ec4b5e29ad76cb8d5868f027ebe1ab044f798f0c95c6ce81342a2c0d
-MISC ChangeLog 11550 RMD160 d23ba3756decc400af7cd94035ea59bcf5fe429a SHA1 46adaa758de6a4a4f15a2c02649519b03be2c100 SHA256 da82453711d875414d8136463a5194324777b95affc274080a140f6fe75feece
+MISC ChangeLog 11633 RMD160 9335bc99d822c7d9bdeb6826baa3e406b2c2d67e SHA1 5ef06f7dffee37182dc9d4d356cf185d443ff212 SHA256 c01830d3e1c579cf17cb421173d0d105b15f5ca9780865f4ee6d239e5ca8d070
 MISC metadata.xml 5014 RMD160 c9a0b98bb110fbc4100c469fb1bddd82fecafbf9 SHA1 e55b3fed8028fb6dd46497cf759efbe9ed7f2727 SHA256 7ea0c9b0e56cadc41e0e1ac195ee058ac8abb176a3ac5b8ffb8363af12fd54d8
diff --git a/dev-games/ogre/ogre-1.7.4.ebuild b/dev-games/ogre/ogre-1.7.4.ebuild
deleted file mode 100644
index 8bee729bba78..000000000000
--- a/dev-games/ogre/ogre-1.7.4.ebuild
+++ /dev/null
@@ -1,84 +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.7.4.ebuild,v 1.3 2012/05/26 15:31:19 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 ois +opengl poco profile tbb test 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 )
-	ois? ( dev-games/ois )
-	threads? (
-		poco? ( dev-libs/poco )
-		tbb? ( dev-cpp/tbb )
-	)
-	zip? ( sys-libs/zlib dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-
-S=${WORKDIR}/${PN}_src_v${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-	epatch "${FILESDIR}"/${P}-threading.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)
-		$(cmake-utils_use profile OGRE_PROFILING)
-		$(cmake-utils_use test OGRE_BUILD_TESTS)
-		$(cmake-utils_use threads OGRE_CONFIG_THREADS)
-		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
-		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
-	)
-
-	if use threads ; then
-		local f
-		for f in poco tbb boost ; do
-			use ${f} || continue
-			mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
-			break
-		done
-	fi
-
-	cmake-utils_src_configure
-}