diff options
author | Julian Ospald <hasufell@gentoo.org> | 2013-07-19 18:00:28 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2013-07-19 18:00:28 +0000 |
commit | 6deb3dd80717e35b643a9a34d3817de3d72bef4d (patch) | |
tree | 9248c51cc1888a9128a1b60ee6a7631e3a0933b9 /games-fps/doomsday | |
parent | Replace elog message by DOC_CONTENTS for readme.gentoo.eclass. (diff) | |
download | historical-6deb3dd80717e35b643a9a34d3817de3d72bef4d.tar.gz historical-6deb3dd80717e35b643a9a34d3817de3d72bef4d.tar.bz2 historical-6deb3dd80717e35b643a9a34d3817de3d72bef4d.zip |
simplify REQUIRED_USE
Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'games-fps/doomsday')
-rw-r--r-- | games-fps/doomsday/ChangeLog | 5 | ||||
-rw-r--r-- | games-fps/doomsday/Manifest | 18 | ||||
-rw-r--r-- | games-fps/doomsday/doomsday-1.10.2.ebuild | 137 |
3 files changed, 86 insertions, 74 deletions
diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog index 89d54d6b5126..e6932687de77 100644 --- a/games-fps/doomsday/ChangeLog +++ b/games-fps/doomsday/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-fps/doomsday # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.52 2013/07/17 15:08:40 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.53 2013/07/19 18:00:24 hasufell Exp $ + + 19 Jul 2013; Julian Ospald <hasufell@gentoo.org> doomsday-1.10.2.ebuild: + simplify REQUIRED_USE *doomsday-1.10.2 (17 Jul 2013) diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest index 6bf2ada224ee..ba1447ccc55c 100644 --- a/games-fps/doomsday/Manifest +++ b/games-fps/doomsday/Manifest @@ -11,20 +11,20 @@ AUX wrapper 136 SHA256 64b959cfeb77bd778f16768c0ee509cd128eb855fa4acd8e7c37046c5 DIST deng-1.9.0-beta6.9.tar.gz 6085833 SHA256 3553f6a58660916fdedbe0594f5b22dac4738ee6e02b042992d3140d358954af DIST doomsday-1.10.2.tar.gz 8501449 SHA256 f4e27c70823464595b77b64e392f5405152ee83f6e71e3be56bbb8e3b83fb839 SHA512 f7fe378a5309faffca2aa5f83126626182c76a65993c2addb28cf5e78e0892e25bb5ecb4893aff3b4b6d0f420a558600082ae54a93e50a11306e23d9de8177f6 WHIRLPOOL d433b273a2c9a6c89a31532771149e2e4c5800cf55e8a05f1a38394a58c5c3e7fe1718e5813c2641bb247155e39c7b166aea63bd0f21fd136321038eb2f93117 DIST doomsday-1.9.8.tar.gz 7048039 SHA256 5401e5d58d197c287f7bc1318ee8429f27a76792ae6f2471c12d10281a569474 SHA512 e264d75e939c501290ae33cd69f4c408c83f57b33bc3c17eba4f7b334b1846d830717395b140a986817ea61dbc2918992b66be9e564b2d04d5eb5046fc3f5a65 WHIRLPOOL 66150a95d1e242b6612f39501d0a699eb194d519223b176fd647a250edf6d28478e0d3d52929f659a6e60a8928b227e38339e12323f48e791001be4e6754f638 -EBUILD doomsday-1.10.2.ebuild 4846 SHA256 987765314e0ce96b492c2f652c5aa16751f6e5c3d50dc42e2f26cdf8a309e00f SHA512 2592ba1aa1220b5b9778d9f1b8188755410f64524706af0e2f4f76b0473ecc1308563a44c00d11d7ae6637ea0cb2567b7362c087615a2133b40cf89ef9bb3108 WHIRLPOOL 3398ca3a662cfde38a8d11a82a356a64d7e1fd9c67d2747f99887f8ad8eab0166621390c6e93a7e53aa181c32d3ef66691ba06a01465cd4bc1e5e126917c47e1 +EBUILD doomsday-1.10.2.ebuild 5010 SHA256 368d67ae8cd5bbf918350e202b7ef2619305c2d4f808facc0f712379e3cb713b SHA512 44ec50eb6d0648215b27df38e640b8d28a64c9f0716c293c48f6647323563044956be442621dc93626798452a668de416d890d52f013128cb5044f38f1faf9fd WHIRLPOOL 6b462577bcdde2afc838682cc40530f8e2d5eb5bf07d3143559124b73789e60c1d681c7eadd78cad0bd17e4809e125d2700233291cc44cc366a9e8ba67813861 EBUILD doomsday-1.9.0_beta69.ebuild 2264 SHA256 5ba265d19c0868cebf7a53b32585babbc0fa99bbe29b3686da5c7fda5f227469 SHA512 7cb47d13d70cbfdda7e784f5d1bb3c8fd62b8e32d9298985eee744855356193a76034f7d83e72400ef0d362a4b3851dc7b35bf1c49bb60a19d27cbbcfd0d0e41 WHIRLPOOL 2f7eaa8a2794c45a0279c8c43ffc11e68bb79aaec709d1c675299252d5c0f48e746a51efb12c84b538332da0e43b1168fa7868c444edb961c06d9985469a5152 EBUILD doomsday-1.9.8-r1.ebuild 4209 SHA256 4b11c007067b9c20357c875d62912d49927ac27dea1f6b3d2d2f79a1938c1426 SHA512 77cdf004a29efdbe8af17c8d393576a92fc083f63d50d210f7201183e483df9139cf09d70ca0924d0127b7b464b87a54e7c81510ca66b445b1ef84a953745865 WHIRLPOOL ebf2e446ae839f3034ff68c15ebd08e326be44878b4ef36dcaa96b7f3e72c6d3882d8a9e38481f0a7402e0360ccafa85fd4682c07718348741b3f18b40602b80 EBUILD doomsday-1.9.8.ebuild 3698 SHA256 d018fcfd9a84f932772b3b42cfd85be8a207ff27a149bca1766f4b05215fccc3 SHA512 bed384fbe7aabe6f390c9017d558cdb2b534e44280fc4116d81e43f14de455181509ad56ed4b0e62ca062b73ef072f3c0df1bd6e3a4755c17d2ceac3ac006ef1 WHIRLPOOL cc5d9e6ef48e370992c9456076e54eacbef165cd7dfb923a70335273972ddb7f28aaba3946ca0683956bff9e76f227191e16b44ebae910c6b78b73f46856997e -MISC ChangeLog 8151 SHA256 dd6d509d2babfe6df48a5078f61cacd9b5c28cb7f261200682a9f49074459f0c SHA512 eeb917339af5c1f9f84211d42394e57a04c0cf10943d2f03ef6e91ef46d685bb04c02952e2ba552ee7f8d7be44a8eaa707be1f5e2758b0a862771b309022999e WHIRLPOOL 9024d3a8ff7a6083799fd91f81af1c7ece6a99d1fde16aa6888bfba1f87e12143ca4de3ea8951ecc085c533f5b9ce89dd7a38ed441a0f47668d2d2b6af9beb35 +MISC ChangeLog 8251 SHA256 1cdb68eac7cc01d1b91686837b1f7bb9eb7e8c298911b34f8af1000f26645bec SHA512 3aec9a5d072c8d1b78cabc87330419e3ff209e12e81c1e28a9377fc14ea39744b7bb5c2e4914d357655b67e276d7b4fec1056240497eb2125b61302c9235c2ca WHIRLPOOL bdfe7ecbdda9834d613922ca7d0c4b366b72bfb0a373a2ba39f763d14e42fa3fc2cb854d89d8ce6169214daa2acc3213f643440b2db22a3c4282526846cc0653 MISC metadata.xml 875 SHA256 cdf77347f052fb941dd7a789cd191c401d8ae0add020bed309baf4876e8c22b6 SHA512 039aa83733658ed1036f2c28798cbf28432e9b69dfd669ab3fe87ab2dafbffc33bb6455d82fdaf9a895379f8ab66cf03483fe089a96f2cf33ad7ba89ee8ed43c WHIRLPOOL 5b91d3f1d971b6ec695b3a089bb7285a4b331d79b6f3dd3713aeb99e7a0bd73ca4c3b0ca4bbb6fa335da82f4038ad1941884ed9d62cedb4475b1eee843ab9620 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJR5rN/AAoJEFpvPKfnPDWzoUUH/3PZ/rgWakbB1pN4tRuQSO2w -swbczzosc1QwfkUqyi5vrf3v6cxUpMmSamDjzDHUl56vBtw1/PHWUSEx8t+7MYq6 -oEvt8+EFYpqW9x2pAl+C9xG2IiTMFcWT1sdpScicRZjhvRADeUJSX7a27iogdKPW -Hzwu97fnuJGakCWLcSdaRwIUPHjONS3it0ZkHircsgnWDnoVd0XmtIxRkiWBrnS4 -qXC90Qz2sqyyl+OG4+CYp4ucDXMI2VBUowmKT40tD0/O8YUx9pVG+miLK6V7lfrC -3MxCRSBJU8KI8dFHGZjlBDiMavgCRqFXb4o5nM0S9tFaU7T7vf2WlEen1t7PiLw= -=6KxI +iQEcBAEBCAAGBQJR6X67AAoJEFpvPKfnPDWzg24H/2/MCbIhHq7tsIA5Lnaey1Un +A3NIQKFYx2uE1s2rz8ESt+HKXqrZ01d0HavfTeHaUEdhkoxO6jn1Fxa7ANQFj3VQ +IqIE4xq5yAsRzE4THxAHvRlGV47MEXI5nnlzy237p4kfVW5l0q8BvVlWAx/nd48v +sT2kFRGNnU1yqWNfoBJVuf2H8X+hI+lRZ4KEIIiDGFyaE/b90eSiSeIcZ/rLN299 +mQhmlL09Uubb5jjs5XHYS1srnYErj9FW8WxHabmyPdOdI2ifSs6qwS8L4FoHQ35C +ie1vouM3cgKKWgNjWuKlaQ51KH4I3dYJNL+RjVJ/4kr5GDF+Y1BJwY+EZy3Pgac= +=eT8O -----END PGP SIGNATURE----- diff --git a/games-fps/doomsday/doomsday-1.10.2.ebuild b/games-fps/doomsday/doomsday-1.10.2.ebuild index 704593984cdb..7ffcf87d89ee 100644 --- a/games-fps/doomsday/doomsday-1.10.2.ebuild +++ b/games-fps/doomsday/doomsday-1.10.2.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/games-fps/doomsday/doomsday-1.10.2.ebuild,v 1.1 2013/07/17 15:08:40 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.10.2.ebuild,v 1.2 2013/07/19 18:00:24 hasufell Exp $ # TODO: fmod support broken (deng_fmod) @@ -17,9 +17,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools" -REQUIRED_USE="snowberry? ( ${PYTHON_REQUIRED_USE} !dedicated ) - demo? ( doom ) freedoom? ( doom ) resources? ( doom ) - doom? ( !dedicated )" +REQUIRED_USE="snowberry? ( ${PYTHON_REQUIRED_USE} ) + demo? ( doom ) freedoom? ( doom ) resources? ( doom )" DEPEND=" dev-qt/qtcore:4 @@ -36,17 +35,21 @@ DEPEND=" x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm + snowberry? ( ${PYTHON_DEPS} ) ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) - snowberry? ( ${PYTHON_DEPS} ) tools? ( sys-libs/ncurses )" RDEPEND="${DEPEND} - snowberry? ( dev-python/wxpython )" + !dedicated? ( + snowberry? ( dev-python/wxpython ) + )" PDEPEND=" - demo? ( games-fps/doom-data ) - freedoom? ( games-fps/freedoom ) - resources? ( games-fps/doomsday-resources )" + !dedicated? ( + demo? ( games-fps/doom-data ) + freedoom? ( games-fps/freedoom ) + resources? ( games-fps/doomsday-resources ) + )" S=${S}/${PN} @@ -63,11 +66,18 @@ src_prepare() { sed -i \ -e "/^DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \ config_unix.pri || die + echo "CONFIG += nostrip" > config_user.pri echo "PREFIX=/usr/games" >> config_user.pri - use snowberry && - echo "CONFIG += deng_snowberry" >> config_user.pri || \ + + if use dedicated ; then + echo "CONFIG += deng_noclient" >> config_user.pri echo "CONFIG += deng_nosnowberry" >> config_user.pri + else + use snowberry && + echo "CONFIG += deng_snowberry" >> config_user.pri || \ + echo "CONFIG += deng_nosnowberry" >> config_user.pri + fi use fluidsynth && echo "CONFIG += deng_fluidsynth" >> config_user.pri @@ -75,9 +85,6 @@ src_prepare() { use tools || echo "CONFIG += deng_notools" >> config_user.pri - use dedicated && - echo "CONFIG += deng_noclient" >> config_user.pri - if use openal; then echo "CONFIG += deng_openal" >> config_user.pri sed -i \ @@ -110,61 +117,63 @@ src_install() { mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom - if use snowberry; then - python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday - - installmodules() { - # relocate snowberry module directory recursively into site-packages - python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry - # hack around improper path handling - sed -i \ - -e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \ - "${D}"/"${GAMES_BINDIR}"/launch-doomsday-${EPYTHON} || die - } - python_foreach_impl installmodules - # remove old module dir - rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die - - make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry - doicon ../snowberry/graphics/snowberry.png - fi - - if use doom; then - local res_arg - if use resources; then - res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded" + if use !dedicated ; then + if use snowberry ; then + python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday + + installmodules() { + # relocate snowberry module directory recursively into site-packages + python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry + # hack around improper path handling + sed -i \ + -e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \ + "${D}"/"${GAMES_BINDIR}"/launch-doomsday-${EPYTHON} || die + } + python_foreach_impl installmodules + # remove old module dir + rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die + + make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry + doicon ../snowberry/graphics/snowberry.png fi - doicon ../snowberry/graphics/orb-doom.png - doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}" - elog "Created jdoom launcher. To play Doom place your doom.wad to" - elog "\"${GAMES_DATADIR}\"/doom-data" - elog - - if use demo; then - doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \ - "-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}" - fi - if use freedoom; then - doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \ - "-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad" + if use doom; then + local res_arg + if use resources; then + res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded" + fi + + doicon ../snowberry/graphics/orb-doom.png + doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}" + elog "Created jdoom launcher. To play Doom place your doom.wad to" + elog "\"${GAMES_DATADIR}\"/doom-data" + elog + + if use demo; then + doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \ + "-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}" + fi + if use freedoom; then + doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \ + "-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad" + fi fi - fi - if use hexen; then - doicon ../snowberry/graphics/orb-hexen.png - doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen" + if use hexen; then + doicon ../snowberry/graphics/orb-hexen.png + doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen" - elog "Created jhexen launcher. To play Hexen place your hexen.wad to" - elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen" - elog - fi - if use heretic; then - doicon ../snowberry/graphics/orb-heretic.png - doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic" + elog "Created jhexen launcher. To play Hexen place your hexen.wad to" + elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen" + elog + fi + if use heretic; then + doicon ../snowberry/graphics/orb-heretic.png + doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic" - elog "Created jheretic launcher. To play Heretic place your heretic.wad to" - elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic" - elog + elog "Created jheretic launcher. To play Heretic place your heretic.wad to" + elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic" + elog + fi fi prepgamesdirs |