Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/pyzy/files/, app-i18n/pyzy/
Date: Wed, 09 Sep 2020 06:29:14
Message-Id: 1599632743.eb6937943308ea5216fd00a3918e515a014b3d84.dlan@gentoo
1 commit: eb6937943308ea5216fd00a3918e515a014b3d84
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 9 06:25:43 2020 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 9 06:25:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb693794
7
8 app-i18n/pyzy: drop old version
9
10 Package-Manager: Portage-3.0.0, Repoman-2.3.23
11 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
12
13 app-i18n/pyzy/Manifest | 1 -
14 app-i18n/pyzy/files/pyzy-boost.patch | 15 --------
15 app-i18n/pyzy/files/pyzy-db.patch | 17 ---------
16 app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch | 56 ---------------------------
17 app-i18n/pyzy/pyzy-0.1.0-r2.ebuild | 59 -----------------------------
18 5 files changed, 148 deletions(-)
19
20 diff --git a/app-i18n/pyzy/Manifest b/app-i18n/pyzy/Manifest
21 index 2e896413356..9b6ca2a57bd 100644
22 --- a/app-i18n/pyzy/Manifest
23 +++ b/app-i18n/pyzy/Manifest
24 @@ -1,4 +1,3 @@
25 DIST pyzy-0.1.0-patches.tar.xz 5288 BLAKE2B 9a6c86aeedd496ae8372bb0640cb1e03386408a0b00a4c51a6223c4fba23f59631267eb0b7c707a11662025ded410609d17ba39327e0ca5011f48bea3422cd79 SHA512 3a3b9fc317f1c5f59bbe83f3ce58fc76a50bcee798118d66571ba31d504e73fbe7a6976f03ae28f9712c0ba641386ac69390a86185464371728782a62b98291f
26 -DIST pyzy-0.1.0.tar.gz 1571946 BLAKE2B 2a09dab87ddc9ca9a1e2c7b71dd66fb8d75a9a0932fd87d94392e64bc6a940ce8d3d89ed09f9b3ae0da1a76275ec580033c745c7cfb85724be1f7732cb52d3b9 SHA512 42477152ffd6a2f7ce0e8f920d98e9dc9c7fc32fe9e93a2a4de75c791e70d0f08c30eca0244dc2b87981f6bfc4e635234d62720aa19358c8f80a84e0c371c662
27 DIST pyzy-0.1.0.tar.xz 752248 BLAKE2B 5f927cfea31f8cd67cb3e7af9b48c6f48a7707e8324b6b211c3baea0e07683df1da3c8683a5f9aa5073277229ee4d712174f95a764b4dcc5dc5f40330791561e SHA512 18d78bc70229caad44fdba4b7971014979da0aeb35841cea9577d05e5eca871dfe40d285a926ac05a247c8a0b8ab34fd721dcd34517200c5cc75b6b1ed545b35
28 DIST pyzy-database-1.0.0.tar.bz2 9977983 BLAKE2B 86f9ee48d584f33ada1ee5380efdaefd85750290caada320c4c9a21206b8fb50fe6a43b931fb41a8c3bc24853bb7843e23d1778b40e6eae68fa4ec383f2b4dcc SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7
29
30 diff --git a/app-i18n/pyzy/files/pyzy-boost.patch b/app-i18n/pyzy/files/pyzy-boost.patch
31 deleted file mode 100644
32 index 34acacfbc9b..00000000000
33 --- a/app-i18n/pyzy/files/pyzy-boost.patch
34 +++ /dev/null
35 @@ -1,15 +0,0 @@
36 ---- a/configure.ac
37 -+++ b/configure.ac
38 -@@ -143,9 +143,9 @@
39 - )
40 - if test x"$enable_boost" = x"yes"; then
41 - # check boost
42 -- BOOST_REQUIRE([1.39])
43 -- BOOST_FIND_HEADER([boost/bind.hpp])
44 -- BOOST_FIND_HEADER([boost/signals2.hpp])
45 -+ AX_BOOST_BASE([1.39])
46 -+ AC_CHECK_HEADERS([boost/bind.hpp])
47 -+ AC_CHECK_HEADERS([boost/signals2.hpp])
48 - fi
49 - AM_CONDITIONAL(HAVE_BOOST, test x"$enable_boost" = x"yes")
50 -
51
52 diff --git a/app-i18n/pyzy/files/pyzy-db.patch b/app-i18n/pyzy/files/pyzy-db.patch
53 deleted file mode 100644
54 index 44d0ac6bf45..00000000000
55 --- a/app-i18n/pyzy/files/pyzy-db.patch
56 +++ /dev/null
57 @@ -1,17 +0,0 @@
58 ---- a/data/db/open-phrase/Makefile.am
59 -+++ b/data/db/open-phrase/Makefile.am
60 -@@ -30,13 +30,10 @@
61 - DBTAR = pyzy-database-$(DBVER).tar.bz2
62 -
63 - $(DBTAR):
64 -- $(AM_V_GEN) \
65 -- wget http://pyzy.googlecode.com/files/$(DBTAR) || \
66 -- ( $(RM) $@; exit 1)
67 -+ touch $@
68 -
69 - stamp-db: $(DBTAR)
70 - $(AM_V_GEN) \
71 -- tar jxfm $(DBTAR); \
72 - mv db/main.db db/$(db_file); \
73 - touch $@
74 -
75
76 diff --git a/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch b/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
77 deleted file mode 100644
78 index 1e23e8b6e5d..00000000000
79 --- a/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
80 +++ /dev/null
81 @@ -1,56 +0,0 @@
82 -https://github.com/pyzy/pyzy/pull/1
83 -
84 -Author: Hillwood Yang <hillwood@××××××××.org>
85 -
86 ---- a/src/SimpTradConverter.cc
87 -+++ b/src/SimpTradConverter.cc
88 -@@ -4,6 +4,7 @@
89 - *
90 - * Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@×××××.com>
91 - * Copyright (c) 2010 BYVoid <byvoid1@×××××.com>
92 -+ * Copyright (c) 2015 Hillwood Yang <hillwood@××××××××.org>
93 - *
94 - * This library is free software; you can redistribute it and/or
95 - * modify it under the terms of the GNU Lesser General Public
96 -@@ -40,7 +41,6 @@ namespace PyZy {
97 - #ifdef HAVE_OPENCC
98 -
99 - class opencc {
100 -- static const int BUFFER_SIZE = 64;
101 - public:
102 - opencc (void)
103 - {
104 -@@ -55,29 +55,13 @@ public:
105 -
106 - void convert (const char *in, String &out)
107 - {
108 -- long n_char;
109 -- unichar *in_ucs4 = g_utf8_to_ucs4_fast (in, -1, &n_char);
110 --
111 -- ucs4_t *pinbuf = (ucs4_t *)in_ucs4;
112 -- size_t inbuf_left = n_char;
113 -- while (inbuf_left != 0) {
114 -- ucs4_t *poutbuf = (ucs4_t *)m_buffer;
115 -- size_t outbuf_left = BUFFER_SIZE;
116 -- size_t retval = opencc_convert(m_od, &pinbuf, &inbuf_left, &poutbuf, &outbuf_left);
117 -- if (retval == (size_t) -1) {
118 -- /* append left chars in pinbuf */
119 -- g_warning ("opencc_convert return failed");
120 -- out << (unichar *) pinbuf;
121 -- break;
122 -- }
123 -- *poutbuf = L'\0';
124 -- out << m_buffer;
125 -- }
126 -- g_free (in_ucs4);
127 -+ char * converted = opencc_convert_utf8 (m_od, in, -1);
128 -+ g_assert (converted != NULL);
129 -+ out = converted;
130 -+ opencc_convert_utf8_free (converted);
131 - }
132 - private:
133 - opencc_t m_od;
134 -- unichar m_buffer[BUFFER_SIZE + 1];
135 - };
136 -
137 - void
138
139 diff --git a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
140 deleted file mode 100644
141 index 2c736e2414a..00000000000
142 --- a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
143 +++ /dev/null
144 @@ -1,59 +0,0 @@
145 -# Copyright 1999-2017 Gentoo Foundation
146 -# Distributed under the terms of the GNU General Public License v2
147 -
148 -EAPI="6"
149 -PYTHON_COMPAT=( python2_7 )
150 -
151 -inherit autotools ltprune python-any-r1
152 -
153 -PYZY_DB="${PN}-database-1.0.0"
154 -
155 -DESCRIPTION="The Chinese PinYin and Bopomofo conversion library"
156 -HOMEPAGE="https://github.com/pyzy/pyzy"
157 -SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
158 - https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${PYZY_DB}.tar.bz2"
159 -
160 -LICENSE="LGPL-2.1"
161 -SLOT="0"
162 -KEYWORDS="amd64 x86"
163 -IUSE="boost doc opencc"
164 -
165 -RDEPEND="dev-db/sqlite:3
166 - dev-libs/glib:2
167 - sys-apps/util-linux
168 - boost? ( dev-libs/boost )
169 - opencc? ( app-i18n/opencc:= )"
170 -DEPEND="${RDEPEND}
171 - ${PYTHON_DEPS}
172 - sys-devel/autoconf-archive
173 - doc? ( app-doc/doxygen )"
174 -
175 -PATCHES=(
176 - "${FILESDIR}"/${PN}-boost.patch
177 - "${FILESDIR}"/${PN}-db.patch
178 - "${FILESDIR}"/${PN}-opencc-1.0.0.patch
179 -)
180 -
181 -src_prepare() {
182 - mv "${WORKDIR}"/db data/db/open-phrase || die
183 -
184 - default
185 - eautoreconf
186 -}
187 -
188 -src_configure() {
189 - econf \
190 - $(use_enable boost) \
191 - $(use_enable opencc) \
192 - --enable-db-open-phrase \
193 - DOXYGEN=$(usex doc doxygen true)
194 -}
195 -
196 -src_install() {
197 - if use doc; then
198 - HTML_DOCS=( docs/html/. )
199 - fi
200 -
201 - default
202 - prune_libtool_files
203 -}