diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-02-06 21:01:28 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-02-06 21:01:28 +0000 |
| commit | 6b25cf2f9c2ce8b9fd79a72f9cbee7c26c159a5b (patch) | |
| tree | 3f15940915b8da39d25c461b7b0bc9d8a3d3d96c /dev-games | |
| parent | Verion bump, remove old. (diff) | |
| download | gentoo-2-6b25cf2f9c2ce8b9fd79a72f9cbee7c26c159a5b.tar.gz gentoo-2-6b25cf2f9c2ce8b9fd79a72f9cbee7c26c159a5b.tar.bz2 gentoo-2-6b25cf2f9c2ce8b9fd79a72f9cbee7c26c159a5b.zip | |
add stl use dep for tinyxml (bug #529631)
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/ogre/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.9.0-r1.ebuild | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog index 340b75a04c59..ea819a6b407b 100644 --- a/dev-games/ogre/ChangeLog +++ b/dev-games/ogre/ChangeLog @@ -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_bones_@gentoo.org> ogre-1.9.0-r1.ebuild: + add stl use dep for tinyxml (bug #529631) 27 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> -ogre-1.9.0.ebuild: old diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 260348d71d98..dc52917f3546 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -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 @@ REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) RESTRICT="test" #139905 RDEPEND=" - dev-libs/tinyxml media-libs/freetype:2 virtual/opengl virtual/glu @@ -49,6 +48,7 @@ RDEPEND=" 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 @@ src_prepare() { -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" |