mr_bones_ 15/02/06 21:01:28 Modified: ogre-1.9.0-r1.ebuild ChangeLog Log: add stl use dep for tinyxml (bug #529631) (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 dev-games/ogre/ogre-1.9.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild?r1=1.1&r2=1.2 Index: ogre-1.9.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ogre-1.9.0-r1.ebuild 5 Nov 2014 19:37:37 -0000 1.1 +++ ogre-1.9.0-r1.ebuild 6 Feb 2015 21:01:28 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild,v 1.1 2014/11/05 19:37:37 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild,v 1.2 2015/02/06 21:01:28 mr_bones_ Exp $ EAPI=5 CMAKE_REMOVE_MODULES="yes" @@ -30,7 +30,6 @@ RESTRICT="test" #139905 RDEPEND=" - dev-libs/tinyxml media-libs/freetype:2 virtual/opengl virtual/glu @@ -49,6 +48,7 @@ poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) + tools? ( dev-libs/tinyxml[stl] ) zip? ( sys-libs/zlib dev-libs/zziplib )" DEPEND="${RDEPEND} x11-proto/xf86vidmodeproto @@ -64,6 +64,9 @@ -e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \ CMake/Utils/OgreConfigTargets.cmake || die + # make sure we're not using the included tinyxml + rm -f Tools/XMLConverter/{include,src}/tiny*.* + # Fix some path issues epatch "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \ "${FILESDIR}/${P}-remove_media_path_to_bindir.patch" 1.100 dev-games/ogre/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?rev=1.100&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?rev=1.100&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?r1=1.99&r2=1.100 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- ChangeLog 27 Jan 2015 07:59:51 -0000 1.99 +++ ChangeLog 6 Feb 2015 21:01:28 -0000 1.100 @@ -1,6 +1,9 @@ # 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.99 2015/01/27 07:59:51 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.100 2015/02/06 21:01:28 mr_bones_ Exp $ + + 06 Feb 2015; Michael Sterrett <mr_bon...@gentoo.org> ogre-1.9.0-r1.ebuild: + add stl use dep for tinyxml (bug #529631) 27 Jan 2015; Michael Sterrett <mr_bon...@gentoo.org> -ogre-1.9.0.ebuild: old
