summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen <eroen@occam.eroen.eu>2013-06-08 05:55:02 +0200
committereroen <eroen@occam.eroen.eu>2013-06-08 05:55:02 +0200
commit1f441c8987960b3d83cdd0b37f065a47687fb336 (patch)
treef54e543a336081800fee96531188e1e2ddf91562 /games-engines
parentgmock-1.6.0: add tr1 use flag (diff)
downloaderoen-1f441c8987960b3d83cdd0b37f065a47687fb336.tar.gz
eroen-1f441c8987960b3d83cdd0b37f065a47687fb336.tar.bz2
eroen-1f441c8987960b3d83cdd0b37f065a47687fb336.zip
openmw-9999: add tr1 use flag
Diffstat (limited to 'games-engines')
-rw-r--r--games-engines/openmw/Manifest4
-rw-r--r--games-engines/openmw/metadata.xml3
-rw-r--r--games-engines/openmw/openmw-9999.ebuild15
3 files changed, 16 insertions, 6 deletions
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index a6d2cd4..ecf0dae 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -9,5 +9,5 @@ EBUILD openmw-0.20.0.ebuild 1625 SHA256 9d7f87bb4b0ca560c12f8675b809a491bcd882ae
EBUILD openmw-0.21.0.ebuild 1636 SHA256 cc6ce30804a55794041b0d0460fc1d0d60b1f43f0b21c2ebe3e23fa6e4d8d578 SHA512 a4594120ff820ae7b1e583caa9b5bdaaf6e71d5b15f9cb71c38a61337d67e03e823a5f70378c0f4bf2bfe4684d8fde92aa652f43c73978e30f5850c81d263018 WHIRLPOOL 99df5c25c4700d057d55d0004fa2c410cf0b7fb08575f12a46e2c7b61485868a176d202f56aa2e1523726803855d0b42b651d6de4d509bc2f94ff3ba922f5e5c
EBUILD openmw-0.23.0.ebuild 1598 SHA256 85a0e719d3d6fd84c51b8849d3ea5dd4885119da66b4f6263d9f7f5e520422cd SHA512 f030f181567e8408524d88df1b371eda20877f308cbcbc220656a8e4cd3af8c0a4a040bd4b0903229ca2431647fab800c34cdc47d8a999d50155594e9685b314 WHIRLPOOL 674b5a96af4fcf0354458cdc92bd34559529f3e72cf848bd8c25c5845de1f8ab6d0bb00c4c60d7f580675439af27ac92173f0980738e368f8579776d11f518c9
EBUILD openmw-0.24.0_pre9999.ebuild 1936 SHA256 55a2bceab8254e1f92c6d90241a61f0bfd55576a739a3b77012eeffc5d7f7884 SHA512 bbc499c93640b7cbc7b1e6bb6dded3b0886c5bbd975e2874517706f482b9aac6e7bafc9dc5b3461d27a2297e84dbdb38d1f1e2a5fdc664e9f42feba5573a04e0 WHIRLPOOL 740bf8bf4d5a3c0767cc543fe197b1a91c38e81561b7ed1f17d971ea89df2094c7e512c98041d2f90a286c6a64ead047583c0fb2677bfcfbda30c15f89997480
-EBUILD openmw-9999.ebuild 1776 SHA256 e6e1b40225e4c395eddbbbdc8cb03ab3b39954dd79a7782726cf344e5517f1a0 SHA512 c0e2efd4cf3eb1173f236ce50d63f75658b39eecc14e04106cdbb54581aed73aeaf01e6b44ca79871519cfeedb6f79e1cca33c16a8386bed20231783b9e2019d WHIRLPOOL 4d2ac05596c59ad62ad02d251f64e0a816ca3c4ad76357f8e518fa0f16d1e45839730ab6f0939bd051e3cf8d0f994ecb8dd0702ff06f8367ab0c9a38f6b3e05f
-MISC metadata.xml 378 SHA256 cf1d0adba9aded901ebdac00befbdaa6665e37c8a4f43bce402ddfbcfdb58ff1 SHA512 3a8bc1effedb29ee006beee99f63d0b3a8f70ec4f67a0524456c685f46cee0c8f60e29c6facc613a4484744a119a7529defa515856eb85e6df8023058e9ea3b6 WHIRLPOOL 73215f7b1130b50b3c4876c1e0a6c293f7c7ca215e71686c1dfb0895168051162c5d4e78b83a12dada163b4b6124efddbee4282aa4d7d8fe633ebdd709c5aa1d
+EBUILD openmw-9999.ebuild 1951 SHA256 f593c756065e08ee7b7432ab3cee940eca5b1ae9022d4ccacc2632c948b01f6f SHA512 085ad8fd830b895ea2e3d29c8809cef0d18e1a1084f0b0517af971747e8b7e0b265de440f899a666974c91300cbfc21f026fb5cc7ffbb0fb9a7b22baa63a2dcb WHIRLPOOL b96d3163bdd700a2bab774b629bfae412e89ecd3827a907b167fdf2fd5801204c3ecca974b3b3d8b2ea8cf780f12ada637095a6ede18511891c8cd0a97114eea
+MISC metadata.xml 435 SHA256 95e22fa26a5026ec72a54bd871db0c9a5ea35da817f75958bb29b56fca3828f0 SHA512 f7d93610c9c106a13c6cb834a16d4d0c2975d2cfd74a4720ec63e778b7dbe0ed97e5dce8df6404cbc035234a289798ad7efb32c5457d4a70c419548d6931ef7a WHIRLPOOL 9019016e27d2f93ccdc644258d5d6a313c98d539a89d6f2ef3c8352c660f455d2a0f891daa830894b5811ecf46332a377db00a048b4f9ab529a8a85c1e323693
diff --git a/games-engines/openmw/metadata.xml b/games-engines/openmw/metadata.xml
index d47dba8..1599ff5 100644
--- a/games-engines/openmw/metadata.xml
+++ b/games-engines/openmw/metadata.xml
@@ -4,5 +4,8 @@
<longdescription lang="en">
OpenMW is an attempt to reimplement the popular role playing game Morrowind. It aims to be a fully playable, open source implementation of the game. You must own Morrowind to use OpenMW.
</longdescription>
+ <use>
+ <flag name=tr1>Use TR1 libraries</flag>
+ </use>
</pkgmetadata>
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 368bbf8..2e6f2cb 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils versionator games cmake-utils
+inherit eutils flag-o-matic versionator games cmake-utils
[[ $(get_version_component_range $(get_version_component_count)) == *999? ]] && inherit git-2
DESCRIPTION="Unofficial open source engine reimplementation of the game Morrowind"
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmw.org/"
LICENSE="GPL-3 BitstreamVera DaedricFont OFL-1.1"
SLOT="0"
KEYWORDS=""
-IUSE="test"
+IUSE="test +tr1"
if [[ $(get_version_component_range $(get_version_component_count)) == *999? ]]; then
S="${WORKDIR}"/${PN}
@@ -36,11 +36,18 @@ LIBDEPEND="dev-games/ogre[boost,cg,freeimage,ois,opengl,threads,zip]
dev-qt/qtgui
dev-qt/qtxmlpatterns"
DEPEND="${LIBDEPEND}
- test? ( dev-cpp/gmock
- dev-cpp/gtest )"
+ test? ( dev-cpp/gmock[tr1=]
+ dev-cpp/gtest[tr1=] )"
[[ ${EAPI} == *-hdepend ]] || DEPEND+=" ${HDEPEND}"
RDEPEND="${LIBDEPEND}"
+pkg_setup() {
+ if use test && ! use tr1; then
+ append-cflags -DGTEST_USE_OWN_TR1_TUPLE=1
+ append-cxxflags -DGTEST_USE_OWN_TR1_TUPLE=1
+ fi
+}
+
src_prepare() {
epatch_user
}