gentoo resync : 15.12.2019

6 files changed, 9 insertions, 166 deletions

diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index b95d80d258fc..c77d455fe20a 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,5 +1,3 @@
-AUX libunwind-1.1-fix-CVE-2015-3239.patch 523 BLAKE2B e81db6d31d70c6d39fef7ff5106054e5783f11c5e80b8eca443a19e6e285052d782989f6b18c3040ec898068eedf02a06e0a99338d586a5fd1a7f39199a8fc24 SHA512 71f28720486c07cbbc31cf2747096e324cc43dd57c4ec9312da12fd4aa9d5af83e4cbe80071b6192cdf14a2e2afd090c136e57476ac981204a933db67d609c01
-AUX libunwind-1.1-lzma.patch 3004 BLAKE2B 6ce2d7d21a8ddedca1276661c74c432bd8fdc031d1bdb31383f4f85bb0decee2a56ac00d1ed9ce45fb5ce4817c9bb7e34fb382afb0acdb1551496df86798b2b2 SHA512 d15f849d743426fd030de2990d683a5373273ecfc407b081280e7f5fb2e65350496badb7b094911719e5b3f6bdac5ddf2653e556391c58a8559938a11f60250c
 AUX libunwind-1.2-coredump-regs.patch 619 BLAKE2B b901d50cb7fa4ab372da26120e512da0ca506322130583623eebe31548a65f5a53249b632d71409d77a6dc00eb002beddd44f8a5d11dc82bf8450b812770a023 SHA512 48536ef54590221b42a3ca568ec781e526807b3d8aed3e33e19e6efacfa05a428a6101d3a51e79ea5d3e1d783bcba9acb92f7623c121d3e00cd3e1a17d13e282
 AUX libunwind-1.2-ia64-missing.patch 3863 BLAKE2B 384d2afd7d725f0730207b5b32ff4ffcedd852043af83b1884c7dc95116298eff41bd7f997e0ad51c9912b59e36b439eb524d3d4786f2a0a19dff32437e62003 SHA512 e8f65d706839770d993f9801371e1e294a0231c4bfe29b497e4a859567b7f5b6561b0a15d59b1626311e549fe57149046f5a76424a2ad69c521610aaa3019c17
 AUX libunwind-1.2-ia64-ptrace-coredump.patch 1445 BLAKE2B 0b4b6b5d7b3cfc8be58c3973b096ceeb19faa84f175a23f2130588351e40f94abf5c53a4eb5813d8b9da7762f032671031d2d637bd2ec445f7e4f9ea9d276773 SHA512 0bab310ff16294d7617077ffa1261fe9c1a6aaeb4339c96918869c4dd9a2b1b73fbe2ebb5c895f1a420ff7922da85cbb44ccfcd69df6e2518c1f2ff64b7b2d76
@@ -8,10 +6,9 @@ AUX libunwind-1.2.1-arm-__asm__.patch 2350 BLAKE2B de56de0e3bf32cc66d3b9cc85552d
 AUX libunwind-1.2.1-fix_version_macros.patch 381 BLAKE2B 77b523a859a66297eb5677e0eedfc511b6e3cae7058b49da2da41b27d1d22d72b9a662f2b20338eaa5166bd5ae414531695f540098a1dfb674e668ed4c683079 SHA512 4178ed205046dbdf0cea6c7004b866f840e4e3b477a88c3a24f4178e4c642f9d0cfbe7c0f79c6408fad95d8f387f55c912022a78fae382d69e80cd4ff41d8bad
 AUX libunwind-1.2.1-no-PROTECTED.patch 539 BLAKE2B 86a65116d9179b33ea4737583683d1506072cbf162831ba3193c0c3ed74f7091dea226c2f9cf06387574ae1d15cc1db1627137f0f80adc542fb5534cf8f6254c SHA512 fe76aef28096ccfdb5c290da631efe8f7cbef13fddb415227f97cfe974162d757a3439b542bee0fe225950200f3cec5e7eecf60c60b2584e2a922618b73e2a7b
 AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac40a5cb05fbda00e5dde5b4ecedfa21442cb5481281b8aac45b118d8b8d503bafe69aa9adb93cac9c7e89cb72f8b44bdb7018a09aa4c9d512e20a457c7d78f SHA512 36b76eefdff3ca832696c13b18d9153ca89d5b648c7df11d3c112a85e9ab92e9f124fdbd05d2d9017bd9c5cdc6bbb2de5038918c9f3a2695c8fa3a05835abdb0
-DIST libunwind-1.1.tar.gz 1098603 BLAKE2B c1ef0916c45786dcf820bef164f03e27af29f84d3173dc3a2e9fd54486a18d99713df152d810db4eb3e36df4afa7df1b544e6c9271479e2fcbffe473a17c4372 SHA512 bfe04f2bfac9f9e47c37f0b23ed2f264d8d3d3d6f1392fe9d794ee13cad216b3740979e922e4276fb65c1ccdc836fce48812cb5459ecdd2a89a621036a35d7c1
 DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707faf2d32d2b571239252a1d0fb6a273a6a46c4a107db63f74f7b54c0c54cf252b8b79ad53216333ba7bcf63147a1 SHA512 af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
-EBUILD libunwind-1.1-r1.ebuild 2429 BLAKE2B c903745f6d196f2d95254b84a9329600f4b7347574ac67883e3e24414f35919cf95bb4b12f360e331c12bc2647fa591481711618da763573fd3e7dc30581e351 SHA512 2d5b0179022f21794e6b3a115e487b797fec328001451125bbb451a06f28463efc84b8ec70f2827a974d91d767325cf1c073793a5d87de8678259c8e358494c6
+DIST libunwind-1.3.1.tar.gz 801262 BLAKE2B 4dfcd5e170ef0f7626aa966672f3302b4d8f231fcda37c72fbddb9ab913e82b45bb613b22c5ead8bbd5b09fa92bc0db1c32a744b11e40fd736c3a1412ad3d842 SHA512 3110d0aed4f5c781ef1ff72c9337e59793c02c42066209a4ac44f50eff1c0b0e02a5ff9f66891e62016de14af065a47975763970b839b700c0ff2e9f415c8def
 EBUILD libunwind-1.2.1-r1.ebuild 3163 BLAKE2B 1b160324a293b2897a0690daa05637630734b621df5f996b025b5dab9ecd9d420b703b3a827e3985dc3721ff5e4b1bb1aee559d79082755b7d6c6a14b7f177f5 SHA512 4c87ef071250f453f14a4a8279fd07f3b65c7f48c75600ed60be6f3c40762cab10690590b7433ad1abd6eb3a712fc69981382ee1e1b7ed55b28326100c8e8591
-EBUILD libunwind-1.2.1-r2.ebuild 3224 BLAKE2B 0b25a6c74b58e078e1801719167dd7b6bfacce677d184cdf3cacbb871b6e48e463c1eb2d5d009e3fb0b8e4adf4fb8c641744043a1469c1199042bbbb3d073991 SHA512 e1949212aec5f4ff2355748e8cc4128928c656984b4164777f5931bec2271f59fb65c58b9fe2f0f16855df549cbf3f462a2558cbebb488adbbea3747804f2183
-EBUILD libunwind-1.2.1-r3.ebuild 3261 BLAKE2B 5db36c0b03414855f985fbe240522189645a9d6d594626d91e1896542dc8f4e223c544fbb555d6645eb81be9eb46632f62957a031ba2fdf4717ffc03d596e39b SHA512 ce631136be34cca61bad7e6046b6af9bd5f9c82206f858997b642a96455c95bbbdb35fa9b1578995a7dda9cf9e524029f021c557e35f44edc69cbc89a68680c5
+EBUILD libunwind-1.2.1-r3.ebuild 3255 BLAKE2B 0c4656527538db7b3bfd4d281a072225127e315c8539b583f8bf0e8f1fede0143012f246c1c6d75dd709ccdac3e5a704ac196451fb516989d4eb56f7fc9b9bc1 SHA512 ac6bb5d1ba3e1327f5cddff4add1c13398a74ea9121aa7f39cc419cbcf4c2b81085813a887bf5abfef08dabc0eba6fbc642e04dc3122951e691e3c3e7093c3ce
+EBUILD libunwind-1.3.1.ebuild 3111 BLAKE2B 14aa52ed1b3ecca2bd3648aa188894cd364d5d2b285e7ab47813614c06cf7abc6abe556860ee02b9671210cfa1855eaab9d8b70408b5aa92fe056879d123090c SHA512 df955e46ebb8f90d765c5d0a7960d1d6e48997db6ba3393fc41e53776b5d8fc1e3264f593dfe5ba7f5b1e73879eb4df1a542547199952bef072c326c43fa9c02
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch b/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch
deleted file mode 100644
index 153108bbb151..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-taken from Fedora
-
-https://bugs.gentoo.org/585830
-
---- libunwind-1.1/include/dwarf_i.h.CVE20153239
-+++ libunwind-1.1/include/dwarf_i.h
-@@ -20,7 +20,7 @@
- extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
- /* REG is evaluated multiple times; it better be side-effects free!  */
- # define dwarf_to_unw_regnum(reg)					  \
--  (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
-+  (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
- #endif
- 
- #ifdef UNW_LOCAL_ONLY
diff --git a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch b/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
deleted file mode 100644
index 09cefa028539..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 15 Feb 2014 21:00:59 -0500
-Subject: [PATCH] link sublibs against liblzma as needed
-
-The coredump/elf32/elf64/elfxx libs use lzma funcs but don't link against
-it.  This produces sub-shared libs that don't link against lzma and can
-make the linker angry due to underlinking like so:
-
-libtool: link: x86_64-pc-linux-gnu-gcc -O2 -march=amdfam10 -pipe -g \
-	-frecord-gcc-switches -Wimplicit-function-declaration -fexceptions \
-	-Wall -Wsign-compare -Wl,-O1 -Wl,--hash-style=gnu \
-	-o .libs/test-coredump-unwind test-coredump-unwind.o  \
-	../src/.libs/libunwind-coredump.so ../src/.libs/libunwind-x86_64.so
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_footer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_buffer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_end'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_uncompressed_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_buffer_decode'
-collect2: error: ld returned 1 exit status
-
-So add LIBLZMA to the right LIBADD for each of these libraries.
-
-URL: https://bugs.gentoo.org/444050
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -169,7 +169,7 @@ libunwind_arm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libunwind_arm_la_LDFLAGS) $(LDFLAGS) -o $@
- @ARCH_ARM_TRUE@am_libunwind_arm_la_rpath = -rpath $(libdir)
--libunwind_coredump_la_LIBADD =
-+libunwind_coredump_la_LIBADD = $(LIBLZMA)
- am__libunwind_coredump_la_SOURCES_DIST = coredump/_UCD_accessors.c \
- 	coredump/_UCD_create.c coredump/_UCD_destroy.c \
- 	coredump/_UCD_access_mem.c coredump/_UCD_elf_map_image.c \
-@@ -214,15 +214,15 @@ am_libunwind_dwarf_local_la_OBJECTS = dwarf/Lexpr.lo dwarf/Lfde.lo \
- libunwind_dwarf_local_la_OBJECTS =  \
- 	$(am_libunwind_dwarf_local_la_OBJECTS)
- @REMOTE_ONLY_FALSE@@USE_DWARF_TRUE@am_libunwind_dwarf_local_la_rpath =
--libunwind_elf32_la_LIBADD =
-+libunwind_elf32_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf32_la_OBJECTS = elf32.lo
- libunwind_elf32_la_OBJECTS = $(am_libunwind_elf32_la_OBJECTS)
- @USE_ELF32_TRUE@am_libunwind_elf32_la_rpath =
--libunwind_elf64_la_LIBADD =
-+libunwind_elf64_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf64_la_OBJECTS = elf64.lo
- libunwind_elf64_la_OBJECTS = $(am_libunwind_elf64_la_OBJECTS)
- @USE_ELF64_TRUE@am_libunwind_elf64_la_rpath =
--libunwind_elfxx_la_LIBADD =
-+libunwind_elfxx_la_LIBADD = $(LIBLZMA)
- am_libunwind_elfxx_la_OBJECTS = elfxx.lo
- libunwind_elfxx_la_OBJECTS = $(am_libunwind_elfxx_la_OBJECTS)
- @USE_ELFXX_TRUE@am_libunwind_elfxx_la_rpath =
--- 
-1.8.5.5
-
diff --git a/sys-libs/libunwind/libunwind-1.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.1-r1.ebuild
deleted file mode 100644
index d6226861dbdd..000000000000
--- a/sys-libs/libunwind/libunwind-1.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils libtool
-
-DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
-HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
-SRC_URI="mirror://nongnu/libunwind/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="7"
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug debug-frame libatomic lzma +static-libs"
-
-RESTRICT="test" #461958 -- re-enable tests with >1.1 again for retesting, this is here for #461394
-
-# We just use the header from libatomic.
-RDEPEND="lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
-	libatomic? ( dev-libs/libatomic_ops )"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-QA_DT_NEEDED_x86_fbsd="usr/lib/libunwind.so.7.0.0"
-
-src_prepare() {
-	# These tests like to fail.  bleh.
-	echo 'int main(){return 0;}' > tests/Gtest-dyn1.c
-	echo 'int main(){return 0;}' > tests/Ltest-dyn1.c
-
-	# Since we have tests disabled via RESTRICT, disable building in the subdir
-	# entirely.  This worksaround some build errors too. #484846
-	sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
-
-	sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure{.ac,} || die #444050
-	epatch "${FILESDIR}"/${P}-lzma.patch #444050
-	epatch "${FILESDIR}"/${P}-fix-CVE-2015-3239.patch #585830
-	elibtoolize
-}
-
-src_configure() {
-	# https://savannah.nongnu.org/bugs/index.php?34324
-	# --enable-cxx-exceptions: always enable it, headers provide the interface
-	# and on some archs it is disabled by default causing a mismatch between the
-	# API and the ABI, bug #418253
-	# conservative-checks: validate memory addresses before use; as of 1.0.1,
-	# only x86_64 supports this, yet may be useful for debugging, couple it with
-	# debug useflag.
-	ac_cv_header_atomic_ops_h=$(usex libatomic) \
-	econf \
-		--enable-cxx-exceptions \
-		$(use_enable debug-frame) \
-		$(use_enable lzma minidebuginfo) \
-		$(use_enable static-libs static) \
-		$(use_enable debug conservative_checks) \
-		$(use_enable debug)
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests.
-	# Sandbox causes some tests to freak out.
-	SANDBOX_ON=0 emake check
-}
-
-src_install() {
-	default
-	# libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without
-	# shared library, so we keep it in any case
-	use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete
-}
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
index 800ad13d87d9..d9557f28c39f 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # half of tests are broken (toolchain version dependent)
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild b/sys-libs/libunwind/libunwind-1.3.1.ebuild
index a64db840b93d..e91ad4925c30 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild
+++ b/sys-libs/libunwind/libunwind-1.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -12,16 +12,16 @@ HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
 SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="7"
+SLOT="7/8" # it should be a "0/8" where '8' is libunwind.so.8
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # half of tests are broken (toolchain version dependent)
 
 # We just use the header from libatomic.
-RDEPEND="lzma? ( app-arch/xz-utils )"
+RDEPEND="lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	libatomic? ( dev-libs/libatomic_ops )"
+	libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -44,13 +44,9 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092
-	"${FILESDIR}"/${PN}-1.2-ia64-undwarf.patch
 	"${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch
 	"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
-	"${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch
 	"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch
-	"${FILESDIR}"/${PN}-1.2.1-no-PROTECTED.patch #659732
-	"${FILESDIR}"/${PN}-1.2.1-arm-__asm__.patch #635674
 )
 
 src_prepare() {