gentoo auto-resync : 06:12:2022 - 21:11:24

6 files changed, 24 insertions, 67 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ee22d23d3e2a..977f86b6397a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 7fe969d208ab..679efb71b6e9 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1,6 +1,5 @@
-AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3af122826d7250d9cec4df9ef48a3564cb522911d56710394eaa183b6180e08eae939b9f00a73fe061f21be4142520689687ad4c SHA512 72ebdc63cbb2c56bd8274f92501cbbae8c66e7d81b11b8fdeda38149da4bf44ab88699d248093eedc9813f6cd60e2a1f360fb39d778b4b7827777b1d003ab1dc
-AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
+AUX aiksaurus-1.2.1-autoconf.patch 477 BLAKE2B 201ef5b40eecae3103132eec1c9925565d264504340828c8cc9b544b6b748f0c274d9e770bf65a91fcab47131ebfe0b1d244dc93fd0159db3b68fae80829dd52 SHA512 e8a0a4886573f5c9ac6160e4d066ca155bd6a72271553e05061da4056546ec5914220ea28e40df5ae89d37fccb0958dbfdeffc70d3c54663ab047422d52cc2d8
 DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1-r2.ebuild 1042 BLAKE2B d20952fb4381bb00d97c244193c6a01bb8046367199b251e7ac9f85d1d63d08e94be395fa552fa16dc5138b2b8806f8d58281cf4a7990ac4d587cd72c8ded8bb SHA512 58709cf03af4d19a72ddb395a3877299815e756d083d054be352065dc6d77d8989281e7d58ccc36b890a95541589a0662fa7d192386a8e124dd7b55737511aa1
+EBUILD aiksaurus-1.2.1-r3.ebuild 1118 BLAKE2B 45a093ab00386eb0ea7d80d3d8a10bff658168ffa237731e7b9533d8dceb9a842e730aef3d7bece73e9a0339f932d6e3429f3aafa00697d70dfdec8be9710143 SHA512 f443ccc18f1c4f589f2ca4951032cbbbf2d3438a8592ea455a9197f4a05ef78a987dde81cd6e143ed4b14818671ca448e3935cd244b85405e51b6271b0d9af15
 MISC metadata.xml 246 BLAKE2B 6ffed2d4f482be2312cbf43d4831e4578c01c855c2134af7d046be942d566069c910bf5fff0133366f2808a7680f50995f2fe9576b561346c54003b59b02ff10 SHA512 6c290491874e5711080025e89aedb0d9072009324b6757bda046f220eda86ad332814745c9653dbe1b14ee4fa8c625f4a4f66201ca49aac95ad7f681df481153
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild
index 1fbc912f1abb..968ec591c6f3 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic libtool
+inherit autotools flag-o-matic
 
-DESCRIPTION="A thesaurus lib, tool and database"
+DESCRIPTION="A thesaurus lib, tool, and database"
 HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
 SRC_URI="
 	mirror://sourceforge/${PN}/${P}.tar.gz
@@ -24,13 +24,17 @@ PATCHES=(
 	"${WORKDIR}"/patches/${P}-gcc43.patch
 	"${WORKDIR}"/patches/${P}-format-security.patch
 	"${WORKDIR}"/patches/${P}-c++17.patch
+	"${FILESDIR}"/aiksaurus-1.2.1-autoconf.patch
 )
 
 src_prepare() {
 	default
+
 	# Needed to make relink work on FreeBSD, without it won't install.
 	# Also needed for a sane .so versionning there.
-	elibtoolize
+	#elibtoolize
+	# Clang 16
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch
new file mode 100644
index 000000000000..2821709e7784
--- /dev/null
+++ b/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch
@@ -0,0 +1,13 @@
+https://sources.debian.org/patches/aiksaurus/1.2.1%2Bdev-0.12-7/01-changes-from-pristine-tarball.patch/
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,6 +50,9 @@ AC_SUBST(LT_RELEASE)
+ LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE`
+ LT_REVISION=$AIK_INTERFACE_AGE
+ LT_AGE=`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE`
++m4_pattern_allow([LT_CURRENT])
++m4_pattern_allow([LT_REVISION])
++m4_pattern_allow([LT_AGE])
+ 
+ LT_AIK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+ 
diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch
deleted file mode 100644
index ba90a4519502..000000000000
--- a/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- aiksaurus-1.2.1/base/caiksaurus.cpp.orig	2014-06-07 21:14:03.869649696 +0100
-+++ aiksaurus-1.2.1/base/caiksaurus.cpp	2014-06-07 21:33:06.241471066 +0100
-@@ -254,7 +254,7 @@
-         /* see if we got --version. */
-         if ( !strcmp(arg, "--version") || !strcmp(arg, "-v") )
-         {
--            printf(version);
-+            printf("%s", version);
-             exit(0);
-         }
- 
-@@ -262,7 +262,7 @@
-         else if ( !strcmp(arg, "--help") || !strcmp(arg, "-h") )
-         {
-             printf("Usage: %s [word]\n\n", argv[0]);
--            printf(help);
-+            printf("%s", help);
-             exit(0);
-         }   
-     }
-@@ -271,7 +271,7 @@
-     if (argc != 2)
-     {
-         printf("Usage: %s [word]\n", argv[0]);
--        printf(help);
-+        printf("%s", help);
-         exit(1);
-     }
- }
diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch
deleted file mode 100644
index a6d570af569d..000000000000
--- a/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- aiksaurus-1.2.1/base/aiksaurus.t.cpp
-+++ aiksaurus-1.2.1/base/aiksaurus.t.cpp
-@@ -24,6 +24,7 @@
- #include "config.h"
- #include <iostream>
- #include <string>
-+#include <cstdlib>
- using namespace std;
- using AiksaurusImpl::AsciiCompare;
- 
---- aiksaurus-1.2.1/gtk/src/Display.cpp
-+++ aiksaurus-1.2.1/gtk/src/Display.cpp
-@@ -22,6 +22,7 @@
- #include "Meaning.h"
- #include "DialogMediator.h"
- #include "Exception.h"
-+#include <cstring>
- using namespace std;
- 
- namespace AiksaurusGTK_impl
---- aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp
-+++ aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp
-@@ -23,6 +23,7 @@
- #include <gtk/gtk.h>
- #include <iostream>
- #include <string>
-+#include <cstdlib>
- using namespace std;
- 
- int main(int argc, char** argv)