gentoo resync : 05.12.2021

6 files changed, 35 insertions, 94 deletions

diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
index a7ddabd1bc66..7865e5726551 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -1,6 +1,4 @@
-AUX ucon64-2.2.1-change-mem2-64bit.patch 748 BLAKE2B 93cfdd3056b50390a3e476783d17422cb1e8895184ddae87c0e18f411501c931afbb0706b23e8514cb15844ad55d84139064c05047aff6a4a6334a3d40eb240e SHA512 ab0b5b2e5bbc19ba2f40d86787bb146653c562a7e111b4cc41c8b9e2daaaeeb190cc13e0745ee5c77e6e273010172fb79fa04da63b7be79ab783cd1c5c5cb0ac
-AUX ucon64-2.2.1-respect-flags.patch 886 BLAKE2B 9e0ee5dc2738db7881a0d91fcc85a325e91dd86d92eec00bf3df62973e126d92f3067ca9117202fb14082ae5500e97e043203ad3ee94b190bb3e329cfef9438d SHA512 ea4b94a8d37d13ca7e88688837683990b410caadf7c4618e2a3509b7f3a6c1f419690f29ffb71c2182daa0e52fdb7eac0f083effb615b45adb3aaf2af2c61a0f
-AUX ucon64-2.2.1-zlib.patch 627 BLAKE2B bd873a95bdbf3d8d34870b026a56e4d1937b3d9712934d69e0cc5ced105b055a7fe76c0c827f34d5eb7c644ca61c20b2fa7c9ece53a1ec5bae0c7c42912970f9 SHA512 3df1952cf01602e0678990a430c070847f64ad483e70fc716245ec2fcc08c6439e2859c0d68fae7142fc0779245e034beeb45688fb598730d945a2096a496efe
-DIST ucon64-2.2.1-src.tar.gz 1476080 BLAKE2B 8f7010bde2c7306f6a76dec4ce5e31975c286801e6504bf8bc99287bd7adc4ab10331a8cab308fed83ece9e13bdb01327f6d3439eba776038dbb19eb2b72cf70 SHA512 34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
-EBUILD ucon64-2.2.1.ebuild 1366 BLAKE2B 77c515c3388ad591a8858d4adba31fbdeb21ca6f278a86d150f8aa201674a39980bda78159ecb6f9b63a7d9cbcd548ebeeceab60dcb35c03fdc222bbbac9be2a SHA512 7a2917bb3bca1957a9c8e51b6d57c1942fc5dcdcfa04f8ee1ef5631e14f5ec8383e5f0a52df6607b85064aab25c9973d1a05110e341f0369fbf4a34f121776ae
+AUX ucon64-2.2.2-respect-flags.patch 709 BLAKE2B 7f174b9437ad2ac51e9da1f8f87943b4934b6ae4b1758524e7aeaa1d5f9e02f35a51cf88fe5c5f5d816c54ce2ced65430b64874235ee42d3e0d837e218b8eb56 SHA512 26ba9ee8b303d573c8f5422caed9d4f3dbe6b1ef154ca55248102c1f385e326b7d9bda5cb4141b9488e597765d3b1245e36c2dec2cb97412711713f344183cda
+DIST ucon64-2.2.2-src.tar.gz 1481087 BLAKE2B 3ae3d09f4ea186d4e64d712bf0e3036ca79b7e87ba9a9b165fdcee2f0e24ac1dd00a5da9653a404850e8bc1f85cd6b26e0d03615e60090709d9b792c3db07e8e SHA512 21e403e6de64c0a76de32032fbafea75f53a96b88b343220cdc8d62ef3bdec252764cacb9bbf98a910477ba451bc05aee8c9f91024b9e5d3149f7ead20d426b5
+EBUILD ucon64-2.2.2.ebuild 1252 BLAKE2B 6452f640bb2ef21765b8403ae8562b1ef24cc08fc1d3458d0817514de11cbdb554192cc17485067cbe6087f0c326a28a860d8d42dc502633191bb618e5deebd2 SHA512 f94fe766ad0e3aee1eff57d8d9b5c0fac158bbb2d38accf216bae853cb9f12af4710a4a5941333575086ceff4dee9a0fefbd6a649b06ef76ff5359f91b5ed16f
 MISC metadata.xml 330 BLAKE2B 9a6bd9e7dd9cb75ef36bef6e74e96b4a44bb0a1f968921053aec137d61649e1bc6fd26b14102a8d40678f93555c4c14bba1da02b854df25abb60d74663d5f5f3 SHA512 13977e1889a6cd2d81dadabb0a659107d9e2ba454f36ccc27b5f79e18a88d3aa4b0be93c0d867ddf21ba64857ff8ef9c61832c8a9c1b21558b63c52742903897
diff --git a/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch b/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
deleted file mode 100644
index d07a18fdd8f0..000000000000
--- a/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix crash on 64bit platforms in change_mem2()
-https://bugs.gentoo.org/753950
-
-From upstream:
-https://sourceforge.net/p/ucon64/svn/2821/
---- a/libdiscmage/misc.c
-+++ b/libdiscmage/misc.c
-@@ -1875,5 +1875,5 @@
-           if (strpos == pos_1st_esc)
-             setindex = 0;                       // reset argument pointer
--          if (pos_1st_esc == (unsigned int) -1)
-+          if (pos_1st_esc == (size_t) -1)
-             pos_1st_esc = strpos;
- 
---- a/misc/misc.c
-+++ b/misc/misc.c
-@@ -502,5 +502,5 @@
-           if (strpos == pos_1st_esc)
-             setindex = 0;                       // reset argument pointer
--          if (pos_1st_esc == (unsigned int) -1)
-+          if (pos_1st_esc == (size_t) -1)
-             pos_1st_esc = strpos;
- 
diff --git a/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch b/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
deleted file mode 100644
index c1c9ed6f78da..000000000000
--- a/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Respect *FLAGS and toolchain variables in Makefiles where missing.
---- a/Makefile
-+++ b/Makefile
-@@ -12,3 +12,3 @@
- CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -Wno-format-truncation \
---Wno-stringop-overflow -O3 -fsigned-char
-+-Wno-stringop-overflow -fsigned-char
- # Enable -Wstringop-overflow[=type] when it is no longer a broken, partial
-@@ -19,3 +19,2 @@
- # ld: warning: option -s is obsolete and being ignored
--LDFLAGS+=-s
- endif
---- a/backup/libcd64/Makefile
-+++ b/backup/libcd64/Makefile
-@@ -1,2 +1 @@
--CC=gcc
- 
-@@ -7,3 +6,2 @@
- else
--CFLAGS+=-O6 -funroll-loops -fexpensive-optimizations
- endif
-@@ -181,4 +179,4 @@
- else
--	ld -r $^ $(LIBS) -o $*.o
--	ar crs $@ $*.o
-+	$(LD) -r $^ $(LIBS) -o $*.o
-+	$(AR) crs $@ $*.o
- endif
---- a/libdiscmage/Makefile.in
-+++ b/libdiscmage/Makefile.in
-@@ -33,3 +33,2 @@
- # /usr/bin/libtool: -static not specified, -s invalid
--LDFLAGS+=-s
- endif
-
diff --git a/games-util/ucon64/files/ucon64-2.2.1-zlib.patch b/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
deleted file mode 100644
index a618c3bce75a..000000000000
--- a/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix undefined macro issue when compiling with zlib.
-https://bugs.gentoo.org/753950
-
-From upstream:
-https://sourceforge.net/p/ucon64/svn/2817/
-https://sourceforge.net/p/ucon64/svn/2819/
---- a/libdiscmage/ioapi.h
-+++ b/libdiscmage/ioapi.h
-@@ -35,4 +35,7 @@
- extern "C" {
- #endif
-+#ifndef OF
-+#define OF(x) x
-+#endif
- 
- typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
---- a/misc/ioapi.h
-+++ b/misc/ioapi.h
-@@ -35,4 +35,7 @@
- extern "C" {
- #endif
-+#ifndef OF
-+#define OF(x) x
-+#endif
- 
- typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
diff --git a/games-util/ucon64/files/ucon64-2.2.2-respect-flags.patch b/games-util/ucon64/files/ucon64-2.2.2-respect-flags.patch
new file mode 100644
index 000000000000..9e772fe6c76a
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.2-respect-flags.patch
@@ -0,0 +1,29 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,3 +13,3 @@
+ 
+-CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -O3 -fsigned-char
++CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -fsigned-char
+ ifneq ($(findstring clang,$(CC)),clang)
+@@ -21,3 +21,2 @@
+ # ld: warning: option -s is obsolete and being ignored
+-LDFLAGS+=-s
+ endif
+--- a/backup/libcd64/Makefile
++++ b/backup/libcd64/Makefile
+@@ -1,3 +1,2 @@
+ ifeq ($(CC),cc)
+-CC=gcc
+ endif
+@@ -12,5 +11,3 @@
+ else
+-CFLAGS+=-O3 -funroll-loops
+ ifneq ($(findstring clang,$(CC)),clang)
+-CFLAGS+=-fexpensive-optimizations
+ endif
+--- a/libdiscmage/Makefile.in
++++ b/libdiscmage/Makefile.in
+@@ -37,3 +37,2 @@
+ # /usr/bin/libtool: -static not specified, -s invalid
+-LDFLAGS+=-s
+ endif
diff --git a/games-util/ucon64/ucon64-2.2.1.ebuild b/games-util/ucon64/ucon64-2.2.2.ebuild
index 13ebde02c0b5..617f85487c0d 100644
--- a/games-util/ucon64/ucon64-2.2.1.ebuild
+++ b/games-util/ucon64/ucon64-2.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://ucon64.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src/src"
 
-LICENSE="LGPL-2.1+ GPL-2+"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug usb zlib"
@@ -21,9 +21,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-change-mem2-64bit.patch
 	"${FILESDIR}"/${P}-respect-flags.patch
-	"${FILESDIR}"/${P}-zlib.patch
 )
 
 src_prepare() {
@@ -44,7 +42,7 @@ src_configure() {
 	)
 	econf "${econfargs[@]}"
 
-	tc-export AR CC LD # for libcd64 with respect-flags.patch
+	tc-export AR CC LD
 }
 
 src_install() {