summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-games/ogre/ChangeLog5
-rw-r--r--dev-games/ogre/Manifest18
-rw-r--r--dev-games/ogre/ogre-1.9.0.ebuild6
3 files changed, 17 insertions, 12 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index a3193a45f2d7..036e7ab48d83 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-games/ogre
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.95 2013/12/30 21:22:28 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.96 2013/12/30 21:30:16 hasufell Exp $
+
+ 30 Dec 2013; Julian Ospald <hasufell@gentoo.org> ogre-1.9.0.ebuild:
+ fix REQUIRED_USE to have reliable use-dependencies
*ogre-1.9.0 (30 Dec 2013)
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index ae9f43ab04e0..ca03e3100674 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -7,17 +7,17 @@ AUX ogre-1.8.1-threading.patch 2060 SHA256 5404ac5abd128fbe0d6a54344d82cdc1587ef
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 2788 SHA256 deb0121970bb39fbda6e229b275ba5f07e942da1b836f2ef1241ddc1c4b3f1c0 SHA512 4113a4bbcd0d09025dbfeb1a855250508f077b5b8857e813753b2902a292a3d527edb965159d4333657ca4f153ee20669238bb04fc0cdd3e39b69b09cb15f2fc WHIRLPOOL bbad7ddbb9e5c53cd57ad968be85db011a2d59f837b1b5f2be1b3a2256378e46f5ad0af87e4a27c4d4c84402b1a9f273cce8feb32b3b7bdd079cb62ea037c7f2
-EBUILD ogre-1.9.0.ebuild 2660 SHA256 7895aac1c78aa1e1a3fda741c0e9acdd5fe963da4834ae4ed17e421d1b04e19e SHA512 cab19ceb77e4f51af0fcee9ac6ae1ac7349012c344dd1564d7d63ef6464e6bed55dc518c7149315c56cff2c1df0aab5f20756017e1ed05624959be8d26a20dc5 WHIRLPOOL 54b85ed098af578a387d2e15bee982a4815e58441c010c07b002992e936aecf819b791a70180e33525197c3668c32c17ba80a869f0982bb47112cb74b199ed3e
-MISC ChangeLog 13574 SHA256 2b539ccfee6900f894242196b87ce8e43c8d3e4d4e8c2b7c540af6478913501f SHA512 ef8e2075c6a8e9f25808b8a731f6efd4d2fc7d736eabe3ae992e3ae1927881024f547b85f5d53778752a74214471a58e9e915d4cd5473c99dda3d865a5f29a37 WHIRLPOOL 1472939ec0fe14592f593e1b31a724dd11401a6064e17f205dc689303ed9a89df4c6ba1f3cb5160fd85eeec400848aa82544148f64ca16724e1de66082f45abf
+EBUILD ogre-1.9.0.ebuild 2697 SHA256 c39cd8bd7f7a106007df7897be7c5e02a1ceecb693bc07ac13018d2bb3019d33 SHA512 73580d03a3252ef57651fdb31b9b58e2dbcf3c27371db69c2e6d070e6ce033aeb5373f840ff38ae6e848e0b376a918912157235411c9a473db7f65587f21f60a WHIRLPOOL f4f0a9383ac0a0c9bc8cc72135d8a83c684c5b4e60f4bb6d11f131f6b0396881d545360cf4eaeb66bcddd31596925d28e5ebbc670443c332b1d4896dcf756cd5
+MISC ChangeLog 13698 SHA256 777eb9ecb3c1916d3060e61b64297082452264e34875eb5008cbdee07f0302ef SHA512 bff9a3e2b3c54a127297f8f061c6d8d03d78aa911fb2aa95b4905841d8a7d0ff976aaac6220bc69364187f97c6214eb82d77a6274dfb691274491a5dba083e0a WHIRLPOOL f9427a1ec3c0517acb4023025a4e74ef552693a71daa2d8a6d262af00a570895d7f6aa9349aa92dde8a57ae47815c9e000581e87a224f91ec5eb19bdc1f96f1e
MISC metadata.xml 4897 SHA256 45a214db2ff7ecfbc7c9d4949cba75af450a8cf1c65ab44a57d6cc74d3ae4be6 SHA512 7cf77c7422fec1116e163f8035aa8a8aaedfafaee05ee1d315f667e902169066eadf5f5fa8960e1fd4b311a029212fb9766b7e6b343ad250c3e0390d360fc323 WHIRLPOOL 13507b98e0eadb961effc15eab2859933944873fb51439761211a76fd40947129ce1e6a69035727b1c66d6e981818eb357ef116af4f18522a21faed7fbaadb1e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJSweQdAAoJEFpvPKfnPDWz8Y4H/25HDd79rpCgke7fBSGLt+8I
-dBYDjf1JkrGRchH1Rt0NZIg2jsb8y3rJXrxOsGoB7ERBn3TyphYzKqVsD15WhVYb
-E2sdUCV0BKZ2Co1UAbXinH3BPGm43bj0fm7lNMSSaVHDbp9DZBTDpJhEpGH8TBht
-cFz5cqg14cQK/c5MBKbCHfOTN5lSYxz11ACnodaDPXAwFGnR+yNPcfxskNUgf6wv
-+pz2UUrXPE95JLzenbUcprVP8u0YvZTPc0o0sYKQRQKALjTODOb3L3d2bdegc7Yr
-Muz2hcb7zXs5dD2oWhLPMGHU4sZFwjmwJlzhP/sL1Nam3gRBvUhm867+JJ0q+m4=
-=AjyA
+iQEcBAEBCAAGBQJSweXtAAoJEFpvPKfnPDWzJKQH/RifOLBmF652vWQHKHZ71rZC
+UFLgFxBuhhiOG7rWbMucdSZZHZSKPdjM20n1Y9Vl+fwIRR6j5CPQAGSOhqTJk5Nu
+k/SI3HeZzHrz8HP2IkmfWVjKOiDKpN9Q1omlMqJDqmXzvfs8/aqSLTHwTw8ZyurC
+6208R/ihkttNv9RiNNXHSHIGXdEgtxLAU1Gkp6hpE/qy5hLZKgDFo2Uy/xZKnwqs
+ZKs7W4OYuJXcBAyYBJzQfv4BxqW0+jitbLbE9YrAu2xKp1HfDkXo81yFFaQj4FFW
+fwNk/rIP9Q5pZPZ5ryJIo1qIy5ks7MKqOGVq+kIivw/eGv29gMvYeBmi19GWNRM=
+=seis
-----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/ogre-1.9.0.ebuild b/dev-games/ogre/ogre-1.9.0.ebuild
index ff12497d5aee..ed5dda657f71 100644
--- a/dev-games/ogre/ogre-1.9.0.ebuild
+++ b/dev-games/ogre/ogre-1.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.ebuild,v 1.1 2013/12/30 21:22:28 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0.ebuild,v 1.2 2013/12/30 21:30:16 hasufell Exp $
EAPI=5
CMAKE_REMOVE_MODULES="yes"
@@ -15,7 +15,9 @@ LICENSE="MIT public-domain"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb threads tools +zip"
-REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
+REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) )
+ poco? ( threads )
+ tbb? ( threads )"
RESTRICT="test" #139905
RDEPEND="