From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-strategy/liquidwar/Manifest | 6 ++ .../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 ++++++++++++++++++++++ games-strategy/liquidwar/metadata.xml | 8 +++ 6 files changed, 134 insertions(+) create mode 100644 games-strategy/liquidwar/Manifest create mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch create mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch create mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch create mode 100644 games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild create mode 100644 games-strategy/liquidwar/metadata.xml (limited to 'games-strategy/liquidwar') diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest new file mode 100644 index 000000000000..9ac03e77fc48 --- /dev/null +++ b/games-strategy/liquidwar/Manifest @@ -0,0 +1,6 @@ +AUX liquidwar-5.6.4-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a +AUX liquidwar-5.6.4-ovflfix.patch 700 BLAKE2B d0a46b244008d78eaa67cba8f8a39a710c8b75d64876a9e7eae86b168c94f8111326739795b061a2209c70fbb05399291cfdfa6f580c3439e7a68768e9049def SHA512 0d242ff7ba17af4b5d61e040b37fbf363d5c4bec615af21e2b2ea77f7cef4633f66a870196e40b590c6609ed15c90208172154b4e613b6ea0d4fe0f2189bb294 +AUX liquidwar-5.6.4-underlink.patch 442 BLAKE2B bfd7beea85546fca013de4229bbd0b1a658f87a608d1340e2463304c72b1d6e82917a95052488f53be40e3bfcafcf23b13007d8f86d541c8236e6dbaeec1c948 SHA512 3835cad62e8141774c5675d1dbc22103cb41a6af0d4a0a70b23e96d88fe72f49b872823bfb9f35294b8d1bec5d6e89942b37928ee92bb53ecb177a560fe8559d +DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7 +EBUILD liquidwar-5.6.4-r2.ebuild 1650 BLAKE2B 92597eae770aa2a1063101a383eb406922c969b9adf8187b812fa98ae04d6135b29dcb90440190c0a02d2637d3f06752894c7a122aac3c88a62a3a67fa08558f SHA512 4adc6c05c0f9c319ba75c3720679040bdf5e2b2e269ed1208cf155a44b26b14d015943b5520233adcb86156f007b16840f8696d1d150933b1e8cc1b89f5c86c9 +MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 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 new file mode 100644 index 000000000000..a1e93c9b738c --- /dev/null +++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 000000000000..c092f02beabe --- /dev/null +++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch @@ -0,0 +1,18 @@ +--- 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 new file mode 100644 index 000000000000..d80e349bf1b1 --- /dev/null +++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..8899b512aa19 --- /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 +} diff --git a/games-strategy/liquidwar/metadata.xml b/games-strategy/liquidwar/metadata.xml new file mode 100644 index 000000000000..78274e0fa550 --- /dev/null +++ b/games-strategy/liquidwar/metadata.xml @@ -0,0 +1,8 @@ + + + + + games@gentoo.org + Gentoo Games Project + + -- cgit v1.2.3