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

3 files changed, 154 insertions, 0 deletions

diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index f24ebf3f0b86..e5bfab6c544c 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -3,6 +3,8 @@ AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db
 AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
+AUX aspell-0.60.8.1-gcc-15-fix.patch 1848 BLAKE2B e61fb13c0fe4b16e69c70d286f505682fe7f0a296a64c7176df6c81d494816424cc7bb914ee11ef8f0a76ab58ea9fad9dcb605a3e810617ad6f35d489a039ddf SHA512 47b282de19f85a040cd3d43fff642e36c63306f0f5fcadcf6e5245e9a094c45990557a386169de4ad0acc923c2295c946187b56d86ea175049208f166853359d
 DIST aspell-0.60.8.1.tar.gz 3567205 BLAKE2B b7e2045658d9553beef9a7fb69264fdd5be22b5b8abce93baf08111ca5bb3e0bfedb9f351d0e4cde9d41e20960b584d8f02c0df02268cf282c925edc8ffbab8d SHA512 80fa9d7f5f4b8bf66388825ae28403713a2e3eda81fc31f2f452c3e2fe8349cd0fa8f0e4d0d3f8cffe215817229af25aa7be2dba358cb9cdc97e9d2834ba5ca7
+EBUILD aspell-0.60.8.1-r1.ebuild 2804 BLAKE2B 653c8427ebf72b568e6e2bfca9700dc1a4a6d0e773192ea1dd03e834b7f7c4340eca309d3531b569d6c9ffb36eed3f6bb4296b39d8599aeb48d814b4bc036749 SHA512 555bb2ccae016692ca532d4afd534ba5479a9bbc94cf50a0b3a63184ccc48253ad4993ec94617bb8dfe676821ab6da72bfd43b3d657663a9ab710b53e9341b84
 EBUILD aspell-0.60.8.1.ebuild 2750 BLAKE2B ce187cf0893da0140e49f8e440b19fd5f022777e6cb7f1f089795b179227e2b0f81894983301dda3ffd1eb5c03b5b78c9dc73be38a7fd80ae472b313721a9ff2 SHA512 3a2ee75e8d0b4c78d5c56a111e1c46fdc9552a8ef66a0ab31d6c97dfa5079cbadde78d0dd6b7530007b401ac839cd726d6aeebec01dd6c3efc37bb0f0b3ac304
 MISC metadata.xml 334 BLAKE2B 21076177b3c8b9885a962e3b809ac5dbd0499a32cd9dd8c2a656fc2f98a2ee17dd605890dd36b4567e9adda542762f4031cd53e4b72c67f712a8a8a015541504 SHA512 698c5fc0cb978c79d99db139581aad79016445eb0edae71b604792127d0a7c1e6c40f614df0afbad154ff0402cbf5685a1949ebf7fc5163b2298b05430c9d0ac
diff --git a/app-text/aspell/aspell-0.60.8.1-r1.ebuild b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
new file mode 100644
index 000000000000..9a89d92f72db
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="nls unicode"
+
+# All available language app-dicts/aspell-* packages.
+LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa
+	fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku
+	ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR
+	qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
+)
+
+for LANG in ${LANGUAGES[@]}; do
+	IUSE+=" l10n_${LANG}"
+
+	case ${LANG} in
+		de-1901)
+			DICT="de-alt"
+			;;
+		pt-BR)
+			DICT="pt-br"
+			;;
+		pt-PT)
+			DICT="pt"
+			;;
+		*)
+			DICT="${LANG}"
+			;;
+	esac
+
+	PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
+done
+unset DICT LANG LANGUAGES
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	nls? ( virtual/libintl )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.5-nls.patch"
+	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
+	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+	"${FILESDIR}/${PN}-0.60.8.1-gcc-15-fix.patch"
+)
+
+src_prepare() {
+	default
+
+	rm m4/lt* m4/libtool.m4 || die
+	eautoreconf
+	elibtoolize --reverse-deps
+
+	# Parallel install of libtool libraries doesn't always work.
+	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+	# This has to be after automake has run so that we don't clobber
+	# the default target that automake creates for us.
+	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+	# The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more.
+	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable nls)
+		$(use_enable unicode)
+		--sysconfdir="${EPREFIX}"/etc/aspell
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# Install Aspell/Ispell compatibility scripts.
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	# As static build has been disabled,
+	# all .la files can be deleted unconditionally.
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch b/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch
new file mode 100644
index 000000000000..e16b196b599f
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch
@@ -0,0 +1,39 @@
+https://git.savannah.gnu.org/cgit/aspell.git/commit/?id=ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041
+
+From ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 21 Jul 2024 22:01:50 +0100
+Subject: modules/speller/default/vector_hash-t.hpp: fix gcc-15 build
+
+Uncoming `gcc-15` added extra checks for template instantiation that is
+guaranteed to fail in
+  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=313afcfdabeab3e6705ac0bd1273627075be0023
+
+As a result `aspell` build now fails as:
+
+    In file included from modules/speller/default/readonly_ws.cpp:51:
+    modules/speller/default/vector_hash-t.hpp: In member function 'void aspeller::VectorHashTable<Parms>::recalc_size()':
+    modules/speller/default/vector_hash-t.hpp:186:43: error: 'class aspeller::VectorHashTable<Parms>' has no member named 'e'
+      186 |     for (iterator i = begin(); i != this->e; ++i, ++this->_size);
+          |                                           ^
+    modules/speller/default/vector_hash-t.hpp:186:59: error: 'class aspeller::VectorHashTable<Parms>' has no member named '_size'; did you mean 'size'?
+      186 |     for (iterator i = begin(); i != this->e; ++i, ++this->_size);
+          |                                                           ^~~~~
+          |                                                           size
+
+It looks like `_size` is `size_` mis-spelling and `e` was not introduced
+here.
+--- a/modules/speller/default/vector_hash-t.hpp
++++ b/modules/speller/default/vector_hash-t.hpp
+@@ -183,7 +183,7 @@ namespace aspeller {
+   template<class Parms>
+   void VectorHashTable<Parms>::recalc_size() {
+     size_ = 0;
+-    for (iterator i = begin(); i != this->e; ++i, ++this->_size);
++    for (iterator i = begin(), e = end(); i != e; ++i, ++size_);
+   }
+ 
+ }
+-- 
+cgit v1.1
+