From 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 May 2018 14:13:35 +0100 Subject: gentoo resync : 02.05.2018 --- games-simulation/pmars-sdl/Manifest | 4 +- .../pmars-sdl/files/pmars-sdl-0.9.2e-format.patch | 12 +-- .../pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 92 ++++++++++++++++++++++ games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild | 91 --------------------- 4 files changed, 100 insertions(+), 99 deletions(-) create mode 100644 games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild delete mode 100644 games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild (limited to 'games-simulation/pmars-sdl') diff --git a/games-simulation/pmars-sdl/Manifest b/games-simulation/pmars-sdl/Manifest index b3c91e60b42f..e45bc381d418 100644 --- a/games-simulation/pmars-sdl/Manifest +++ b/games-simulation/pmars-sdl/Manifest @@ -1,4 +1,4 @@ -AUX pmars-sdl-0.9.2e-format.patch 1976 BLAKE2B ea56c1ad6032db89f0e5f3c8320b61d680abe772b3c0d4088cdf378abf34d3b1aefe4461a0446f2e7b43eca48844ac76c22002b02debc5bd22c98c9b852e353b SHA512 dbf068f6fe9993c5917c1be5ace48c5def932365fe558f893a3bdb3e5d35e6ce25e8e46ef074d214da5c2ba65a4bc7e9e8cbf806370bb225d5ecba9a4133387f +AUX pmars-sdl-0.9.2e-format.patch 1988 BLAKE2B 57e96f71c6dfb6cea7286421acaa2a576ca26d9e5068a0c840b2d00dabd3ea87b2b482fe28253ef0d1b6c667bb13a2b9b8ad53f59cbb54a98f7d4da6ab1f66bf SHA512 1736220e86c762392e7074674d506fe161308a09c682a7c3cccfa7e58be880f6d44738854eae2c2c6dfc22d819c04c8fb5e9a5db632d00c35de09f4b44347014 DIST pmars-0.9.2-5.tar.gz 200966 BLAKE2B 398323191290a9e3d57cb371c2070585cf78f845ca4cbadfa09f03045abc80f7b3fb71a58c18bbfdf503a3239d25bd0734b10e784d6570766e6b5c0ec606aadf SHA512 197d1967507199ed5eb075fb232a2f15d9bdf4bec03fc6b1d6df5d6259d6627eb40338c5787852ea10d96858029144348128b08e86c7079d96f10fd09dafc315 -EBUILD pmars-sdl-0.9.2e.ebuild 1828 BLAKE2B 23f782db28539e8cb38d6b8c7add537fb9569fd551079d9b690b5432a2a6eb5c1ae7c1d1aa80f0c1f583fd3cab131b40439730b1830d1dbde635f8a6f329845c SHA512 919f21aca0abb8c377cfae916db57860581f37298b78d8f43398de607cb3a580415467371fbc308c6921e8f1c5c4eddd5088a75fcac701840158efa758b4709f +EBUILD pmars-sdl-0.9.2e-r1.ebuild 1796 BLAKE2B 4620393a9697e9f68ac759f7a3e5fc01e0508aa82fd0aa9462b87e58f44471e6ccde75197654a3a7756de2dfa978c6ed360ac00269e50a3a175c190b9b43ef2d SHA512 2c831bc2e06429ffc4dd79a41c26c726cdbc1b9a890cd8551c2726839be867e3de2325d990bbcbdeafd640758364c71819ede81761dbee310bd70306375b589e MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch index d8c588a32206..4e02da8a82a8 100644 --- a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch +++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch @@ -1,5 +1,5 @@ ---- src/asm.c.old 2015-10-28 13:23:53.465014342 +0100 -+++ src/asm.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/asm.c.old 2015-10-28 13:23:53.465014342 +0100 ++++ b/src/asm.c 2015-10-28 13:23:10.502813377 +0100 @@ -652,7 +652,7 @@ macputs(str); #else @@ -27,8 +27,8 @@ #ifndef VMS textout(outs); #else ---- src/cdb.c.old 2015-10-28 13:24:04.669805966 +0100 -+++ src/cdb.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/cdb.c.old 2015-10-28 13:24:04.669805966 +0100 ++++ b/src/cdb.c 2015-10-28 13:23:10.502813377 +0100 @@ -2760,7 +2760,7 @@ fprintf(outp, nameByAuthorScores, warrior[idxV[i]].name, warrior[idxV[i]].authorName, scrV[idxV[i]]); @@ -38,8 +38,8 @@ for (j = 0; j < warriors; ++j) { fprintf(outp, " %d", warrior[idxV[i]].score[j]); } ---- src/clparse.c.old 2015-10-28 13:24:10.648694768 +0100 -+++ src/clparse.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/clparse.c.old 2015-10-28 13:24:10.648694768 +0100 ++++ b/src/clparse.c 2015-10-28 13:23:10.502813377 +0100 @@ -289,7 +289,7 @@ if (next_input(filep, inputs)) { if (!strcmp(inputs, "-")) { diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild new file mode 100644 index 000000000000..b7f96156df97 --- /dev/null +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit readme.gentoo-r1 toolchain-funcs + +MY_PN="${PN/-sdl/}" +MY_PV="${PV/e/-5}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Portable redcode simulator's sdl port for core war" +HOMEPAGE="http://corewar.co.uk/pihlaja/pmars-sdl/" +SRC_URI="http://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="sdl X" + +RDEPEND=" + sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) + X? ( x11-libs/libX11 ) + !sdl? ( !X? ( sys-libs/ncurses:0= ) ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}"/${P}-format.patch ) + +DOC_CONTENTS=" + There are some macros in /usr/share/pmars/macros + which you should make accessible to pmars by typing + export PMARSHOME=/usr/share/pmars/macros\n +" + +src_compile() { + CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE" + LFLAGS="-x" + + if use sdl ; then + CFLAGS="${CFLAGS} -DSDLGRAPHX `sdl-config --cflags`" + LIB=`sdl-config --libs` + elif use X ; then + CFLAGS="${CFLAGS} -DXWINGRAPHX" + LIB="-L/usr/X11R6/lib -lX11" + else + CFLAGS="${CFLAGS} -DCURSESGRAPHX" + LIB="-lcurses" + fi + + cd src + + SRC="asm.c + cdb.c + clparse.c + disasm.c + eval.c + global.c + pmars.c + sim.c + pos.c + str_eng.c + token.c" + + for x in ${SRC}; do + einfo "compiling ${x}" + $(tc-getCC) ${CFLAGS} ${x} -c || die + done + + echo + einfo "linking with LIB: ${LIB}" + $(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die +} + +src_install() { + dobin src/${MY_PN} + doman doc/${MY_PN}.6 + + dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref + readme.gentoo_create_doc + + insinto "/usr/share/${MY_PN}/warriors" + doins warriors/* + + insinto "/usr/share/${MY_PN}/macros" + doins config/*.mac +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild deleted file mode 100644 index 2df3782e3915..000000000000 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs eutils games - -MY_PN="${PN/-sdl/}" -MY_PV="${PV/e/-5}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Portable redcode simulator's sdl port for core war" -HOMEPAGE="http://corewar.co.uk/pihlaja/pmars-sdl/" -SRC_URI="http://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="sdl X" - -DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) - X? ( x11-libs/libX11 ) - !sdl? ( !X? ( sys-libs/ncurses:0 ) )" -RDEPEND=${DEPEND} - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-format.patch -} - -src_compile() { - CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE" - LFLAGS="-x" - - if use sdl ; then - CFLAGS="${CFLAGS} -DSDLGRAPHX `sdl-config --cflags`" - LIB=`sdl-config --libs` - elif use X ; then - CFLAGS="${CFLAGS} -DXWINGRAPHX" - LIB="-L/usr/X11R6/lib -lX11" - else - CFLAGS="${CFLAGS} -DCURSESGRAPHX" - LIB="-lcurses" - fi - - cd src - - SRC="asm.c - cdb.c - clparse.c - disasm.c - eval.c - global.c - pmars.c - sim.c - pos.c - str_eng.c - token.c" - - for x in ${SRC}; do - einfo "compiling ${x}" - $(tc-getCC) ${CFLAGS} ${x} -c || die - done - - echo - einfo "linking with LIB: ${LIB}" - $(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die -} - -src_install() { - dogamesbin src/${MY_PN} - doman doc/${MY_PN}.6 - - dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref - - insinto "${GAMES_DATADIR}/${MY_PN}/warriors" - doins warriors/* - - insinto "${GAMES_DATADIR}/${MY_PN}/macros" - doins config/*.mac - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - ewarn "There are some macros in ${GAMES_DATADIR}/${MY_PN}/macros" - ewarn "which you should make accessible to pmars by typing" - ewarn "export PMARSHOME=${GAMES_DATADIR}/${MY_PN}/macros\n" -} -- cgit v1.2.3