Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: app-text/hunspell/
Date: Thu, 02 Mar 2017 18:54:24
Message-Id: 1488480819.544f1fed95b806a864f10aed4a70f14f8fdd2330.lluixhi@gentoo
1 commit: 544f1fed95b806a864f10aed4a70f14f8fdd2330
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Thu Mar 2 18:53:39 2017 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Thu Mar 2 18:53:39 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=544f1fed
7
8 app-text/hunspell: sync with upstream
9
10 drop r99 suffix
11
12 app-text/hunspell/Manifest | 4 +--
13 ...pell-1.3.3-r99.ebuild => hunspell-1.3.3.ebuild} | 33 +++++++++-------------
14 app-text/hunspell/metadata.xml | 9 ------
15 3 files changed, 15 insertions(+), 31 deletions(-)
16
17 diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
18 index b9af65c..8e24bc0 100644
19 --- a/app-text/hunspell/Manifest
20 +++ b/app-text/hunspell/Manifest
21 @@ -3,5 +3,5 @@ AUX hunspell-1.3.2-static-lib.patch 451 SHA256 7259ea8f23a4d2717e85f62e3276cbcc2
22 AUX hunspell-1.3.3-error_h.patch 1218 SHA256 bf3f74ccf7809e3d4ba454a2e8fa0a2b4048c0d718b3ce6746f490c540939583 SHA512 c8b900b92ac648a0d1be7b7b3ae2e798e5c3b1acd9770a27219d0005019dc0668c4b55c89b01229ddf19fba2346bc82a76f907c72ff2e0f51482bc9a075eed37 WHIRLPOOL f42abd45987f46393cf5a28acc0ec2ad5d7d57b0b10c2ea7000325c1f82035cf269f914e523beee41abe900680e91ded2bfdc9d2d80546090b056f4f5cc6ffa5
23 AUX hunspell-1.3.3-multibyte-chars.patch 1866 SHA256 1a2f0c6fd79894fa5f556c1715bc4bd05f2409b1d778bc2f597e3d44dc64f457 SHA512 a5b3b2a7b93bf5c5cdf446ae4a85e88e6bf1244c05437df29734241507e715f18ca5967de708f20ab569b55c646f85f4277c1112c867321edfd105a946c7bf9c WHIRLPOOL df9418af8941e8cba06a6b4b63369324fbad358b4c4bface9385f720ac91881150cd832e3c0f5665bc35ae5cd02da9c978233d1254d0ff45370516db58997563
24 DIST hunspell-1.3.3.tar.gz 986081 SHA256 a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c SHA512 7599981d002a4a032c41c83f6287243a4942b0e25c408049a3ba86c16f63ce964800a3ac325ace0402b0d7256690c4a4151a66f19a8f58cc455af0498bb1af04 WHIRLPOOL c10f7f7b326ce886bd031da29e9e04a1f4a5914f24cbe75061ed539958e7a8efaa4d4ea16f2b17437c63d97d6f558a27c092bc43c9f56c75078667d5344402f8
25 -EBUILD hunspell-1.3.3-r99.ebuild 2303 SHA256 01a01993245db5055ea6e1ed54d4e06f1f56cde673787efeb0d27421a06147ac SHA512 e67fe3031ce34df836d68545194d214192c0defc5770eb896cbe3b88442a06ebe183ed0d21a3ab687b3107868d2ac2e6bd597944407a371a00af7ff6381ab7e3 WHIRLPOOL f80b65be8a512a9ec21a86fe8800c591e76ec3a6eeb7d704ab6aacc48e3c0328db8186da727e18df6b0e522270310adb7be3cdb88bfcbd10782e446ca0d02090
26 -MISC metadata.xml 527 SHA256 22730719dfe8b3efd34889cd496f6c0508544433cf315e27aa49550a31d55bed SHA512 1defdc87b33619dd65f0852224aa0e86ed6520864e6cc3cac5b74f340ba325a7c6448c30574170bdf64b45288a2eab747e4cb205eab90e70a4ed9b5e468a8671 WHIRLPOOL 88188a8ea882fd7acd487bcae87e4c891597d5883d0c625f928c8c24e7ebcefc537ff28df46f5140ff2d38171d74753183d69a859721f785e88bed3460ff99b2
27 +EBUILD hunspell-1.3.3.ebuild 2387 SHA256 6f9120c9e6954469129dd0a6144bb656436f215e034b2feaa461705276f75d15 SHA512 9fb1e8a1b4448bbb485b62f151ca692dafb678f268af9684ba8632bb5f9f938b54fabdf8b24fe7bcf4627b3372fe3779d1557d4ae278bc36752ada4491d2ea40 WHIRLPOOL b575067fae62a82f4391f8d0d4da49666edb82ad522a5ee4b2dde3f217400284c6fee9002e1fe2c19f87b8b544a05b1cbd7ae46ec7f9ecfda3f0b9b23f7b67fe
28 +MISC metadata.xml 217 SHA256 618d419d35162d585b2082531194ef24d5b8f19067fd6e8f6efc4f2ad8f48db6 SHA512 e3d0bbb208e3aa303b020ec076371e0b5d35f6ca26c9fff1185b0107a8528699167035fa31dc568534251b9a8b2dc2f0f09b0c2c9f8d7228a4f942e36934349f WHIRLPOOL 22f8aac5575d555e13da038a334747d9a942f08c118d196c83956472c8797ede9d145bb3cd34f664f42f21c580797a9a7f7beae98c23d54270a6ad6ae13d99c2
29
30 diff --git a/app-text/hunspell/hunspell-1.3.3-r99.ebuild b/app-text/hunspell/hunspell-1.3.3.ebuild
31 similarity index 73%
32 rename from app-text/hunspell/hunspell-1.3.3-r99.ebuild
33 rename to app-text/hunspell/hunspell-1.3.3.ebuild
34 index 9f3c37c..941c076 100644
35 --- a/app-text/hunspell/hunspell-1.3.3-r99.ebuild
36 +++ b/app-text/hunspell/hunspell-1.3.3.ebuild
37 @@ -1,6 +1,5 @@
38 # Copyright 1999-2016 Gentoo Foundation
39 # Distributed under the terms of the GNU General Public License v2
40 -# $Id$
41
42 EAPI=5
43 inherit eutils multilib autotools flag-o-matic versionator
44 @@ -14,35 +13,29 @@ HOMEPAGE="http://hunspell.sourceforge.net/"
45 SLOT="0"
46 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
47 IUSE="ncurses nls readline static-libs"
48 -KEYWORDS="amd64 arm ~mips ppc x86"
49 +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
50
51 RDEPEND="
52 - ncurses? ( sys-libs/ncurses )
53 + ncurses? ( sys-libs/ncurses:0= )
54 readline? ( sys-libs/readline:= )"
55 DEPEND="${RDEPEND}
56 sys-devel/gettext"
57
58 # describe properly mi
59 -LANGS="af bg ca cs cy da de el en eo es et fo fr ga gl he hr hu ia id is it km
60 -ku lt lv mk ms nb nl nn pl pt pt_BR ro ru sk sl sq sv sw tn uk zu"
61 +LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
62 +is it km ku lt lv mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu"
63
64 -DICT_DEP="app-dicts/myspell-en"
65 +PDEPEND="app-dicts/myspell-en"
66 for lang in ${LANGS}; do
67 - if [[ ${lang} == de ]] ; then
68 - DICT_DEP+=" linguas_de? (
69 - || (
70 - app-dicts/myspell-de
71 - app-dicts/myspell-de-alt
72 - )
73 - )"
74 - else
75 - DICT_DEP+=" linguas_${lang}? ( app-dicts/myspell-${lang/pt_BR/pt-br} )"
76 - fi
77 - IUSE+=" linguas_${lang}"
78 + IUSE+=" l10n_${lang}"
79 + case ${lang} in
80 + de-1901) dict="de_1901" ;;
81 + pt-BR) dict="pt-br" ;;
82 + *) dict="${lang}" ;;
83 + esac
84 + PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
85 done
86 -PDEPEND="${DICT_DEP}"
87 -
88 -unset lang LANGS DICT_DEP
89 +unset dict lang LANGS
90
91 S=${WORKDIR}/${MY_P}
92
93
94 diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
95 index 9ffc5a6..66fcbb8 100644
96 --- a/app-text/hunspell/metadata.xml
97 +++ b/app-text/hunspell/metadata.xml
98 @@ -1,15 +1,6 @@
99 <?xml version="1.0" encoding="UTF-8"?>
100 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
101 <pkgmetadata>
102 - <maintainer type="person">
103 - <email>elizabeth@×××××××××××.me</email>
104 - <name>Elizabeth Myers</name>
105 - <description>Proxied maintainer; set to assignee in all bugs</description>
106 - </maintainer>
107 - <maintainer type="project">
108 - <email>proxy-maint@g.o</email>
109 - <name>Proxy Maintainers</name>
110 - </maintainer>
111 <upstream>
112 <remote-id type="sourceforge">hunspell</remote-id>
113 </upstream>