* [gentoo-commits] repo/gentoo:master commit in: games-strategy/liquidwar/files/, games-strategy/liquidwar/
@ 2018-05-02 19:28 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-05-02 19:28 UTC (permalink / raw
To: gentoo-commits
commit: e3f5ce5524d48cd371d579fb535ea8c874b5d5b0
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed May 2 18:10:39 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed May 2 19:27:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f5ce55
games-strategy/liquidwar: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../files/liquidwar-5.6.4-exec-stack.patch | 12 ++--
.../liquidwar/files/liquidwar-5.6.4-ovflfix.patch | 4 +-
.../files/liquidwar-5.6.4-underlink.patch | 4 +-
games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild | 64 ++++++++++++++++++++++
4 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
index 83e733b28a0..a1e93c9b738 100644
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
@@ -1,5 +1,5 @@
---- src/glouglou.s
-+++ src/glouglou.s
+--- a/src/glouglou.s
++++ b/src/glouglou.s
@@ -240,3 +240,6 @@
ret
@@ -7,8 +7,8 @@
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
---- src/monster.s
-+++ src/monster.s
+--- a/src/monster.s
++++ b/src/monster.s
@@ -972,3 +972,6 @@
ret # retour au c
@@ -16,8 +16,8 @@
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
---- src/spread.s
-+++ src/spread.s
+--- a/src/spread.s
++++ b/src/spread.s
@@ -957,3 +957,6 @@
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
index 446385624cf..c092f02beab 100644
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
@@ -1,5 +1,5 @@
---- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200
-+++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200
+--- a/src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200
++++ b/src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200
@@ -100,12 +100,12 @@
data->privacy = privacy;
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
index 2bc53e0cacc..d80e349bf1b 100644
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
@@ -1,5 +1,5 @@
---- src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200
-+++ src/Makefile.in 2011-06-22 07:46:00.681613957 +0200
+--- a/src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200
++++ b/src/Makefile.in 2011-06-22 07:46:00.681613957 +0200
@@ -223,7 +223,7 @@
EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
else
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
new file mode 100644
index 00000000000..8899b512aa1
--- /dev/null
+++ b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Unique multiplayer wargame"
+HOMEPAGE="http://www.ufoot.org/liquidwar/"
+SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=media-libs/allegro-4.2:0[X]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${P}-exec-stack.patch \
+ "${FILESDIR}"/${P}-ovflfix.patch
+ sed -i \
+ -e 's:/games::' \
+ -e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
+ -e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \
+ -e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \
+ -e '/^INFODIR/ s/=.*/= $(infodir)/' \
+ -e '/^GAMEDIR/ s/exec_prefix/bindir/' \
+ -e '/install/s:-s ::' \
+ -e 's:$(DOCDIR)/txt:$(DOCDIR):g' \
+ -e 's:$(GMAKE):$(MAKE):' \
+ -e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \
+ || die 'sed Makefile.in failed'
+ sed -i \
+ -e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
+ -e 's:/games::' src/Makefile.in \
+ || die "sed src/Makefile.in failed"
+ eapply "${FILESDIR}"/${P}-underlink.patch
+}
+
+src_configure() {
+ econf \
+ --disable-doc-ps \
+ --disable-doc-pdf \
+ --disable-target-opt \
+ $(use_enable x86 asm)
+}
+
+src_compile() {
+ # skip build_doc target wrt bug 460344
+ emake build_bin build_data
+}
+
+src_install() {
+ emake DESTDIR="${D}" install_nolink
+ einstalldocs
+ rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+ # Provided desktop file is completely obsolete
+ rm -f "${ED}"/usr/share/applications/liquidwar.desktop
+ make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/liquidwar/files/, games-strategy/liquidwar/
@ 2020-10-18 15:58 Stefan Strogin
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Strogin @ 2020-10-18 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 6120833da2bb7e7f40bf8f23254c6c20d02bb6aa
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Mon Sep 21 00:25:07 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 15:57:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6120833d
games-strategy/liquidwar: drop old 5.6.4
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17393
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
games-strategy/liquidwar/Manifest | 1 -
.../files/liquidwar-5.6.4-exec-stack.patch | 27 ---------
.../liquidwar/files/liquidwar-5.6.4-ovflfix.patch | 18 ------
.../files/liquidwar-5.6.4-underlink.patch | 11 ----
games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild | 64 ----------------------
5 files changed, 121 deletions(-)
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index 22a50a9213a..c8606349def 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1,2 +1 @@
-DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
DIST liquidwar-5.6.5.tar.gz 6508987 BLAKE2B 26411f3c79a407a467f14a0c18b4ff320ab522ed96e43d00fdf4ccc8feab72e786361ac367349336e0478b6cbd187d9ce7c12e28be7896476557beb7b2f65327 SHA512 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
deleted file mode 100644
index a1e93c9b738..00000000000
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/glouglou.s
-+++ b/src/glouglou.s
-@@ -240,3 +240,6 @@
-
- ret
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/monster.s
-+++ b/src/monster.s
-@@ -972,3 +972,6 @@
- ret # retour au c
-
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/spread.s
-+++ b/src/spread.s
-@@ -957,3 +957,6 @@
-
-
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
deleted file mode 100644
index c092f02beab..00000000000
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200
-+++ b/src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200
-@@ -100,12 +100,12 @@
-
- data->privacy = privacy;
- data->log = log;
-- strncpy (data->metaserver, metaserver, URL_SIZE);
-+ strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
- data->port = port;
- data->busy_players = busy_players;
- data->max_players = max_players;
-- strncpy (data->password, password, URL_SIZE);
-- strncpy (data->comment, comment, URL_SIZE);
-+ strncpy (data->password, password, sizeof(data->password));
-+ strncpy (data->comment, comment, sizeof(data->comment));
- }
-
- /*------------------------------------------------------------------*/
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
deleted file mode 100644
index d80e349bf1b..00000000000
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200
-+++ b/src/Makefile.in 2011-06-22 07:46:00.681613957 +0200
-@@ -223,7 +223,7 @@
- EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
- else
- LINK_OPTIONS =
-- EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
-+ EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
- endif
-
- CONFIG_OPTIONS = \
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
deleted file mode 100644
index 8899b512aa1..00000000000
--- a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Unique multiplayer wargame"
-HOMEPAGE="http://www.ufoot.org/liquidwar/"
-SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=media-libs/allegro-4.2:0[X]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}"/${P}-exec-stack.patch \
- "${FILESDIR}"/${P}-ovflfix.patch
- sed -i \
- -e 's:/games::' \
- -e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
- -e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \
- -e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \
- -e '/^INFODIR/ s/=.*/= $(infodir)/' \
- -e '/^GAMEDIR/ s/exec_prefix/bindir/' \
- -e '/install/s:-s ::' \
- -e 's:$(DOCDIR)/txt:$(DOCDIR):g' \
- -e 's:$(GMAKE):$(MAKE):' \
- -e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \
- || die 'sed Makefile.in failed'
- sed -i \
- -e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
- -e 's:/games::' src/Makefile.in \
- || die "sed src/Makefile.in failed"
- eapply "${FILESDIR}"/${P}-underlink.patch
-}
-
-src_configure() {
- econf \
- --disable-doc-ps \
- --disable-doc-pdf \
- --disable-target-opt \
- $(use_enable x86 asm)
-}
-
-src_compile() {
- # skip build_doc target wrt bug 460344
- emake build_bin build_data
-}
-
-src_install() {
- emake DESTDIR="${D}" install_nolink
- einstalldocs
- rm -f "${ED}"/usr/share/doc/${PF}/COPYING
- # Provided desktop file is completely obsolete
- rm -f "${ED}"/usr/share/applications/liquidwar.desktop
- make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-18 15:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-02 19:28 [gentoo-commits] repo/gentoo:master commit in: games-strategy/liquidwar/files/, games-strategy/liquidwar/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-10-18 15:58 Stefan Strogin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox