gentoo resync : 16.09.2020

6 files changed, 2 insertions, 154 deletions

diff --git a/app-i18n/pyzy/Manifest b/app-i18n/pyzy/Manifest
index f56ef12045e4..9e000951978c 100644
--- a/app-i18n/pyzy/Manifest
+++ b/app-i18n/pyzy/Manifest
@@ -1,10 +1,5 @@
-AUX pyzy-boost.patch 411 BLAKE2B e56c6b1a79a9ef30096403c5ec445d52eecb7df8f979d6cdaac06fed4439e1280433964f76cacd8c38994f2cbd75f7e8ff31a89f15b724a94435edd4750f079b SHA512 3cb8a0cf43f1fc53949fc8a69c95fcd04b49121d676530da39da6aa70a4916a2f0a6974056b1ee461d2804a28fdb7bb6a9780e5f5e217a4ffa8716b6f2060882
-AUX pyzy-db.patch 359 BLAKE2B 78a99578169984ade022edd5df52eede1041d5e9f55464e1cbff6f8ca6885d68e0cc639f6c0e351d347492a178d635128ea8cce99be60440a27eadd513f547d0 SHA512 794366e0304e92b55bca70eb11a4373eb29e272c2db27db3259b5ca84e8164427ffaacb1fdb15fc0d2a4c6c9d36408f0bf8b35ee5ccba9a9746ae13c7032cfdb
-AUX pyzy-opencc-1.0.0.patch 1712 BLAKE2B 67befcfa21dd1f1ba6543e93eacbd857f0d28a4e14940128710d5fff30f4041748d04addb2990d3e9b08f8533bc58fea67c8d3201054a12f8155f2c0275e2bd3 SHA512 4455229fb9c271e5f2a08292b34daf0cb2969a21af52cf116fadb15764cc82a4e557a9672d253af9a3968a8e907c92d8fd4542e2225a2f09fafe9592c58e7713
 DIST pyzy-0.1.0-patches.tar.xz 5288 BLAKE2B 9a6c86aeedd496ae8372bb0640cb1e03386408a0b00a4c51a6223c4fba23f59631267eb0b7c707a11662025ded410609d17ba39327e0ca5011f48bea3422cd79 SHA512 3a3b9fc317f1c5f59bbe83f3ce58fc76a50bcee798118d66571ba31d504e73fbe7a6976f03ae28f9712c0ba641386ac69390a86185464371728782a62b98291f
-DIST pyzy-0.1.0.tar.gz 1571946 BLAKE2B 2a09dab87ddc9ca9a1e2c7b71dd66fb8d75a9a0932fd87d94392e64bc6a940ce8d3d89ed09f9b3ae0da1a76275ec580033c745c7cfb85724be1f7732cb52d3b9 SHA512 42477152ffd6a2f7ce0e8f920d98e9dc9c7fc32fe9e93a2a4de75c791e70d0f08c30eca0244dc2b87981f6bfc4e635234d62720aa19358c8f80a84e0c371c662
 DIST pyzy-0.1.0.tar.xz 752248 BLAKE2B 5f927cfea31f8cd67cb3e7af9b48c6f48a7707e8324b6b211c3baea0e07683df1da3c8683a5f9aa5073277229ee4d712174f95a764b4dcc5dc5f40330791561e SHA512 18d78bc70229caad44fdba4b7971014979da0aeb35841cea9577d05e5eca871dfe40d285a926ac05a247c8a0b8ab34fd721dcd34517200c5cc75b6b1ed545b35
 DIST pyzy-database-1.0.0.tar.bz2 9977983 BLAKE2B 86f9ee48d584f33ada1ee5380efdaefd85750290caada320c4c9a21206b8fb50fe6a43b931fb41a8c3bc24853bb7843e23d1778b40e6eae68fa4ec383f2b4dcc SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7
-EBUILD pyzy-0.1.0-r2.ebuild 1272 BLAKE2B ff8885974ae0dcfeeecf721e7647ae9d10f3f2163833505c7e72d7a2fc55bb6d8e927bad973be7bd125ebc60fd0427505b37c85d02ae506ad1d165ffc8400882 SHA512 28c9aecc4ce1d935d84188195ec5cbf59d73b4fd42421d5d8adc54f28f85e83d050c5a91419a03e05b5e7f3f9654e2ba01e97b946d8e1c43d20e54bdc11715a4
-EBUILD pyzy-0.1.0-r3.ebuild 1217 BLAKE2B f56a62c2996bb95a837206b20995d4c6e2e48469238052ba7197dc53f8afae931f64c26d96cd6766d791c95353651c9fda1194f469fc8dafe0f894691437dab6 SHA512 8a549910f0bcb137f3b3804ee268fa3970e136753131a04cd608c8b54c43d26aeb20988da6293cd4c581b77cdf5c92d508ccc1ee2ad88893ff2c423e3376d16f
+EBUILD pyzy-0.1.0-r3.ebuild 1215 BLAKE2B ed7b82a68addb322b185a4854f8921e53b6e31cc101fff10aaf037773019ce2a023e589a13140345e61f042f1558308da2e2cf544b50a5012c02d50663cb1df6 SHA512 e9766216c2f0c070963ddb2ff7afd48442fbe4839ef781a470b7843e579055e06a1981bd12d528a680daa73ae9fb3567261de0045255c3b2a418b04e8279ba2b
 MISC metadata.xml 649 BLAKE2B cab621c7a04f8b7672825ecf49fc56c251afef71dcbb7d6c728815b7b56f8bf5c77650ddb91c704dd2b5aaf89d3d55c7e83bd9f7510d164fef13db118177c81d SHA512 46c86fc066ea686db8497ff7dc76361a865a24215b49d2924521235c5bf88f9b029c25597f1bd19399f965052c6b324ded0a2d287cdd29518a2f46cc6614c4a4
diff --git a/app-i18n/pyzy/files/pyzy-boost.patch b/app-i18n/pyzy/files/pyzy-boost.patch
deleted file mode 100644
index 34acacfbc9ba..000000000000
--- a/app-i18n/pyzy/files/pyzy-boost.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -143,9 +143,9 @@
- )
- if test x"$enable_boost" = x"yes"; then
-     # check boost
--    BOOST_REQUIRE([1.39])
--    BOOST_FIND_HEADER([boost/bind.hpp])
--    BOOST_FIND_HEADER([boost/signals2.hpp])
-+    AX_BOOST_BASE([1.39])
-+    AC_CHECK_HEADERS([boost/bind.hpp])
-+    AC_CHECK_HEADERS([boost/signals2.hpp])
- fi
- AM_CONDITIONAL(HAVE_BOOST, test x"$enable_boost" = x"yes")
- 
diff --git a/app-i18n/pyzy/files/pyzy-db.patch b/app-i18n/pyzy/files/pyzy-db.patch
deleted file mode 100644
index 44d0ac6bf456..000000000000
--- a/app-i18n/pyzy/files/pyzy-db.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/data/db/open-phrase/Makefile.am
-+++ b/data/db/open-phrase/Makefile.am
-@@ -30,13 +30,10 @@
- DBTAR = pyzy-database-$(DBVER).tar.bz2
- 
- $(DBTAR):
--	$(AM_V_GEN) \
--	wget http://pyzy.googlecode.com/files/$(DBTAR) || \
--	( $(RM) $@; exit 1)
-+	touch $@
- 
- stamp-db: $(DBTAR)
- 	$(AM_V_GEN) \
--	tar jxfm $(DBTAR); \
- 	mv db/main.db db/$(db_file); \
- 	touch $@
- 
diff --git a/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch b/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
deleted file mode 100644
index 1e23e8b6e5db..000000000000
--- a/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://github.com/pyzy/pyzy/pull/1
-
-Author: Hillwood Yang <hillwood@opensuse.org>
-
---- a/src/SimpTradConverter.cc
-+++ b/src/SimpTradConverter.cc
-@@ -4,6 +4,7 @@
-  *
-  * Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
-  * Copyright (c) 2010 BYVoid <byvoid1@gmail.com>
-+ * Copyright (c) 2015 Hillwood Yang <hillwood@opensuse.org>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -40,7 +41,6 @@ namespace PyZy {
- #ifdef HAVE_OPENCC
- 
- class opencc {
--    static const int BUFFER_SIZE = 64;
- public:
-     opencc (void)
-     {
-@@ -55,29 +55,13 @@ public:
- 
-     void convert (const char *in, String &out)
-     {
--        long n_char;
--        unichar *in_ucs4 = g_utf8_to_ucs4_fast (in, -1, &n_char);
--
--        ucs4_t *pinbuf = (ucs4_t *)in_ucs4;
--        size_t inbuf_left = n_char;
--        while (inbuf_left != 0) {
--            ucs4_t *poutbuf = (ucs4_t *)m_buffer;
--            size_t outbuf_left = BUFFER_SIZE;
--            size_t retval = opencc_convert(m_od, &pinbuf, &inbuf_left, &poutbuf, &outbuf_left);
--            if (retval == (size_t) -1) {
--                /* append left chars in pinbuf */
--                g_warning ("opencc_convert return failed");
--                out << (unichar *) pinbuf;
--                break;
--            }
--            *poutbuf = L'\0';
--            out << m_buffer;
--        }
--        g_free (in_ucs4);
-+        char * converted = opencc_convert_utf8 (m_od, in, -1);
-+        g_assert (converted != NULL);
-+        out = converted;
-+        opencc_convert_utf8_free (converted);
-     }
- private:
-     opencc_t m_od;
--    unichar m_buffer[BUFFER_SIZE + 1];
- };
- 
- void
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
deleted file mode 100644
index 2c736e2414ad..000000000000
--- a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools ltprune python-any-r1
-
-PYZY_DB="${PN}-database-1.0.0"
-
-DESCRIPTION="The Chinese PinYin and Bopomofo conversion library"
-HOMEPAGE="https://github.com/pyzy/pyzy"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
-	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${PYZY_DB}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost doc opencc"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	sys-apps/util-linux
-	boost? ( dev-libs/boost )
-	opencc? ( app-i18n/opencc:= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-boost.patch
-	"${FILESDIR}"/${PN}-db.patch
-	"${FILESDIR}"/${PN}-opencc-1.0.0.patch
-)
-
-src_prepare() {
-	mv "${WORKDIR}"/db data/db/open-phrase || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable opencc) \
-		--enable-db-open-phrase \
-		DOXYGEN=$(usex doc doxygen true)
-}
-
-src_install() {
-	if use doc; then
-		HTML_DOCS=( docs/html/. )
-	fi
-
-	default
-	prune_libtool_files
-}
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
index d73898c2b194..986a3e9bb94e 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost doc opencc"
 
 RDEPEND="dev-db/sqlite:3