gentoo christmass resync : 25.12.2020

3 files changed, 2 insertions, 106 deletions

diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 3c45816281aa..b9503e5d783c 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -2,8 +2,6 @@ AUX libunwind-1.2-coredump-regs.patch 619 BLAKE2B b901d50cb7fa4ab372da26120e512d
 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
 AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac40a5cb05fbda00e5dde5b4ecedfa21442cb5481281b8aac45b118d8b8d503bafe69aa9adb93cac9c7e89cb72f8b44bdb7018a09aa4c9d512e20a457c7d78f SHA512 36b76eefdff3ca832696c13b18d9153ca89d5b648c7df11d3c112a85e9ab92e9f124fdbd05d2d9017bd9c5cdc6bbb2de5038918c9f3a2695c8fa3a05835abdb0
-DIST libunwind-1.4.0.tar.gz 872941 BLAKE2B 39628dd46151d2748372c8f1dfa3cd39114770b85e890b048304f8395b2778a22da4cc468eb6fe1e2357a41bed5a6067e12992634859dabe30addd0fd39b4269 SHA512 60bce1e840f071d3a48cfa8e2acff988977956f659c5c04ce83f00751348fbbeddbfc54e8c9bd6ebc9073423ca5ee1816655dc5aa59fefd0a8edc9c3f7f3b913
 DIST libunwind-1.5.0.tar.gz 878355 BLAKE2B ee35441289926ac22a58bedb9f831d8e13bacd663a99b3ce25eed229f25f0423bbbd90e09e3d62b003518d7a620aa6d15b0dd5b93632736a89fa0667b35d5fc2 SHA512 1df20ca7a8cee2f2e61294fa9b677e88fec52e9d5a329f88d05c2671c69fa462f6c18808c97ca9ff664ef57292537a844f00b18d142b1938c9da701ca95a4bab
-EBUILD libunwind-1.4.0.ebuild 3084 BLAKE2B 2c1791c707e2b2fe38abea2faa0f904a414d49c46c61ddc8ced7603294221cdec275758f230a2696e0378db1ea0c4e26fcf66e1e9a2840e32ba90b4ce291ff9f SHA512 efc6aaa08d84b322fb31485c83881447657a6ad588cc5b29a50ff78e3a4ade8a14d4c99370eb042aa19f7baef716decedd71dc1b6697921a66f53c6b80dc87de
-EBUILD libunwind-1.5.0.ebuild 3234 BLAKE2B 49fd0f035b58211350dad8d60fe706f306fc85a1805384e069ce3f2c6024d86b84c77d59d334defc09b6c90e62b39d8f5df7628288402eb401b326d5dc7ebe56 SHA512 8d9017bd8162a3a06c1fcc3d21a97a63ae6b397a7575c6aed6b812ad2f31ddd108a4048761278cbb60f115edd305c5d38dffbab3bf77ab1d2c5e0caa6ba53b59
+EBUILD libunwind-1.5.0.ebuild 3233 BLAKE2B 3f2cf31fabbc43bb0ec23353ae4bb93baf94df6fb2b0ce526989df3bb5d1ac705d537c1342090fd3d27aec779f661df4f83f64a362a159bb4bc9183f269e8846 SHA512 1ca06a8a5f3332746c4964d0befa05579eba67593555a86b09496badd1e5485bf04640760ea1300699c3655bde91c8cad12ca4a2a08f635459c2819a4e192f7a
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/libunwind-1.4.0.ebuild b/sys-libs/libunwind/libunwind-1.4.0.ebuild
deleted file mode 100644
index f3a6bbb9eff6..000000000000
--- a/sys-libs/libunwind/libunwind-1.4.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2005-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-inherit autotools flag-o-matic libtool multilib-minimal
-
-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/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/8" # 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" # some tests are broken (toolchain version dependent)
-
-# We just use the header from libatomic.
-RDEPEND="lzma? ( app-arch/xz-utils[static-libs?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libunwind.h
-
-	# see libunwind.h for the full list of arch-specific headers
-	/usr/include/libunwind-aarch64.h
-	/usr/include/libunwind-arm.h
-	/usr/include/libunwind-hppa.h
-	/usr/include/libunwind-ia64.h
-	/usr/include/libunwind-mips.h
-	/usr/include/libunwind-ppc32.h
-	/usr/include/libunwind-ppc64.h
-	/usr/include/libunwind-sh.h
-	/usr/include/libunwind-tilegx.h
-	/usr/include/libunwind-x86.h
-	/usr/include/libunwind-x86_64.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092
-	"${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch
-	"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
-	"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch
-)
-
-src_prepare() {
-	default
-	chmod +x src/ia64/mk_cursor_i || die
-	# Since we have tests disabled via RESTRICT, disable building in the subdir
-	# entirely.  This works around some build errors too. #484846
-	sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
-
-	elibtoolize
-	eautoreconf
-
-	# Let's wait for proper fix upstream in https://github.com/libunwind/libunwind/issues/154
-	# Meanwhile workaround for gcc-10 with -fcommon, bug #706560
-	append-cflags -fcommon
-}
-
-multilib_src_configure() {
-	# --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.
-	ECONF_SOURCE="${S}" \
-	ac_cv_header_atomic_ops_h=$(usex libatomic) \
-	econf \
-		--enable-cxx-exceptions \
-		--enable-coredump \
-		--enable-ptrace \
-		--enable-setjmp \
-		$(use_enable debug-frame) \
-		$(use_enable doc documentation) \
-		$(use_enable lzma minidebuginfo) \
-		$(use_enable static-libs static) \
-		$(use_enable debug conservative_checks) \
-		$(use_enable debug)
-}
-
-multilib_src_compile() {
-	# Bug 586208
-	CCACHE_NODIRECT=1 default
-}
-
-multilib_src_test() {
-	# Explicitly allow parallel build of tests.
-	# Sandbox causes some tests to freak out.
-	SANDBOX_ON=0 emake check
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/sys-libs/libunwind/libunwind-1.5.0.ebuild b/sys-libs/libunwind/libunwind-1.5.0.ebuild
index 42ee07e1b350..0426d0b78971 100644
--- a/sys-libs/libunwind/libunwind-1.5.0.ebuild
+++ b/sys-libs/libunwind/libunwind-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/8" # libunwind.so.8
-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 zlib"
 
 RESTRICT="test" # some tests are broken (toolchain version dependent, rely on external binaries)