[gentoo-commits] repo/gentoo:master commit in: sci-misc/apertium/files/, sci-misc/apertium/

["David Seifert" <soap@gentoo.org>]

commit:     0d3c72be82f27867bf9c4b7b3506a5ce0ff32b15
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 14:36:14 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 14:36:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3c72be

sci-misc/apertium: Fix broken autotools

Closes: https://bugs.gentoo.org/595166
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-misc/apertium/apertium-3.2.0.ebuild            |  5 +-
 .../apertium/files/apertium-3.2.0-autotools.patch  | 81 ++++++++++++++++++++++
 2 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/sci-misc/apertium/apertium-3.2.0.ebuild b/sci-misc/apertium/apertium-3.2.0.ebuild
index 9f77d6c9025..997def4d182 100644
--- a/sci-misc/apertium/apertium-3.2.0.ebuild
+++ b/sci-misc/apertium/apertium-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,7 +28,8 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-flags.patch
 	"${FILESDIR}"/${PV}-datadir.patch
 	"${FILESDIR}"/${P}-libpcre.patch
-	)
+	"${FILESDIR}"/${P}-autotools.patch
+)
 
 MAKEOPTS+=" -j1"
 AUTOTOOLS_IN_SOURCE_BUILD=1

diff --git a/sci-misc/apertium/files/apertium-3.2.0-autotools.patch b/sci-misc/apertium/files/apertium-3.2.0-autotools.patch
new file mode 100644
index 00000000000..4d3a91a795a
--- /dev/null
+++ b/sci-misc/apertium/files/apertium-3.2.0-autotools.patch
@@ -0,0 +1,81 @@
+--- a/apertium/Makefile.am
++++ b/apertium/Makefile.am
+@@ -78,7 +78,7 @@
+ 
+ apertium_pretransfer_SOURCES = apertium_pretransfer.cc
+ apertium_multiple_translations_SOURCES = apertium-multiple-translations.cc
+-apertium_multiple_translations_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_multiple_translations_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ apertium_destxt_SOURCES = apertium_destxt.cc
+ apertium_retxt_SOURCES = apertium_retxt.cc
+ apertium_deshtml_SOURCES = apertium_deshtml.cc
+@@ -99,45 +99,45 @@
+ apertium_remediawiki_SOURCES = apertium_remediawiki.cc
+ 
+ apertium_tagger_SOURCES = apertium_tagger.cc
+-apertium_tagger_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_tagger_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_tmxbuild_SOURCES = apertium_tmxbuild.cc
+-apertium_tmxbuild_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_tmxbuild_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_preprocess_transfer_SOURCES = transferpp.cc
+ apertium_preprocess_transfer_LDADD = $(APERTIUM_LIBS) \
+-                                     -lapertium$(GENERIC_MAJOR_VERSION)
++                                     libapertium3.la
+ 
+ apertium_filter_ambiguity_SOURCES = apertium_filter_ambiguity.cc
+ apertium_filter_ambiguity_LDADD = $(APERTIUM_LIBS) \
+-                                  -lapertium$(GENERIC_MAJOR_VERSION)
++                                  libapertium3.la
+ 
+ apertium_transfer_SOURCES = apertium_transfer.cc
+-apertium_transfer_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_transfer_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_interchunk_SOURCES = apertium_interchunk.cc
+-apertium_interchunk_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_interchunk_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_postchunk_SOURCES = apertium_postchunk.cc
+-apertium_postchunk_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_postchunk_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_lextor_SOURCES = apertium_lextor.cc
+-apertium_lextor_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_lextor_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ #apertium_lextor_eval_SOURCES = apertium-lextor-eval.C
+-#apertium_lextor_eval_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++#apertium_lextor_eval_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_tagger_apply_new_rules_SOURCES = apertium_tagger_apply_new_rules.cc
+-apertium_tagger_apply_new_rules_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_tagger_apply_new_rules_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ ###apertium_lextor_search_SOURCES = apertium-lextor-search.C
+-###apertium_lextor_search_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++###apertium_lextor_search_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ ###pruebas_lextor_SOURCES = pruebas-lextor.C
+-###pruebas_lextor_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++###pruebas_lextor_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_gen_wlist_lextor_translation_SOURCES = apertium_gen_wlist_lextor_translation.cc
+-apertium_gen_wlist_lextor_translation_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_gen_wlist_lextor_translation_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ INCLUDES = -I$(top_srcdir) $(APERTIUM_CFLAGS)
+ CLEANFILES = *~ apertium_destxt.cc apertium_retxt.cc apertium_deshtml.cc \
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,7 +142,7 @@
+ 
+ 
+ PKG_CHECK_MODULES(APERTIUM, [dnl
+-  lttoolbox-3.2 >= required_lttoolbox_version dnl
++  lttoolbox >= required_lttoolbox_version dnl
+   libxml-2.0 >= required_libxml_version dnl
+   libpcre >= required_libpcre_version], CPPFLAGS="$CPPFLAGS $APERTIUM_CFLAGS"; LIBS="$LIBS $APERTIUM_LIBS")
+