gentoo auto-resync : 18:07:2023 - 00:58:24

5 files changed, 31 insertions, 44 deletions

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index a7a08c80feb6..4ceb49756115 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,7 +1,6 @@
-AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
 AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
-DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808
+AUX hunspell-1.7.2-renameexes.patch 5726 BLAKE2B f0a46b70ee8e8c22f0aa2e8d9c1d832e66fd2d3cd58a0cc85ec1d38abc7d500ec4bfba12966abdc016adb434b71bae82373ab3d14ed12a45a20ae8084d00ff3c SHA512 2940d0b47ece661d9dbd66c2400fef06927cf6b41f4c646d36a667252446257fb5be8b60ce42d372c6d7a8f9bdc0ce37966891e608e2ae9f4c2cb5ed19384c96
 DIST hunspell-1.7.2.tar.gz 1536202 BLAKE2B dba8b2b505a040e3a4df488f702dafe4fd226271e67a68e1c1f9c953cc86dfa6f0049d205a8c6616b779d559b82cc8595bf2b4e86ed63e3b42cc9e20b1fecc18 SHA512 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac
-EBUILD hunspell-1.7.1.ebuild 2237 BLAKE2B 9d7b276cd62741c1e71f3c801dbbfa0e1c5568c47cc8661de22c75ff2cafd6b6f4a1f3f2a2e5d6533870b2e40aca5ab7cab76b5b91f160f79e32d1e52b3948ea SHA512 19dd0258bd4f7956e40f8dfa6d2285b4ca983e41c3c63b9a0243149bc492be7fa329f154c5341740d41dae989184531c01ec72f0801c9accb312e9b9c1ae528a
-EBUILD hunspell-1.7.2.ebuild 2237 BLAKE2B cef944ec1749b85595e0b56b50c0cf2d1cc0fa5bd9b9f059587ce86c9aafab322d87bf22f8d0fd2cd35594dba8f1ecef07ace072c9947ebf1ad3488ebe6a1ac1 SHA512 053e53bed45e67d866eb4a7aead157efd9b59934e2021db5ec3b22efc8e649dbc5cf6a8c3e2fe51fef2ae9a801be1de3c8c9b1b012841f7514b509201d144d3f
-MISC metadata.xml 301 BLAKE2B b51f61b0ee48d57bc3cb55e7b82b28395877d7c5b4b715f1e79330da95cf6874c1361341a0ac85ab0ecdc1420b2046d278913571ed69604142cf0cd73181099b SHA512 c83f8543e28a964670c59474527d3866c941e211c60c14b23a2c950ac8b9fad35983af5303820ad96920931ddcc676c0d7201ede9fc56f1b41e7c63e15b8a261
+EBUILD hunspell-1.7.2-r1.ebuild 2183 BLAKE2B e9b99c96280a1a202092056f4337e834f8f3178e70012691a77f50c0266d6e01ccf46dec19b5c7f518c0866006a959b0a4efef5cf083f107649266a882e8a036 SHA512 3d35366e064303d394e56793686af117dbb1ed9b3b67b3dba341aabbb55c67be738865ec440941188da0843dd01deeb664ec174fcdcfc30da6013684f8c80ac6
+EBUILD hunspell-1.7.2.ebuild 2252 BLAKE2B 7978e640fe731d0fd75b7086e62c6db195b05183c4e26314987962da592fdf9ec85146dc0b2a6b7f7795ca363d87c897bf1855daee6801c1cbbfea6b3fda2112 SHA512 b45cc2b362659ae935430cc8b02d8dda98664065188b21c1c8bd4dfadb0abad051d30c75f91b566bc788109f8a972e41c08adad0f5c76b73be8f6ae64e2858a3
+MISC metadata.xml 482 BLAKE2B 8353792e0fe0002c01b7f6007d14f129d4c6e05512ae8cbec8f49bb270c57cefa816971026a2cfb4b84f7fd8ee0d80cd887c94196ec3a685e1079ffc5de0c8bc SHA512 2a56bd6f9c4f2a57694f98813315566b8c2e61f77d57f39269d242c802471206b5e99633b0ef6e7b9290d63db576ac661ac2133bbb9c27be69791a023b3bb364
diff --git a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch
index c45b9cc8a154..52696b968608 100644
--- a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
+++ b/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch
@@ -14,7 +14,6 @@ https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/hunspell/files
 ---
  src/tools/Makefile.am | 14 +++++++-------
  src/tools/chmorph.cxx |  6 +++---
- src/tools/example.cxx |  4 ++--
  src/tools/munch.cxx   |  4 ++--
  src/tools/unmunch.cxx |  4 ++--
  tests/Makefile.am     |  2 +-
@@ -77,22 +76,6 @@ index 6e5add6..163186d 100644
            " (convert informal Hungarian second person texts to formal third "
            "person texts)\n");
        exit(1);
-diff --git a/src/tools/example.cxx b/src/tools/example.cxx
-index 8213a5f..c3cc76a 100644
---- a/src/tools/example.cxx
-+++ b/src/tools/example.cxx
-@@ -48,9 +48,9 @@ int main(int argc, char** argv) {
-   /* first parse the command line options */
- 
-   if (argc < 4) {
--    fprintf(stderr, "example (now it works with more dictionary files):\n");
-+    fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
-     fprintf(stderr,
--            "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+            "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
-     exit(1);
-   }
- 
 diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx
 index 5f51fc6..c8f8beb 100644
 --- a/src/tools/munch.cxx
diff --git a/app-text/hunspell/hunspell-1.7.1.ebuild b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
index 3794ace6622f..97635c6a1145 100644
--- a/app-text/hunspell/hunspell-1.7.1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,17 +11,20 @@ DESCRIPTION="Spell checker, morphological analyzer library and command-line tool
 HOMEPAGE="https://hunspell.github.io/"
 SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
+	virtual/libiconv
 	ncurses? ( sys-libs/ncurses:= )
 	readline? ( sys-libs/readline:= )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
+BDEPEND="
+	>=sys-devel/gettext-0.18
+"
 
 PDEPEND=""
 for lang in ${LANGS}; do
@@ -41,9 +44,9 @@ PATCHES=(
 	# Upstream package creates some executables which names are too generic
 	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
 	# It modifies a Makefile.am file, hence eautoreconf.
-	"${FILESDIR}/${PN}-1.7.0-renameexes.patch"
+	"${FILESDIR}/hunspell-1.7.2-renameexes.patch"
 
-	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" # bug #692614
+	"${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614
 )
 
 src_prepare() {
@@ -60,23 +63,19 @@ src_configure() {
 	# You can do that, libreoffice can find them anywhere, just
 	# ping me when you do so ; -- scarabeus
 	local myeconfargs=(
-		$(use_enable nls)
-		$(use_with ncurses ui)
-		$(use_with readline readline)
-		$(use_enable static-libs static)
+		"$(use_enable nls)"
+		"$(use_with ncurses ui)"
+		"$(use_with readline readline)"
+		"$(use_enable static-libs static)"
 	)
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-
-	einstalldocs
-
 	find "${ED}" -type f -name '*.la' -delete || die
+	einstalldocs
 
-	# bug #342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null || die
-	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so} || die
-	popd >/dev/null || die
+	# Bug #908872
+	keepdir "/usr/share/myspell"
 }
diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild
index e2a26ff8f926..2b5009ebd494 100644
--- a/app-text/hunspell/hunspell-1.7.2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Spell checker, morphological analyzer library and command-line tool
 HOMEPAGE="https://hunspell.github.io/"
 SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
@@ -41,9 +41,9 @@ PATCHES=(
 	# Upstream package creates some executables which names are too generic
 	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
 	# It modifies a Makefile.am file, hence eautoreconf.
-	"${FILESDIR}/${PN}-1.7.0-renameexes.patch"
+	"${FILESDIR}/hunspell-1.7.2-renameexes.patch"
 
-	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" # bug #692614
+	"${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614
 )
 
 src_prepare() {
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
index 527d24169a89..8c5ebb71fbc5 100644
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person" proxied="yes">
+		<email>zurabid2016@gmail.com</email>
+		<name>Zurab Kvachadze</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">hunspell</remote-id>
 		<remote-id type="github">hunspell/hunspell</remote-id>
 	</upstream>
 </pkgmetadata>