gentoo resync : 29.12.2022

5 files changed, 4 insertions, 114 deletions

diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 7d6fcf4605f0..056bb4f65406 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,9 +1,6 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
-DIST enchant-2.3.2.tar.gz 991782 BLAKE2B ece8c4cbac2c242c23b4b8c5ab2daf1037705dbf58ad29b4863dd01cb30b2d98e11828f2b9d1ce3823aec419c871cc3dd1092e4659e10ef3e3cd2df867255be4 SHA512 886635bb55c5f0c774445e4a0f14d39e2d08eeb964257037062c2e97c2cf3348be8c631ff5e7a13144936127761964bdc60ff1e0dd6f63b292a655626f91ef62
 DIST enchant-2.3.3.tar.gz 990877 BLAKE2B 310b66931e803ccb643a47c1476122a558de7a192b50f532d4cdababe55d398268bf5bfcc0ed556d665af88f6c183c1871147d302ad39a7ebd4fc29e1ab16967 SHA512 c97764a8f219033b440cbfb820624f54993b19ba1f38b56f20336889304f753c7c513008bb92cd1424bfbf528c2d473f35bef93d9140063612e3a270fd000deb
-EBUILD enchant-1.6.1-r1.ebuild 1625 BLAKE2B 8f42b0410fa9b7565c5eebb849fa32c8850e8d77d65d34cc5f69a6ae553acf3bbf702e85d134387e8b2a75ad22f43426021d65b5ef4ac4f8e92cd6b3236c0d9c SHA512 fb0da3b82a95b9af44b7f35c05c204f6eaf2529fe72dcfe00b2e9a0ba6edfccdacda4f87e0e167548d66b2256beef4177bf4ee7fbad9a4817ed5688270531de3
-EBUILD enchant-1.6.1-r2.ebuild 1409 BLAKE2B a97738ba4d5106c8ac058fc8c184fe6e43f010d6bc68451710060eea06253a0c959691c6a5bfce6054a739c7af0ee5e150dba302988711e4aba93f435a98bf37 SHA512 32cdc506270fd6a5fa957a59410472b884c203b62c53b06e8ebf9c2489e4dd889cb84005ccb92795047459b6968cc68dab243e0f387d007ebe9a65447727e10c
-EBUILD enchant-2.3.2.ebuild 1234 BLAKE2B db4fc98f82f8dc5a139a01c61836629e128138482e78bdd7ad3b99b0b1a1a0a52f5c7c352fa6094fccc0ab42f3adcff8bc4e730aaa3cfeb13560e5a0f64967e4 SHA512 4e55587f310f6970002bed29142c20ae42afa67995624f6785aa102534b2ae837dde841bd1db201a1b302cd0bcce78fb068d75debe1435d696791d3f6e552bc5
-EBUILD enchant-2.3.3-r1.ebuild 1306 BLAKE2B dc86e08f340c6c3803d4d70d49c0770b1677b1f8175fe5e7285a8ce4e51b8962391fa1521a3cbf9e16e01830df35e28a1ee90f6757acb2043813697843c1cdf0 SHA512 b430157cf7dce2efb3bb1ae06e57a5d553ca90bc7260b72e36c4e2d346a72cc0b926fa90b9bd31cd3cce0ce28ae99a33b33755fa7eb5790f2132ec4912f80233
+EBUILD enchant-1.6.1-r2.ebuild 1402 BLAKE2B 82313fac47e2aa83cba94e715ea231ae1f2185c534a47efb591ad0c4f03a87b5439bb35343e2c25dc2d5713e77831e74746e46c3a159d3683321a728f8a1d94e SHA512 b91a1745d398a453cbe34d320079e9f17a29c4ebf23eab5dd69006f433593acc4cfe0c184d3b6ffa1211e36851a0e17ea98e2c0cfbcf4df3d5d41a9d6b4e013e
+EBUILD enchant-2.3.3-r1.ebuild 1306 BLAKE2B 85894066783b9e967f865134070e6850c8858156c823569fd931ae1f1fc34cc0a8e8e617c6129cae4f492954bf05a992d58ac26bd749aa164c428a50012f2705 SHA512 a54ec38dfdb6214bad21a10fd8c4158774c5146150d5d9a56888f66120ccde11c80d65fb743d4da9b3fccc19b976c9ffd6f2db449077fbff2ad949c0d0fc93d5
 MISC metadata.xml 626 BLAKE2B 292276574828700f2688f2a5b1fc09a1c57a0e39ea89067bb728ac773654ab7ae073be8d2af1cd68f8d4f28f7fcf9fb2f7782db63c0ab7f457d389ab66c95c18 SHA512 894afee900f5a285cbd7715b7fd689e645013c134dbf5a8b5bd8aee9dd886793010a907ed6164d393896648a1932721bc404a7a96e38fe1705705dbd5848bbff
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
deleted file mode 100644
index 595d263abfd1..000000000000
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV="$(replace_all_version_separators '-')"
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
-)
-
-src_prepare() {
-	default
-	sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
-	sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484, shouldn't be an issue in 2.2
-}
-
-src_configure() {
-	econf \
-		$(use_enable aspell) \
-		$(use_enable hunspell myspell) \
-		$(use_enable static-libs static) \
-		--disable-hspell \
-		--disable-ispell \
-		--disable-uspell \
-		--disable-voikko \
-		--disable-zemberek \
-		--with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild
index d4302d6ca527..25628fd99c79 100644
--- a/app-text/enchant/enchant-1.6.1-r2.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.3.2.ebuild b/app-text/enchant/enchant-2.3.2.ebuild
deleted file mode 100644
index 2da677c77f45..000000000000
--- a/app-text/enchant/enchant-2.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-IUSE="aspell +hunspell test voikko"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-RDEPEND="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )
-	voikko? ( dev-libs/libvoikko )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/unittest++-2.0.0-r2 )"
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT="test" # Tests fail
-
-src_configure() {
-	# TODO: Add app-text/nuspell support
-	econf \
-		--datadir="${EPREFIX}"/usr/share/enchant-2 \
-		--disable-static \
-		$(use_enable test relocatable) \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_with voikko) \
-		--without-nuspell \
-		--without-hspell \
-		--without-applespell \
-		--without-zemberek \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.3.3-r1.ebuild b/app-text/enchant/enchant-2.3.3-r1.ebuild
index f40c183d7f32..3f7c2ef51001 100644
--- a/app-text/enchant/enchant-2.3.3-r1.ebuild
+++ b/app-text/enchant/enchant-2.3.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell nuspell test voikko"
 RESTRICT="!test? ( test )"