6 files changed, 168 insertions, 125 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 8dd0b81472ba..3633c38fb6d4 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index f2df44650900..b96fd149c39d 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -12,6 +12,7 @@ DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc505
 DIST binutils-2.39-patches-6.tar.xz 92380 BLAKE2B 39f490f1134fb0e7dc80924a280d3113efe0ed094ee15de97c42ab751c83d2f5aa7448966d8cbbcde722b2af4999a36c1e5aa2f37ca6d2e3942b97b6d90ff152 SHA512 213cd7a86da83987966675f3195e843d898ca4ff412dfc29fd33ed80adb7bbf80a0b2919cd8e7dd49208c73a621ab7b720970f2259418bdc82ed2a568ff62064
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 DIST binutils-2.40-patches-5.tar.xz 293628 BLAKE2B b7ed1d1fbf38b420661f984b9519b3d863da45b2a873773a521310021b0c1d5d7c24c152adb3e8a999d40f5619c0e54962114590ec9528380089977af0c30b74 SHA512 6e6df932b18ca20fe245b3ff8d3d06dbdae4daadaec3b668fa44e086d4e8ff56439681b2d810ebc74173b6348020edacb176e8c3cbf20657cce04297b97f4f83
+DIST binutils-2.40-patches-6.tar.xz 299212 BLAKE2B 3a68a924e9747fdd0486327a5bd2490cb72376f2cb6c6a60030d8c6b71357150d956a1e71d91683d43b571cb5bf738270880f72ef175d6c8faa257b090abeb8b SHA512 984dab529276ab4f9d215f643c7c18bd1793f438aaad0be158d209787c9c4a6bb68b10bec2065d3fe14a1594d5f1c29f55b2e9bac34a6f489f4b466c02e24766
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
 EBUILD binutils-libs-2.34-r2.ebuild 3633 BLAKE2B 4bb2862dc364c5f64597d2fb22f867028ee85c4d8a14ab85e28c2f5dab43cdb2a690e91b43d1a7994081df9c21be6c9850b808f01d71e18b97c1439ad1890fcb SHA512 84a368c4c1ba2a3f4e1b3043f531deab5457b0169d83b38bada72b857e9a86a7ca86cb317a062216ee7d2b87e39c6648e8bbd62e676507c638ea6fcfc9efda28
 EBUILD binutils-libs-2.35.2.ebuild 4055 BLAKE2B 5a2eed3c0e4a9f23742fe73258504faa0c52a975f9a53b9eaade40bd7f2af66d8524b4b08c02bf88770be79fa2163045b0721d5036860fc7b6c24e865e7da59e SHA512 da95193b41c9776c8f352c1008c3f7e64713ccf3f474f603cb390437e8ccdf0c6a32f5093281294d62441d671b7148a9955c235a8474810c8c8b029eb97d1765
@@ -20,4 +21,5 @@ EBUILD binutils-libs-2.37_p1-r2.ebuild 4081 BLAKE2B 665bb72f6494c2ca300487b61d04
 EBUILD binutils-libs-2.38-r2.ebuild 4758 BLAKE2B 9de4470b987db46dd9647023f5750c2f51c826e4cc215f6f12b6721a42717cfbfb1459043cd4dd92507dc9cc8e7c589d20e0435f6d41413a354c2de015af0fc0 SHA512 eae783c74866707e7dd2500fb4255d29503ebcd0ddfef0371288ace77f465e112423d3ed687db53ddc684a980f74708fb043bca9fabea4cc2e0156e638431504
 EBUILD binutils-libs-2.39-r5.ebuild 4766 BLAKE2B ee4275f3555984c95e8063a6858e761bb19485c51f7f5f88dbdb36dcd4f0491f9ea3044d8b3a9aca79a079ab9c8374a2fd1ae64a706738720b740aa497b03995 SHA512 a595fc95ec0dc535d09f864ebda797085d3f3c81acca7671c9aafc9edc19b329bbcb7112df17f9a66a34fda98803ff989144b7f24091d0cb293859855ffdca08
 EBUILD binutils-libs-2.40-r5.ebuild 5007 BLAKE2B 3170efa253aa7e9ba4351593b344e3e9dc317fc70ed8f1c034bfe7142870e6a8866c9a75c4e494a5c0f00eb6c7debdb8448cb8f78d646642524684d26d372c49 SHA512 1d57e7404b41d31d6f7b4c4e9a7aedbf229b3e811bd34f46cbc953308d3f125a5563e7b59c392615737b3890b4b7568433d748b365399936b5e6476575704d53
+EBUILD binutils-libs-2.40-r7.ebuild 5012 BLAKE2B e158d44b4c9cfda0942e138dcd0a003dae67f8d00f81c99fc24de4f94380316c67692417357daf6547140fea2beca8d8fc09d3df622d357a6693844157fbeca5 SHA512 e952d4cc9ab96d1f143a2a9ecbdb7d52829f57f56cc755559132df1d796763342f10797c4562037ddc11ef240a1a3cd51ba05ca0c077ab6ada7ea3b122013445
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild b/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild
new file mode 100644
index 000000000000..45c549b9f007
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=6
+PATCH_DEV=dilfridge
+
+inherit libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV%_p?}"
+IUSE="64-bit-bfd cet multitarget nls static-libs test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? ( dev-util/dejagnu )
+"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P%_p?}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	export MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Revisit if it's useful, we do have binutils[zstd] though
+		--without-zstd
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	# Provided by sys-devel/gdb instead
+	rm "${ED}"/usr/share/info/sframe-spec.info || die
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 303ccaf4771a..da96efdbf84b 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,11 +1,8 @@
 DIST libunwind-1.6.2-docs.tar.xz 25372 BLAKE2B d16562b29c49070f0cd6ad9211c7c3283b527bd88677d9ce50b15f27254bac504ea79b807e01f4f2bdb05649ff8980f94346ef9737bf5b5bd7c313e547222f10 SHA512 71bcb781cc37ccbef7b349225b1b3b4cd6ba4ce5a48d8478cea17f8245614b672d8e14b5a088e2d998ea717670a371925d4fbe407dde636611f7c2f2901065d8
 DIST libunwind-1.6.2-loong.patch.xz 122756 BLAKE2B 1d369d18e71c4b9faa79a31a917a0f42a7bb394acd3bf8dc9ef181f2ca55bee04bef070c57ea04853b756efd561cb60409770b1f6fa9095d0e14565eb0bfc621 SHA512 46c8a6022dbf099965cf121d91691aae0a38fb31901730f47f712a7078b323e04f278e6751a7d169ed7e87792f321b15471b253668541598b82edb6626b9518f
 DIST libunwind-1.6.2.tar.gz 901392 BLAKE2B 3d0313f7e92cbc3e1a84ad3831a5170f21cdf772f1697ca0a59dea63cdd47da382e9f1fd77325d9ff8bcd47559a425dc883a820c646c628cd00faed82cb0f83f SHA512 1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7
-DIST libunwind-1.7.0-docs.tar.xz 27268 BLAKE2B e035009c7a7df15b020b8186e18053ee0e839e4a779155057426531c28d96f18cfc7beeef6ac1dd8496781812bc1023fbfcb5de0dffebda7de0e6975b17a23e6 SHA512 c18e3664d72fa0856609ac99a7ca04f969167f9bb2cd849e9ce0df63565c27a41080f67bb6d452657471fd0796c386fd993cfc4f3881ca47086301cda069b943
 DIST libunwind-1.7.1-docs.tar.xz 27248 BLAKE2B 0905f49ce72e6cafbb185828a4adf7eb5a88ede335104b1b0679e66199079e3dad9d83815d10a864b4480d88abd82b73bb71181962b1fea39ec41f534d78d549 SHA512 d786572e7fbd5ef7852712f592bd17d4110951083991c5ffcff2bb4ae91e4519b42743f848fe7f2cc9f72d8a0240531ec3d27806972c2c309d06a9048284b97b
-DIST libunwind-1.7.1.tar.gz 912881 BLAKE2B af66062a25bf8d7e308f29770316de34f46eaf2bb9f8c2a67a98dba1f7ffb6744b52b220501d7d2db37b70ea4fba27fc41f687e3add1ee35c528a5c99dc0924e SHA512 372fd57663c46788104632e7f721871afe33a2244cc45c38d754e5d10b6692a41dc0d24aa673df94cc6790b4fac0d3341bc4499872ef461e106e8887dadf3830
-DIST libunwind-1.70.tar.gz 912930 BLAKE2B ef9cd9dc516cf906e883f40230942b18406f2cdbcfa7f7ea25673b400ebe621feb69d13ad1959bd0431bdf9c336082c7c364170214d8ae0f34eb8d285427bee3 SHA512 ec65a73db2f563784b880abf81864b85165255770e950feea57dd83700b72726d0e8c7d5b06e9485735538452730b8ecf2d52c3cc8190dfe69b765e1a9d4271c
+DIST libunwind-1.7.2.tar.gz 912590 BLAKE2B 519570a02d06ce4a174ca226941e493499054112de1c92938434e9fb56fabc8446f699a886ea8beee672ac5e28acd03d16169257a43e2ee1bab084fb331ef4cf SHA512 903f7e26c7d4c22e6ef4fe8954ca0f153fdf346cec40e1e8f7ab966d251110f4deb0a84d1fd150aee194ed966b5c1e01ee27c821cd043859852da33a94faae1f
 EBUILD libunwind-1.6.2-r1.ebuild 3839 BLAKE2B 79586bb73b80e070fd92559e08d5f9edc79907906002ad41c5701069653586742e7bd996e1524c85a3bc908ba144be71b73b3dd37c2c83dc74f648e080458283 SHA512 4e46c59e9c8f123786c5b56713bb75db5d24c84d2b2234f8be3ea5d51bd0fb9688e0f787755f31ff13ce611f2558977b0636210fd528a04c89a977599d7035ff
-EBUILD libunwind-1.7.0.ebuild 3777 BLAKE2B 40f192d45267c974f1e27a6f814472b3c6cd24800d43f23464ccd57c79abd4983a363229bbf39910c7bada60b0a093035ee1565719ee368bbc29787a0a98ddff SHA512 52860437c05c092c62cc04848f7f25abf9b010aaf1e46f7c981f36019a277068268d7c9ada442acbc71d7d5e1f2b0e5ae3d8bcfd738e8b8231559b7568dae0ce
-EBUILD libunwind-1.7.1.ebuild 3658 BLAKE2B f188026dab4e5f16adb84abbc98537f9de6b8238fecd612751d3a2c5c308a92fc593339e5746826159a037ac9e5d1f9c71836fe90c0f2c89d36129cdb2e0c806 SHA512 3476221ec95bfcd8f76a7b40412f86c387b7c4997b8a0928c9eacd82d18db1f1e0b6c64ef4d8677e92cb34df1ce6a1ef95909a0b219b0cac4325bc216a26530a
+EBUILD libunwind-1.7.2.ebuild 3649 BLAKE2B 7662f8084b7150a34097e7e69439f094632c14f82d352897fc233fcd1e01d3ccf7bef3968c3ec7a6bc4c427bdc9b3b0c447a32ddb31e24b46df80a2b92681c97 SHA512 a6c126cbef7694219a260583b60184dc2fed02475f8744ba5a526b1b5f60cef1fe35d75ea452ab80cfb136cd32460693dc112060f0254835c67cc76a65415179
 MISC metadata.xml 632 BLAKE2B 89e326bf82b001cbf4fc665315af12062c0afda7a4ebdc6da5b966b9f918e769a516767f6b054b9915ddfe397edc98c4a4f8e6c238d5accf122d3ceb76b92faa SHA512 3677c9c0a6ea3bc90dddf8501209601bdf0b4ea188ec164c39aa6e21ce2f6fa3ce5c672fe7e8ef0ad5c344debf26f8679bc0a126860eb2862832792de9f7d94b
diff --git a/sys-libs/libunwind/libunwind-1.7.0.ebuild b/sys-libs/libunwind/libunwind-1.7.0.ebuild
deleted file mode 100644
index 5c329968f024..000000000000
--- a/sys-libs/libunwind/libunwind-1.7.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2005-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libunwind-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${LIBUNWIND_DOCS_PREBUILT:=1}
-
-LIBUNWIND_DOCS_PREBUILT_DEV=sam
-LIBUNWIND_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-LIBUNWIND_DOCS_USEFLAG="+doc"
-
-[[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] && LIBUNWIND_DOCS_USEFLAG="doc"
-
-inherit multilib-minimal
-
-# Weird MY_P for https://github.com/libunwind/libunwind/issues/535
-MY_P=${PN}-$(ver_rs 2 '')
-DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
-HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
-SRC_URI="https://github.com/libunwind/libunwind/releases/download/v${PV}/${MY_P}.tar.gz"
-if [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] ; then
-	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBUNWIND_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBUNWIND_DOCS_VERSION}-docs.tar.xz )"
-fi
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0/8" # libunwind.so.8
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug debug-frame ${LIBUNWIND_DOCS_USEFLAG} libatomic lzma static-libs test zlib"
-
-RESTRICT="test !test? ( test )" # some tests are broken (toolchain version dependent, rely on external binaries)
-
-BDEPEND="
-	doc? ( app-text/texlive-core )
-"
-RDEPEND="
-	lzma? ( app-arch/xz-utils[static-libs?,${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[static-libs?,${MULTILIB_USEDEP}] )
-"
-# We just use the header from libatomic.
-DEPEND="
-	${RDEPEND}
-	libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )
-"
-
-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-riscv.h
-	/usr/include/libunwind-sh.h
-	/usr/include/libunwind-tilegx.h
-	/usr/include/libunwind-x86.h
-	/usr/include/libunwind-x86_64.h
-)
-
-src_prepare() {
-	default
-
-	chmod +x src/ia64/mk_cursor_i || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		# --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
-		--enable-cxx-exceptions
-		--enable-coredump
-		--enable-ptrace
-		--enable-setjmp
-		$(use_enable debug-frame)
-		$(multilib_native_use_enable doc documentation)
-		$(use_enable lzma minidebuginfo)
-		$(use_enable static-libs static)
-		$(use_enable zlib zlibdebuginfo)
-		# 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.
-		$(use_enable debug conservative_checks)
-		$(use_enable debug)
-		$(use_enable test tests)
-	)
-
-	export ac_cv_header_atomic_ops_h=$(usex libatomic)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-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 "${ED}" -name "*.la" -type f -delete || die
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${LIBUNWIND_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-}
diff --git a/sys-libs/libunwind/libunwind-1.7.1.ebuild b/sys-libs/libunwind/libunwind-1.7.2.ebuild
index 635390c0974f..ba82ff7d4f09 100644
--- a/sys-libs/libunwind/libunwind-1.7.1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.7.2.ebuild
@@ -9,7 +9,7 @@ EAPI=8
 : ${LIBUNWIND_DOCS_PREBUILT:=1}
 
 LIBUNWIND_DOCS_PREBUILT_DEV=sam
-LIBUNWIND_DOCS_VERSION=$(ver_cut 1-3)
+LIBUNWIND_DOCS_VERSION=1.7.1
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 LIBUNWIND_DOCS_USEFLAG="+doc"