gentoo resync : 25.11.2020

5 files changed, 75 insertions, 11 deletions

diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 5b6749b5ad9c..235f06796b83 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/lletters/Manifest b/games-kids/lletters/Manifest
index 9c4a56e1fa5b..1f8abeb51fd2 100644
--- a/games-kids/lletters/Manifest
+++ b/games-kids/lletters/Manifest
@@ -1,8 +1,10 @@
 AUX lletters-0.1.95-build-2.patch 2433 BLAKE2B a69d1d3b60dbb13028241544e7b8a7c59ddf30c3910803d0c595cf97cd09b7a46091849151b436a80419fab486dcd2bfa79056e8b5f4f95cb77b1f78af4cdea4 SHA512 1eb775c132b936f205fa7606b7a3d0e05df873aab573c09e17a2c0aee922ee5fbaf46a619674509735f259bc22295ac761919ae3537d9551ab7ac1b1eb5bcf26
+AUX lletters-0.1.95-fno-common.patch 1005 BLAKE2B f3017dd406345b5fa54dbd7e0b1623166491ff3dc82d5b3351ed5f67da370239d525a0817b1a8e64cc966a061bccbeadff2437eb393295a24fd90d72cf2acc34 SHA512 7678036cac743ea842e18ff441a7a65984c4415a2b25b1bcd87dfc2b0f92fb9d13837d4575120263bf32783320aa57b6cb479170f1c08e7982cf1bb98db3c477
 AUX lletters-0.1.95-make-382.patch 798 BLAKE2B 59a265776338d806bd7f72c647254a598b50b5d5ee78cf45481c69b5afc5f86bddc41538c4e3b71e10becbf3aa725c35a4d6a1717a681936bf597473e75eae38 SHA512 f4bc71bb6b2ad619851c7bc8ff44ca1404f14c0b98ae1bc1ab8e5c0bcb286a49409f927f8d0355de7fd189223906e7243155ae1be6cab160381fc143ee843b33
+AUX lletters-0.1.95-nolang.patch 464 BLAKE2B 350f0a66e619cf47dc2b64c7f8159522372c7685e132cb2d3bd413c4234c0b7ed52b6944cf948aaef48d8403a9fe8142fec1cbadaa20a3ddd1d45366fdd1df15 SHA512 30462c61a4f03f587ea42ac92352f7dab5fe31922e1569cfdcf38919290f4537417f82ef72385151a6e59bb0412dd5528942a70ea97796c6c8f3f71cd10fce76
 AUX lletters-0.1.95-underlink.patch 475 BLAKE2B e48275417517f6a7ce0a3a0e0b9455bbec2440e2cef46ac922ec584658ce006e8ca25bd5a269350fe62fbd98f7e7edd52f9717aa62377daf521f0fe4d710b7f2 SHA512 ecaf18f8e7d897bbeeb1dff48bf4e9174d9f87af1186f122196e1109ed09e577492be7cbc5e74edc41dbae82123a485052151f2046a607a1be068b206fc7b0fd
 DIST lletters-media-0.1.9a.tar.gz 1966275 BLAKE2B 2bf4fb788c26ca6219d60aad208a0b5eae0829d7357765beeafd055545aa336c74c8f5edb4e9caed327ec7969d9780e2bd231c56099ae87f5b396119a163c1ed SHA512 0eb7f12c0ddeae4f9634c4c6a81ae496bc9a93e3863e1f993790e4a3589efb7163387ba28a43c18427a03362f7ddd8a5e0bca6eabcc904015c1711b95186dca0
 DIST lletters_0.1.95+gtk2-3.diff.gz 457812 BLAKE2B f155b63773c57595f660afa88b4f92bf5c270b66c12cc5bc173384941eeab2112f433b37add06a1a0e18e5e7dc78f13d92b42bfd2edf64ad8832e5a085e6a1c9 SHA512 d4daf92741e4fd8a249de9fe0b22ad6108687c00c194ccbee103c51de70392707319ecef00a7e55dd6878789a23fb5d9a365c468bf55c1326e899f4224b11e77
 DIST lletters_0.1.95+gtk2.orig.tar.gz 180896 BLAKE2B f3709f061f5f199d85f23767af015b5e1f94f8684d683f60e53a22b039fb307b0cdec12e4b76888eaef9bc763d85d991d253333a1b3e0c269cc7ca8ed2ba3533 SHA512 40720f44511895fd780e4147b923ccc49a4068c10219c17bee2a54595721b87ba0ec99062e45e9b6477bd38bc3eccf0dbe830784776c37213d6c3b06f1105845
-EBUILD lletters-0.1.95-r3.ebuild 1078 BLAKE2B 0482fbc1c0e87330282689840737943b0a35c3e0d8f82d435045923f4afc880e7921b3e1124af4979d7d34c603f21f7333fae9234ade8f77038c05ec9908a934 SHA512 181d7c0ff8fc1f39faead21cce083e638d7494767ad3d406de75a1561843b674e983a50530cb3ddd117b905863b34641682fe353c659952e80e24a4a01466146
+EBUILD lletters-0.1.95-r4.ebuild 1165 BLAKE2B a329fa44dcaebfccd3f6b83fca752776c2e8deb27b18557e078601d397901d8c216e6de0916a422a088de2e973cd0483eb40ff0ab562c693e3a627a4ee2ea51b SHA512 170a8b8a1f64febb049c66391666ba9d50c672c1f33ff559bb3d29b7072cae7c9ccda1da7be9386641322423f4b6103a7e6b4cc26dda9aa746ce1558dbafd233
 MISC metadata.xml 326 BLAKE2B e77269c1fa3495bebb1528cb544a93198a3cbc38b566de760c0935220cffdad805507010d69bde1fa62747ed4f61a0a352e6686814a207cd2e1f74335131651c SHA512 c235545ff08cbf0d011c27006f03f919f4bb3a3e1dabb136f87278ef55cf55d1b31cb9050a3712394cf5a925c21f7c2884b30e8cf0cf595621d674cb2ac42094
diff --git a/games-kids/lletters/files/lletters-0.1.95-fno-common.patch b/games-kids/lletters/files/lletters-0.1.95-fno-common.patch
new file mode 100644
index 000000000000..284b276231ef
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-fno-common.patch
@@ -0,0 +1,41 @@
+diff -r edda3caf942c libqdwav/wav_lib.h
+--- a/libqdwav/wav_lib.h	Sat Oct 03 19:10:00 2020 +0000
++++ b/libqdwav/wav_lib.h	Sat Oct 03 19:12:33 2020 +0000
+@@ -29,11 +29,11 @@
+ 	char   	head[43];
+ } wav_sig;
+ 
+-buffmem_desc	binfo;
+-count_info	cinfo;
++extern buffmem_desc	binfo;
++extern count_info	cinfo;
+ 
+-int 	dsp_fd;
+-int 	*buffer;
++extern int 	dsp_fd;
++extern int 	*buffer;
+ 
+ short 	get_wav_format		(wav_sig *info);
+ int 	open_wav		(char *header, char file_name[]);
+@@ -47,4 +47,4 @@
+ int 	init_parm		(int argc, char *argv[], wav_sig *file_info);
+ int 	open_wav_rec		(wav_sig *info);
+ 
+-int bsize;
++extern int bsize;
+diff -r edda3caf942c libqdwav/wav_read.c
+--- a/libqdwav/wav_read.c	Sat Oct 03 19:10:00 2020 +0000
++++ b/libqdwav/wav_read.c	Sat Oct 03 19:12:33 2020 +0000
+@@ -6,7 +6,11 @@
+ #include <sys/stat.h>
+ #include "wav_lib.h"
+ 
+-
++buffmem_desc	binfo;
++count_info	cinfo;
++int 	dsp_fd;
++int 	*buffer;
++int bsize;
+ 
+ 	/* wav header is 44 bytes long */
+ int open_wav(char *header, char file_name[]){
diff --git a/games-kids/lletters/files/lletters-0.1.95-nolang.patch b/games-kids/lletters/files/lletters-0.1.95-nolang.patch
new file mode 100644
index 000000000000..52ff642b8e18
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-nolang.patch
@@ -0,0 +1,14 @@
+Don't crash when LANG is not set
+
+--- lletters-0.1.95/lln.c	2020-10-03 20:22:43.470743688 +0100
++++ lletters-0.1.95/lln.c	2020-10-03 20:31:03.322335396 +0100
+@@ -138,7 +138,8 @@ main (int argc, char *argv[])
+   /* End change by Gopal Narayanan */
+ 
+   /* Change by Lalo Martins, Feb 27 1999: */
+-  lang = strtok(getenv ("LANG"), "_");
++  char* envlang = getenv("LANG");
++  lang = strtok(envlang ? envlang : "", "_");
+ //  lang = strtok(lang, "_");
+ 
+   if (!lang)
diff --git a/games-kids/lletters/lletters-0.1.95-r3.ebuild b/games-kids/lletters/lletters-0.1.95-r4.ebuild
index 6c7bbbb14eba..52ddc4d05833 100644
--- a/games-kids/lletters/lletters-0.1.95-r3.ebuild
+++ b/games-kids/lletters/lletters-0.1.95-r4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop
 
 PATCH_LEVEL=3
 
@@ -17,17 +18,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 PATCHES=(
-	"${WORKDIR}"/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff
-	"${FILESDIR}"/${P}-build-2.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-make-382.patch
+	"${WORKDIR}/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff"
+	"${FILESDIR}/${P}-build-2.patch"
+	"${FILESDIR}/${P}-underlink.patch"
+	"${FILESDIR}/${P}-make-382.patch"
+	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}/${P}-nolang.patch"
 )
 
 src_prepare() {