gentoo auto-resync : 10:07:2022 - 13:27:24

8 files changed, 34 insertions, 24 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 668a171d4a21..88c7c80f4b17 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 3c12c15af8ae..2941f13284cc 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,4 +1,5 @@
+AUX unace-2.5-includes.patch 269 BLAKE2B e4a0d3d03c392b3ff7af055d0a2ee8fe182cd5bde54e2868606bd78cc5a0a801b79f795e0cbfbf0d771b7e9dec5679daec3681b83563b94ec5081ea9523a129e SHA512 7986366dde0c1459b184fd81ffcd89b0a6469198c28dbcbe391f38596022c94a45103a8a573e3434b59d17e9d361bc0d70f047778361fa74ea15299ec31975b5
 DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb16e4c501510f88c4b20e214026d1a39f93e3a1e37129d8b54b61f90aa04ca56d9bb1bb186ea3d394772ef48660d6926312ea3 SHA512 bb704cc1881601b3319b6052bce71f1c98d638b6822f32b9595c9b5434898187d747220c7167cc4acb2bbdbe8bde8618856fdcd277a69026a4bef41950cbb46b
 DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
-EBUILD unace-2.5-r5.ebuild 677 BLAKE2B d6e46d2e819fa3d5a13c708cbceadd3def0bb3ded130420767e6411e5cd3853fc847191f35a9f0ea198d1a3e6a5dd56a8d80128223a63bbc2bc51f3384cbcdda SHA512 33572c57f7b86998e043fff8b73449d08ca340e28e47766c701672285d08827d8ae77e473d8733903a4acb71732db7904990eeb999baa6301a656df02b3b95dc
+EBUILD unace-2.5-r6.ebuild 706 BLAKE2B 3f5fb8dbab50636437adb19dd9bb8611a8faf7d316efce5a3edfe7d86027533f05356b68f41aa12330c1a9cb23e9eaa3655c6b095e5a47379f1d221534944994 SHA512 aa049a1e2670927c8418a5d91878f256c57a0101c51938f32f333827f3a7948942284b1f563bcdd3bc7d5dc3e781cccb62a43088d280690fca0dce6ca7f2898a
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/app-arch/unace/files/unace-2.5-includes.patch b/app-arch/unace/files/unace-2.5-includes.patch
new file mode 100644
index 000000000000..ca272a185041
--- /dev/null
+++ b/app-arch/unace/files/unace-2.5-includes.patch
@@ -0,0 +1,10 @@
+--- a/source/base/all/uninorm/unincore.c
++++ b/source/base/all/uninorm/unincore.c
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include "base/all/includes.h" /* BASE_LFN_MAXLEN */
+ #include "unidata.h"
++#include "unincore.h"
+ 
+ /* Hangul constants */
+ #define SBase  0xAC00
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r6.ebuild
index fd5a75cbe2f2..f8dbaf5919a5 100644
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r6.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit toolchain-funcs
 
 DEB_VER="9"
+
 DESCRIPTION="ACE unarchiver"
 HOMEPAGE="http://www.winace.com/"
-SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
 	mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}-${DEB_VER}.debian.tar.xz"
 
 LICENSE="freedist"
 SLOT="1"
 KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE=""
 
-PATCHES=( "${WORKDIR}"/debian/patches/ )
+PATCHES=(
+	"${WORKDIR}"/debian/patches/
+	"${FILESDIR}"/${P}-includes.patch
+)
 
 src_configure() {
 	tc-export CC
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index e81fc6a832d5..8599385dacff 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -1,4 +1,4 @@
 AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
-EBUILD unadf-0.7.12-r1.ebuild 712 BLAKE2B d3b7c30a3646c35f0c231f0ebb28a4e2ed615a61f061e250217569421c0f3384aff24d5f7103525fcec6d08aff2f380490a38e3851f1978eb36e9616d973b1f8 SHA512 5f7f95bc553a624af88bb31bb87fda728ac3a1a9042d76e4fdccceee2fd7c665d83b29ace890e581555760a0fc8ad5840dbb1338a4622fba21303cb88d20521f
+EBUILD unadf-0.7.12-r2.ebuild 630 BLAKE2B e4e3eb425272a0d5eb33643c29262b4fc270d7f8b1fc38b258254ad64b6621c092cfbd6490a64f4670a3e77032a4393694a613f0a67ca25f412e2353aa30cf4c SHA512 7c905dde35cde5cda520aa3afafaa4ed5dc3a77873d5d608a22d9c6d04953ec88d1810c267caf211a9ee385e6b09b050f08690d1731a0dc04220dd200565134c
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/app-arch/unadf/unadf-0.7.12-r1.ebuild b/app-arch/unadf/unadf-0.7.12-r2.ebuild
index fb1aed5c2ad7..2c73f6a4a614 100644
--- a/app-arch/unadf/unadf-0.7.12-r1.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -10,13 +10,12 @@ MY_PN="adflib"
 DESCRIPTION="Extract files from Amiga adf disk images"
 HOMEPAGE="http://lclevy.free.fr/adflib/"
 SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
 PATCHES=( "${FILESDIR}"/${PN}-0.7.12-CVE-2016-1243_CVE-2016-1244.patch )
 
 src_prepare() {
@@ -24,11 +23,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index 02bbc65cd739..be58d243f0be 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,3 +1,3 @@
 DIST zpaq715.zip 1000646 BLAKE2B 3ecc69af7c14ca43643d54feac54647c82ac25e0212fc7f6e60821b76ba1976a2b2ccbf07e030ab6518c8643b452309d622cbea602fc4fe8798af7e4ecb2b027 SHA512 4cddcc04dff5e9dceb7138cf9e82b718b696048368ff494339f877d93e4423ed7959c0cfb2e30ba7dcbcdd6bbd59fa1021ceaca6d51e3180d8034b7a3997c265
-EBUILD zpaq-7.15.ebuild 1031 BLAKE2B 62d4893a1d53bda01e99877d8fe92442ecc0476f422d9bf799c05717c16bf8dc0f42e5635075a236e966014369dc6aa321e188292e4061725b1ced99652d555a SHA512 bc1e2f1e7da4e74bb91cbf700b4e81aadf4c9534f28c034176bd0c4904decf0489d62ba0969b5f1d964d1a8432632d1eb5c8989d5d44095f70a3919cc308dad3
+EBUILD zpaq-7.15-r1.ebuild 1032 BLAKE2B 57dd4e8f9b18daa44a7ab8c473e1bc84230a9824c733ca0e4f92cd83d9069b967ff4f449d882f7d8a1b53101b8e3d6dd399d00928e6b1c78b761290da2872c98 SHA512 04bcc6901531a9d6fa5781378a60800d8ff5b7608106e0a1991a2e222958abd5c1710f202a494c722dd1ace6eb3cf4460435e00f4c8a119b3da456071acfa815
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/zpaq/zpaq-7.15.ebuild b/app-arch/zpaq/zpaq-7.15-r1.ebuild
index aabf4cdca479..cd79e48be432 100644
--- a/app-arch/zpaq/zpaq-7.15.ebuild
+++ b/app-arch/zpaq/zpaq-7.15-r1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit flag-o-matic pax-utils toolchain-funcs
 
-MY_P=${PN}${PV/./}
+MY_P="${PN}${PV/./}"
+
 DESCRIPTION="Journaling incremental deduplicating archiving compressor"
 HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
 SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
+S="${WORKDIR}"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -16,12 +18,10 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +jit"
 
 # perl for pod2man
-DEPEND="
+BDEPEND="
 	app-arch/unzip
 	dev-lang/perl"
 
-S=${WORKDIR}
-
 src_compile() {
 	use debug || append-cppflags -DNDEBUG
 	use jit || append-cppflags -DNOJIT
@@ -34,8 +34,8 @@ src_test() {
 }
 
 src_install() {
-	emake install PREFIX="${ED%/}"/usr
-	use jit && pax-mark m "${ED%/}"/usr/bin/zpaq
+	emake install PREFIX="${ED}"/usr
+	use jit && pax-mark m "${ED}"/usr/bin/zpaq
 	einstalldocs
 }