From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QDwAn-0004Ki-0f for garchives@archives.gentoo.org; Sun, 24 Apr 2011 10:04:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01D751C06D; Sun, 24 Apr 2011 10:04:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C669E1C06D for ; Sun, 24 Apr 2011 10:04:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C903B1B4017 for ; Sun, 24 Apr 2011 10:04:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 11A70803E3 for ; Sun, 24 Apr 2011 10:04:02 +0000 (UTC) From: "Azamat H. Hackimov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Azamat H. Hackimov" Message-ID: <5c10e05caa0b103884e01a758b47488d322c2354.winterheart@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: dev-games/ogre/, dev-games/ogre/files/ X-VCS-Repository: proj/gamerlay X-VCS-Files: dev-games/ogre/files/ogre-1.7.2-gcc46.patch dev-games/ogre/ogre-1.7.1.ebuild dev-games/ogre/ogre-1.7.2.ebuild X-VCS-Directories: dev-games/ogre/ dev-games/ogre/files/ X-VCS-Committer: winterheart X-VCS-Committer-Name: Azamat H. Hackimov X-VCS-Revision: 5c10e05caa0b103884e01a758b47488d322c2354 Date: Sun, 24 Apr 2011 10:04:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 16f9f116345417703c3ea4903755f6b7 commit: 5c10e05caa0b103884e01a758b47488d322c2354 Author: Azamat H. Hackimov gmail com> AuthorDate: Sun Apr 24 10:03:49 2011 +0000 Commit: Azamat H. Hackimov gentoo ru> CommitDate: Sun Apr 24 10:03:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gamerlay.git;= a=3Dcommit;h=3D5c10e05c [dev-games/ogre] version bump to 1.7.2 Fixed doc USE-flag, added gcc 4.6 patch. (Portage version: 2.1.9.42/git/Linux x86_64, unsigned Manifest commit) --- dev-games/ogre/files/ogre-1.7.2-gcc46.patch | 10 ++++++++++ .../ogre/{ogre-1.7.1.ebuild =3D> ogre-1.7.2.ebuild} | 14 +++++++++++-= -- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dev-games/ogre/files/ogre-1.7.2-gcc46.patch b/dev-games/ogre= /files/ogre-1.7.2-gcc46.patch new file mode 100644 index 0000000..7fe766a --- /dev/null +++ b/dev-games/ogre/files/ogre-1.7.2-gcc46.patch @@ -0,0 +1,10 @@ +--- a/OgreMain/include/OgreOptimisedUtil.h ++++ b/OgreMain/include/OgreOptimisedUtil.h +@@ -29,6 +29,7 @@ Torus Knot Software Ltd. + #ifndef __OptimisedUtil_H__ + #define __OptimisedUtil_H__ +=20 ++#include + #include "OgrePrerequisites.h" + #include "OgreEdgeListBuilder.h" +=20 diff --git a/dev-games/ogre/ogre-1.7.1.ebuild b/dev-games/ogre/ogre-1.7.2= .ebuild similarity index 91% rename from dev-games/ogre/ogre-1.7.1.ebuild rename to dev-games/ogre/ogre-1.7.2.ebuild index 6c0e5af..47b582f 100644 --- a/dev-games/ogre/ogre-1.7.1.ebuild +++ b/dev-games/ogre/ogre-1.7.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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 $ =20 -EAPI=3D2 +EAPI=3D3 inherit multilib eutils cmake-utils =20 MY_PV=3D"${PV//./-}" @@ -33,12 +33,20 @@ RDEPEND=3D"media-libs/freetype:2 zip? ( sys-libs/zlib dev-libs/zziplib )" DEPEND=3D"${RDEPEND} x11-proto/xf86vidmodeproto - dev-util/cmake dev-util/pkgconfig + doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )" =20 S=3D"${WORKDIR}/${PN}_src_v${MY_PV}" =20 +src_prepare() { + epatch "${FILESDIR}/${P}-gcc46.patch" + if use doc; then + sed -i -e "s:share/OGRE/docs:share/doc/${P}:" \ + Docs/CMakeLists.txt || die "sed failed" + fi +} + src_configure() { #-DOGRE_STATIC=3DON local mycmakeargs=3D"