[gentoo-commits] repo/gentoo:master commit in: games-strategy/tornado/files/, games-strategy/tornado/
commit: bfdfce2c5717f2fc7a13713dedf92e3141292ce3
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Oct 21 02:53:51 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Oct 21 03:38:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfdfce2c
games-strategy/tornado: simplify patch and support prefix
Manual install rather than a 13kB patch that adds DESTDIR
everywhere and ignored EPREFIX.
Also made nls unconditional as it uses libintl.h either way
(but allowing selection through plocale.eclass).
Signed-off-by: Ionen Wolkens gentoo.org>
.../tornado/files/tornado-1.4-make.patch | 19 +
games-strategy/tornado/tornado-1.4-r3.ebuild | 45 +++---
2 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/games-strategy/tornado/files/tornado-1.4-make.patch
b/games-strategy/tornado/files/tornado-1.4-make.patch
new file mode 100644
index 000..1dc2ac70344
--- /dev/null
+++ b/games-strategy/tornado/files/tornado-1.4-make.patch
@@ -0,0 +1,19 @@
+Respect flags and use pkg-config.
+--- a/Makefile
b/Makefile
+@@ -1,4 +1,2 @@
+-CC = gcc
+-MAKE = make
+-LDFLAGS = -lncurses
++LIBS := $(shell $(PKG_CONFIG) --libs ncurses) $(LIBS)
+ OBJFILES = main.o draw.o erwin.o network.o scores.o
+@@ -6,3 +4,3 @@
+ LOCALEPATH = /usr/local/share/locale
+-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\""
++CFLAGS := $(CFLAGS) -Wall -DPREFIX="\"$(PREFIX)\""
-DLOCALEPATH="\"$(LOCALEPATH)\"" $(shell $(PKG_CONFIG) --cflags ncurses)
$(CPPFLAGS)
+ VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\
//`
+@@ -27,3 +25,3 @@
+ tornado: $(OBJFILES)
+- $(CC) $(LDFLAGS) $(OBJFILES) -o tornado
++ $(CC) $(LDFLAGS) $(OBJFILES) -o tornado $(LIBS)
+
diff --git a/games-strategy/tornado/tornado-1.4-r3.ebuild
b/games-strategy/tornado/tornado-1.4-r3.ebuild
index 082cbe23940..290d8ba7825 100644
--- a/games-strategy/tornado/tornado-1.4-r3.ebuild
+++ b/games-strategy/tornado/tornado-1.4-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit toolchain-funcs
+inherit plocale toolchain-funcs
DESCRIPTION="Clone of a C64 game - destroy the opponent's house"
HOMEPAGE="https://github.com/kouya/tornado;
@@ -12,34 +12,53 @@
SRC_URI="https://github.com/kouya/tornado/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="nls"
RDEPEND="
acct-group/gamestat
sys-libs/ncurses:=
- nls? ( virtual/libintl )"
+ virtual/libintl"
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- nls? ( sys-devel/gettext )"
+ sys-devel/gettext"
PATCHES=(
- "${FILESDIR}"/${P}-r2-gentoo.patch
+ "${FILESDIR}"/${P}-make.patch
)
-src_configure() {
- if ! use nls; then
- sed -i \
- -e '/^all:/s|locales||g' \
- -e '/^install:/s|install-locale-data||g' \
- Makefile || die
- fi
+src_prepare() {
+ default
+
+ sed -i "/SCOREFILE_NAME/s|/|${EPREFIX}/|" scores.h || die
+}
+src_compile() {
tc-export CC PKG_CONFIG
+
+ emake PREFIX="${EPREFIX}/usr" LOCALEPATH="${EPREFIX}/usr/share/locale"
}
src_install() {
- default
+ dobin tornado
+ doman doc/man/tornado.6
+
+ einstalldocs
+
+ tornado_man() {
+ doman -i18n=${1} doc/man/${1}/${PN}.6
+ }
+ local PLOCALES="de fr it nl no ru"
+ plocale_for_each_locale tornado_man
+
+ tornado_loc() {
+ insinto /usr/share/locale/${1}/LC_MESSAGES
+ newins po/${1}.mo ${PN}.mo
+ }
+ PLOCALES+=" es pt"
+ plocale_for_each_locale tornado_loc
+
+ insinto /var/games
+ doins ${PN}.scores
fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
fperms g+s /usr/bin/${PN}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/tornado/files/, games-strategy/tornado/
commit: 96c6c7a3faef6bdf2bc1bd6bc893dfb1d03fbc93
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed Jul 18 12:30:00 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed Jul 18 12:30:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c6c7a3
games-strategy/tornado: Add USE=nls.
Package-Manager: Portage-2.3.43, Repoman-2.3.10
...rnado-1.4-r1-gentoo.patch => tornado-1.4-r2-gentoo.patch} | 0
.../tornado/{tornado-1.4-r1.ebuild => tornado-1.4-r2.ebuild} | 12 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/games-strategy/tornado/files/tornado-1.4-r1-gentoo.patch
b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
similarity index 100%
rename from games-strategy/tornado/files/tornado-1.4-r1-gentoo.patch
rename to games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
diff --git a/games-strategy/tornado/tornado-1.4-r1.ebuild
b/games-strategy/tornado/tornado-1.4-r2.ebuild
similarity index 73%
rename from games-strategy/tornado/tornado-1.4-r1.ebuild
rename to games-strategy/tornado/tornado-1.4-r2.ebuild
index 1cdb04da4b1..c2a5f7c2f76 100644
--- a/games-strategy/tornado/tornado-1.4-r1.ebuild
+++ b/games-strategy/tornado/tornado-1.4-r2.ebuild
@@ -11,13 +11,14 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="nls"
DEPEND="
- sys-devel/gettext
+ nls? ( sys-devel/gettext )
"
RDEPEND="
- virtual/libintl
+ nls? ( virtual/libintl )
"
PATCHES=(
@@ -25,6 +26,13 @@ PATCHES=(
)
src_configure() {
+ if ! use nls; then
+ sed -i \
+ -e '/^all:/s|locales||g' \
+ -e '/^install:/s|install-locale-data||g' \
+ Makefile || die
+ fi
+
tc-export CC PKG_CONFIG
}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/tornado/files/, games-strategy/tornado/
commit: 3dab339ab625b1ca0aa2f11a02dc36607e028ed1
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed Jul 18 11:54:21 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed Jul 18 11:54:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dab339a
games-strategy/tornado: Old.
Package-Manager: Portage-2.3.43, Repoman-2.3.10
.../tornado/files/tornado-1.4-gentoo.patch | 26 ---
games-strategy/tornado/tornado-1.4.ebuild | 37 --
2 files changed, 63 deletions(-)
diff --git a/games-strategy/tornado/files/tornado-1.4-gentoo.patch
b/games-strategy/tornado/files/tornado-1.4-gentoo.patch
deleted file mode 100644
index fb896684115..000
--- a/games-strategy/tornado/files/tornado-1.4-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
Makefile.old2009-02-12 12:42:25.0 +0100
-+++ Makefile2009-02-12 12:44:52.0 +0100
-@@ -1,10 +1,9 @@
--CC = gcc
- MAKE = make
--LDFLAGS = -lncurses
-+LDLIBS = -lncurses
- OBJFILES = main.o draw.o erwin.o network.o scores.o
--PREFIX = /usr/local
--LOCALEPATH = /usr/local/share/locale
--CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
-+PREFIX = /usr
-+LOCALEPATH = /usr/share/locale
-+CFLAGS += -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
- VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\
//`
- LOCALES = de
- MAN = doc/man
-@@ -25,7 +24,7 @@
- $(MAKE) -C $(MAN) all
-
- tornado: $(OBJFILES)
-- $(CC) $(LDFLAGS) $(OBJFILES) -o tornado
-+ $(CC) $(LDFLAGS) $(OBJFILES) $(LDLIBS) -o tornado
-
- debug: tornado.6 locales
- gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c
network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\""
-DLOCALEPATH="\"$(LOCALEPATH)\""
diff --git a/games-strategy/tornado/tornado-1.4.ebuild
b/games-strategy/tornado/tornado-1.4.ebuild
deleted file mode 100644
index 0c6638176e9..000
--- a/games-strategy/tornado/tornado-1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Clone of a C64 game - destroy the opponent's house"
-HOMEPAGE="http://kiza.kcore.de/software/tornado/;
-SRC_URI="http://kiza.kcore.de/software/tornado/download/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_prepare() {
- sed -i \
- -e "s:PREFIX/bin:${GAMES_BINDIR}:" \
- -e "s:PREFIX/man:/usr/man:" \
- -e "s:/var/games:${GAMES_STATEDIR}:" \
- -e "s:/usr/local:/usr:" \
- doc/man/tornado.6.in \
- || die "sed failed"
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
- dogamesbin tornado
- doman doc/man/tornado.6
- dodoc AUTHOR CREDITS Changelog README TODO
- insinto "${GAMES_STATEDIR}"
- doins tornado.scores
- prepgamesdirs
- fperms 664 "${GAMES_STATEDIR}/tornado.scores"
-}
