gentoo resync : 04.05.2018

5 files changed, 30 insertions, 26 deletions

diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index 0bc4cd459ac0..9ac03e77fc48 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1,6 +1,6 @@
-AUX liquidwar-5.6.4-exec-stack.patch 430 BLAKE2B 712aedee771cd1958ec252852d6f889f867c4264ec81b10e833257ee4c9d7f33977b1729b20c19940d9ae35d3a08df12e4302c6efa538c16934f5a9c1cd311fb SHA512 e5f068a73bc8a13f85350823fb12264adaaa2e4ad7b19dcba6d3bb81c8ff70818a274adb9827665208bc5d63cde59a7ec5c2bc83fd3449b4e8fbffd4d8ef5ce7
-AUX liquidwar-5.6.4-ovflfix.patch 696 BLAKE2B 5117cd7286b75cdba47a9849a6c1dd65339682b9a387a374bb25340c09daea66bcf983022c66ca2fb92ff81083ed10f11fce24346a949e6a7cf40c69de767cad SHA512 2d1b72ac481ef9c742e4b22e012805161e628fcdbebc8b55084c03fae63f0fd88da92ce1827ad08c27da2ca2c0ec3482726e4524887385cf4fc75f202c302102
-AUX liquidwar-5.6.4-underlink.patch 438 BLAKE2B c57af7199c560f3b82cc007c20a8d525aceb4d1f8867df207711a3ecd3c31013f88677734d9283b9ee0a67122b550efcd84cd9bde180c26ad1afe3c93ab89753 SHA512 c4795242e102566d208ca57d68fdb60d3c69d0aec5c8a2f196e4bcbfa91e64c07cb8b06d82e870c059405967f8563090a8910ace3bad17b9591047329ccbe3d5
+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-r1.ebuild 1535 BLAKE2B dfec55beda94bfc7783644f15e53d98d926d4eb0c8f83a2846522312018770819fe32da0799deb816a30c43a728e8f5bda57fd81d8eaad71e6e4593eb6cb33f4 SHA512 4ceaf10463625f3d484e2e95d4097bd92133889216b9c1a3828ad99ce004a91e9b6cfe9459d29e8647acb9fa989570a8a3dea2df635f010d435a62722beb4248
+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
index 83e733b28a05..a1e93c9b738c 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 446385624cfa..c092f02beabe 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 2bc53e0caccb..d80e349bf1b1 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-r1.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
index bfbb51bdca17..8899b512aa19 100644
--- a/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
-DESCRIPTION="unique multiplayer wargame"
+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="nls"
+IUSE=""
 RESTRICT="test"
 
 RDEPEND=">=media-libs/allegro-4.2:0[X]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-exec-stack.patch \
+	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/applnk/Games/:' \
+		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \
 		-e '/^INFODIR/ s/=.*/= $(infodir)/' \
 		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
 		-e '/install/s:-s ::' \
@@ -36,11 +38,11 @@ src_prepare() {
 		-e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
 		-e 's:/games::' src/Makefile.in \
 		|| die "sed src/Makefile.in failed"
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	eapply "${FILESDIR}"/${P}-underlink.patch
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--disable-doc-ps \
 		--disable-doc-pdf \
 		--disable-target-opt \
@@ -54,7 +56,9 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install_nolink
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	use nls || rm -f "${D}"/usr/share/doc/${PF}/README.*
-	prepgamesdirs
+	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
 }