gentoo resync : 28.04.2021

4 files changed, 30 insertions, 26 deletions

diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
index c33e021261c1..caffa529fe65 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -1,5 +1,5 @@
-AUX ucon64-2.0.0-ovflfix.patch 681 BLAKE2B 7244c12a6e2cae4fe5bc2e8dd0325aa04098b638eaf11b7040dbcad342080a522241f7b3d76b522eb632fef7d0a3bc6d020d1d0669e177b779a9c32e494e3189 SHA512 050ad442ce4e2dfa45ef2cbe3245e623d965e922528a4c64c2652de07934d255d0581ceb536f0883c8f3291a30f9f1807d4078a14f9b29178495dab75a277402
-AUX ucon64-2.0.0-zlib.patch 1274 BLAKE2B 8e53d1c559f75a6b0a4e40a510ed4eccd6ff7d1b5b3ae8f81061503ea7aadc1ec36d35fc670f1afed6e85fb5daf601d49650f1e2e2de5e2942a8f359e7dc2f89 SHA512 708034434a809f65c7cc05fcbae474a8dd5d473ae11458a4bb8510fd553da50691911c1e9fc8ee8457989192ad2b350ab6667214946d5d1f89bd64af8df7272f
+AUX ucon64-2.0.0-ovflfix.patch 609 BLAKE2B 0a79d69ea392eb4015e399e045e3f929ed52b2df96e1dae76b1ada01820c9e71375ec9fa81ddf60a582350a9547461900c78a04bf7d45b7884a3cda0585638fd SHA512 cacf5d0831f647e627601327d2c37aabf78d4a21444132c45f5be00d26be7f3d8b8f5b085e2f2b3cdf41e817bf1252df8a122a608f528b61ee0a5b3c5283d315
+AUX ucon64-2.0.0-zlib.patch 986 BLAKE2B 227b7c17972bc69e5a725d10ba022df11fd1248593fb79759c8d75979b1d58c5c7eaede26bcddd09de27e6ed6c9ff1166babd1e92a95a30936ef11635f0f43a8 SHA512 9274372fe5214b4ac76e1d44252a5abe1e0d61ef25bda4240d7f9d74b292fe01c8d363a1d70c82b1145e3ddb29eb6b05ae61b2861e6044e4b72cd3708a5b9196
 DIST ucon64-2.0.0-src.tar.gz 1188488 BLAKE2B 846ea6142eb50abc8165c9abb3cc05245f891b78d786798758e393032cc59c1f3cccc0fe0e70e256e308f709870bc1cc2754df30a8fababea30eda84fd1b2b64 SHA512 d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
-EBUILD ucon64-2.0.0.ebuild 1428 BLAKE2B 4a7df9af94c6b1802f77d7ea947447ddc08eb17a134992a36c60cd516fd9dc5e5b727f22c09092305a8049442795a9dcb9793b7fb806148c4f384daa83f9f03b SHA512 7ade0622278b5fab6b6fd6a7319ac6d29329c376c55efbc902c151c11720793e352359d5c78029681e5ae4fa063921935f3a39d6cda3181ea36162a46646bc83
+EBUILD ucon64-2.0.0.ebuild 1450 BLAKE2B 2941c723d27d5bbdb5e390197f3c0d32660c0ef201b38cd2a6cb5b3abf6dd46d0cc5cdd5952ecc6f22f501118e4eeeea444181f2112a0419129d5b3c983f5978 SHA512 f323f68a591e6b2c39079b96c30402e9fc9e4226b53112da0dcaeb3852b3794eccbcd2815c005a148b310d1ed4f3cfef5f81b8b7ad959d6c567d980c3727a87c
 MISC metadata.xml 329 BLAKE2B 7e77481b48419ef3da77a1b758a5e49c3f6686bdec3c14f81fe4f5051aec4b63433b970b6bb8ea5fc3ca4f98893a372cf3fb32c0e8bc3098379729cfd6672995 SHA512 eeaeb79bd3f8931262b87f4956705aea7408f5afd8879e6b8c5d5436a851be22a2e9a9e22ccd5250ea270db0c2876633fbf3d160df47cff9be490e203619ed7f
diff --git a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
index 0a1668f2d09f..22bb9a9795fb 100644
--- a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
+++ b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
@@ -1,5 +1,5 @@
---- backup/lynxit.c.old	2010-11-04 09:07:18.000000000 +0100
-+++ backup/lynxit.c	2010-11-04 09:08:17.000000000 +0100
+--- a/backup/lynxit.c
++++ b/backup/lynxit.c
 @@ -561,7 +561,7 @@
        return FALSE;
      }
diff --git a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
index 7a122713d232..d7d3b21c833e 100644
--- a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
+++ b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
@@ -1,5 +1,5 @@
---- misc/unzip.h.old	2011-09-23 19:53:09.708884325 +0200
-+++ misc/unzip.h	2011-09-23 19:54:00.012878355 +0200
+--- a/misc/unzip.h
++++ b/misc/unzip.h
 @@ -49,6 +49,10 @@
  #include "zlib.h"
  #endif
@@ -11,8 +11,8 @@
  #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
  /* like the STRICT of WIN32, we define a pointer that cannot be converted
      from (void*) without cast */
---- libdiscmage/unzip.h.old	2011-09-23 19:59:47.319837133 +0200
-+++ libdiscmage/unzip.h	2011-09-23 20:00:07.230834769 +0200
+--- a/libdiscmage/unzip.h
++++ b/libdiscmage/unzip.h
 @@ -48,6 +48,9 @@
  #ifndef _ZLIB_H
  #include "zlib.h"
@@ -23,8 +23,8 @@
  
  #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
  /* like the STRICT of WIN32, we define a pointer that cannot be converted
---- libdiscmage/misc_z.c.old	2012-03-19 08:39:41.975022496 +0100
-+++ libdiscmage/misc_z.c	2012-03-19 08:40:13.109803301 +0100
+--- a/libdiscmage/misc_z.c
++++ b/libdiscmage/misc_z.c
 @@ -27,6 +27,7 @@
  #include <string.h>
  #include <errno.h>
@@ -33,8 +33,8 @@
  #include <zlib.h>
  #include "misc_z.h"
  #include "misc.h"
---- misc/archive.c.old	2012-03-19 08:41:06.478999810 +0100
-+++ misc/archive.c	2012-03-19 08:41:24.134741668 +0100
+--- a/misc/archive.c
++++ b/misc/archive.c
 @@ -27,6 +27,7 @@
  #include <string.h>
  #include <errno.h>
diff --git a/games-util/ucon64/ucon64-2.0.0.ebuild b/games-util/ucon64/ucon64-2.0.0.ebuild
index 694c0f57261b..64f8177f6f34 100644
--- a/games-util/ucon64/ucon64-2.0.0.ebuild
+++ b/games-util/ucon64/ucon64-2.0.0.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 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="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/${P}-src/src
+PATCHES=(
+	"${FILESDIR}"/${P}-ovflfix.patch
+	"${FILESDIR}"/${P}-zlib.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ovflfix.patch \
-		"${FILESDIR}"/${P}-zlib.patch
+	default
+
 	sed -i \
 		-e "/^CFLAGS/s/-O3/${CFLAGS}/" \
 		-e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \
@@ -30,7 +29,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	if [[ ! -e /usr/include/sys/io.h ]] ; then
+	if [[ ! -e "${ESYSROOT}"/usr/include/sys/io.h ]] ; then
 		ewarn "Disabling support for parallel port"
 		myconf="${myconf} --disable-parallel"
 	fi
@@ -41,8 +40,13 @@ src_configure() {
 src_install() {
 	dobin ucon64
 	dolib.so libdiscmage/discmage.so
-	cd ..
-	dohtml -x src -r -A png,jpg *
+
+	cd .. || die
+
+	docinto html
+	dodoc *.html
+	docinto html/images
+	dodoc images/*
 }
 
 pkg_postinst() {