gentoo christmass resync : 25.12.2020

8 files changed, 36 insertions, 10 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4e00419f3ec9..4e0368404148 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest
index 85770fb2b965..da3de5f90783 100644
--- a/games-arcade/kobodeluxe/Manifest
+++ b/games-arcade/kobodeluxe/Manifest
@@ -1,5 +1,6 @@
+AUX kobodeluxe-0.5.1-clang.patch 670 BLAKE2B bebded939e08b4a5184170c1527b4e9135e1c4be8ba3b788576778aab337f21eb96556ac7aefa8f3da76145abad1219a0840a8f58bf5dc8394b9b428f535b7c1 SHA512 7d36f7e537de05868107f34b1645db8f16e01317ab443d1cfb84eb4ab0ff8771e522539e37190bc555208e7ec996b90f4cfb130781232432d9d8a53fad18ca67
 AUX kobodeluxe-0.5.1-glibc2.10.patch 219 BLAKE2B 78c45966711049c7715ae0efd18289be82b4ea3965d85338ab81c79f07785273a6d767cf471deace08722b3ab9b8581a45201e30343b9e6ad784d820256b7dd9 SHA512 77624a0e18958d76c938e9d1becb72803079364612056687fb955cc912bda9b4443c7e6245abb6a32cc3ff96b04c63993e3cd114f73115254efe7b50f749a45c
 AUX kobodeluxe-0.5.1-glibc29.patch 2408 BLAKE2B c3abfe3594b2c43428d4e49a34285680a1ae2ac40106aac255aa2da846a67ecbcfcf8f5d8af48ca0adbf627d188f6a8941d6b4f75df3bdad39fff4d869b324e1 SHA512 de2014b9a0607ddb5853c63eb4c14daf4f14d2158697348d952305db09b4a8f84a3a918cd730085f01120b7cbcfae076afd73c559c1ddd46f5a9777c89e76897
 DIST KoboDeluxe-0.5.1.tar.bz2 1781752 BLAKE2B d7f08ab9603b861f8992629bac9a65051a3c5fee6822f1951d57cbc5c31055a6cefeed098637dda84c0a1538645f47816848d767a4fa7916726b5784dfbc0414 SHA512 fc107e4367fd300574823aa40c68311d95de3a403d7c930963b8754aac14293f0624996fd77c4de0677921d11883047b68dd95df81eeb03078c37426ebd58afd
-EBUILD kobodeluxe-0.5.1-r1.ebuild 1236 BLAKE2B b34a08fdd3c518443f53af54f67d3edc96e6350b918e132688c569a430914eed0f23b6474a9f9ec286590e0fe1958f795d1ef9a943cabcabb4870049b15fe89e SHA512 fe75c34de56bb558cdda8d30d33aa392e70ae6750daac99e53752045e9321c02396149be685a5de4a162172fb09d56e4c4f15f2e3f9a12c2ae83594d043939fe
+EBUILD kobodeluxe-0.5.1-r2.ebuild 1274 BLAKE2B e448d47c8aa22955b9082a932550ab551fe465505d8b7875fbefdb2f20ab14532cf0219c02313fef5d34b0ab6a883cf904f6e8d196e5cb0d086bb4f633d5a88a SHA512 1793faf4183a24345edc641463fb387a47b54373077b7b2fc9818f2e1af17c8d34f35b3d95b8327067d625b8c3adc5ab59615a637cc5a42bc76a9602008fdb2c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch
new file mode 100644
index 000000000000..7732b6e147d4
--- /dev/null
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch
@@ -0,0 +1,22 @@
+--- a/filemap.cpp
++++ b/filemap.cpp
+@@ -851,7 +851,7 @@
+ 	while(k)
+ 	{
+ 		if(strcmp(k->key, key) == 0 || all)
+-			fprintf(f, "%s"FM_DEREF_TOKEN" --> \"%s\"\n", k->key, k->path);
++			fprintf(f, "%s" FM_DEREF_TOKEN " --> \"%s\"\n", k->key, k->path);
+ 		k = k->next;
+ 	}
+ }
+--- a/prefs.cpp
++++ b/prefs.cpp
+@@ -30,7 +30,7 @@
+ void prefs_t::init()
+ {
+ 	comment("--------------------------------------------");
+-	comment(" Kobo Deluxe "VERSION" Configuration File");
++	comment(" Kobo Deluxe " VERSION " Configuration File");
+ 	comment("--------------------------------------------");
+ 	comment(" Switches - [no]<switch>");
+ 	comment(" Values - <key> [<value>|\"<string>\"]");
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r2.ebuild
index ed655d6c5b87..b813ddc2a1b0 100644
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit desktop
 
 MY_P="KoboDeluxe-${PV/_/}"
@@ -22,17 +22,20 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc29.patch
+	"${FILESDIR}"/${P}-glibc2.10.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}" || die
 	unpack ./icons.tar.gz
 }
 
 src_prepare() {
 	default
-	eapply \
-		"${FILESDIR}"/${P}-glibc29.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
 	# Fix paths
 	sed -i \
 		-e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \
diff --git a/games-arcade/lbreakout2/Manifest b/games-arcade/lbreakout2/Manifest
index b6edde2cba52..68c89231df8c 100644
--- a/games-arcade/lbreakout2/Manifest
+++ b/games-arcade/lbreakout2/Manifest
@@ -2,5 +2,5 @@ AUX lbreakout2-2.6.5-gentoo.patch 2134 BLAKE2B ba98ce2153009499c8ab1f59674a2e762
 DIST lbreakout2-2.6.5.tar.gz 3491519 BLAKE2B b382b391f3aa12f975ed52ec9f7de21f864c2171e0b6d1469ae1224b3cb240ff8a680ebae9ea37a85aa95c432c164058e8a9a0a1d094bbef572670bdbd17ca4e SHA512 45c54bc9401131c96eba5fdcc08ca1324904fb50d3967acf7f29034045cbcd4c1d0b65f38eb33d8aace4cfe35f2a2e7a6c2319e4a6d6a1b41274dbe293a1747b
 DIST lbreakout2-levelsets-20141220.tar.gz 372221 BLAKE2B 16da9ee84e856734645a2ddf1665a8ebf8a52aa63be5d91e20f359bfb270d7bed16e7a4903c0847543141120d8d633bf84ceda867000354eedf201e389faf0db SHA512 482c1e95a37735f7bca510fa34d0f046e89b5aa9528b9af9dfff5bcb3fe656140285a95670caae2565cc9ebd30c3dc87a1fe77a6b75061ce9349ee7e36aa13d5
 DIST lbreakout2-themes-20141220.tar.gz 34006503 BLAKE2B 5262e04368d1c77b2690f70ded0c3da17b7ce31175271f22142b0418dfabb840561f4dbd97d16a12da6addb9d15e22e5ca97f96c8380bd0e7983642ee55fd1e3 SHA512 6088ff4bd9dfbbeb91c74e4adb500593af88ea6796bdec577afb43fc4ea9819c4f2dae76b6b7a8ad1ce2ec32ef575e41a6fa924463107a5dcd211f50bb94a906
-EBUILD lbreakout2-2.6.5-r1.ebuild 2058 BLAKE2B 4eecffaf1454de018affe6816f49760c329596b086889687e8647108d72131a698141fe114d4878d6d2dfd61ecf40962bf52f818df385cae4f6df66f4661a769 SHA512 c6ba48f3c3f3946dbb6e5e18a88a3ab05a0611ed7b3efa414ad1f1cbd8c6406785fb48d9aa4f7c3ad154298f81d7169af67135d24b3947776ac84dbb1248527f
+EBUILD lbreakout2-2.6.5-r1.ebuild 2055 BLAKE2B db034b277b8db6b0f86a6333d96fcdb6d5cde48a21fd4851d28b4112282d58f899efbfd1154998c7fdea76461e09382b55f94a6f0b15f36d1cfd5fe97ac5b3c8 SHA512 51cf1392f60e00fc68494bfddefefcc26829f128707b10574e86f0f5072b56a4fed2910258efd6252c902aea3d8a2a424b76ed14429693223a4a0ab90dfcf5ca
 MISC metadata.xml 413 BLAKE2B 483149bf4aab9f2a8fea8fbaa6cdcf8ea0c029750acc79b8c4203f27f139a96bf80f5c73c972802ac9eea89f29e98c71214d7a723b82d81290a776fd49480ad7 SHA512 152c0d0d5ac6e3babb26c8eba16c31ed687e0a39ee7b6a86442a1a1efcb4f2d63ccd7f6062857df78047dca8466f548548d40c8baf8359cbaf1758ac03eb1661
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
index 129ed748d93f..4f0c9cc48e96 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/games-arcade/supertransball2/Manifest b/games-arcade/supertransball2/Manifest
index 1bdcbbde5bfe..70cfd777199a 100644
--- a/games-arcade/supertransball2/Manifest
+++ b/games-arcade/supertransball2/Manifest
@@ -1,4 +1,4 @@
 DIST stransball2-v15-linux.zip 302212 BLAKE2B 8b45e32f37c805e75ba0d19ef004d75baea689fe87e946d50301cef01230492fd531b4100bc6200a261c24463443b2811faea8d200d15b15af0c884dbc285d2a SHA512 e87655dfca039c0c8553372b4da139f1d8fa420aad1909b422318dc049a9f7972c8d2398b83fde677b3eaf21d2d70fad73d7ec0c4b7bcbeacbf3544e6e575f6a
 DIST supertransball2_1.5-8.debian.tar.xz 26148 BLAKE2B 50ada1b6976da9686aa5cabd5e3a04222e30f9c69565018eebe51271842842dab88829c0672d7375995e3835c3be4983c8990e736278177d7d10596ed2453a0c SHA512 efbb8517b73d4413755663f96aa01eb679b43876091920a6d9a9fc0a31d001828aa536ac59e74172fa519d14b1dff117c150c022fb8f3898efbee2901a418a53
-EBUILD supertransball2-1.5-r1.ebuild 1336 BLAKE2B 7cdd68e25098efcda80e41a2f07d8608d8ae3321dca2e85566243c7f701804c8fe5e3a7fe201f5e938c06f9d612a4095d498ef500b2beac875c763c3dd6276af SHA512 5e0f792169a78202a4dda99831c26b7f426f92745169e1f749bafb3e8a18baa6e6be2d5fc9a625170e38f5946655337d41d15373ebc6dd6031c4562c49a040a2
+EBUILD supertransball2-1.5-r1.ebuild 1333 BLAKE2B 56bea69d0e38e0e889ac18a693a9f29661f87656a38a74d7b7e77908b72ba09a1ffdc432b95e98983558bcbf725062b58c9f1e7e4725edaaabc3b1ce0b59d95e SHA512 1b01dc0b82d0aa93dfe3bfcdeac492c4c9528008bef7bce564ff457d7cc04892025e935dc0c2fd99670036912526599e19e3085329888007b42eb88764669a6c
 MISC metadata.xml 732 BLAKE2B 02a55b153806bf73c5f777a196d4bcaa79f3bf4155eda30b792b56ba1289df14c5d8597e38b1a2b122d7b53c4792e589a01b57bf31fafbae99333b3dead5e9f8 SHA512 ff6eef56c6c80e08bac6a0d2ce6f848d22e90c1326a2a3e0927c04fdabe38cd0736b8f3555cd8f0743d1ba6cc5094946488cb0b9cf1c1db4ee4176f3bde79e8d
diff --git a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
index 55a24219bd81..9b8e585d7b53 100644
--- a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
+++ b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6