* [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
@ 2019-08-01 11:07 Stefan Strogin
0 siblings, 0 replies; 7+ messages in thread
From: Stefan Strogin @ 2019-08-01 11:07 UTC (permalink / raw
To: gentoo-commits
commit: e57fd1a66b68c33337271320b43b6e61416971bb
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 1 11:06:07 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Thu Aug 1 11:06:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57fd1a6
games-simulation/pmars-sdl: fix building with ncurses[tinfo]
Closes: https://bugs.gentoo.org/689984
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
index b7f96156df9..b52f266d523 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -46,7 +46,7 @@ src_compile() {
LIB="-L/usr/X11R6/lib -lX11"
else
CFLAGS="${CFLAGS} -DCURSESGRAPHX"
- LIB="-lcurses"
+ LIB="-lcurses -ltinfo"
fi
cd src
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
@ 2021-06-18 21:07 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-06-18 21:07 UTC (permalink / raw
To: gentoo-commits
commit: c2c24ad694d76c541d680eb671a34dd04838cbf4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 21:07:08 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 21:07:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c24ad6
games-simulation/pmars-sdl: use pkg-config to find ncurses, x11
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
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
index ae564aa94c0..df1ca5fb51e 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
!sdl? ( !X? ( sys-libs/ncurses:0= ) )
"
DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-format.patch
@@ -46,15 +47,15 @@ src_compile() {
append-cflags $(sdl-config --cflags)
append-cppflags -DSDLGRAPHX
- LIB=$(sdl-config --libs)
+ LIB="$(sdl-config --libs)"
elif use X ; then
append-cppflags -DXWINGRAPHX
- LIB="-L${ESYSROOT}/usr/X11R6/lib -lX11"
+ LIB="$($(tc-getPKG_CONFIG) --libs x11)"
else
append-cppflags -DCURSESGRAPHX
- LIB="-lcurses -ltinfo"
+ LIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
fi
cd src || die
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
@ 2021-06-18 21:07 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-06-18 21:07 UTC (permalink / raw
To: gentoo-commits
commit: e0cf7e09ea6ae0b0ce6e4bf9429e80f1fbbf90e6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 21:07:05 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 21:07:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0cf7e09
games-simulation/pmars-sdl: modernise ebuild
* EAPI 7
* Use ${ESYSROOT}
* Use append-flags, append-cppflags
* General bash tidying
* Add missing die
* Remove overquoting
* Use subshells, not backticks
* Respect CPPFLAGS
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 77 ++++++++++++----------
1 file changed, 43 insertions(+), 34 deletions(-)
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
index 6e25ce586a2..ae564aa94c0 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit readme.gentoo-r1 toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs readme.gentoo-r1
MY_PN="${PN/-sdl/}"
MY_PV="${PV/e/-5}"
@@ -11,6 +12,7 @@ MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="Portable redcode simulator's sdl port for core war"
HOMEPAGE="https://corewar.co.uk/pihlaja/pmars-sdl/"
SRC_URI="https://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="BSD GPL-2"
SLOT="0"
@@ -24,9 +26,9 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-format.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-format.patch
+)
DOC_CONTENTS="
There are some macros in /usr/share/pmars/macros
@@ -35,41 +37,48 @@ DOC_CONTENTS="
"
src_compile() {
- CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE"
- LFLAGS="-x"
+ local LIB=""
+ export LFLAGS="-x"
+
+ append-cppflags -DEXT94 -DPERMUTATE
if use sdl ; then
- CFLAGS="${CFLAGS} -DSDLGRAPHX `sdl-config --cflags`"
- LIB=`sdl-config --libs`
+ append-cflags $(sdl-config --cflags)
+ append-cppflags -DSDLGRAPHX
+
+ LIB=$(sdl-config --libs)
elif use X ; then
- CFLAGS="${CFLAGS} -DXWINGRAPHX"
- LIB="-L/usr/X11R6/lib -lX11"
+ append-cppflags -DXWINGRAPHX
+
+ LIB="-L${ESYSROOT}/usr/X11R6/lib -lX11"
else
- CFLAGS="${CFLAGS} -DCURSESGRAPHX"
+ append-cppflags -DCURSESGRAPHX
+
LIB="-lcurses -ltinfo"
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
+ cd src || die
+
+ local programs=(
+ asm.c
+ cdb.c
+ clparse.c
+ disasm.c
+ eval.c
+ global.c
+ pmars.c
+ sim.c
+ pos.c
+ str_eng.c
+ token.c
+ )
+
+ for program in "${programs[@]}" ; do
+ einfo "Compiling ${program}"
+ $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${program} -c || die
done
- echo
- einfo "linking with LIB: ${LIB}"
+ einfo "Linking with LIB: ${LIB}"
$(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die
}
@@ -80,10 +89,10 @@ src_install() {
dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref
readme.gentoo_create_doc
- insinto "/usr/share/${MY_PN}/warriors"
+ insinto /usr/share/${MY_PN}/warriors
doins warriors/*
- insinto "/usr/share/${MY_PN}/macros"
+ insinto /usr/share/${MY_PN}/macros
doins config/*.mac
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
@ 2018-05-01 19:37 Pacho Ramos
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2018-05-01 19:37 UTC (permalink / raw
To: gentoo-commits
commit: de21028b4b08aaafcb3a5a7076f9575bcc9db5d5
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue May 1 18:36:07 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue May 1 19:35:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de21028b
games-simulation/pmars-sdl: make repoman happy
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
index 05129c0d1c7..b7f96156df9 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
@@ -29,9 +29,9 @@ S="${WORKDIR}/${MY_P}"
PATCHES=( "${FILESDIR}"/${P}-format.patch )
DOC_CONTENTS="
- There are some macros in ${GAMES_DATADIR}/${MY_PN}/macros
+ There are some macros in /usr/share/pmars/macros
which you should make accessible to pmars by typing
- export PMARSHOME=${GAMES_DATADIR}/${MY_PN}/macros\n
+ export PMARSHOME=/usr/share/pmars/macros\n
"
src_compile() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
@ 2018-05-01 19:37 Pacho Ramos
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2018-05-01 19:37 UTC (permalink / raw
To: gentoo-commits
commit: 9b6d1597fdb53feea15ad8de5c4e24d14ed3972e
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue May 1 18:36:17 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue May 1 19:35:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6d1597
games-simulation/pmars-sdl: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild | 91 ----------------------
1 file changed, 91 deletions(-)
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 2df3782e391..00000000000
--- 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"
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
@ 2016-05-06 17:10 Michael Sterrett
0 siblings, 0 replies; 7+ messages in thread
From: Michael Sterrett @ 2016-05-06 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 79d57486b7eb17684a0fcd4c94cc081322f0edbb
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 17:01:06 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri May 6 17:09:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d57486
games-simulation/pmars-sdl: add slot to sys-libs/ncurses
Package-Manager: portage-2.2.26
games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
index 1826340..c4489d1 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
@@ -20,7 +20,7 @@ IUSE="sdl X"
DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] )
X? ( x11-libs/libX11 )
- !sdl? ( !X? ( sys-libs/ncurses ) )"
+ !sdl? ( !X? ( sys-libs/ncurses:0 ) )"
RDEPEND=${DEPEND}
S=${WORKDIR}/${MY_P}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
@ 2016-05-06 2:50 Michael Sterrett
0 siblings, 0 replies; 7+ messages in thread
From: Michael Sterrett @ 2016-05-06 2:50 UTC (permalink / raw
To: gentoo-commits
commit: 931c46f8d29dfa16c138da2587d4a8deb22d7f88
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 02:43:23 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri May 6 02:49:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931c46f8
games-simulation/pmars-sdl: set RDEPEND
Package-Manager: portage-2.2.26
games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
index 3429dd0..1826340 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit toolchain-funcs games eutils
+inherit toolchain-funcs eutils games
MY_PN="${PN/-sdl/}"
MY_PV="${PV/e/-5}"
@@ -21,6 +21,7 @@ IUSE="sdl X"
DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] )
X? ( x11-libs/libX11 )
!sdl? ( !X? ( sys-libs/ncurses ) )"
+RDEPEND=${DEPEND}
S=${WORKDIR}/${MY_P}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-06-18 21:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-01 11:07 [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/ Stefan Strogin
-- strict thread matches above, loose matches on Subject: below --
2021-06-18 21:07 David Seifert
2021-06-18 21:07 David Seifert
2018-05-01 19:37 Pacho Ramos
2018-05-01 19:37 Pacho Ramos
2016-05-06 17:10 Michael Sterrett
2016-05-06 2:50 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox