[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/, app-arch/p7zip/

["Sam James" <sam@gentoo.org>]

commit:     2861b43fa9fdf0f2dfff1508647e5eae87f84d8d
Author:     Joe Kappus <joe <AT> wt <DOT> gd>
AuthorDate: Fri Apr 14 19:34:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 06:49:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2861b43f

app-arch/p7zip: fix natspec patch

due to how we handle makefiles need to drop that part from patch
and update the makefiles directly in ebuild. fixes build with natspec.

Closes: https://bugs.gentoo.org/904332
Signed-off-by: Joe Kappus <joe <AT> wt.gd>
Closes: https://github.com/gentoo/gentoo/pull/30597
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/p7zip/files/p7zip-17.05-natspec.patch | 13 -------------
 app-arch/p7zip/p7zip-17.05-r1.ebuild           |  5 ++++-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app-arch/p7zip/files/p7zip-17.05-natspec.patch b/app-arch/p7zip/files/p7zip-17.05-natspec.patch
index 45f24559a4c8..7487924af306 100644
--- a/app-arch/p7zip/files/p7zip-17.05-natspec.patch
+++ b/app-arch/p7zip/files/p7zip-17.05-natspec.patch
@@ -115,16 +115,3 @@ index 353e895..44071f3 100644
    if (isUtf8)
      if (ConvertUTF8ToUnicode(s, res) || ignore_Utf8_Errors)
        return;
-diff --git a/makefile.machine b/makefile.machine
-index a89b568..3e12592 100644
---- a/makefile.machine
-+++ b/makefile.machine
-@@ -16,7 +16,7 @@ CC=gcc
- CC_SHARED=-fPIC
- LINK_SHARED=-fPIC -shared
- 
--LOCAL_LIBS=-lpthread
-+LOCAL_LIBS=-lpthread -lnatspec
- LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
- 
- OBJ_CRC32=$(OBJ_CRC32_C)

diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index dbb6ca8a3567..f07d678263c8 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -25,7 +25,10 @@ BDEPEND="
 src_prepare() {
 	default
 
-	use natspec && eapply "${FILESDIR}"/${P}-natspec.patch
+	if use natspec; then
+		eapply "${FILESDIR}"/${P}-natspec.patch
+		sed -i '/^LOCAL_LIBS/s/$/ -lnatspec/' makefile.* || die
+	fi
 
 	if ! use pch; then
 		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die