From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1338370-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id E0E67158086
	for <garchives@archives.gentoo.org>; Wed, 10 Nov 2021 23:44:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 001EBE0A03;
	Wed, 10 Nov 2021 23:44:54 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 66CEFE0A03
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Nov 2021 23:44:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 1CB8F34318D
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Nov 2021 23:44:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 44ED91AD
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Nov 2021 23:44:51 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1636587884.83bad4f1e73ca2051e518d58fda63f90fd251b5a.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/elfutils/elfutils-0.186.ebuild
X-VCS-Directories: dev-libs/elfutils/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 83bad4f1e73ca2051e518d58fda63f90fd251b5a
X-VCS-Branch: master
Date: Wed, 10 Nov 2021 23:44:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 56e489a5-abaf-40a3-9a30-0177e38c8e22
X-Archives-Hash: 7ef0ef602d1306fcab23550933866d56

commit:     83bad4f1e73ca2051e518d58fda63f90fd251b5a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 23:44:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 23:44:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83bad4f1

dev-libs/elfutils: add 0.186

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/elfutils/elfutils-0.186.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dev-libs/elfutils/elfutils-0.186.ebuild b/dev-libs/elfutils/elfutils-0.186.ebuild
index c40baf26562..d7c479481a3 100644
--- a/dev-libs/elfutils/elfutils-0.186.ebuild
+++ b/dev-libs/elfutils/elfutils-0.186.ebuild
@@ -45,12 +45,20 @@ src_prepare() {
 	default
 
 	if use elibc_musl; then
-		eapply "${FILESDIR}"/musl/
+		mkdir -p "${T}"/musl || die
+		cp -rv "${FILESDIR}"/musl/*.patch "${T}"/musl || die
+
+		# Delete patches upstreamed in 0.186
+		rm "${T}/musl/${PN}-0.185-error-h.patch" || die
+		rm "${T}/musl/${PN}-0.185-strndupa.patch" || die
+
+		eapply "${T}"/musl/
 	fi
 
 	if ! use static-libs; then
 		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
 	fi
+
 	# https://sourceware.org/PR23914
 	sed -i 's:-Werror::' */Makefile.in || die
 }