gentoo resync : 25.11.2020

3 files changed, 47 insertions, 21 deletions

diff --git a/games-action/luola/Manifest b/games-action/luola/Manifest
index 771c90d8e6e2..29f76e701c1e 100644
--- a/games-action/luola/Manifest
+++ b/games-action/luola/Manifest
@@ -1,6 +1,7 @@
+AUX luola-1.3.2-fno-common.patch 873 BLAKE2B b0fef29165ed35c692d1ff898796b294d38c335c494771ab288df2de093276a7feca2196f82eb36525638da5ad69316b7c82737ac61a18362072f9cd9d2f3e3f SHA512 5a0b97eb340c0cc8446e2da57841987950a94d5a7cc48df87a0ff30e4e23e435d3ff975a3405ab96b08cc66bca327a64b08a8d3f6f2eecc5f36fe3eb4fc34ccd
 AUX luola-1.3.2-underlink.patch 249 BLAKE2B b6cc9e7d9b3acc7b2772c8596357a38bfd318de008e60da3186aff7a4b52a6618dfdda5e0e90a8e9bf751cf6111153e5277d16792728529f195a9cb4c82d6018 SHA512 99a842abc48193ec92ac9005653b70ba0ea07abffe99c598413400cad68ce72b0d10d38e0ee827e49f0c91cd8c85b7f6e0313e369403118d527e8a92b7adf46d
 DIST luola-1.3.2.tar.gz 1774711 BLAKE2B 017327e47066a4ba5d4e1a8f1a7f923f74dc0b3770b43237ba8bfc9f91835d1c8ef18728be5cb85b42a66cc99185942ddd059206fa155d5fa95a897b0176aa5b SHA512 4e8b2f5e813dbb4d951632ded20f013aae6837d525d0068b430ae41319503f206ec27f2873cff241af8ba4cd1728ec89dcf8279a94dbb3094330de1ca531712f
 DIST nostalgia-1.2.tar.gz 1475672 BLAKE2B fda721e35b9afcb50d96309c0fe693d81cee43ae2410299ad026c8a36727870331008e866a0725f88977292fec85d01f4da9618c6070c8ea7265a2a316a9acb2 SHA512 06a03b3398204c04f88fccbbf6a59f11da043c73dc203fe258e09e036364ee73cae337b9828bd27b52ebee6ff456c317143444c3b6c395addcdedf720988731f
 DIST stdlevels-6.0.tar.gz 1850148 BLAKE2B cd621d2e42cf10950fd7c81b6753bd6f8f8df178a8009de9219a40141de4bd73ee7e410e107b7ba99e3e1e7af978291604995cf1f2e52975a3de5ecaeb776837 SHA512 d1823ca8340dea8766310962507bc5aad06c0f737c16c3ce32afaafc0e83a8b7b4d301d5cf65a0466fdaee9ec2a7ce718d03be61b383ac6fe030101466eff11a
-EBUILD luola-1.3.2-r1.ebuild 1181 BLAKE2B b71f327e9ad80ae0522f12d0d2b9686d160f9b965dcba2990167d30f8f4b688129f33799ee0b07665bdcd2e11cf7630f97b1939eb82f7aad0e144bee602ecfe0 SHA512 816539b2276bcc5e5b01f78c978ef57e51b7462aa00c417cb6dc8f95a7be3ec0e52cd142832022b66759bb87fb427174c81fd6a3770e6d6fbdcaa1137b74b66f
+EBUILD luola-1.3.2-r1.ebuild 1018 BLAKE2B 0b7620037832a8a6e1539ea622f527588a1025bf1c81e1a79971ec510a118dffb4af817a7fb5cd601b7f2b1c331810a3bc89ade4305ff8b3a02a6742d5123bde SHA512 848cd1d3fba247fd280f8b9c26b02153c5bae3cb3c88050c4b4f87fb25ba0bbf48ab37bc70d10e9857d2e24ce4ea8e29400a58bdb008f0f5cfb5085178e46d4f
 MISC metadata.xml 325 BLAKE2B 2c5d6a18895f3af0049678aa6eb707808345a81f2d96ce5faa254dba43fe54ab2dac6e1997b44ea3a4dff2bb4d65233864158f5b211b6ef85e234f51b59d9159 SHA512 5e693021a9b1e4a0cff7c4b953648d3e8d9c0acb40d910288f8ed16a558117455e52841ebb32b78909f850b9f5a3b00165aafb343ab15a3e86e7d45a4e00f8c1
diff --git a/games-action/luola/files/luola-1.3.2-fno-common.patch b/games-action/luola/files/luola-1.3.2-fno-common.patch
new file mode 100644
index 000000000000..e0b191df831f
--- /dev/null
+++ b/games-action/luola/files/luola-1.3.2-fno-common.patch
@@ -0,0 +1,33 @@
+--- a/src/pilot.c
++++ b/src/pilot.c
+@@ -43,6 +43,8 @@
+ #define PILOT_STD_RADIUS 4.1 /* Normal radius for pilot */
+ #define PILOT_PAR_RADIUS 8.0 /* Parachuting radius for pilot */
+ 
++struct Pilot Pilot;
++
+ /* List of active pilots */
+ struct dllist *pilot_list;
+ 
+--- a/src/pilot.h
++++ b/src/pilot.h
+@@ -45,7 +45,8 @@
+     int toofast;                /* How long has the pilot been falling too fast */
+     struct Spring *rope;        /* The ninjarope */
+     int ropectrl;               /* -1 retracts rope, 1 extends it */
+-} Pilot;
++};
++extern struct Pilot Pilot;
+ 
+ /* Rope length limits. Actual rope length is nodelen*nodecount */
+ static const double pilot_rope_minlen = 0.1;
+--- a/tools/im_vwing.c
++++ b/tools/im_vwing.c
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <limits.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <ctype.h>
+ 
+ #include "im_vwing.h"
diff --git a/games-action/luola/luola-1.3.2-r1.ebuild b/games-action/luola/luola-1.3.2-r1.ebuild
index ff2ec53aa188..0a2f70c623da 100644
--- a/games-action/luola/luola-1.3.2-r1.ebuild
+++ b/games-action/luola/luola-1.3.2-r1.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools desktop gnome2-utils
+inherit autotools desktop xdg
 
 DESCRIPTION="A 2D multiplayer arcade game resembling V-Wing"
 HOMEPAGE="http://freshmeat.sourceforge.net/projects/luola"
-SRC_URI="mirror://gentoo/${P}.tar.gz
+SRC_URI="
+	mirror://gentoo/${P}.tar.gz
 	mirror://gentoo/stdlevels-6.0.tar.gz
 	mirror://gentoo/nostalgia-1.2.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="media-libs/libsdl[X,sound,joystick,video]
+RDEPEND="
+	media-libs/libsdl[X,sound,joystick,video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer
@@ -25,6 +26,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
@@ -37,24 +39,14 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+
 	insinto /usr/share/${PN}/levels
 	doins "${WORKDIR}"/*.{lev,png}
-	dodoc AUTHORS ChangeLog DATAFILE FAQ LEVELFILE README TODO \
-		RELEASENOTES.txt ../README.Nostalgia
+
+	dodoc DATAFILE LEVELFILE RELEASENOTES.txt ../README.Nostalgia
 	newdoc ../README README.stdlevels
+
 	doicon -s 64 luola.png
 	make_desktop_entry luola Luola
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}