gentoo resync : 19.03.2019

3 files changed, 2 insertions, 36 deletions

diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index e2ce2b6dbfa2..07a2ef9fc332 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,4 +1,3 @@
-AUX libutf8proc-1.3.1_p2-overrun.patch 1358 BLAKE2B 4583a42923db3ad30cd407ee736b6758151e4060a2aed528a54a61ca012d0bf7113ec68994805039a725958ac5bdf15bb9b482d7ff0ab53af2188bea2d4c816e SHA512 e897917e6346f3a0c539d3e2a762a37fc553bda17c64327249835f6f64e981cd9e98c627ffc95e5b36bc54837254cbc43fe9192e7671308f18b7167f0d6cbf6b
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 730 BLAKE2B bff6364e922c7a82cc95316b9e055b8b75d1cfa2f2edd1eac16af283526e12a9b2e03e1476befa8f3237f0f22182d9f44aed2ee6b774d898602c5ecc07159c83 SHA512 558f39bca2db826ade93fff8f1af57f88a358988943bbde4861463500339d9f453a50eb3c1f56f51b8b45cc24730fb97853bef4ab03cf459585eb802518135f8
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 728 BLAKE2B 94abd7f27372c69f09c13ee84ce0f8dcef22467410ce755af0858072bea77382ebc94af4d58f7768c90c9fb5fbf3d2d5afb3e0436e0df01e1a1068d4c8383dd7 SHA512 8bfe79664480c0360e4f4578d4e2179ea6fbbc13a2746ccee715e34fd61509e12cdea0756a932ac551b82a93129db84a7cd3523477a22680584802b644c49471
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libutf8proc/files/libutf8proc-1.3.1_p2-overrun.patch b/dev-libs/libutf8proc/files/libutf8proc-1.3.1_p2-overrun.patch
deleted file mode 100644
index 8ce7f4cfbe98..000000000000
--- a/dev-libs/libutf8proc/files/libutf8proc-1.3.1_p2-overrun.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libutf8proc-1.3.1-2/test/iterate.c
-+++ libutf8proc-1.3.1-2/test/iterate.c
-@@ -13,11 +13,17 @@ static void testbytes(unsigned char *buf, int len, utf8proc_ssize_t retval, int
-     utf8proc_int32_t out[16];
-     utf8proc_ssize_t ret;
- 
-+    /* Make a copy to ensure that memory is left uninitialized after "len"
-+     * bytes. This way, Valgrind can detect overreads.
-+     */
-+    unsigned char tmp[16];
-+    memcpy(tmp, buf, len);
-+
-     tests++;
--    if ((ret = utf8proc_iterate(buf, len, out)) != retval) {
-+    if ((ret = utf8proc_iterate(tmp, len, out)) != retval) {
-         fprintf(stderr, "Failed (%d):", line);
-         for (int i = 0; i < len ; i++) {
--            fprintf(stderr, " 0x%02x", buf[i]);
-+            fprintf(stderr, " 0x%02x", tmp[i]);
-         }
-         fprintf(stderr, " -> %zd\n", ret);
-         error++;
---- libutf8proc-1.3.1-2/src/utf8proc.c
-+++ libutf8proc-1.3.1-2/src/utf8proc.c
-@@ -128,7 +128,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_iterate(
-   if ((uc - 0xc2) > (0xf4-0xc2)) return UTF8PROC_ERROR_INVALIDUTF8;
-   if (uc < 0xe0) {         // 2-byte sequence
-      // Must have valid continuation character
--     if (!utf_cont(*str)) return UTF8PROC_ERROR_INVALIDUTF8;
-+     if (str >= end || !utf_cont(*str)) return UTF8PROC_ERROR_INVALIDUTF8;
-      *dst = ((uc & 0x1f)<<6) | (*str & 0x3f);
-      return 2;
-   }
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 7a2691d29761..0b1b1a78c86e 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"