[gentoo-commits] repo/gentoo:master commit in: mail-filter/libsrs_alt/files/, mail-filter/libsrs_alt/

[Fabian Groffen]

commit:     5cf61691ddfac7700856869d533f507748aaf7b7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May  4 19:34:16 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May  4 19:34:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf61691

mail-filter/libsrs_alt-1.0-r1: fix link, thanks orbea, bug #778575

Closes: https://bugs.gentoo.org/778575
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .../libsrs_alt/files/libsrs_alt-1.0-link-fix.patch | 32 ++++++++++++++++++++++
 mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild    |  9 ++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/mail-filter/libsrs_alt/files/libsrs_alt-1.0-link-fix.patch b/mail-filter/libsrs_alt/files/libsrs_alt-1.0-link-fix.patch
new file mode 100644
index 00000000000..d2e37c07d62
--- /dev/null
+++ b/mail-filter/libsrs_alt/files/libsrs_alt-1.0-link-fix.patch
@@ -0,0 +1,32 @@
+From 5fe95ee063c1f29037cdaacd2d96aea4759b57c1 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@××××××.net>
+Date: Sat, 27 Mar 2021 08:28:11 -0700
+Subject: [PATCH] build: Correctly use .la files and LDADD.
+
+---
+ Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 46de31a..5bdf9d3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,13 +1,11 @@
+ SUBDIRS = lib src .
+ EXTRA_DIST = MTAs
+ 
+-LDADD = lib/libcompat.a
+-
+ bin_PROGRAMS = srs
+ noinst_PROGRAMS = test
+ 
+ test_SOURCES = test.c
+-test_LDFLAGS = src/.libs/libsrs_alt.a
++test_LDADD = lib/libcompat.la src/libsrs_alt.la
+ 
+ srs_SOURCES = srs.c
+-srs_LDFLAGS = src/.libs/libsrs_alt.a
++srs_LDADD = lib/libcompat.la src/libsrs_alt.la
+-- 
+2.26.3
+

diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
index ad3fc51b0e4..2b6e7c534c3 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,9 +20,12 @@ IUSE="static-libs"
 
 RDEPEND="!dev-perl/Mail-SRS"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-ftime.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-ftime.patch
+	"${FILESDIR}"/${P}-link-fix.patch
+)
 
+src_prepare() {
 	# add missing header
 	sed -i -e '/timeb.h>/ a #include <stdlib.h>' test.c