From de3babb0675097943c486d9d1ac05056ec8a934f Mon Sep 17 00:00:00 2001 From: "Witold Pilat (fau)" Date: Wed, 18 Dec 2013 00:43:22 +0100 Subject: games-fps/chocolate-doom: Version bump and major update, thanks to Tommy[D] and floppym --- games-fps/chocolate-doom/ChangeLog | 7 ++ games-fps/chocolate-doom/Manifest | 10 +- .../chocolate-doom/chocolate-doom-1.2.1.ebuild | 77 ---------------- .../chocolate-doom/chocolate-doom-2.0.0.ebuild | 102 +++++++++++++++++++++ .../chocolate-doom/chocolate-doom-9999.ebuild | 80 ++++++++++------ games-fps/chocolate-doom/metadata.xml | 4 + 6 files changed, 168 insertions(+), 112 deletions(-) delete mode 100644 games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild create mode 100644 games-fps/chocolate-doom/chocolate-doom-2.0.0.ebuild (limited to 'games-fps') diff --git a/games-fps/chocolate-doom/ChangeLog b/games-fps/chocolate-doom/ChangeLog index 0e3dc9d4d..24071e5d4 100644 --- a/games-fps/chocolate-doom/ChangeLog +++ b/games-fps/chocolate-doom/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*chocolate-doom-2.0.0 (17 Dec 2013) + + 17 Dec 2013; Witold Pilat (fau) + -chocolate-doom-1.2.1.ebuild, +chocolate-doom-2.0.0.ebuild, + chocolate-doom-9999.ebuild, metadata.xml: + Version bump and major update, thanks to Tommy[D] and floppym + 10 Apr 2013; Julian Ospald chocolate-doom-1.2.1.ebuild, chocolate-doom-9999.ebuild: fix build, make funstuff nonfatal for live ebuild diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest index 484cd5967..34844061e 100644 --- a/games-fps/chocolate-doom/Manifest +++ b/games-fps/chocolate-doom/Manifest @@ -1,5 +1,5 @@ -DIST chocolate-doom-1.2.1.tar.gz 664600 SHA256 ffad50a847f707ea5c87844dbd9c1339e6d2d182bb5cf6e6f629df420f6629c1 SHA512 a8f0d7224c106def98c8e5b2a36319e1394a0f9348d8fbfc13447ae6b4aae15fc2bc5f114cde0b9fa87aa8b918fb78eab72b951443f538dc0f644deee6f17aee WHIRLPOOL 9a10bb143f52f052329e2a6bf5d60b701427576e92372c9f8e386db8b6a64ae3ccdd67209a1aea0afbc4fdd0f7dde0c8f38e93643960c67d3e42c24c3cc8628e -EBUILD chocolate-doom-1.2.1.ebuild 1699 SHA256 04dcee69184ba95cb4d3b8b87fea4b492f1b83e32f92573000a54cdee22e11f5 SHA512 3238a0ebd257786f46315eb43c9986115f6873a08bfa49085dcb2046218242f123531fe29558d708f066e660b2f39a0551cab5e796105fe2a79197a69f2e507b WHIRLPOOL d9d28f0e68bad9fed1c8b1f88ef5e3c396d06cdf0fcc3d70d16de77696f5f2551976c9fe6c8d8133777e67f3e3535deb4cec2ecd25aa54f7541b07a2f324270f -EBUILD chocolate-doom-9999.ebuild 1829 SHA256 de3b1cca721428c3ccb12a88819f4d2e2446cc6c836d34e97988cec228093031 SHA512 830f216210cee26bc9f6aae62b6e2d68e0c8715588c7b8453ba87ec49ad8c3491d8aba86d039f4fd8222170e9b6a2fb03e6a3c8ce9eeb041d75f25ec52e00383 WHIRLPOOL dc2540d20d75547e024d2d66999f720c736b04b4c8b5e9e31f7ed0ce3e93207d559b2998ff133ffb1c1fcfc1e7508cf029e35a948c6dfdcccbea017aff81ae61 -MISC ChangeLog 1920 SHA256 3a3fcb12ce810c183fac27709ca7826709bb2756a493c036dbb9325ddc63ee76 SHA512 d4e4144b289903d5aaca0b83abcf905dd03b13c1a55304969d8e5fdac48f6fd1d667683d5555d43646e90701a5f249d30b626b2cb30926e85bf2086d476cdb3c WHIRLPOOL 6348b42739514a3a666524d180308c59f971ff17a701cd4a5a1980d09ec2fcf4dd3a21135e565c64eab9e9caeb79dac6334a803f45e8e28f15bf892300dee36d -MISC metadata.xml 454 SHA256 ebf3e48e309d1c4651f2535a97eb3d9fe6129db5bb15726f99736cf9a1c04a60 SHA512 31d507b4abaee7b501e1391dc4635a08b2c50a7fca073ab0da6221c1c18a5025a40982d2ed701fb655ea84de3526e7d626add338ef89fc8319f443379b120949 WHIRLPOOL 40fd88ae798fe15970925538ad295f2e55f625cc591ab70ea3cbf961a46102245fa30960b6964ed0a1498de5e04c3596b9da22026fbf331fb480455a6404b651 +DIST chocolate-doom-2.0.0.tar.gz 2092519 SHA256 85c58b77dad933013253b453ef01907492b4719acd56cf8cb6c76f4a361ab60c SHA512 2d342d5400f7000d82283e56b4d56771f664bfee2d8b1b2f991ed0fd76768d0aad16ced57896f2bc08ab2a39116d5b1c5447e979356d69da27d07509d7ad3701 WHIRLPOOL c4405665d67c64d0a9fc03f8837473c31ac13c5d83ce89c0731c4bd4d567b7ed879d56886e7fc417fab75f304c767402996628961b9beb9846237c3889799860 +EBUILD chocolate-doom-2.0.0.ebuild 2381 SHA256 4dde5db70b8dcffef5f870f065ea188ca302b5510f53da39cca0d3ab07f70670 SHA512 ce4e6632982dfad400a9db311f317a0ba9560df9d4c1f97ec8fa5fcfacec60a36b0a78033c73536742bff676eda970c1fca291312815f84848d56d8893c5c315 WHIRLPOOL acafc3af267f87497546fbd9d538896fd640e4a662e58f22b14c67407165e093d63ad877c8b1960ddbe43e5dc27d0e06d8f26504bd8270ed29a461dbff42cfa1 +EBUILD chocolate-doom-9999.ebuild 2382 SHA256 ae00f6f8805393fecd87beedff8dd911a38eec3d87ed3a5d138f2a85ec8a5c76 SHA512 87f9e5bacf5350ee221551f593fd3de7dd2d91a9b32eef460db99fef48f7a08a01573ae7641616b1fdd495658b44b93916089d7fa93b5c09af126541c8c65028 WHIRLPOOL 20f691a3153f0cea4a4e17a3d46c569e38debb80561de29eb381bb3c6971de282805ba4eebade15d6e975d9560a4f430cd674782ded49985781d02aa8d28106e +MISC ChangeLog 2187 SHA256 906274610c3a1b7b59fcc1dc24ab210b0954f0c2a18130fa8b391877ca190913 SHA512 5b871fa216a6b3f5caf21dc6ebec09099051f201845e3aae3c50ae42969dd172c68a038e13c14d62651db2327c3570e7d1cffa13171fc3fda4871a603ba71172 WHIRLPOOL a2ee3f3ba1343c31e093b3186541d2a9416f66d8dd63ace05ed9d328c6cea95418f9a9c09ef790a2eee62b2e7953974b25a9143f132fdd4081da5a3bd71cabc0 +MISC metadata.xml 710 SHA256 11e6098beed15ff653282b10ecd2f4443f9c52b590b8d6f30279d3629632db82 SHA512 fb930090c50e7b5c4681a8994ed1bd5971b4fa72faf6ec35e57d5346afaeda4071e9e9a5c25ab670a9265ad9af15912160e97b41e266b4fcf826cd4c0f94fb61 WHIRLPOOL 0b6030e4132303b6c94a492cd5ef2f1d5a5f485f74991de5e6c63ef3b97dab0354d7267bb9a82907aa18e78f4e7b5c1f02116ad8c5a574298c2418317fa0565f diff --git a/games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild b/games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild deleted file mode 100644 index 6540d2b22..000000000 --- a/games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit autotools python-any-r1 flag-o-matic games - -DESCRIPTION="Doom port designed to act identically to the original game" -HOMEPAGE="http://www.chocolate-doom.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="server" - -DEPEND=">=media-libs/libsdl-1.1.3 - media-libs/sdl-mixer - media-libs/sdl-net" -RDEPEND=${DEPEND} - -pkg_setup() { - games_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - # Change default search path for IWAD - sed -i \ - -e "s:/usr/share/games/doom:${GAMES_DATADIR}/doom-data:" \ - src/d_iwad.c || die "sed main.c failed" - - sed -i \ - -e "s:^gamesdir =.*:gamesdir = ${GAMES_BINDIR}:" \ - setup/Makefile.am || die "sed Makefile.am failed" - - append-libs -lm - eautoreconf -} - -src_configure() { - egamesconf \ - --disable-sdltest -} - -src_install() { - dogamesbin "src/${PN}" - dogamesbin setup/chocolate-setup - if use server ; then - dogamesbin src/chocolate-server - fi - - newicon data/doom.png "${PN}.png" - make_desktop_entry "${PN}" "Chocolate Doom" - newicon data/setup.png chocolate-setup.png - make_desktop_entry chocolate-setup "Chocolate Doom Setup" chocolate-setup.png - - doman man/*.{5,6} - dodoc AUTHORS BUGS CMDLINE ChangeLog NEWS README TODO - - keepdir "${GAMES_DATADIR}/doom-data" - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - - einfo - einfo "To play the original Doom levels, place doom.wad and/or doom2.wad" - einfo "into "${GAMES_DATADIR}"/doom-data, then run: ${PN}" - einfo - einfo "To configure game options run: chocolate-setup" - einfo -} diff --git a/games-fps/chocolate-doom/chocolate-doom-2.0.0.ebuild b/games-fps/chocolate-doom/chocolate-doom-2.0.0.ebuild new file mode 100644 index 000000000..5a5df9da7 --- /dev/null +++ b/games-fps/chocolate-doom/chocolate-doom-2.0.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) + +inherit eutils autotools python-any-r1 games + +DESCRIPTION="Doom, Heretic, Hexen and Strife port designed to act identically to original games" +HOMEPAGE="http://www.chocolate-doom.org/" +SRC_URI="http://www.chocolate-doom.org/downloads/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+doom heretic hexen strife server timidity" + +RDEPEND="media-libs/libsamplerate + >=media-libs/libsdl-1.1.3:0 + media-libs/sdl-mixer[timidity?] + media-libs/sdl-net" +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" + +pkg_setup() { + games_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + # Change default search path for IWAD + sed -i \ + -e "s:/usr/share/games/doom:${GAMES_DATADIR}/doom-data:" \ + src/d_iwad.c man/INSTALL.template || die "sed failed" + sed -i \ + -e "s:^gamesdir =.*:gamesdir = ${GAMES_BINDIR}:" \ + src/setup/Makefile.am || die "sed Makefile.am failed" + + eautoreconf +} + +src_configure() { + egamesconf \ + --disable-sdltest +} + +src_install() { + doicon data/${PN}.png + doicon data/chocolate-setup.png + + dogamesbin src/chocolate-setup + make_desktop_entry chocolate-setup "Chocolate Setup" \ + chocolate-setup "Settings" + doman man/chocolate-setup.6 + doman man/default.cfg.5 + + local opt game game_full + for opt in "doom Doom" \ + "heretic Heretic" \ + "strife Strife" \ + "hexen Hexen" + do + game=${opt%% *} + game_full=${opt#* } + if use $game ; then + dogamesbin src/chocolate-${game} + dosym chocolate-setup "${GAMES_BINDIR}/chocolate-${game}-setup" + + make_desktop_entry chocolate-${game} \ + "Chocolate ${game_full}" ${PN} "Game;Shooter" + make_desktop_entry chocolate-${game}-setup \ + "Chocolate ${game_full} Setup" chocolate-setup "Settings" + + doman man/*${game}*.{5,6} + fi + done + + if use server ; then + dogamesbin src/chocolate-server + doman man/chocolate-server.6 + fi + + domenu src/${PN}-screensaver.desktop + dodoc AUTHORS ChangeLog HACKING NEWS NOT-BUGS README* TODO + + keepdir "${GAMES_DATADIR}/doom-data" + + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + + einfo + einfo "To play the original Doom levels, place doom.wad and/or doom2.wad" + einfo "into ${GAMES_DATADIR}/doom-data, then run: ${PN}" + einfo + einfo "To configure game options run: chocolate-setup" + einfo +} diff --git a/games-fps/chocolate-doom/chocolate-doom-9999.ebuild b/games-fps/chocolate-doom/chocolate-doom-9999.ebuild index 26a0a7032..3d03a3447 100644 --- a/games-fps/chocolate-doom/chocolate-doom-9999.ebuild +++ b/games-fps/chocolate-doom/chocolate-doom-9999.ebuild @@ -4,66 +4,86 @@ EAPI=5 -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit autotools subversion python-any-r1 flag-o-matic games +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) +EGIT_REPO_URI="https://github.com/chocolate-doom/chocolate-doom.git" -DESCRIPTION="Doom port designed to act identically to the original game" +inherit eutils autotools python-any-r1 games git-2 + +DESCRIPTION="Doom, Heretic, Hexen and Strife port designed to act identically to original games" HOMEPAGE="http://www.chocolate-doom.org/" -ESVN_REPO_URI="https://chocolate-doom.svn.sourceforge.net/svnroot/${PN}/trunk/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="server" +IUSE="+doom heretic hexen strife server timidity" -DEPEND=">=media-libs/libsdl-1.1.3 - media-libs/sdl-mixer +RDEPEND="media-libs/libsamplerate + >=media-libs/libsdl-1.1.3:0 + media-libs/sdl-mixer[timidity?] media-libs/sdl-net" -RDEPEND=${DEPEND} +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" -pkg_setup () { +pkg_setup() { games_pkg_setup python-any-r1_pkg_setup } -src_unpack() { - subversion_src_unpack -} - src_prepare() { # Change default search path for IWAD sed -i \ -e "s:/usr/share/games/doom:${GAMES_DATADIR}/doom-data:" \ - src/d_iwad.c || die "sed main.c failed" - + src/d_iwad.c man/INSTALL.template || die "sed failed" sed -i \ -e "s:^gamesdir =.*:gamesdir = ${GAMES_BINDIR}:" \ - setup/Makefile.am || die "sed Makefile.am failed" + src/setup/Makefile.am || die "sed Makefile.am failed" - append-libs -lm eautoreconf } src_configure() { egamesconf \ - --disable-sdltest \ - --disable-dependency-tracking + --disable-sdltest } src_install() { - dogamesbin "src/${PN}" - dogamesbin setup/chocolate-setup + doicon data/${PN}.png + doicon data/chocolate-setup.png + + dogamesbin src/chocolate-setup + make_desktop_entry chocolate-setup "Chocolate Setup" \ + chocolate-setup "Settings" + doman man/chocolate-setup.6 + doman man/default.cfg.5 + + local opt game game_full + for opt in "doom Doom" \ + "heretic Heretic" \ + "strife Strife" \ + "hexen Hexen" + do + game=${opt%% *} + game_full=${opt#* } + if use $game ; then + dogamesbin src/chocolate-${game} + dosym chocolate-setup "${GAMES_BINDIR}/chocolate-${game}-setup" + + make_desktop_entry chocolate-${game} \ + "Chocolate ${game_full}" ${PN} "Game;Shooter" + make_desktop_entry chocolate-${game}-setup \ + "Chocolate ${game_full} Setup" chocolate-setup "Settings" + + doman man/*${game}*.{5,6} + fi + done + if use server ; then dogamesbin src/chocolate-server + doman man/chocolate-server.6 fi - newicon data/doom.png "${PN}.png" - make_desktop_entry "${PN}" "Chocolate Doom" - newicon data/setup.png chocolate-setup.png - make_desktop_entry chocolate-setup "Chocolate Doom Setup" chocolate-setup.png - - nonfatal doman man/*.{5,6} - nonfatal dodoc AUTHORS BUGS CMDLINE ChangeLog NEWS README TODO + domenu src/${PN}-screensaver.desktop + dodoc AUTHORS ChangeLog HACKING NEWS NOT-BUGS README* TODO keepdir "${GAMES_DATADIR}/doom-data" @@ -75,8 +95,8 @@ pkg_postinst() { einfo einfo "To play the original Doom levels, place doom.wad and/or doom2.wad" - einfo "into "${GAMES_DATADIR}"/doom-data, then run: ${PN}" + einfo "into ${GAMES_DATADIR}/doom-data, then run: ${PN}" einfo - einfo "To configure game options run: chocolate-setup" + einfo "To configure game options run: chocolate-setup" einfo } diff --git a/games-fps/chocolate-doom/metadata.xml b/games-fps/chocolate-doom/metadata.xml index 0167e1e3d..396a5201e 100644 --- a/games-fps/chocolate-doom/metadata.xml +++ b/games-fps/chocolate-doom/metadata.xml @@ -8,6 +8,10 @@ Enable installation of server + Install chocolate-doom executable + Install chocolate-heretic executable + Install chocolate-hexen executable + Install chocolate-strife executable -- cgit v1.2.3-65-gdbad