Add libsdl usd deps - might fix bug #459360; use usex

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/games-fps/worldofpadman/ChangeLog b/games-fps/worldofpadman/ChangeLog
index 96868e922c5b939d8e678af5d9f3daa55a374df5..2db12c9fd66f8959625a87274f4895ab2280887a 100644 (file)
--- a/games-fps/worldofpadman/ChangeLog
+++ b/games-fps/worldofpadman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/worldofpadman
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/ChangeLog,v 1.15 2014/06/24 23:34:13 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/ChangeLog,v 1.16 2015/02/08 18:16:12 mr_bones_ Exp $
+
+  08 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> worldofpadman-1.6.ebuild:
+  Add libsdl usd deps - might fix bug #459360; use usex
 
   24 Jun 2014; Michael Sterrett <mr_bones_@gentoo.org> worldofpadman-1.6.ebuild:
   add missing glu dep (bug #514854)

diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest
index 9d60c42ce8d1c7793e3c3df6fbc39cf74d42e317..a284d26b4638d1d8cfd30303901c1278f7a7e6bf 100644 (file)
--- a/games-fps/worldofpadman/Manifest
+++ b/games-fps/worldofpadman/Manifest
@@ -1,6 +1,6 @@
 AUX worldofpadman-1.6-gentoo.patch 2102 SHA256 4755298fa34f296d6fdc9334d875b582463ca4e5ae74c65c69e2bbdfb07a463f SHA512 d124b17972f0837c0ded524c0077bf2c58cf5d6d6254c69069d07e3616096ed7bf9e67ea9e6e658c1e706df28403375693858131eb09e30877d1132bec48efd7 WHIRLPOOL 706419680cce86ade743d9f96095bf7525a2e286de87c741d7135eeeec3d4240ab8c2b8cc6ab6ba9435813bf1c0e1d83dab8912c1081ad6adbc0e1328beae796
 DIST wop-1.5-unified.zip 947290087 SHA256 82af4a8b93cac1a6fa8deb2607e9b0a15255f8386b0c8cb21d6e532ac6c601f5 SHA512 fea0207efadf15afab7001227e27126aef4a673bd478dccb513c3011d0811074b2788083862f07e2f02f1a80ccb57a45ff64de8de155d8f8f7f1ab53ecf2402b WHIRLPOOL 9e39698f19f987fcae0957bd4bac53742fb6d88aa81e87750238871987f14c9202ab38918d30d0f4a420427cf719398182d4af74330f9bbd731530c54285f83b
 DIST wop-1.5.x-to-1.6-patch-unified.zip 122204892 SHA256 fe120218823825d742c506b2f448e15bf6ca756b99bc1d11d12749191e12c4c7 SHA512 a45018bd79e9e23c57bcaf692fa14c323671103558caad6acb794c2990cc5fe9cc8bdbe6a6c8254c4560d81eb59f5e3b9a6800a61b21a15870c4439f7179d936 WHIRLPOOL 61ff77e5168ec609f3fb498b7dffdf9138a14f6ea63e5537ffb583e17edb67cbab4c56d788bcfc994a2f3a11c517c10fa90c12cc0fc80571bd2702ce896597cc
-EBUILD worldofpadman-1.6.ebuild 2217 SHA256 3b8f2f407612706c342682b11109a6ce8031e9e7a03c5ff0ff724d9f6288c670 SHA512 54e7cbe461b616bc7445d471f28fd778f0252061ff88e82a4d7464de00a43a83ba76e5771baa77d99f7a69d0cafe24243f85d2d72cf66ff7409bec002bdd6d6a WHIRLPOOL ccfc588a362fbb300549325cfc7ca46891e02d2fd90c5bc20a1c087caed31bcf46cc98dac49be771f7f4d8f0d2436aa649bc3880719b3d80a2ae3c3e956cd753
-MISC ChangeLog 2300 SHA256 08bad2ff692cc6cd7d94a38f5e6e1c34e7b1bc2192f68595b88885903d400cf9 SHA512 45b72a47b145518c6425ddd2aa10887127f44e1079c97ebd1b63b224e7c7a4ad16c0508a5b6d58a13841a8e62ff2e9bd67064e2269de53a126e79f8aa466650e WHIRLPOOL 50a8f6428676312d37fe713e6dbdba0667f598b0e2f7ffc1efbafdd3dfe2d48939df5fc7114ff4790bebb1629e2a01927eb99430624b9c1a4c96525c08aaf90e
+EBUILD worldofpadman-1.6.ebuild 2170 SHA256 14a0f69776f14bb95dbcb212493bcfcc30850b2af41e925652599752350b3f9e SHA512 396564508bf4633c605b2c9a6f5e955b0a349e33d0c9949249de94013d55d19f494e9fb0e00d4725bbbf96bb93f3d28e2495f070bcfd9a2319af259503cd576d WHIRLPOOL bb49da1163bd0df51ed5cce5108b9e7610e0a6d5458329c08e71de654e3c0edff425c125f0acb88799e3f3c9d9fa2826960b79066060fc6f6c906119965fbaa9
+MISC ChangeLog 2438 SHA256 7be777a776f0ec9c8b6dcc91f27f359bdde77ec9ff341bdd32ce4a24b88bc54a SHA512 a6b0437395f39d7143ce41defb3e5668869893b2c8cbac4ae57220aee150928b3fc54cf6f6f4347e8c21b1a7d2baee156959b296b984d5f0608ddcb91824ecf9 WHIRLPOOL 7bc5f87e1e46d5aff4f7402a3c9a245cab82f72f894b9e8023f2aa2163c7ed992510b9e473ae8726824030df4186f546d3980c52786a16c84cbc4a0653e338cb
 MISC metadata.xml 235 SHA256 ba7e89e78da07591bbf79b474180b7d9f4e53e8f877663be273bf0b7a6af7c29 SHA512 75c8c679349ca42b342fdebd1b80e0028c75f87cb0d21275ebef335baa22addd0f324e9466e884a155ae78c7dca6d0043dbf7d2b3287a7a987990a3a0cf7f55a WHIRLPOOL 7063988071e883afae9482a3cc7527c8e5225783236f85368bdf19b2ef97a2326e4055a71e14599a3ccf0137fc27a2a71c6da7b1b59298cec30d5beb85179be2

diff --git a/games-fps/worldofpadman/worldofpadman-1.6.ebuild b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
index e230edfec9e2d3772bdcbacd099f360102ecf441..82ca44426890eefab01c12bde30098841cf47246 100644 (file)
--- a/games-fps/worldofpadman/worldofpadman-1.6.ebuild
+++ b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
@@ -1,9 +1,8 @@
-# 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/games-fps/worldofpadman/worldofpadman-1.6.ebuild,v 1.6 2014/06/24 23:34:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/worldofpadman-1.6.ebuild,v 1.7 2015/02/08 18:16:12 mr_bones_ Exp $
 
 EAPI=5
-
 inherit eutils games
 
 DESCRIPTION="A cartoon style multiplayer first-person shooter"
@@ -20,7 +19,7 @@ RDEPEND="sys-libs/zlib
        !dedicated? (
                media-libs/speex
                virtual/jpeg:0
-               media-libs/libsdl
+               media-libs/libsdl[opengl,video]
                virtual/opengl
                virtual/glu
                openal? ( media-libs/openal )
@@ -63,12 +62,12 @@ src_compile() {
                BUILD_CLIENT=$(use dedicated && echo 0) \
                DEFAULT_BASEDIR="${GAMES_DATADIR}"/${PN} \
                OPTIMIZE= \
-               USE_CURL=$(use curl && echo 1 || echo 0) \
+               USE_CURL=$(usex curl 1 0) \
                USE_CURL_DLOPEN=0 \
-               USE_OPENAL=$(use openal && echo 1 || echo 0) \
+               USE_OPENAL=$(usex openal 1 0) \
                USE_OPENAL_DLOPEN=0 \
-               USE_CODEC_VORBIS=$(use vorbis && echo 1 || echo 0) \
-               USE_CIN_THEORA=$(use theora && echo 1 || echo 0) \
+               USE_CODEC_VORBIS=$(usex vorbis 1 0) \
+               USE_CIN_THEORA=$(usex theora 1 0) \
                USE_RENDERER_DLOPEN=0 \
                USE_INTERNAL_ZLIB=0 \
                USE_INTERNAL_JPEG=0 \