diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-02-06 21:01:33 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-02-06 21:01:33 +0000 |
| commit | 2818a51407ef2eb8d5e55b299119c60d8c70fa02 (patch) | |
| tree | f3c947528f324a264aa9c51a5a9738ab6b6c76b7 /dev-games | |
| parent | Verion bump, remove old. (diff) | |
| download | historical-2818a51407ef2eb8d5e55b299119c60d8c70fa02.tar.gz historical-2818a51407ef2eb8d5e55b299119c60d8c70fa02.tar.bz2 historical-2818a51407ef2eb8d5e55b299119c60d8c70fa02.zip | |
add stl use dep for tinyxml (bug #529631)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/ogre/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-games/ogre/Manifest | 4 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.9.0-r1.ebuild | 9 |
3 files changed, 12 insertions, 6 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/Manifest b/dev-games/ogre/Manifest index 2da973d88587..4ef322bf0a38 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -6,6 +6,6 @@ AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 524 SHA256 95fc1c6c1128eace7 DIST ogre-1.9.0.tar.bz2 128098305 SHA256 3072df52b2bed2a1b52e969f140ae9a4373ec931029d3eaa032e7c609a91ef82 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde WHIRLPOOL 625cc09ba5a76757b47764c41583584f538eb9561e5bfd546192e06da504aa3924d7070a7dfbe420c4db3edf5870baf5e8b77cc611aa4185806508f79302d6cd DIST ogre_src_v1-8-1.tar.bz2 88619968 SHA256 da908ac934265d25e378d336d648327afe569a758ef262029acd357d506f6aab SHA512 0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2 WHIRLPOOL 7325effb6421710ff0e21ab0e29443404fed151cc2aeaf481c597fd098278bb6223b9e2115abbd175f305e909491766c2d7b871b028d5b46f8028269b25c161d EBUILD ogre-1.8.1.ebuild 2794 SHA256 950bfc4f9ed09ac45d875ad931344941118a0e4d9fba24d08484c91874b85d11 SHA512 577c11d253e01ad84dc9f55ee0ef054978c7a339133c9e61f3e03023c2f3c95b2c24d354298220434080c61c64db09e733213dc59d06ce956e7a6ba195bec308 WHIRLPOOL 68611bd6cd696ddc4bd63fbf19c623eeb7e5f5138b4d1623ffca9391512489beb5f1777accab0bc86e287923b1507ec52758b7f2fead6a3c72988e22f8a80d8a -EBUILD ogre-1.9.0-r1.ebuild 3692 SHA256 6324ec8cda219239547df97c90472f5a3deb99ccdfb5419ce7be06ce5d3a6886 SHA512 9e5bbf254e8da7a8c62328f18c409f60c9ddbaa3505c67e90686cc279456d76689ac10066c433ce73b6614ae93bbdb68b6a82949b6aa94b3cb9ea8cc6f28b87d WHIRLPOOL 25b715efed1b2157ffb2442988c1b3ae370eb8def2b478c3ac3b05decd7c21fe808464dfa328f3a8f40bc6c3498e52ed323cb348a5b8f76c5183f20d6c9b4e7a -MISC ChangeLog 14159 SHA256 fe11668cc456bfa20a329f49abaac92a5b75d103eb1f5f298a8b6e635886d6cb SHA512 ec337da8e90f889462059d658efcb4dd6803685a7c7f7dd5812f55ba9652d911afffef36ce33526e33ccf89754eea11021cfe3f7e716a9ddb6f286689a87d7e0 WHIRLPOOL c8b94a8800dc256c09419fb154eda63b52809bf946a1644e75e92b67d51b23c02c4dfbb8ae50a90715537d62e077035545d3891e3faaceebb4a810c2892a086f +EBUILD ogre-1.9.0-r1.ebuild 3808 SHA256 846a5de67184b675b7323a15263eda7c5399d04ebb1b074b5a108637a6e22945 SHA512 38db6854b65ade4bb417f32ba499dad3f45c1e61c2657e92832291690b82aa726a9d9e6862d8f641f1ac5ce2dcc8829cbed704bf4a0dc428e8a4731e08b91661 WHIRLPOOL 39a97d01be739e30ff511bef3879c943d283c34c091ee1fe9e7ffc597838306f12f27f59cbffdaf31ad17939517c5bb2c5e25dd0202a87c17da535665597d758 +MISC ChangeLog 14282 SHA256 dab5d95da181028b14065e5b2fdb698425b66d7646a5b0cf5f3fdd8de07572d6 SHA512 0a8fe5c2f7ae852461b80aa915ac69580dc71313b431da20957696d16ceb853006f9987b2966d6c02038986e033785ca6509aa73ed0a4dd89008fcfe3bce9df0 WHIRLPOOL 3c21fd7c3fffbb9e0035593307f04fff23f5659964ab32c5ebc919705600703135b7b04b107dd21318ae03083f5e4f5edaa8da5d0bcd952c8eb610bac08445e8 MISC metadata.xml 5027 SHA256 d7eefe3cf5c25a5f7fed26277ea771bed386b56d5e45a5126000e8588662245b SHA512 45c6f2b47aad3aca08c273be97a3a1f933a5f85bf4f538e1e0383c2223dd1eff72d4240c159d151839e60ae9d62a011e134d08ae11e34c1edb6584ea543d3f15 WHIRLPOOL 54d46098a887c9d7776aa6e95944a4f81a3babb716f7faab95b698b5f9211d747fa82b965f803e347917b580e7ba74733327d71305f8b19248e969aaaba72dbe 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" |