gentoo resync : 15.06.2021

5 files changed, 154 insertions, 0 deletions

diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
index caffa529fe65..a501b41ea661 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -1,5 +1,10 @@
 AUX ucon64-2.0.0-ovflfix.patch 609 BLAKE2B 0a79d69ea392eb4015e399e045e3f929ed52b2df96e1dae76b1ada01820c9e71375ec9fa81ddf60a582350a9547461900c78a04bf7d45b7884a3cda0585638fd SHA512 cacf5d0831f647e627601327d2c37aabf78d4a21444132c45f5be00d26be7f3d8b8f5b085e2f2b3cdf41e817bf1252df8a122a608f528b61ee0a5b3c5283d315
 AUX ucon64-2.0.0-zlib.patch 986 BLAKE2B 227b7c17972bc69e5a725d10ba022df11fd1248593fb79759c8d75979b1d58c5c7eaede26bcddd09de27e6ed6c9ff1166babd1e92a95a30936ef11635f0f43a8 SHA512 9274372fe5214b4ac76e1d44252a5abe1e0d61ef25bda4240d7f9d74b292fe01c8d363a1d70c82b1145e3ddb29eb6b05ae61b2861e6044e4b72cd3708a5b9196
+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.0.0-src.tar.gz 1188488 BLAKE2B 846ea6142eb50abc8165c9abb3cc05245f891b78d786798758e393032cc59c1f3cccc0fe0e70e256e308f709870bc1cc2754df30a8fababea30eda84fd1b2b64 SHA512 d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
+DIST ucon64-2.2.1-src.tar.gz 1476080 BLAKE2B 8f7010bde2c7306f6a76dec4ce5e31975c286801e6504bf8bc99287bd7adc4ab10331a8cab308fed83ece9e13bdb01327f6d3439eba776038dbb19eb2b72cf70 SHA512 34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
 EBUILD ucon64-2.0.0.ebuild 1450 BLAKE2B 2941c723d27d5bbdb5e390197f3c0d32660c0ef201b38cd2a6cb5b3abf6dd46d0cc5cdd5952ecc6f22f501118e4eeeea444181f2112a0419129d5b3c983f5978 SHA512 f323f68a591e6b2c39079b96c30402e9fc9e4226b53112da0dcaeb3852b3794eccbcd2815c005a148b310d1ed4f3cfef5f81b8b7ad959d6c567d980c3727a87c
+EBUILD ucon64-2.2.1.ebuild 1366 BLAKE2B 77c515c3388ad591a8858d4adba31fbdeb21ca6f278a86d150f8aa201674a39980bda78159ecb6f9b63a7d9cbcd548ebeeceab60dcb35c03fdc222bbbac9be2a SHA512 7a2917bb3bca1957a9c8e51b6d57c1942fc5dcdcfa04f8ee1ef5631e14f5ec8383e5f0a52df6607b85064aab25c9973d1a05110e341f0369fbf4a34f121776ae
 MISC metadata.xml 329 BLAKE2B 7e77481b48419ef3da77a1b758a5e49c3f6686bdec3c14f81fe4f5051aec4b63433b970b6bb8ea5fc3ca4f98893a372cf3fb32c0e8bc3098379729cfd6672995 SHA512 eeaeb79bd3f8931262b87f4956705aea7408f5afd8879e6b8c5d5436a851be22a2e9a9e22ccd5250ea270db0c2876633fbf3d160df47cff9be490e203619ed7f
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
new file mode 100644
index 000000000000..d07a18fdd8f0
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..c1c9ed6f78da
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000000..a618c3bce75a
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
@@ -0,0 +1,26 @@
+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/ucon64-2.2.1.ebuild b/games-util/ucon64/ucon64-2.2.1.ebuild
new file mode 100644
index 000000000000..13ebde02c0b5
--- /dev/null
+++ b/games-util/ucon64/ucon64-2.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug usb zlib"
+
+RDEPEND="
+	usb? ( virtual/libusb:0 )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-change-mem2-64bit.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-zlib.patch
+)
+
+src_prepare() {
+	default
+
+	sed "/discmage.so/s|.* \"|\"${EPREFIX}/usr/$(get_libdir)/${PN}/|" \
+		-i ucon64_misc.c || die
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable debug)
+		$(use_with usb libusb)
+		$(use_with zlib)
+		--enable-ppdev
+		--with-libcd64
+		--with-libdiscmage
+	)
+	econf "${econfargs[@]}"
+
+	tc-export AR CC LD # for libcd64 with respect-flags.patch
+}
+
+src_install() {
+	dobin ucon64
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libdiscmage/discmage.so
+
+	docinto html
+	dodoc -r ../images ../{changes,developers,faq,hardware,readme}.html
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Be sure to check ~/.ucon64rc for some options after"
+		elog "you've run uCON64 for the first time."
+	fi
+}