gentoo auto-resync : 07:08:2024 - 12:37:20

7 files changed, 3 insertions, 289 deletions

diff --git a/sci-misc/apertium/Manifest b/sci-misc/apertium/Manifest
index 833879f2a935..a9aa8d948355 100644
--- a/sci-misc/apertium/Manifest
+++ b/sci-misc/apertium/Manifest
@@ -1,10 +1,4 @@
-AUX 3.2.0-datadir.patch 1315 BLAKE2B 011d2670fafed5ef1a891c39a6c6f084156f1f14a69e9d382318ddc4599318de516ba4fbacbda4d23e28b036b4483d2adc33be44b277cb9da067a66a4e07fb72 SHA512 51d4950ee82298a3b77a83e625c7bf788bdbc15b0fa16e1b5e0b57a8be1c28d5a499a1d3fa2436b7cdeedf397803b6ca6fe6740871b8c3a9687b57b3182f9e6a
-AUX 3.2.0-flags.patch 2163 BLAKE2B 213aa7a6cd5dd9c5e068f5bfe96d5dbe3640e6c231230a912996e705efbe37ba486e962da9b7b5473b8b38ed1861eee3d2f3565ca5a5764433792ab0264c4266 SHA512 25a1e8687c38091b249fbbef4dac01c95f4b446ad7e3ffd829b8803d056e34ec49057855af80f8ec578d83894234ab0c87b900daec759a6fd3ba8ae3fc736fce
-AUX apertium-3.2.0-autotools.patch 3814 BLAKE2B b5e621bde3986220b2e624234e5a865d4ed4f114412aa8e822d587eb12f66f8549fc7b083b52340bea36f18001e42f8e32a034127ec43ff70f94674b821b853f SHA512 b5ff3fe8820aff1d7f10eb38ba5b921c87a780c6e146f316a43f8436facb1671b873d22a0b8cd9b0d7f1fda53db9db9b291cd0083d848d039a91aeeaf82d8b30
-AUX apertium-3.2.0-libpcre.patch 1480 BLAKE2B 218a59978c694b1cbd4a6fcad2e80e0abf30be9f89f4f6180e6a94ff8a399ef7e60790b74a661866bef5dd09dfa7b0ed5cdb17027c2539659ca9eaaf816042eb SHA512 e8816e99ea2e2c0c027e498d77bf6948002f84781a3af77bb6cf570dfbf29a4a111b94abadfd4b8e4c35737c17abc51c89d880ee938a71fd7a2e57fe88ac081b
 AUX apertium-3.8.3-bashism.patch 1118 BLAKE2B c85794029961ee2ceae993fc02807fac3b18f7fd86c7bd094401e77e7d633b7b5ea6d5d38f45311df4e783196e9b88ab590d1e4c787ff87cc0f3e3a09d0aa605 SHA512 0140595bc652df6b8584c3d3f7fd071a9ee545063a0baa0b0a553e10db32cb1f4e9d9fe578ebe3612c7583bf65b500e7170a64240735dd2951e97808545ec132
-DIST apertium-3.2.0.tar.gz 767311 BLAKE2B 03069a0839d0ad61db12aea977e0847b3093a46becd7c36e3bb7b483242986f8f1b4a94c6c64bdfc94f11d13353fbdb6835ff032158d9a05151342606fdd57a1 SHA512 ec80d72480e414eb9a169241d0921b21009dde7c1da9a773f500f16ac785741be1f4a221c25b3b32e7847405f76e93b5feadb6f541170c0742718e27dfa1fb25
 DIST apertium-3.8.3.tar.bz2 560957 BLAKE2B c610395fb1e725ddc628a15b1234c434d174c5b5664ed8fa2d1480d438e143bcd194b6f5a2e79ede6fec0d4fa156be2b7725134727e2f976fe7ecd053a88c520 SHA512 78da8ffcc01706563c4e34c73355b3c65bc2b22abf1501169638b89eae95cd0a4bff095eef5488cba58d0e67b8dd7efd93759981ebd28a9115028e7ad75fa551
-EBUILD apertium-3.2.0.ebuild 863 BLAKE2B 8e2e8cbd3ab2574ec91f8b066b0fd102a0dbdea83ae431a942cffd5ab1288dd9ed91e2969bd1de3bab5d8e2575cb3399ad846244b1e45225c3da352bf86dbae8 SHA512 4c4acdac501ff98b46f26f144af3019f9eca5eecb2a7327a787925df695c0a687af9e85b077a17468d3aba7b8b988f012de1f2d8d3eee742572117d9a871cdfd
-EBUILD apertium-3.8.3.ebuild 1162 BLAKE2B f1e0cbd8744345032e15abe4a0fc5d4e054c4c477c6b3d7e6e4f9fc6e05fd798559d35e35c6e38e521c6d7f4614820efcc90d750ad29f683834f9954ecf0ddc9 SHA512 0aac7cd36ac319a04849359ba2c2bee9454946c2bfdb1a8f1e274882ada3d9f6fdf28e969701dbf08d08b787b1650e3c162a29353361087d67e80e7fa7832160
+EBUILD apertium-3.8.3.ebuild 1163 BLAKE2B 431d7e4dcaf6dc01d44bd56df8f53682b3feba0e3aeb99e73d6052a2de0afe9352f3ee929c8f9fc25c849d72f90a33e180b365b04923586cb5926bf865badef7 SHA512 e47a5929ee72da395c504e46e3a37e15c8b968a03b55b657a276220fa707593e885dc6d4efcc6fc1a1da4a72f05f9c0857e1dc0ae14a8b829e4ebdb527d6302c
 MISC metadata.xml 389 BLAKE2B 9674e02a0086439f5df797f8951d470efbc238f8bd4ba18ac45de8cb37142b6925fa83a0e4f8cc9895ed4f22d31fa61b7bad86e54cdd99938dd73d1523b0c170 SHA512 0622d3671a133e98538ee98d68db414e1eab4da2dde733d6406e25771651e8a0713c107120a3796484cc9d0f45504b5ea8d463e5a4e9127378c58dfb9b5cf18d
diff --git a/sci-misc/apertium/apertium-3.2.0.ebuild b/sci-misc/apertium/apertium-3.2.0.ebuild
deleted file mode 100644
index eea1d0d07414..000000000000
--- a/sci-misc/apertium/apertium-3.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Shallow-transfer machine Translation engine and toolbox"
-HOMEPAGE="https://apertium.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/libxslt
-	dev-libs/libpcre[cxx]
-	>=sci-misc/lttoolbox-3.2
-	virtual/libiconv"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-flags.patch
-	"${FILESDIR}"/${PV}-datadir.patch
-	"${FILESDIR}"/${P}-libpcre.patch
-	"${FILESDIR}"/${P}-autotools.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-misc/apertium/apertium-3.8.3.ebuild b/sci-misc/apertium/apertium-3.8.3.ebuild
index 4ae4fbb9009e..32a638707374 100644
--- a/sci-misc/apertium/apertium-3.8.3.ebuild
+++ b/sci-misc/apertium/apertium-3.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools python-any-r1
 
 DESCRIPTION="Shallow-transfer machine Translation engine and toolbox"
diff --git a/sci-misc/apertium/files/3.2.0-datadir.patch b/sci-misc/apertium/files/3.2.0-datadir.patch
deleted file mode 100644
index d081cd50bc79..000000000000
--- a/sci-misc/apertium/files/3.2.0-datadir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Nur apertium-3.2.0.orig/apertium/Makefile.am apertium-3.2.0/apertium/Makefile.am
---- apertium-3.2.0.orig/apertium/Makefile.am	2011-07-29 06:55:49.000000000 +0100
-+++ apertium-3.2.0/apertium/Makefile.am	2011-07-29 07:03:58.000000000 +0100
-@@ -66,10 +66,10 @@
- 
- instdir = apertium
- 
--apertiumdir = $(prefix)/share/apertium
-+apertiumdir = $(datadir)/
- apertiuminclude = $(prefix)/include/apertium-$(GENERIC_API_VERSION)
- apertiumlib = $(prefix)/lib 
--apertiumsysconf = $(prefix)/etc/apertium
-+apertiumsysconf = $(sysconfdir)/apertium
- 
- apertium_DATA = deformat.xsl reformat.xsl new2old.xsl lexchoice.xsl \
-                 lexchoicebil.xsl tagger.dtd interchunk.dtd format.dtd \
-diff -Nur apertium-3.2.0.orig/Makefile.am apertium-3.2.0/Makefile.am
---- apertium-3.2.0.orig/Makefile.am	2011-07-29 06:55:49.000000000 +0100
-+++ apertium-3.2.0/Makefile.am	2011-07-29 07:08:39.000000000 +0100
-@@ -1,13 +1,10 @@
- SUBDIRS = $(GENERIC_LIBRARY_NAME)
- DIST_SUBDIRS = $(GENERIC_LIBRARY_NAME)
- 
--modesdir=$(prefix)/share/apertium/modes
-+modesdir = $(datadir)/apertium/modes
-+modes_DATA = README-MODES
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = apertium-$(GENERIC_RELEASE).pc
- 
- EXTRA_DIST=autogen.sh README-MODES
--
--install-data-local:
--	mkdir -p $(modesdir)
--	$(INSTALL_DATA) README-MODES  $(modesdir)/README
diff --git a/sci-misc/apertium/files/3.2.0-flags.patch b/sci-misc/apertium/files/3.2.0-flags.patch
deleted file mode 100644
index 9bdc4a34c117..000000000000
--- a/sci-misc/apertium/files/3.2.0-flags.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nur apertium-3.2.0.orig/configure.ac apertium-3.2.0/configure.ac
---- apertium-3.2.0.orig/configure.ac	2011-07-29 06:43:38.000000000 +0100
-+++ apertium-3.2.0/configure.ac	2011-07-29 06:46:26.000000000 +0100
-@@ -54,68 +54,6 @@
- 
- # Checks for programs.
- 
--AC_MSG_CHECKING([Compilation architecture: PPC, i686, x86_64, Other])
--if test x$(which arch) = x
--then ARCH=$($(which uname) -m)
--else ARCH=$($(which arch))
--fi
--
--case "${target_os}" in
--  mingw*)
--    MinGW=yes
--  ;;
--  cygwin*)
--    Cygwin=yes
--  ;;
--esac
--
--if test x$ARCH = xppc
--then
--  AC_MSG_RESULT([PowerPC])
--  CFLAGS="$CFLAGS -Wall -ansi -fomit-frame-pointer"
--  CXXFLAGS="$CXXFLAGS -Wall -ansi -fomit-frame-pointer"
--else
--  if test x$MinGW = xyes
--  then 
--    AC_MSG_RESULT([MinGW])
--    CFLAGS="$CFLAGS -Wall -march=i686 -O3 -DMINGW -fomit-frame-pointer \
--	        -funroll-loops -I/include -L/lib"
--    CXXFLAGS="$CXXFLAGS -Wall -march=i686 -O3 \
--            -fomit-frame-pointer -funroll-loops -I/include -L/lib"
--    CPPFLAGS="$CPPFLAGS -I/include"
--  else
--    if test x$Cygwin = xyes
--    then 
--      AC_MSG_RESULT([Cygwin])
--      CFLAGS="$CFLAGS -Wall -march=i686 -O3 -fomit-frame-pointer \
--           -funroll-loops"
--      CXXFLAGS="$CXXFLAGS -Wall -march=i686 -O3 \
--              -fomit-frame-pointer -funroll-loops"
--      CPPFLAGS="$CPPFLAGS"
--    else
--      if test x$ARCH = xi686
--      then
--        AC_MSG_RESULT([i686])
--        CFLAGS="$CFLAGS -Wall -ansi -march=i686 -O3 -fomit-frame-pointer -funroll-loops"
--        CXXFLAGS="$CXXFLAGS -Wall -ansi -march=i686 -O3 \
--                -fomit-frame-pointer -funroll-loops"
--      else
--        if test x$ARCH = xx86_64
--        then
--          AC_MSG_RESULT([x86_64])
--          CFLAGS="-Wall -ansi -O3 -mtune=nocona -fomit-frame-pointer -funroll-loops $CFLAGS"
--          CXXFLAGS="-Wall -ansi -O3 -mtune=nocona \
--                  -fomit-frame-pointer -funroll-loops $CXXFLAGS"
--        else
--          AC_MSG_RESULT([Other])
--          CFLAGS="-Wall -ansi -O3 $CFLAGS"
--          CXXFLAGS="-Wall -ansi -O3 $CXXFLAGS"
--        fi
--      fi
--    fi    
--  fi
--fi
--
- AC_PROG_CXX
- AC_PROG_LIBTOOL
- AM_SANITY_CHECK
diff --git a/sci-misc/apertium/files/apertium-3.2.0-autotools.patch b/sci-misc/apertium/files/apertium-3.2.0-autotools.patch
deleted file mode 100644
index 4d3a91a795a6..000000000000
--- a/sci-misc/apertium/files/apertium-3.2.0-autotools.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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")
- 
diff --git a/sci-misc/apertium/files/apertium-3.2.0-libpcre.patch b/sci-misc/apertium/files/apertium-3.2.0-libpcre.patch
deleted file mode 100644
index 29a6a5483bb8..000000000000
--- a/sci-misc/apertium/files/apertium-3.2.0-libpcre.patch
+++ /dev/null
@@ -1,43 +0,0 @@
- configure.ac | 28 ++++++++++++++++------------
- 1 file changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0bfca01..2d8ec3b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -183,19 +183,23 @@ AC_CHECK_FUNCS(strcasecmp)
- 
- if test x$(uname) != xDarwin;
- then 
--AC_CHECK_HEADER(pcreposix.h,
--  AC_CHECK_LIB(pcre, pcre_info,[
--  LIBS="$LIBS -lpcreposix -lpcre"
--  no_comp_check=yes],
--  AC_MSG_ERROR([*** unable to locate pcre library ***])),
--  AC_MSG_ERROR([*** unable to locate pcreposix.h include file ***]))
-+PKG_CHECK_MODULES([PCRE],
-+  [libpcre libpcreposix libpcrecpp],
-+  [LIBS="${LIBS} ${PCRE_LIBS}" no_comp_check=yes], [
-+    AC_CHECK_HEADER(pcreposix.h,
-+      AC_CHECK_LIB(pcre, pcre_version,[
-+      LIBS="$LIBS -lpcreposix -lpcre"
-+      no_comp_check=yes],
-+      AC_MSG_ERROR([*** unable to locate pcre library ***])),
-+      AC_MSG_ERROR([*** unable to locate pcreposix.h include file ***]))
- 
--AC_CHECK_HEADER(pcrecpp.h,
--  AC_CHECK_LIB(pcrecpp,pcre_compile,[
--  LIBS="$LIBS -lpcrecpp"
--  no_comp_check=yes],
--  AC_MSG_ERROR([*** unable to locate pcrecpp library ***])),
--  AC_MSG_ERROR([*** unable to locate pcrecpp.h include file ***])) 
-+    AC_CHECK_HEADER(pcrecpp.h,
-+      AC_CHECK_LIB(pcrecpp,pcre_compile,[
-+      LIBS="$LIBS -lpcrecpp"
-+      no_comp_check=yes],
-+      AC_MSG_ERROR([*** unable to locate pcrecpp library ***])),
-+      AC_MSG_ERROR([*** unable to locate pcrecpp.h include file ***])) 
-+  ])
- fi
- 
-