gentoo resync : 12.03.2021

5 files changed, 26 insertions, 78 deletions

diff --git a/dev-libs/udis86/Manifest b/dev-libs/udis86/Manifest
index b08b245244ff..7ede4c2016c6 100644
--- a/dev-libs/udis86/Manifest
+++ b/dev-libs/udis86/Manifest
@@ -1,8 +1,6 @@
-AUX udis86-1.7-yasm.patch 907 BLAKE2B e27f90003cc54d926b1bd39a274e7d030d6701a8833e90cc26b2f7196dbd458bf818198191227ffa97c6521be5bdca87d9c364da5add8f32ed9905252674acb9 SHA512 23bc5c973b43654083f6a70b79c3c32cfa96c2e8c85905fca9c88b11f3993d4999b2114399b289fff90a31b2c25b375a56a8e8464c6fddb6591c0f6d421bb557
 AUX udis86-1.7.2-docdir.patch 644 BLAKE2B 7929a12d9dcc43035b3ed0ec6da5dc54e7a51c19b50e4405eaac83ca351a7b9c367fa1754b1adde419ad04c19f90f8e83272b2b34e7a01974ab84a01a1f2a1f1 SHA512 4b552f30ad2c2a33ea5f3b51f01a287d0e19571368187ee5c7ab625e39a46ebdb9aaa3aa8aecb89cfc3481309a511bd37d29260377fd153bd7b427ee4adcf3da
 AUX udis86-1.7.2-python3.patch 1543 BLAKE2B c2bcd32c934e2a3ae5232ab6cf2516ae0598a3f8dfc02dcbdbcd2d217728ed5a707c8f328eb9047199f293e4b7aa66898c6e288a91c2bd5b538217c3df691424 SHA512 8075f31c778b962952e8feabafe76b984d037ee482c3cce633cf46ad15baff42d15af0061fab3dcadbae3e3b4f19bda07f7cbc3d7a9482b5b48c46fcea70023b
+AUX udis86-1.7.2-uninitialized-variable.patch 590 BLAKE2B afba36f587b9ac4e09d79aab081092dbae8640c8ad2e533019d22bb69b4fb38d36a5d43c390cb2201c3081ecc63037b099fd61e38fb307c4dcb632a67567d8ef SHA512 7c55fd11b296dfeee4bd13e1dbcc7880eec3d0653408ad2e71c71feb3b9b7546d7c814d27e53663b7e94a284aeff0563e8fb577794eaa629f24cbc63ce7d54d6
 DIST udis86-1.7.2.tar.gz 445085 BLAKE2B 0e67a1ae28688a5febdb4502714a6d99b1fda9028470bac1ecf9314d33c2f081726e3706e9616f352fbf1561283429cb96b92ea4a88e454ec21eadc84bb336d8 SHA512 8cb35d70ac020cd74ced22252aa735a266e5db98d89df565a560baa4ace0cd730e9db838241b70c3b93c27d6b2c75a88edf9c357c864d0f0104323925371c96f
-DIST udis86-1.7.tar.gz 696651 BLAKE2B 5d0a97e06b6bc7b263b6f080e12f832d4bfc9a4791a495e49cd2f4ee6d37d13e593891e02fe9ee3c3fb5e7ec23bf25ae7aa1dccd1f95b5c003f6a6e45bbb7f8d SHA512 df0f802d4c0cf6b39b5b996cfd721cb7d0bdd1b0e2f2f7bcb7165514541b94d795c653e885d9f928d9a27f19464ed6fa948f4315fc1f3887079201fcbb2a241e
-EBUILD udis86-1.7-r2.ebuild 727 BLAKE2B 9435654d37e1dba515e815fcdfb6f07bea96b9743dbd22e9a11400924f89a1fbbba30203216184fed53abe71501326e11708a01bd19dc4517e1b30a545f36788 SHA512 1901dd09fae0f12e1c4a41b905460704794708803f1c68e04203f0612a63d1a8057991fdbbcf24bb0e1757f3c2814f4793ea698bf45265dad3806e05fda96e15
-EBUILD udis86-1.7.2-r1.ebuild 941 BLAKE2B 56852542a9ecfc48292f2edc6d836ee4d1370c4449122568fadf163987f4bdf6af2bca16caf4012cc8b5435d142a49969d3198b765d8f02fd95cc2d3476968ee SHA512 34e3fff101b531ec42ca16407336a0d107c1a5fc1c9cc3c3ddc9a0def2c23b7b3f1a10eb494e8db6ff4ebf54b12d71d75c6fbaf8c0aa90c7a0e538cb10366576
+EBUILD udis86-1.7.2-r1.ebuild 988 BLAKE2B 2480bdcb194c78b89e0f94028606fce72b80fb0679a53d438f8d63c6cb8ebd61f31f66c1d99112557f1a92785a1713c552ddb45c8c24675054edeeac3e2e5f1e SHA512 eb8890fe4fdaac6b1908ff2aafe95ce45b149a090bb71d9c7bbecc119924f60447de08c9e5e1710f3c9f06a0dde3e84bed65beb65b43945f98fed37da920f80d
 MISC metadata.xml 342 BLAKE2B 5f721c4727a6ee72b711b6df53a260dd420e4389f02091326483aa69995817965b8375097d3abd519b6c25e5cbceecff3de7efdc23178a2d98ee5d64522522e7 SHA512 042c3b3a181b435308c2c6cb6fb411cf5c00fb0403736a7fdd4048553c5d3ce7b2130421dd785511ec97b2c0e55f0e6e3cc603273ae5f87d19a61f9da0914a66
diff --git a/dev-libs/udis86/files/udis86-1.7-yasm.patch b/dev-libs/udis86/files/udis86-1.7-yasm.patch
deleted file mode 100644
index 3d3eecdf8283..000000000000
--- a/dev-libs/udis86/files/udis86-1.7-yasm.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,6 +25,9 @@
- AC_DISABLE_SHARED
- AC_PROG_LIBTOOL
- 
-+AC_PATH_PROG([YASM], yasm,)
-+AC_SUBST(YASM)
-+
- # If this is a gnu compiler, pass -Wall
- if test "$ac_cv_c_compiler_gnu" = "yes"; then
- 	CFLAGS="$CFLAGS -Wall"
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -10,7 +10,7 @@
- ovrrun_LDADD   = ../libudis86/libudis86.la
- ovrrun_CFLAGS  = -I$(top_srcdir)/libudis86 -I$(top_srcdir)
- 
--YASM = yasm
-+YASM = @YASM@
- 
- dist_check_DATA = test16.asm test32.asm test64.asm testjmp.asm testobscure.asm \
- 		 testjmp.ref testobscure.ref randtest.raw randtest16.ref      \
-@@ -18,7 +18,10 @@
- 
- check-local: tests
- 
--tests: test16 test32 test64 testjmp bufovrrun randraw
-+yasm_tests: test16 test32 test64 testjmp
-+no_yasm_tests: bufovrrun randraw
-+
-+tests: $(if $(YASM), yasm_tests) no_yasm_tests
- 
- test16: gen 
- 	$(YASM) -f bin -o test16.bin $(top_srcdir)/tests/test16.asm
diff --git a/dev-libs/udis86/files/udis86-1.7.2-uninitialized-variable.patch b/dev-libs/udis86/files/udis86-1.7.2-uninitialized-variable.patch
new file mode 100644
index 000000000000..3778e535caa5
--- /dev/null
+++ b/dev-libs/udis86/files/udis86-1.7.2-uninitialized-variable.patch
@@ -0,0 +1,22 @@
+From cce390dd61996e569bd8a3bca78e7aa4b286d6df Mon Sep 17 00:00:00 2001
+From: Vivek Thampi <vivek.mt@gmail.com>
+Date: Sun, 22 Sep 2013 12:13:05 -0700
+Subject: [PATCH] Minor fix for an uninitialized var
+
+---
+ libudis86/decode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libudis86/decode.c b/libudis86/decode.c
+index 3dab9ad..55638bd 100644
+--- a/libudis86/decode.c
++++ b/libudis86/decode.c
+@@ -228,7 +228,7 @@ static int
+ decode_prefixes(struct ud *u)
+ {
+   int done = 0;
+-  uint8_t curr, last = 0;
++  uint8_t curr = 0, last = 0;
+   UD_RETURN_ON_ERROR(u);
+ 
+   do {
diff --git a/dev-libs/udis86/udis86-1.7-r2.ebuild b/dev-libs/udis86/udis86-1.7-r2.ebuild
deleted file mode 100644
index 130c1b7981a6..000000000000
--- a/dev-libs/udis86/udis86-1.7-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib eutils
-
-DESCRIPTION="Disassembler library for the x86/-64 architecture sets"
-HOMEPAGE="http://udis86.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-		x86-fbsd? ( dev-lang/yasm )
-	)"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-yasm.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--enable-shared
-		--with-pic
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/dev-libs/udis86/udis86-1.7.2-r1.ebuild b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
index f7f19738e446..72bba553ae98 100644
--- a/dev-libs/udis86/udis86-1.7.2-r1.ebuild
+++ b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -27,6 +27,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
 	"${FILESDIR}"/${P}-python3.patch
+	"${FILESDIR}"/${P}-uninitialized-variable.patch
 )
 
 src_prepare() {