gentoo auto-resync : 09:11:2022 - 09:25:48

3 files changed, 71 insertions, 12 deletions

diff --git a/games-kids/lletters/Manifest b/games-kids/lletters/Manifest
index a4db73ceedf3..d6741f1aa721 100644
--- a/games-kids/lletters/Manifest
+++ b/games-kids/lletters/Manifest
@@ -1,4 +1,5 @@
 AUX lletters-0.1.95-build-2.patch 2433 BLAKE2B a69d1d3b60dbb13028241544e7b8a7c59ddf30c3910803d0c595cf97cd09b7a46091849151b436a80419fab486dcd2bfa79056e8b5f4f95cb77b1f78af4cdea4 SHA512 1eb775c132b936f205fa7606b7a3d0e05df873aab573c09e17a2c0aee922ee5fbaf46a619674509735f259bc22295ac761919ae3537d9551ab7ac1b1eb5bcf26
+AUX lletters-0.1.95-clang16.patch 1351 BLAKE2B abc11221bd0e06437344945f0f4f5ee059f053f2a59f2d92697be74f9275cfcb9cde17c511901a02eb6676a13907e54aac5b3ef0c0b4dad7ab620483ab69dd87 SHA512 7f91e8f77ce3adb81b4e6a535c17fed4c38311919686c43389eb9c02a0b669a7cf155ab2e90ab713e49f5e452b0c030b0842c3aacd97504344b85c02b2b8a02d
 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
@@ -6,5 +7,5 @@ AUX lletters-0.1.95-underlink.patch 475 BLAKE2B e48275417517f6a7ce0a3a0e0b9455bb
 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-r4.ebuild 1165 BLAKE2B a329fa44dcaebfccd3f6b83fca752776c2e8deb27b18557e078601d397901d8c216e6de0916a422a088de2e973cd0483eb40ff0ab562c693e3a627a4ee2ea51b SHA512 170a8b8a1f64febb049c66391666ba9d50c672c1f33ff559bb3d29b7072cae7c9ccda1da7be9386641322423f4b6103a7e6b4cc26dda9aa746ce1558dbafd233
+EBUILD lletters-0.1.95-r5.ebuild 1138 BLAKE2B 69559e03f24862c6b9e24c5e664bf654593448f1a5c9a6d75ff19b8d917adbaef56956f82d5830385301c977327ab4d9c725a125adb4e2f8d69bf22713bd1005 SHA512 e5d22296d620050e2522cccd6754c43987463f9008a40bd889fdbd0506dc0e15a93d1241124cfa1eb92cf73e7cee79ad6bc285cddbb613e8f695acf2f62a6b3d
 MISC metadata.xml 327 BLAKE2B 75c7f98e98ac46fdcf50d0836c31d8a187330e33e67046ea63b9aa4d9854d303833ad2d4da3bab49cffa484d33245aacfd860ee671828f76c276fd5747be3aa6 SHA512 35288b6526b4e8da90bb46ee58a863a64efd4fd6afebc553285bbb2753fc49d3bf1a26805066b933629db28d6b45c4868f607873925cfdbf4ff7d72e190cc324
diff --git a/games-kids/lletters/files/lletters-0.1.95-clang16.patch b/games-kids/lletters/files/lletters-0.1.95-clang16.patch
new file mode 100644
index 000000000000..8fb6591dd136
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-clang16.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/874693
+--- a/libqdwav/wav_lib.h
++++ b/libqdwav/wav_lib.h
+@@ -44,2 +44,3 @@
+ int 	init_wav		(char file_name[], wav_sig *info);
++int     init_wav_read           (char file_name[], wav_sig *info);
+ void	get_wav_nextblock	(int handle, char *buffer);
+--- a/libqdwav/wav_read.c
++++ b/libqdwav/wav_read.c
+@@ -6,2 +6,3 @@
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include "wav_lib.h"
+--- a/libqdwav/wav_write.c
++++ b/libqdwav/wav_write.c
+@@ -5,2 +5,3 @@
+ #include <sys/soundcard.h>
++#include <unistd.h>
+ #include "wav_lib.h"
+--- a/list.c
++++ b/list.c
+@@ -1,2 +1,3 @@
+ #include <string.h> /* for strs */
++#include <dirent.h>
+ #include "lletters.h"
+@@ -4,6 +5,5 @@
+ /* prototype std lib functions */
+-extern int alphasort ();
+ 
+ /* local prototypes */
+-int file_select (struct direct *entry);
++int file_select (const struct dirent *entry);
+ 
+@@ -13,3 +13,3 @@
+   int count, i;
+-  struct direct **files;
++  struct dirent **files;
+ 
+@@ -46,3 +46,3 @@
+ int
+-file_select (struct direct *entry)
++file_select (const struct dirent *entry)
+ {                               /* ignore . and .. entries */
+--- a/timer.c
++++ b/timer.c
+@@ -1,2 +1,3 @@
+ #include <stdio.h>
++#include <sys/ioctl.h>
+ #include "wav_lib.h"
+--- a/wav_play.c
++++ b/wav_play.c
+@@ -3,2 +3,4 @@
+ #include <stdlib.h>
++#include <sys/ioctl.h>
++#include <unistd.h>
+ #ifdef GSM
diff --git a/games-kids/lletters/lletters-0.1.95-r4.ebuild b/games-kids/lletters/lletters-0.1.95-r5.ebuild
index 52ddc4d05833..b5d6666eb794 100644
--- a/games-kids/lletters/lletters-0.1.95-r4.ebuild
+++ b/games-kids/lletters/lletters-0.1.95-r5.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop
 
-PATCH_LEVEL=3
-
 DESCRIPTION="Game that helps young kids learn their letters and numbers"
-HOMEPAGE="http://lln.sourceforge.net"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2.orig.tar.gz
-	mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff.gz
+HOMEPAGE="https://lln.sourceforge.net/"
+SRC_URI="
+	mirror://gentoo/${PN}_${PV}+gtk2.orig.tar.gz
+	mirror://gentoo/${PN}_${PV}+gtk2-3.diff.gz
 	mirror://sourceforge/lln/${PN}-media-0.1.9a.tar.gz"
 
 LICENSE="GPL-2"
@@ -20,21 +19,22 @@ IUSE="nls"
 
 RDEPEND="
 	x11-libs/gtk+:2
+	dev-libs/glib: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"
+	"${WORKDIR}/${PN}_${PV}+gtk2-3.diff"
 	"${FILESDIR}/${P}-build-2.patch"
 	"${FILESDIR}/${P}-underlink.patch"
 	"${FILESDIR}/${P}-make-382.patch"
 	"${FILESDIR}/${P}-fno-common.patch"
 	"${FILESDIR}/${P}-nolang.patch"
+	"${FILESDIR}/${P}-clang16.patch"
 )
 
 src_prepare() {
@@ -49,7 +49,9 @@ src_configure() {
 
 src_install() {
 	default
+
 	newdoc debian/changelog ChangeLog.debian
+
 	doicon debian/${PN}.xpm
-	make_desktop_entry ${PN} "Linux Letters and Numbers" ${PN}
+	make_desktop_entry ${PN} "Linux Letters and Numbers"
 }