diff options
| -rw-r--r-- | games-fps/chocolate-doom/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/chocolate-doom/Manifest | 10 | ||||
| -rw-r--r-- | games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild | 40 | ||||
| -rw-r--r-- | games-fps/chocolate-doom/chocolate-doom-9999.ebuild | 39 |
4 files changed, 54 insertions, 41 deletions
diff --git a/games-fps/chocolate-doom/ChangeLog b/games-fps/chocolate-doom/ChangeLog index 22f18cfaa..0e3dc9d4d 100644 --- a/games-fps/chocolate-doom/ChangeLog +++ b/games-fps/chocolate-doom/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for games-fps/chocolate-doom -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Apr 2013; Julian Ospald <hasufell@gentoo.org> chocolate-doom-1.2.1.ebuild, + chocolate-doom-9999.ebuild: + fix build, make funstuff nonfatal for live ebuild + 20 Apr 2009; Christian Ruppert <idl0r@gentoo.org> chocolate-doom-9999.ebuild: Live ebuilds shouldn't have KEYWORDS. diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest index c5022edca..484cd5967 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 RMD160 2400a6955a8a452947257079328e444801c3d2f7 SHA1 3b2802c0f8a8b02bc9c425ede0a13aa9fd1314d7 SHA256 ffad50a847f707ea5c87844dbd9c1339e6d2d182bb5cf6e6f629df420f6629c1 -EBUILD chocolate-doom-1.2.1.ebuild 1897 RMD160 a965b2c3e6fd5b539acd933db46a080a992a1b3e SHA1 4d23a97336328d4fea71e63e1cd0049f6de2d007 SHA256 b7095ccb31af95ad656475a60465a52a1105750606046982ef3a8f58c5285e45 -EBUILD chocolate-doom-9999.ebuild 1943 RMD160 790c293da13233f12dbc34f2e9a8e840187e9742 SHA1 bf3c49ab802b3abd03926acc8bf23216c59c2939 SHA256 6c57e83efa5b445387b7292cffa08dc12a4754a94a801bd3cfd8a8eba4b4afd1 -MISC ChangeLog 1757 RMD160 9d779b982fb211ddcfd74c5889651c025502b05b SHA1 581cf20ac30783abfbca6777797c6c5ce5b6a7d2 SHA256 6bf08bcc817f976cd09597c1ebce62d1686ef46d65d859b3c1a5befb3a9a8813 -MISC metadata.xml 454 RMD160 71d326860f58812aba9742f332ddb2cb0791685e SHA1 be79cfd246d44b4180659bcae2052ea9384b0577 SHA256 ebf3e48e309d1c4651f2535a97eb3d9fe6129db5bb15726f99736cf9a1c04a60 +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 diff --git a/games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild b/games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild index 3011531df..6540d2b22 100644 --- a/games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild +++ b/games-fps/chocolate-doom/chocolate-doom-1.2.1.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit games autotools +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/" @@ -18,10 +21,12 @@ DEPEND=">=media-libs/libsdl-1.1.3 media-libs/sdl-net" RDEPEND=${DEPEND} -src_unpack() { - unpack ${A} - cd "${S}" +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:" \ @@ -31,34 +36,31 @@ src_unpack() { -e "s:^gamesdir =.*:gamesdir = ${GAMES_BINDIR}:" \ setup/Makefile.am || die "sed Makefile.am failed" + append-libs -lm eautoreconf } -src_compile() { +src_configure() { egamesconf \ - --disable-sdltest \ - --disable-dependency-tracking \ - || die "egamesconf failed" - - emake || die "emake failed" + --disable-sdltest } src_install() { - dogamesbin "src/${PN}" || die "dogamesbin ${PN} failed" - dogamesbin setup/chocolate-setup || die "dogamesbin chocolate-setup failed" + dogamesbin "src/${PN}" + dogamesbin setup/chocolate-setup if use server ; then - dogamesbin src/chocolate-server || die "dogamesbin chocolate-server failed" + dogamesbin src/chocolate-server fi - newicon data/doom.png "${PN}.png" || die "doicon failed" + newicon data/doom.png "${PN}.png" make_desktop_entry "${PN}" "Chocolate Doom" - newicon data/setup.png chocolate-setup.png || die "doicon failed" + newicon data/setup.png chocolate-setup.png make_desktop_entry chocolate-setup "Chocolate Doom Setup" chocolate-setup.png - doman man/*.{5,6} || die "doman failed" - dodoc AUTHORS BUGS CMDLINE ChangeLog NEWS README TODO || die "dodoc failed" + doman man/*.{5,6} + dodoc AUTHORS BUGS CMDLINE ChangeLog NEWS README TODO - dodir "${GAMES_DATADIR}/doom-data" || die "dodir failed" + keepdir "${GAMES_DATADIR}/doom-data" prepgamesdirs } diff --git a/games-fps/chocolate-doom/chocolate-doom-9999.ebuild b/games-fps/chocolate-doom/chocolate-doom-9999.ebuild index 3eb29946e..26a0a7032 100644 --- a/games-fps/chocolate-doom/chocolate-doom-9999.ebuild +++ b/games-fps/chocolate-doom/chocolate-doom-9999.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit autotools subversion games +EAPI=5 + +PYTHON_COMPAT=( python2_6 python2_7 ) +inherit autotools subversion python-any-r1 flag-o-matic games DESCRIPTION="Doom port designed to act identically to the original game" HOMEPAGE="http://www.chocolate-doom.org/" @@ -18,10 +21,16 @@ DEPEND=">=media-libs/libsdl-1.1.3 media-libs/sdl-net" RDEPEND=${DEPEND} +pkg_setup () { + games_pkg_setup + python-any-r1_pkg_setup +} + src_unpack() { subversion_src_unpack - cd "${S}" +} +src_prepare() { # Change default search path for IWAD sed -i \ -e "s:/usr/share/games/doom:${GAMES_DATADIR}/doom-data:" \ @@ -31,34 +40,32 @@ src_unpack() { -e "s:^gamesdir =.*:gamesdir = ${GAMES_BINDIR}:" \ setup/Makefile.am || die "sed Makefile.am failed" + append-libs -lm eautoreconf } -src_compile() { +src_configure() { egamesconf \ --disable-sdltest \ - --disable-dependency-tracking \ - || die "egamesconf failed" - - emake || die "emake failed" + --disable-dependency-tracking } src_install() { - dogamesbin "src/${PN}" || die "dogamesbin ${PN} failed" - dogamesbin setup/chocolate-setup || die "dogamesbin chocolate-setup failed" + dogamesbin "src/${PN}" + dogamesbin setup/chocolate-setup if use server ; then - dogamesbin src/chocolate-server || die "dogamesbin chocolate-server failed" + dogamesbin src/chocolate-server fi - newicon data/doom.png "${PN}.png" || die "doicon failed" + newicon data/doom.png "${PN}.png" make_desktop_entry "${PN}" "Chocolate Doom" - newicon data/setup.png chocolate-setup.png || die "doicon failed" + newicon data/setup.png chocolate-setup.png make_desktop_entry chocolate-setup "Chocolate Doom Setup" chocolate-setup.png - doman man/*.{5,6} || die "doman failed" - dodoc AUTHORS BUGS CMDLINE ChangeLog NEWS README TODO || die "dodoc failed" + nonfatal doman man/*.{5,6} + nonfatal dodoc AUTHORS BUGS CMDLINE ChangeLog NEWS README TODO - dodir "${GAMES_DATADIR}/doom-data" || die "dodir failed" + keepdir "${GAMES_DATADIR}/doom-data" prepgamesdirs } |