gentoo resync : 14.05.2020

8 files changed, 117 insertions, 85 deletions

diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index a4d794add72d..5aab0b42703a 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,7 +1,10 @@
-AUX libutf8proc-2.3.0-no-static.patch 859 BLAKE2B d461d31600b3ff46cdc791f058eb7bf94070579d638948d04c70a026f37334f85fddb691b31b9beaa0d0a8143f376237a017247179ab9067690c3aa4816badfa SHA512 0129963838e450cf0fd89eab811fda59348690ea45ddc132385fba7211f2afa82bb90c91d8532b2f0aef14c54eb26e02b7d39499e2d03e333fc4789279dbf55f
-AUX libutf8proc-2.3.0-tests-nofetch.patch 1229 BLAKE2B 501fb727f371975792546eea70f4b178983eaad5616ddad51b9de8476848d5f507f083d61eae86f2b23a6e4caa8ed871e2d033d920cd802717bcad4ca1dc90e9 SHA512 ec2a51dec3570d0846436ae29ea7776967284abe11c0be77a8a2515017a2588ec9f943e31e0836167b0c614183f30c32b51c2b172a39c4880c5241d32de72ab7
+AUX libutf8proc-grapheme-test.patch 882 BLAKE2B ed3092be0d7e4e81c9dbde765d4a7cbfadfce266bc71f00dec83f1897436c3c1e759aef06d58136e7bc015861062d26e17b5b4989040bfef4d28d652e0f756eb SHA512 34f3d82bff1a6d0de9cae56b78af8197f103d9c6a4eb9bc912b28f84be8ecec2a7859758a5d1a9d4f5b7593c3f1e17c12f8ca6fdf980916327e3cff718bdc6d9
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
 DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 735 BLAKE2B db22d209558db4bc8cca31719432fc4fc335b51f0a54be7a469783a6fb1ca2c27eea5d8644c5956de0c4dd7c378f8204a3fc30cf076a8597f64cbe559db22c62 SHA512 ed23628e721f8e7f4f662f84153e79dd77d02425b955c5e8bf4d5c5235ec63f65a4d2e537fe24cd808fcd19e9fa07589abb9ea3b2dbc3b28f9092a386a138596
-EBUILD libutf8proc-2.4.0.ebuild 1478 BLAKE2B e724ba48f8e15122e8f47a5cf771f9c7c9d237e7c75c3b93c4511114815057f96e5302ebf49497bdcdb895c3e4c4ab64c9057c33ac240a5c73646e3795439e61 SHA512 df275cba446c3be93d13e9dcdae9321855e1a81344fa5ce14b0d3c9e21cced9fe4d1f2acb643209f34e79affa08954a1c700b2322b3e61c019f3cedc9991aad2
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
+DIST libutf8proc-EastAsianWidth-12.1.0.xz 61760 BLAKE2B 2df2f75a9a2dd150044a5028d1863acab00ecce4511794d2e69259f3a06c20741beb1a6191cefa19e83f9511aafcf5b268d15e0b9db7c2342413dc91c4d3592c SHA512 ff5fc3ac705cf9f7a3aacc6bfd808bd4feab802c7098d8dadcefe6f6639ed82589ba67a37a3a93ff2605aa96009fefc470ce065c9cf84b47370fa17f9a16ea18
+DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 762 BLAKE2B ffce340873038469117109c93b891b742115b10f5cb6b3c4d5e6406c2d9116aa9fa2636c6aabb53d4490e31686c06d240720b8c6d1090ffca632095fca085a5f SHA512 9491e8c77d198d407cb93904f7ef210f176a848025157f46b6403b196910f9c09efea851a59780e493a122311a91ca8573365c05b913f05d60288e843d50a21b
+EBUILD libutf8proc-2.4.0.ebuild 1761 BLAKE2B 1f8a7836edf339f2d96000272219aec6960544ce2d2065e38a06a2e4b8ec0ac7ddd05525ec3259a299049be4c937f710ebe9208f262769d8c0eb8dbe366f862b SHA512 6e1dd47063329a1cb4e8e6b2b23f3f1f6810eb6e0e362ac7f91d4475a035f2233c3c20ced21046e1ad3807f6384f7a03c6f57e0bdc28256b3948d9543cded30f
+EBUILD libutf8proc-2.5.0.ebuild 1311 BLAKE2B e5ca29fb70142e745db0b3eb5230a1e737566e975349e86ca93735a7e54ff4d9edf233008aa40597801fe1fef4075dbb81022f3ccc3d23864ac8056860a2799a SHA512 c38ae48a2208092665de10674300580027b3a75d4fef0c8982e0efa8737ace823787ccd4ba73fdd6c1b0c3d0feb41b81ec0572ffc0921d1f4ad43bc6d0cd10c3
+MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-libs/libutf8proc/files/libutf8proc-2.3.0-no-static.patch b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-no-static.patch
deleted file mode 100644
index 75e9eaac6b53..000000000000
--- a/dev-libs/libutf8proc/files/libutf8proc-2.3.0-no-static.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile b/Makefile
-index e3310f7..44c8977 100644
---- a/Makefile
-+++ b/Makefile
-@@ -46,7 +46,7 @@ pkgincludedir=$(includedir:$(prefix)/%=%)
- 
- .PHONY: all clean data update manifest install
- 
--all: libutf8proc.a libutf8proc.$(SHLIB_EXT)
-+all: libutf8proc.$(SHLIB_EXT)
- 
- clean:
- 	rm -f utf8proc.o libutf8proc.a libutf8proc.$(SHLIB_VERS_EXT) libutf8proc.$(SHLIB_EXT)
-@@ -104,7 +104,6 @@ install: libutf8proc.a libutf8proc.$(SHLIB_EXT) libutf8proc.$(SHLIB_VERS_EXT) li
- 	mkdir -m 755 -p $(DESTDIR)$(includedir)
- 	$(INSTALL) -m 644 utf8proc.h $(DESTDIR)$(includedir)
- 	mkdir -m 755 -p $(DESTDIR)$(libdir)
--	$(INSTALL) -m 644 libutf8proc.a $(DESTDIR)$(libdir)
- 	$(INSTALL) -m 755 libutf8proc.$(SHLIB_VERS_EXT) $(DESTDIR)$(libdir)
- 	mkdir -m 755 -p $(DESTDIR)$(pkgconfigdir)
- 	$(INSTALL) -m 644 libutf8proc.pc $(DESTDIR)$(pkgconfigdir)/libutf8proc.pc
diff --git a/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch
deleted file mode 100644
index f438fdd9779b..000000000000
--- a/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/data/Makefile b/data/Makefile
-index f5d1dd9..60c09e3 100644
---- a/data/Makefile
-+++ b/data/Makefile
-@@ -10,6 +10,7 @@ PERL=perl
- MAKE=make
- JULIA=julia
- CURLFLAGS = --retry 5 --location
-+UDATA=${EPREFIX}/usr/share/unicode-data
- 
- .PHONY: clean
- 
-@@ -25,6 +26,7 @@ CharWidths.txt: charwidths.jl EastAsianWidth.txt
- UNICODE_VERSION=12.0.0
- 
- UnicodeData.txt:
-+	cp $(UDATA)/$@ $@
- 	$(CURL) $(CURLFLAGS) -o $@ -O http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt
- 
- EastAsianWidth.txt:
-@@ -43,10 +45,10 @@ CaseFolding.txt:
- 	$(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CaseFolding.txt
- 
- NormalizationTest.txt:
--	$(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/NormalizationTest.txt
-+	cp $(UDATA)/$@ $@
- 
- GraphemeBreakTest.txt:
--	$(CURL) $(CURLFLAGS) $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
-+	cat $(UDATA)/auxiliary/$@ | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
- 
- emoji-data.txt:
- 	$(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://unicode.org/Public/emoji/`echo $(UNICODE_VERSION) | cut -d. -f1-2`/emoji-data.txt
diff --git a/dev-libs/libutf8proc/files/libutf8proc-grapheme-test.patch b/dev-libs/libutf8proc/files/libutf8proc-grapheme-test.patch
new file mode 100644
index 000000000000..64ebc26f671e
--- /dev/null
+++ b/dev-libs/libutf8proc/files/libutf8proc-grapheme-test.patch
@@ -0,0 +1,23 @@
+https://github.com/JuliaStrings/utf8proc/commit/11bb3d9dc796bb006c79c2962a7d19abcadfb3df
+
+Author: Steven G. Johnson <stevenj@alum.mit.edu>
+
+--- a/test/graphemetest.c
++++ b/test/graphemetest.c
+@@ -18,12 +18,12 @@ int main(int argc, char **argv)
+ 
+         while (buf[bi]) {
+             bi = skipspaces(buf, bi);
+-            if (buf[bi] == '/') { /* grapheme break */
++            if ((uint8_t)buf[bi] == 0xc3 && (uint8_t)buf[bi+1] == 0xb7) { /* U+00f7 = grapheme break */
+                 src[si++] = '/';
+-                bi++;
++                bi += 2;
+             }
+-            else if (buf[bi] == '+') { /* no break */
+-                bi++;
++            else if ((uint8_t)buf[bi] == 0xc3 && (uint8_t)buf[bi+1] == 0x97) { /* U+00d7 = no break */
++                bi += 2;
+             }
+             else if (buf[bi] == '#') { /* start of comments */
+                 break;
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index b89571d039c5..6b9420aefe1f 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit toolchain-funcs
 
 MY_P="${P/_p/-}"
-DESCRIPTION="mapping tool for UTF-8 strings"
+
+DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
 HOMEPAGE="http://www.netsurf-browser.org/"
 SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
 
@@ -16,13 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
-
 S="${WORKDIR}/${MY_P}"
 
 _emake() {
 	source "${EPREFIX}"/usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared "${@}"
 }
 
 src_compile() {
diff --git a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
index 276a0508f63d..38e2c5e109a9 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
@@ -1,45 +1,48 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit toolchain-funcs
 
-MY_P="${P#lib}"
-DESCRIPTION="mapping tool for UTF-8 strings"
+DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
 HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
-SRC_URI="https://github.com/JuliaStrings/utf8proc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-12.1.0.xz )"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="test"
+IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${MY_P}"
-
 BDEPEND="test? ( =app-i18n/unicode-data-12.0* )"
+S="${WORKDIR}/${P#lib}"
+
+PATCHES=( "${FILESDIR}"/${PN}-grapheme-test.patch )
 
-PATCHES=(
-	# Don't build or install static libs
-	"${FILESDIR}/${PN}-2.3.0-no-static.patch"
-	# use app-i18n/unicode-data for test data instead of curl
-	"${FILESDIR}/${PN}-2.3.0-tests-nofetch.patch"
-)
+src_prepare() {
+	if use cjk; then
+		einfo "Modifying East Asian Ambiguous (A) as wide ..."
+		cp "${WORKDIR}"/${PN}-EastAsianWidth-12.1.0 ${PN#lib}_data.c || die
+	fi
 
-_emake() {
-	emake CC=$(tc-getCC) AR=$(tc-getAR) "$@"
+	default
 }
 
 src_compile() {
-	_emake
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)"
 }
 
 src_install() {
-	_emake DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
+	emake \
+		DESTDIR="${ED}" \
+		prefix="/usr" \
+		libdir="/usr/$(get_libdir)" \
 		install
+	use static-libs || find "${ED}" -name '*.a' -delete || die
 	# This package used to use netsurf's version as an upstream, which lives in
 	# its own little world. Unlike julia's version, it puts its header file
 	# in libutf8proc/utf8proc.h instead of utf8proc.h. The problem is that
@@ -50,5 +53,7 @@ src_install() {
 }
 
 src_test() {
-	_emake check
+	cp "${EPREFIX}"/usr/share/unicode-data/{Normalization,auxiliary/GraphemeBreak}Test.txt data || die
+
+	emake CC="$(tc-getCC)" check
 }
diff --git a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
new file mode 100644
index 000000000000..5d41081fd989
--- /dev/null
+++ b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
+HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
+SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-13.0.0.xz )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="cjk static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( =app-i18n/unicode-data-13.0* )"
+S="${WORKDIR}/${P#lib}"
+
+PATCHES=( "${FILESDIR}"/${PN}-grapheme-test.patch )
+
+src_prepare() {
+	if use cjk; then
+		einfo "Modifying East Asian Ambiguous (A) as wide ..."
+		cp "${WORKDIR}"/${PN}-EastAsianWidth-13.0.0 ${PN#lib}_data.c || die
+	fi
+
+	default
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		prefix="/usr" \
+		libdir="/usr/$(get_libdir)" \
+		install
+	use static-libs || find "${ED}" -name '*.a' -delete || die
+}
+
+src_test() {
+	cp "${EPREFIX}"/usr/share/unicode-data/{Normalization,auxiliary/GraphemeBreak}Test.txt data || die
+
+	emake CC="$(tc-getCC)" check
+}
diff --git a/dev-libs/libutf8proc/metadata.xml b/dev-libs/libutf8proc/metadata.xml
index 7a38bb900964..7ffc4339bc56 100644
--- a/dev-libs/libutf8proc/metadata.xml
+++ b/dev-libs/libutf8proc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
 </pkgmetadata>