gentoo resync : 29.12.2022

4 files changed, 100 insertions, 24 deletions

diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index 566a86a8a85c..6771565a3f14 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,7 +1,8 @@
 AUX libuninameslist-20200413-makefile.patch 772 BLAKE2B bdb927053b364d9602dd8e3215f4bee166f331c9e996e465127ebcbab2c570251651154bd6e692de7b3da6679cc4e654a1f1779a7451a706b3d9fe29139398e8 SHA512 fbc3a3b30c89651a691db50f959edd7a18755b171b565900ab4631a8ac72588657dc1d00e83eb3d4c7116b6d629413160f5d6f6b64a4d375fedd7739e707f8f3
-DIST libuninameslist-20091231.tar.bz2 568820 BLAKE2B 09574729cc8b655bc9921c49b6f81a7c242a761d70865a0ca6b9ef479582f158f05580e81b94100994ede623ebf8e16f482ae2bacbd596d195b2201023a8ee7e SHA512 3780759428ef2bf2fd808de6ea87a44cf85952f926240ea355d692ef08b5e50c1cf068a2ee05b00cf0fc6b725d71142306aae01e9d6e5144291f6e5dc4505bc2
+AUX libuninameslist-20211114-slibtool.patch 2399 BLAKE2B bd5f8534506b55ce42f16e4d31ea9815d9e6408bff2c1649ebba119fb8e2dc90504e97ba59a4ab6b8dc49fcaaebfff5f0def923162e7f3bca4afb2c8d161ea7f SHA512 026a2dcda527433d33783317545b08a62cf89dba3429eb37871e796599e873feb9de56118dbb152befd86706c3286c004e1e61e3e3690586c2625af5e1f43c24
 DIST libuninameslist-dist-20200413.tar.gz 1210689 BLAKE2B 10577d930e4f1e2d8dc41d7df684b63897f62dae31d0bb2208b26ec9102ecc2fd0181d7d3d05c6c678de69b4f379805bfcbf0a484fd0076ff65ee2fa1e9d1368 SHA512 88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3
-EBUILD libuninameslist-20091231-r1.ebuild 569 BLAKE2B c6c7756ff1750da6071383171f22fdc2aba91bfb73291ba76deb5108ad24760691b9d3e75fc9a69532b82dc9590d000183b59788c533e260033d0e64d57d9e90 SHA512 94ccdd53e367cbd45c8914137d3935c1730c50bf17e6f53b56430b7442a887f9d038c2bb831cb5a0c04d104d1e6b305dcaa9a75cd590e260f56c4eeedca91c36
+DIST libuninameslist-dist-20211114.tar.gz 1247578 BLAKE2B dd96a81c87e214b7b53549ecfcc0b79388a51218f3e6ecb64786d9acc4c540838e2679c4c0f634c94ca55271bb9f3a4350918bd0071c89dbebbd993758ab5314 SHA512 febd0fafe836a85148aa7ceb87888a5882e7c27968c20595026cd947e9e6c1d0246d6e585510377f0e561d36a194d129df302143c67f59dd3b82aa3d30190acb
 EBUILD libuninameslist-20200413-r1.ebuild 598 BLAKE2B 2c00a221fdb6ecab8f83450654b0c5cc189d318749002ae8cbdcd56bf4d646e8d8fde27a1cb52520559fe836ba67e6966c6ee22aaa059443a150bb73ab1de8ed SHA512 79e1882677b8ebb5986d7ec8cf632e63f487dfa141717688b10bf6d45cf6229507b636cefa3fd40343ef8b48ffd7cf0ee5188538a437b6a6d5d5994f92a6e564
 EBUILD libuninameslist-20200413-r2.ebuild 741 BLAKE2B 3b4c5a2d19c9efae026783e3ff68eb83660e64b8976fc8b66efa234d1bb6cd7c0304ec58abd0879dddcab7b7316b0c9fe4b06e04894fa73d1541c6122b01f18c SHA512 985afa82ae78c5ef099997c5ea1d848746d1d7075cc8f50dad1979ec7a6e12fec00684951a2574b6e688417d297aec6af475b5b89430eb633766a32931e2c726
+EBUILD libuninameslist-20211114.ebuild 732 BLAKE2B 27e0eddaa8c59c38a1b5d57ea0488fe805f513cbdb4dbed06c8ca9812311678a1fa082587ab534475b1f5fd8fa17c2714a9cf806dc3d20e40454285602114334 SHA512 5af0af5bd57a3122e6ef174fe1586800d1f6fdcc01d449e0cde652e9a1fa53b2d0c75c9d0c8f5a23c50a2bae86c960fb9bdb86f364909643ae28416deaf79950
 MISC metadata.xml 484 BLAKE2B c5aae59be58a06431b5c19c32ac89ebc77a2ca93c37e98b834e9adf11e7c4a45e7655d21621929b70fac24cc4121f50dff17e462d1d782942215aaf5cffeabe2 SHA512 2bcc9f45999095ed409b6a77b66b827395371ae177c6496056936cff949339d192288b430ff631aea20ced5b107268afe63284919a3e90d0f335427910e18f7f
diff --git a/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch b/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch
new file mode 100644
index 000000000000..9a3edd736137
--- /dev/null
+++ b/media-libs/libuninameslist/files/libuninameslist-20211114-slibtool.patch
@@ -0,0 +1,64 @@
+Upstream-PR: https://github.com/fontforge/libuninameslist/pull/27
+From 77f4eea51b87c2e7a36cd3e1e64b424cdd5f7ad8 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 13 May 2022 21:57:38 -0700
+Subject: [PATCH] build: Link with .la files for internal deps
+
+When building libuninameslist with --enable-frenchlib and slibtool the
+build will fail when it can't find -luninameslist-fr.
+
+However if libuninameslist is already installed to the system it will
+compile successfully using the already installed version of
+uninameslist-fr.so instead of the locally built new library.
+
+This can be fixed by linking with the libtool archive (.la) instead as
+should be done for internal dependencies while -l linker flags should be
+only for external dependencies.
+
+Additionally I removed the now redundant DEPENDENCIES and LIBADD line.
+
+GNU libtool is less strict about user errors and will silently hide such
+issues.
+
+I missed this second issue until now when I fixed the previous issue in
+PR https://github.com/fontforge/libuninameslist/pull/24.
+
+Gentoo Bugs:
+	https://bugs.gentoo.org/779670
+	https://bugs.gentoo.org/792474
+---
+ Makefile.am | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f9fe87c..68c64db 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,25 +44,21 @@ lib_LTLIBRARIES += libuninameslist.la
+ 
+ include_HEADERS = uninameslist.h
+ libuninameslist_la_LIBADD =
+-EXTRA_libuninameslist_la_DEPENDENCIES =
+ man_MANS = libuninameslist.3
+ noinst_HEADERS = nameslist-dll.h
+-LIBADD =
+ 
+ if WANTLIBOFR
+ include_HEADERS += uninameslist-fr.h
+ libuninameslist_fr_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(FR_VERSION)
+ libuninameslist_fr_la_SOURCES = nameslist-fr.c
+ libuninameslist_fr_la.$(OBJEXT): uninameslist-fr.h nameslist-dll.h buildnameslist.h
+-libuninameslist_la_LIBADD += -luninameslist-fr
+-EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la
++libuninameslist_la_LIBADD += libuninameslist-fr.la
+ man_MANS += libuninameslist-fr.3
+-LIBADD += -luninameslist-fr
+ else
+ EXTRA_DIST += nameslist-fr.c uninameslist-fr.h libuninameslist-fr.3
+ endif
+ 
+-libuninameslist_la_LDFLAGS = $(AM_LDFLAGS) $(LIBADD) -version-info $(UN_VERSION)
++libuninameslist_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(UN_VERSION)
+ libuninameslist_la_SOURCES = nameslist.c
+ libuninameslist_la.$(OBJEXT): uninameslist.h nameslist-dll.h buildnameslist.h
+ 
diff --git a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
deleted file mode 100644
index 4ea179d8d318..000000000000
--- a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library of unicode annotation data"
-HOMEPAGE="http://libuninameslist.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libuninameslist/${P}.tar.bz2"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}"/usr -name '*.la' -delete || die
-}
diff --git a/media-libs/libuninameslist/libuninameslist-20211114.ebuild b/media-libs/libuninameslist/libuninameslist-20211114.ebuild
new file mode 100644
index 000000000000..8b737b8c494e
--- /dev/null
+++ b/media-libs/libuninameslist/libuninameslist-20211114.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library of unicode annotation data"
+HOMEPAGE="https://github.com/fontforge/libuninameslist"
+SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${PN}-dist-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch" # 792474
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-frenchlib
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name '*.la' -delete || die
+}