gentoo resync : 28.04.2021

4 files changed, 109 insertions, 10 deletions

diff --git a/media-libs/libtiger/Manifest b/media-libs/libtiger/Manifest
index 4569f24e74ef..f9817a237fe2 100644
--- a/media-libs/libtiger/Manifest
+++ b/media-libs/libtiger/Manifest
@@ -1,3 +1,5 @@
+AUX libtiger-0.3.4-fix-autoreconf.patch 1346 BLAKE2B 90db8353687e3feae55c7aebffdf24b341f9f13dfc9a3fd784995cb4827c49f0c0bc012055b45cf6566ac75a70539bc6174b304b93ac5fb7f8c21ac68b958edc SHA512 ac0de7e8706194834c3d6cc388eb80710b3437d6419435ba7ade5af390bd0fe4b8e28213cfada3d1b5dc24e538a06fff9d47b47ba3accfd0318bee7bdf34f620
+AUX libtiger-0.3.4-fix-undefined-references-slibtool.patch 964 BLAKE2B 41102d231c92b3594284db305e6fd1a484faf389d860020456a9129eed68f22d3a247da28d4855c7bf15c23d9df095e281a39da865b3813748e92e25c3143fa9 SHA512 58e6f43233b89c94541bb005152f638a3d1d173062029240853a38ef08cd38a613b09d56996879dc4bb701d6ab2570f3f2a00f0b7ce8b8be6b2e1d404d44b302
 DIST libtiger-0.3.4.tar.gz 383685 BLAKE2B 92bfb1ec5879c9d4af2eb1ecb26eda007fd583121eaa6e3bb23de9f8b477612eb4c87359ec61869c5a70233f1055eedcef270cb79cdd94944013147e04a85bcf SHA512 559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d
-EBUILD libtiger-0.3.4-r1.ebuild 845 BLAKE2B ef5b4b557db2aa428d08f7c490260ec988cfc65bc72d6170abc672db5ad64734cd5174c2df3a6fdb88efefb179f9eef0092b07489a97fea5b9ea3ba781389e55 SHA512 06d8b3c9ea72eaab21654b74ffa366bb50474450d21ff5dd671239308ee8e253722923d293e19153aeb9b35d08d267742c293e4fe6cc6c96e814ca05549fe35b
+EBUILD libtiger-0.3.4-r1.ebuild 995 BLAKE2B c818bd48c34a0fd927c0afbb2870d3dd20a05bd65c4dddd8b47718e846b247a8f146d36703dc30312409e1b06482706a2a9bf777e5983c96b2b43f003ccfa4e5 SHA512 a7c95da64f711e481b4780f0c306c9d4c303e6c4f88cc8a3064d853407f0745d5253899343593521a385db8e7a62390c4fa22041d74c68277fbe18e5d86401e9
 MISC metadata.xml 550 BLAKE2B 58756433fc1ab142f1f2dc2c465371e19c3838874b697297cf3cd62c88bbfd5805807db521135ab76972cc176b131657caf6ba1c8b75ca792f539816a3baa3d1 SHA512 2590f113bd0261f583083f51aee3beb97771b4a112ed23d2b75028daba956278ad3a56cb7de84973c9bbcc72d1c0ee0e4281531a01a8a44f6e55289d8081a500
diff --git a/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch b/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch
new file mode 100644
index 000000000000..88b3316ea702
--- /dev/null
+++ b/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/778578
+
+From f3f463faa8cb73ffbdce172bddfa839eb65b2d0f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 27 Mar 2021 07:44:14 -0700
+Subject: [PATCH 1/2] Build: Fix autoreconf.
+
+---
+ Makefile.am     | 2 +-
+ configure.ac    | 3 ++-
+ doc/Makefile.am | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c5d6b6e..746d893 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,7 @@ tigerinc_HEADERS=include/tiger/tiger.h include/tiger/tiger_config.h
+ tigerpc_DATA=misc/pkgconfig/tiger.pc
+ noinst_DATA=misc/pkgconfig/tiger-uninstalled.pc
+ 
+-LIBTOOLFLAGS=--silent
++AM_LIBTOOLFLAGS=--silent
+ 
+ AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include
+ 
+diff --git a/configure.ac b/configure.ac
+index 2f63684..a1cf2ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,6 +26,8 @@ dnl     then set AGE to 0.
+ 
+ LIBTIGER_SHARED_VERSION="5:2:0"
+ 
++AM_PROG_AR
++
+ AC_PROG_CC_C_O
+ AC_PROG_LIBTOOL
+ AC_PROG_GREP
+@@ -35,7 +37,6 @@ AC_PROG_SED
+ AC_C_CONST
+ AC_C_INLINE
+ 
+-
+ # headers
+ 
+ AC_HEADER_STDC
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 70d48c5..01e95d3 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,4 +1,4 @@
+-LIBTOOLFLAGS=--silent
++AM_LIBTOOLFLAGS=--silent
+ 
+ # dependency to get doc to be built
+ noinst_DATA = .doc-dummy-target
+-- 
+2.26.3
diff --git a/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch b/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch
new file mode 100644
index 000000000000..01ccc22524ef
--- /dev/null
+++ b/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/778578
+
+From 0b990d5db74b5e5055753f4ad5006b8d89d23d26 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 27 Mar 2021 07:47:09 -0700
+Subject: [PATCH 2/2] build: Add -lm to fix undefined references.
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 746d893..348bad0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,7 +35,7 @@ noinst_HEADERS=\
+ lib_libtiger_la_CFLAGS=@CWARNFLAGS_FULL@ @CFLAGS_FORTIFY_SOURCE@ @CFLAGS_DEBUG@ @CFLAGS_PROFILE@ \
+                        @PANGOCAIRO_CFLAGS@ @KATE_CFLAGS@ @PTHREAD_CFLAGS@
+ lib_libtiger_la_LIBADD=@PANGOCAIRO_LIBS@ @KATE_LIBS@ @PTHREAD_LIBS@
+-lib_libtiger_la_LDFLAGS=-version-info @LIBTIGER_SHARED_VERSION@ -no-undefined
++lib_libtiger_la_LDFLAGS=-version-info @LIBTIGER_SHARED_VERSION@ -no-undefined -lm
+ 
+ am__tar = ${AMTAR} chof - --owner=0 --group=0 --exclude=CVS --exclude=.cvsignore "$$tardir"
+ 
+-- 
+2.26.3
diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index 2e118f17e648..ee5b7ef378fd 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit libtool multilib-minimal
+EAPI=7
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A rendering library for Kate streams using Pango and Cairo"
 HOMEPAGE="https://code.google.com/p/libtiger/"
@@ -13,20 +14,30 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
-RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}]
+RDEPEND="
 	>=media-libs/libkate-0.2.0[${MULTILIB_USEDEP}]
-	x11-libs/cairo[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+	x11-libs/pango[${MULTILIB_USEDEP}]
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.4-fix-autoreconf.patch
+	"${FILESDIR}"/${PN}-0.3.4-fix-undefined-references-slibtool.patch
+)
 
 src_prepare() {
 	default
-	elibtoolize
+
+	eautoreconf
 }
 
 multilib_src_configure() {
-	local ECONF_SOURCE=${S}
+	local ECONF_SOURCE="${S}"
 	econf \
 		--disable-static \
 		$(use_enable doc)
@@ -34,5 +45,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${ED}" -name '*.la' -delete || die
 }