gentoo resync : 29.12.2022

3 files changed, 84 insertions, 2 deletions

diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index 21f91cb39a92..cc5eece4affb 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,4 @@
+AUX libggi-2.2.2-slibtool.patch 2105 BLAKE2B 5cb1f3ede56aa35a5eecdbe49e649b5c512f267bc33c993355d4707c35e090c53586b1a7416262f40066207e6cd41ec8720047b37447b62103a9b94953ebd164 SHA512 f9eaaf862fe1ad7ba1baa29a9016ae810aaf7d054d23ed36512a59076c23e1ce359e08653f6cd13641e6136e023aa4fe511ad545fc4763f0472b0f400965d323
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2-r1.ebuild 1364 BLAKE2B 741d7227754459bcddc6adeb3290da735fbf28ce4f6a852707e14ac6326a8c3fab5a8d725481ff36bf7bbbb4f186a0ab61499f426873638726d03e8841a1f553 SHA512 2738bb0e7ff578efa89e705d34e2c1f0f1db0e5840a914da46524a5cef5c8ea5d12f99b4c3b9bae716f0e57b26b0d17f8d8cd6734e0fd5fc7762efe253c9b6b6
+EBUILD libggi-2.2.2-r1.ebuild 1583 BLAKE2B 5df819fa49270fca1181d35741b104769abc023061eae42c57ca3812226ee178913ddbf4c81cda704c4795663f7fd6ee755e49af40b85a430e225a12e1406fef SHA512 9d4ed77c1805c9f894e5b66fc0fcf19cf9446ded3bc702cc961325dbbd479a4c98c23afa46830c0658d525f888e3f57e47a92c89995058d99e8bcf091a5d4272
 MISC metadata.xml 485 BLAKE2B 6d6d108c523eb917020b6292c303f86749350862790c7bc873c8582bb302f91e028745978d865cb65f5122bff3783ca9e0a5d81912a4bda87c47ae8de9573b53 SHA512 bccc6fc464d0d353628d61b3f9ef3271b5bc08fb959113ec92f72813ed7c7483323c2a610af6a35fecf1ce722e856aa98907673308f84fd0617e83b8128899dc
diff --git a/media-libs/libggi/files/libggi-2.2.2-slibtool.patch b/media-libs/libggi/files/libggi-2.2.2-slibtool.patch
new file mode 100644
index 000000000000..b43c0935b34c
--- /dev/null
+++ b/media-libs/libggi/files/libggi-2.2.2-slibtool.patch
@@ -0,0 +1,65 @@
+Upstream-PR: https://sourceforge.net/p/ggi/patches/8/
+From 9982451bb15f503ccee0690f98bc2a6e4745fe10 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 11 May 2022 19:13:40 -0700
+Subject: [PATCH] build: Fix build with slibtool
+
+On Gentoo both -ltinfo and -lncurses are needed when only the latter is
+used.
+
+Also hardcoded instances of libtool is pointless.
+---
+ configure.in => configure.ac | 12 +++++++++---
+ m4/common.m4                 |  1 -
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+ rename configure.in => configure.ac (99%)
+
+diff --git a/configure.in b/configure.ac
+similarity index 99%
+rename from configure.in
+rename to configure.ac
+index 55801d2..729e1d6 100644
+--- a/configure.in
++++ b/configure.ac
+@@ -557,7 +557,6 @@ AC_CHECK_LIB(socket, connect,
+     SAVECC="$CC"
+     AC_MSG_CHECKING([for connect in -lwsock32])
+     LIBS="$LIBS -lwsock32"
+-    CC="$SHELL ./libtool --mode=link $CC"
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>]], [[connect(0, NULL, 42);]])],[bsdsock_libs="$bsdsock_libs -lwsock32"
+       ac_cv_func_connect=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+@@ -860,9 +859,16 @@ if test "x$build_terminfo_target" != "xno"; then
+     AC_CHECK_LIB($curseslib, set_term,
+ 	terminfolibs="-l$curseslib",
+ 	build_terminfo_target=no)
++    if test "x$build_terminfo_target" != "xno"; then
++        AC_CHECK_LIB($curseslib, mvwaddchnstr,
++	    foo=bar, build_terminfo_target=no)
++        if test "x$build_terminfo_target" != "xno"; then
++            AC_CHECK_LIB(tinfo, LINES,
++                terminfolibs+=" -ltinfo",
++                build_terminfo_target=no)
++        fi
++    fi
+   fi
+-  AC_CHECK_LIB($curseslib, mvwaddchnstr,
+-	foo=bar, build_terminfo_target=no)
+ fi
+ 
+ if test "x$build_vcsa_target" != "xno"; then
+diff --git a/m4/common.m4 b/m4/common.m4
+index d036155..63e524a 100644
+--- a/m4/common.m4
++++ b/m4/common.m4
+@@ -329,7 +329,6 @@ dnl Check for libs using libtool
+ AC_DEFUN([GGI_CHECK_LIB],
+ [
+    save_CC="$CC"
+-   CC="$SHELL ./libtool --mode=link $CC"
+    AC_CHECK_LIB($1, $2, [
+      CC="$save_CC"
+      $3], [
+-- 
+2.35.1
+
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index eec19be578dd..10a163a383e1 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Provides an opaque interface to the display's acceleration function"
 HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
@@ -25,6 +27,20 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch" # 775584
+)
+
+src_prepare() {
+	default
+
+	# We really don't want this
+	# https://sourceforge.net/p/ggi/patches/7/
+	rm -f acinclude.m4 || die
+
+	eautoreconf
+}
+
 src_configure() {
 	local myconf=""