[gentoo-commits] repo/gentoo:master commit in: games-strategy/liquidwar/files/, games-strategy/liquidwar/

["Pacho Ramos" <pacho@gentoo.org>]

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
+}