summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/anthy/anthy-9100h-r3.ebuild2
-rw-r--r--app-i18n/anthy/metadata.xml2
-rw-r--r--app-i18n/bidiv/metadata.xml2
-rw-r--r--app-i18n/cstools/Manifest1
-rw-r--r--app-i18n/cstools/cstools-3.44.ebuild23
-rw-r--r--app-i18n/cstools/metadata.xml2
-rw-r--r--app-i18n/dbskkd-cdb/metadata.xml2
-rw-r--r--app-i18n/enca/metadata.xml2
-rw-r--r--app-i18n/fbterm/fbterm-1.7_p20190503.ebuild12
-rw-r--r--app-i18n/fbterm/files/fbterm-autoconf-2.68.patch24
-rw-r--r--app-i18n/fbterm/metadata.xml2
-rw-r--r--app-i18n/fcitx-anthy/metadata.xml2
-rw-r--r--app-i18n/fcitx-chewing/metadata.xml2
-rw-r--r--app-i18n/fcitx-cloudpinyin/metadata.xml2
-rw-r--r--app-i18n/fcitx-configtool/metadata.xml2
-rw-r--r--app-i18n/fcitx-hangul/metadata.xml2
-rw-r--r--app-i18n/fcitx-libpinyin/metadata.xml2
-rw-r--r--app-i18n/fcitx-m17n/metadata.xml2
-rw-r--r--app-i18n/fcitx-qt5/metadata.xml2
-rw-r--r--app-i18n/fcitx-rime/metadata.xml2
-rw-r--r--app-i18n/fcitx-sayura/metadata.xml2
-rw-r--r--app-i18n/fcitx-sunpinyin/metadata.xml2
-rw-r--r--app-i18n/fcitx-table-extra/metadata.xml2
-rw-r--r--app-i18n/fcitx-unikey/metadata.xml2
-rw-r--r--app-i18n/fcitx/metadata.xml2
-rw-r--r--app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild2
-rw-r--r--app-i18n/freewnn/metadata.xml2
-rw-r--r--app-i18n/ibus-anthy/Manifest2
-rw-r--r--app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild2
-rw-r--r--app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild (renamed from app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild)7
-rw-r--r--app-i18n/ibus-anthy/metadata.xml2
-rw-r--r--app-i18n/ibus-cangjie/metadata.xml2
-rw-r--r--app-i18n/ibus-chewing/Manifest4
-rw-r--r--app-i18n/ibus-chewing/files/ibus-chewing-test.patch30
-rw-r--r--app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild65
-rw-r--r--app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild (renamed from app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild)29
-rw-r--r--app-i18n/ibus-chewing/metadata.xml22
-rw-r--r--app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch48
-rw-r--r--app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch18
-rw-r--r--app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild24
-rw-r--r--app-i18n/ibus-fbterm/metadata.xml2
-rw-r--r--app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch23
-rw-r--r--app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch26
-rw-r--r--app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild (renamed from app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild)16
-rw-r--r--app-i18n/ibus-handwrite/metadata.xml2
-rw-r--r--app-i18n/ibus-hangul/Manifest1
-rw-r--r--app-i18n/ibus-hangul/files/ibus-hangul-test.patch20
-rw-r--r--app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild49
-rw-r--r--app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild16
-rw-r--r--app-i18n/ibus-hangul/metadata.xml2
-rw-r--r--app-i18n/ibus-input-pad/metadata.xml2
-rw-r--r--app-i18n/ibus-kkc/Manifest2
-rw-r--r--app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild (renamed from app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild)20
-rw-r--r--app-i18n/ibus-kkc/metadata.xml16
-rw-r--r--app-i18n/ibus-libpinyin/metadata.xml2
-rw-r--r--app-i18n/ibus-m17n/Manifest4
-rw-r--r--app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild (renamed from app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild)0
-rw-r--r--app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild (renamed from app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild)0
-rw-r--r--app-i18n/ibus-m17n/metadata.xml2
-rw-r--r--app-i18n/ibus-pinyin/metadata.xml2
-rw-r--r--app-i18n/ibus-rime/metadata.xml2
-rw-r--r--app-i18n/ibus-skk/Manifest1
-rw-r--r--app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild36
-rw-r--r--app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild11
-rw-r--r--app-i18n/ibus-skk/metadata.xml2
-rw-r--r--app-i18n/ibus-sunpinyin/metadata.xml2
-rw-r--r--app-i18n/ibus-table-chinese/Manifest1
-rw-r--r--app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild31
-rw-r--r--app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild4
-rw-r--r--app-i18n/ibus-table-chinese/metadata.xml2
-rw-r--r--app-i18n/ibus-table-extraphrase/metadata.xml2
-rw-r--r--app-i18n/ibus-table-latin/metadata.xml2
-rw-r--r--app-i18n/ibus-table-others/Manifest1
-rw-r--r--app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild4
-rw-r--r--app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild21
-rw-r--r--app-i18n/ibus-table-others/metadata.xml2
-rw-r--r--app-i18n/ibus-table/Manifest3
-rw-r--r--app-i18n/ibus-table/ibus-table-1.14.0.ebuild55
-rw-r--r--app-i18n/ibus-table/ibus-table-1.14.1.ebuild (renamed from app-i18n/ibus-table/ibus-table-1.13.3.ebuild)0
-rw-r--r--app-i18n/ibus-table/metadata.xml2
-rw-r--r--app-i18n/ibus-typing-booster/Manifest4
-rw-r--r--app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild (renamed from app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild)6
-rw-r--r--app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild (renamed from app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild)6
-rw-r--r--app-i18n/ibus-typing-booster/metadata.xml13
-rw-r--r--app-i18n/ibus-unikey/Manifest1
-rw-r--r--app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch27
-rw-r--r--app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild34
-rw-r--r--app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild42
-rw-r--r--app-i18n/ibus-unikey/metadata.xml27
-rw-r--r--app-i18n/ibus/Manifest1
-rw-r--r--app-i18n/ibus/ibus-1.5.25.ebuild191
-rw-r--r--app-i18n/ibus/metadata.xml2
-rw-r--r--app-i18n/im-chooser/metadata.xml2
-rw-r--r--app-i18n/im-freewnn/metadata.xml2
-rw-r--r--app-i18n/imhangul/metadata.xml2
-rw-r--r--app-i18n/imsettings/metadata.xml2
-rw-r--r--app-i18n/jfbterm/files/jfbterm-automake-1.13.patch14
-rw-r--r--app-i18n/jfbterm/files/jfbterm-gentoo.patch (renamed from app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch)20
-rw-r--r--app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch (renamed from app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch)4
-rw-r--r--app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch (renamed from app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch)8
-rw-r--r--app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch (renamed from app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch)10
-rw-r--r--app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild28
-rw-r--r--app-i18n/jfbterm/metadata.xml2
-rw-r--r--app-i18n/kakasi/metadata.xml2
-rw-r--r--app-i18n/kanjipad/metadata.xml2
-rw-r--r--app-i18n/kcc/metadata.xml2
-rw-r--r--app-i18n/kcm-fcitx/metadata.xml2
-rw-r--r--app-i18n/kinput2/metadata.xml2
-rw-r--r--app-i18n/libcangjie/metadata.xml2
-rw-r--r--app-i18n/libchewing/metadata.xml2
-rw-r--r--app-i18n/libhangul/metadata.xml2
-rw-r--r--app-i18n/libkkc-data/Manifest1
-rw-r--r--app-i18n/libkkc-data/files/libkkc-data-python3.patch138
-rw-r--r--app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild20
-rw-r--r--app-i18n/libkkc-data/metadata.xml11
-rw-r--r--app-i18n/libkkc/Manifest2
-rw-r--r--app-i18n/libkkc/files/libkkc-marisa-glib.patch23
-rw-r--r--app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild (renamed from app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild)33
-rw-r--r--app-i18n/libkkc/libkkc-9999.ebuild33
-rw-r--r--app-i18n/libkkc/metadata.xml2
-rw-r--r--app-i18n/libpinyin/metadata.xml2
-rw-r--r--app-i18n/librime-lua/librime-lua-20201011103348.ebuild4
-rw-r--r--app-i18n/librime-lua/metadata.xml2
-rw-r--r--app-i18n/librime/librime-1.7.3-r1.ebuild2
-rw-r--r--app-i18n/librime/metadata.xml2
-rw-r--r--app-i18n/libskk/Manifest2
-rw-r--r--app-i18n/libskk/libskk-1.0.5.ebuild8
-rw-r--r--app-i18n/libskk/libskk-1.0.5_p20210830.ebuild (renamed from app-i18n/libskk/libskk-1.0.2.ebuild)17
-rw-r--r--app-i18n/libskk/metadata.xml2
-rw-r--r--app-i18n/libtabe/Manifest2
-rw-r--r--app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch24
-rw-r--r--app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch57
-rw-r--r--app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild71
-rw-r--r--app-i18n/libtabe/metadata.xml8
-rw-r--r--app-i18n/man-pages-it/Manifest1
-rw-r--r--app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild30
-rw-r--r--app-i18n/man-pages-it/metadata.xml11
-rw-r--r--app-i18n/man-pages-ja/metadata.xml2
-rw-r--r--app-i18n/man-pages-l10n/Manifest1
-rw-r--r--app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild2
-rw-r--r--app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild73
-rw-r--r--app-i18n/man-pages-l10n/metadata.xml2
-rw-r--r--app-i18n/man-pages-ru/metadata.xml2
-rw-r--r--app-i18n/man-pages-zh_CN/metadata.xml2
-rw-r--r--app-i18n/mecab-skkserv/metadata.xml2
-rw-r--r--app-i18n/metadata.xml2
-rw-r--r--app-i18n/mozc/metadata.xml2
-rw-r--r--app-i18n/multiskkserv/metadata.xml2
-rw-r--r--app-i18n/nabi/metadata.xml2
-rw-r--r--app-i18n/nkf/metadata.xml2
-rw-r--r--app-i18n/nkf/nkf-2.1.5.ebuild49
-rw-r--r--app-i18n/opencc/metadata.xml2
-rw-r--r--app-i18n/opencc/opencc-1.1.2.ebuild2
-rw-r--r--app-i18n/poedit/metadata.xml2
-rw-r--r--app-i18n/pyzy/metadata.xml2
-rw-r--r--app-i18n/qkc/metadata.xml2
-rw-r--r--app-i18n/rime-data/metadata.xml2
-rw-r--r--app-i18n/scim-anthy/metadata.xml2
-rw-r--r--app-i18n/scim-bridge/metadata.xml2
-rw-r--r--app-i18n/scim-hangul/metadata.xml2
-rw-r--r--app-i18n/scim-input-pad/metadata.xml2
-rw-r--r--app-i18n/scim-m17n/metadata.xml2
-rw-r--r--app-i18n/scim-pinyin/metadata.xml2
-rw-r--r--app-i18n/scim-sayura/metadata.xml2
-rw-r--r--app-i18n/scim-sunpinyin/metadata.xml2
-rw-r--r--app-i18n/scim-tables/metadata.xml2
-rw-r--r--app-i18n/scim-tomoe/metadata.xml2
-rw-r--r--app-i18n/scim-uim/metadata.xml2
-rw-r--r--app-i18n/scim/metadata.xml2
-rw-r--r--app-i18n/skk-jisyo/metadata.xml2
-rw-r--r--app-i18n/skkfep/metadata.xml2
-rw-r--r--app-i18n/skkserv/metadata.xml2
-rw-r--r--app-i18n/skktools/metadata.xml2
-rw-r--r--app-i18n/sunpinyin-data/metadata.xml2
-rw-r--r--app-i18n/sunpinyin/metadata.xml2
-rw-r--r--app-i18n/tagainijisho/metadata.xml2
-rw-r--r--app-i18n/tegaki-zinnia-japanese/metadata.xml2
-rw-r--r--app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch11
-rw-r--r--app-i18n/tomoe-gtk/metadata.xml2
-rw-r--r--app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild (renamed from app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild)13
-rw-r--r--app-i18n/tomoe/files/tomoe-glibc-2.32.patch4
-rw-r--r--app-i18n/tomoe/metadata.xml2
-rw-r--r--app-i18n/tomoe/tomoe-0.6.0-r6.ebuild15
-rw-r--r--app-i18n/transifex-client/metadata.xml2
-rw-r--r--app-i18n/translate-shell/metadata.xml2
-rw-r--r--app-i18n/uchardet/metadata.xml2
-rw-r--r--app-i18n/uchardet/uchardet-0.0.7.ebuild2
-rw-r--r--app-i18n/uim-tomoe-gtk/metadata.xml2
-rw-r--r--app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild8
-rw-r--r--app-i18n/uim/metadata.xml2
-rw-r--r--app-i18n/unicode-cldr/metadata.xml2
-rw-r--r--app-i18n/unicode-data/Manifest2
-rw-r--r--app-i18n/unicode-data/metadata.xml2
-rw-r--r--app-i18n/unicode-data/unicode-data-14.0.0.ebuild28
-rw-r--r--app-i18n/unicode-emoji/metadata.xml2
-rw-r--r--app-i18n/xcin/Manifest2
-rw-r--r--app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch110
-rw-r--r--app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch96
-rw-r--r--app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch118
-rw-r--r--app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch37
-rw-r--r--app-i18n/xcin/metadata.xml8
-rw-r--r--app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild87
-rw-r--r--app-i18n/xsunpinyin/metadata.xml2
-rw-r--r--app-i18n/xvnkb/Manifest1
-rw-r--r--app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch30
-rw-r--r--app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch8
-rw-r--r--app-i18n/xvnkb/files/xvnkb-cc.patch10
-rw-r--r--app-i18n/xvnkb/metadata.xml16
-rw-r--r--app-i18n/xvnkb/xvnkb-0.2.11.ebuild63
-rw-r--r--app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild45
-rw-r--r--app-i18n/yaskkserv/metadata.xml2
-rw-r--r--app-i18n/yaskkserv2/Manifest184
-rw-r--r--app-i18n/yaskkserv2/files/yaskkserv2.confd2
-rw-r--r--app-i18n/yaskkserv2/files/yaskkserv2.initd13
-rw-r--r--app-i18n/yaskkserv2/files/yaskkserv2.service12
-rw-r--r--app-i18n/yaskkserv2/metadata.xml11
-rw-r--r--app-i18n/yaskkserv2/yaskkserv2-0.1.1-r1.ebuild249
-rw-r--r--app-i18n/zinnia-tomoe/metadata.xml2
-rw-r--r--app-i18n/zinnia/metadata.xml2
219 files changed, 1743 insertions, 1391 deletions
diff --git a/app-i18n/anthy/anthy-9100h-r3.ebuild b/app-i18n/anthy/anthy-9100h-r3.ebuild
index 0a4beeca472..f53d63aa55a 100644
--- a/app-i18n/anthy/anthy-9100h-r3.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs static-libs"
BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
index 794feb3174c..f9404c3bdff 100644
--- a/app-i18n/anthy/metadata.xml
+++ b/app-i18n/anthy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
diff --git a/app-i18n/bidiv/metadata.xml b/app-i18n/bidiv/metadata.xml
index c921b96adf6..1d892a124fa 100644
--- a/app-i18n/bidiv/metadata.xml
+++ b/app-i18n/bidiv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/cstools/Manifest b/app-i18n/cstools/Manifest
index 6eef0d40f8c..49d251999cf 100644
--- a/app-i18n/cstools/Manifest
+++ b/app-i18n/cstools/Manifest
@@ -1 +1,2 @@
DIST Cstools-3.42.tar.gz 30650 BLAKE2B bf67d60b2373bed444086a8866695ee861f473fde5a623b7813659fda5dc905bffc968fefb479bd76e8345a1d9f47d3094c55a683a939a45e9a5fffd402ad33c SHA512 78f2f95b5cfde77d23249550085a895abc35965b02ff26382b248d4e713c90c113ad7909b916713dff55c9ee210f13672d609d794b3caf9985fcb207a071f19f
+DIST Cstools-3.44.tar.gz 31924 BLAKE2B 193d1d85746bf028833416bdb3e6c3b220498affb0162bd688fcc7ac4c406c618c53c2d2e7a4cb2fc799469246e1366f8c3f43f6f834220d2719b753c1511630 SHA512 9843eefb5f9a4edb33767162cb4beb24709d61903ccda8552cc9d914ef27ca6705a14e98cfb52a00c37f0428d937237044f96c0ba1673e6e67ad98f027032922
diff --git a/app-i18n/cstools/cstools-3.44.ebuild b/app-i18n/cstools/cstools-3.44.ebuild
new file mode 100644
index 00000000000..660b2ec472e
--- /dev/null
+++ b/app-i18n/cstools/cstools-3.44.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Fails in parallel
+# bug #707888
+DIST_TEST="do"
+inherit perl-module
+
+MY_P="Cstools-${PV}"
+DESCRIPTION="A charset conversion tool cstocs and two Perl modules for Czech language"
+SRC_URI="https://www.adelton.com/perl/Cstools/${MY_P}.tar.gz"
+HOMEPAGE="https://www.adelton.com/perl/Cstools/"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-perl/MIME-tools"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker"
diff --git a/app-i18n/cstools/metadata.xml b/app-i18n/cstools/metadata.xml
index cef9b13e3ce..ec4d1b2a409 100644
--- a/app-i18n/cstools/metadata.xml
+++ b/app-i18n/cstools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/app-i18n/dbskkd-cdb/metadata.xml b/app-i18n/dbskkd-cdb/metadata.xml
index e6d1445169e..58a97627566 100644
--- a/app-i18n/dbskkd-cdb/metadata.xml
+++ b/app-i18n/dbskkd-cdb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/enca/metadata.xml b/app-i18n/enca/metadata.xml
index 11eb65ff9bb..00750b4dfb2 100644
--- a/app-i18n/enca/metadata.xml
+++ b/app-i18n/enca/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index c6271dc437c..fa95d577d19 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,16 +13,18 @@ SRC_URI="https://github.com/gjedeer/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="gpm video_cards_vesa"
-BDEPEND="virtual/pkgconfig"
-DEPEND="media-libs/fontconfig
+RDEPEND="media-libs/fontconfig
media-libs/freetype:2
>=sys-libs/ncurses-6.1
gpm? ( sys-libs/gpm )
video_cards_vesa? ( dev-libs/libx86 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-autoconf-2.68.patch )
FILECAPS=(
cap_sys_tty_config+ep usr/bin/${PN}
diff --git a/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch b/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch
new file mode 100644
index 00000000000..826f3cd3c6b
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,16 +85,16 @@
+
+ if test x"$EPOLL" = xauto -a x"$cross_compiling" = xno; then
+ AC_RUN_IFELSE(
+- AC_LANG_PROGRAM([[#include <sys/epoll.h>]],
+- [[if (epoll_create(10) >= 0) return 0; return 1;]]),
++ [AC_LANG_PROGRAM([[#include <sys/epoll.h>]],
++ [[if (epoll_create(10) >= 0) return 0; return 1;]])],
+ [EPOLL=yes]
+ )
+ fi
+
+ if test x"$SIGNALFD" = xauto -a x"$cross_compiling" = xno; then
+ AC_RUN_IFELSE(
+- AC_LANG_PROGRAM([[#include <sys/signalfd.h>]],
+- [[sigset_t mask; if (signalfd(-1, &mask, 0) >= 0) return 0; return 1;]]),
++ [AC_LANG_PROGRAM([[#include <sys/signalfd.h>]],
++ [[sigset_t mask; if (signalfd(-1, &mask, 0) >= 0) return 0; return 1;]])],
+ [SIGNALFD=yes]
+ )
+ fi
+install-data-local:
diff --git a/app-i18n/fbterm/metadata.xml b/app-i18n/fbterm/metadata.xml
index d76dd2993d2..4a6d3fc25aa 100644
--- a/app-i18n/fbterm/metadata.xml
+++ b/app-i18n/fbterm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/fcitx-anthy/metadata.xml b/app-i18n/fcitx-anthy/metadata.xml
index b01927f26e0..c7a8a39b435 100644
--- a/app-i18n/fcitx-anthy/metadata.xml
+++ b/app-i18n/fcitx-anthy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-chewing/metadata.xml b/app-i18n/fcitx-chewing/metadata.xml
index a1290635788..7ead5c6c52a 100644
--- a/app-i18n/fcitx-chewing/metadata.xml
+++ b/app-i18n/fcitx-chewing/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-cloudpinyin/metadata.xml b/app-i18n/fcitx-cloudpinyin/metadata.xml
index bf9e3c5eb19..0712aa59b60 100644
--- a/app-i18n/fcitx-cloudpinyin/metadata.xml
+++ b/app-i18n/fcitx-cloudpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
index e775c90f0cb..e2e7b8d6f49 100644
--- a/app-i18n/fcitx-configtool/metadata.xml
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-hangul/metadata.xml b/app-i18n/fcitx-hangul/metadata.xml
index 482302a42a0..b4e4f428fa0 100644
--- a/app-i18n/fcitx-hangul/metadata.xml
+++ b/app-i18n/fcitx-hangul/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
index 551336cb14c..36a007bd88b 100644
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-m17n/metadata.xml b/app-i18n/fcitx-m17n/metadata.xml
index e7e76c5011a..e1395db75bd 100644
--- a/app-i18n/fcitx-m17n/metadata.xml
+++ b/app-i18n/fcitx-m17n/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-qt5/metadata.xml b/app-i18n/fcitx-qt5/metadata.xml
index 3bc22939d42..c2cb271102c 100644
--- a/app-i18n/fcitx-qt5/metadata.xml
+++ b/app-i18n/fcitx-qt5/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml
index c50c5ed628c..30cc81a4df3 100644
--- a/app-i18n/fcitx-rime/metadata.xml
+++ b/app-i18n/fcitx-rime/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-sayura/metadata.xml b/app-i18n/fcitx-sayura/metadata.xml
index 530a4f134a6..37682de33b9 100644
--- a/app-i18n/fcitx-sayura/metadata.xml
+++ b/app-i18n/fcitx-sayura/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
index ead0ec38bae..374486963ca 100644
--- a/app-i18n/fcitx-sunpinyin/metadata.xml
+++ b/app-i18n/fcitx-sunpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-table-extra/metadata.xml b/app-i18n/fcitx-table-extra/metadata.xml
index 9af9c45aa41..aab09de3359 100644
--- a/app-i18n/fcitx-table-extra/metadata.xml
+++ b/app-i18n/fcitx-table-extra/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx-unikey/metadata.xml b/app-i18n/fcitx-unikey/metadata.xml
index a0ed74ed5ba..3e887a3bdf4 100644
--- a/app-i18n/fcitx-unikey/metadata.xml
+++ b/app-i18n/fcitx-unikey/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 322e79a5884..1c1d8afb1dd 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
index eb63b8b1409..883a60c349c 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/63271/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="ipv6 uum"
RDEPEND="virtual/libcrypt:=
diff --git a/app-i18n/freewnn/metadata.xml b/app-i18n/freewnn/metadata.xml
index 00f1f852743..2892a3254c4 100644
--- a/app-i18n/freewnn/metadata.xml
+++ b/app-i18n/freewnn/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index cccf13fccfe..a5ee3abc37f 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47
DIST ibus-anthy-1.5.11.tar.gz 809725 BLAKE2B b12139e208c401e3fdda0d3a184b0246d039e077b827d1aeb2da20470deeb62551026c68ba39c289e7876467147a6ba93d318d0582a9b45866c2f5a4f52e85aa SHA512 2ac85bf4ddba56e3f84c3732082b3b63a07175ea712aad2865de4f87b8c0967da303ee1edccbed0890095e8ddab10e58307a47b72ee11b51de3927fdb9e72418
+DIST ibus-anthy-1.5.12.tar.gz 825323 BLAKE2B 4d81a5885e4ad6cfc7a10ecb61bf998a76c24049e58841f84ed31f45a8ab5e91cfd2c60be3a66008f97317047487bedcf956b9126fa17602c6f8a29950687b84 SHA512 6950a2865e4753831f8918f4a5926571bc8304454b6368662ef56a6fb11a60f0675e3d589108ebfd38cb5d193f7b61053a10baa6dad23adad67b3b3fc58760e8
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
index 26c60f32188..5c0306fb49f 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild
index 211a9f81486..553ff6d1baf 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.12.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-
PYTHON_COMPAT=( python3_{8,9} )
+
inherit gnome2-utils python-single-r1 xdg
DESCRIPTION="Japanese Anthy engine for IBus"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -24,8 +24,7 @@ RDEPEND="${PYTHON_DEPS}
')
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
- virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
sys-devel/gettext"
src_prepare() {
diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml
index d3b3cfaef39..cfa2a843f73 100644
--- a/app-i18n/ibus-anthy/metadata.xml
+++ b/app-i18n/ibus-anthy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-cangjie/metadata.xml b/app-i18n/ibus-cangjie/metadata.xml
index 83985854d52..1c9a4efd91c 100644
--- a/app-i18n/ibus-cangjie/metadata.xml
+++ b/app-i18n/ibus-cangjie/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index e2aae822c1f..a6efae009b6 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-chewing-1.5.1-Source.tar.gz 177044 BLAKE2B b188c7ea2c12fd1ccf64a70355da0a6f8a47976f141c8a0a7edcc7a5ccd6b959f73cad2cd1137874f965967780691fe920b44b3141cc6fa4e631921f4c4a2582 SHA512 2db6def1fe8ca3bd71419a001909d285ee48ef84c2f65e14bacff9cd114676bed594f0c90217e1fdab67c995a7b05d675812e90e281371d8464722c31649c633
-DIST ibus-chewing-1.6.1.tar.gz 111103 BLAKE2B c9b22b0fe4b164d02a1782479e139e04e3113299fb3ccebdba24eaa9d15964eca34d381f45f0c313bb53bc0b8c7f7b649ff4c0179c712f6d880e3d92a9d02692 SHA512 b093db79c656433614b9f72719a2b0768a30c2fb6fa066eda1e79cc9932ce1836f7f1e5611612fb44f260fe80a9baa9e18fdc9754b285e8a5f12a87c376cbd39
+DIST ibus-chewing-1.6.1_p20210117.tar.gz 112715 BLAKE2B 80279a40c8733fc8e9f43b09cf825bea53442a6572d7863bf7d8faf06765fcb3609c71b9087551c6b2d35b268b2585f6e4c019f15ccc08c8f91bc3a14427ad57 SHA512 979f58d3b32ec22051d32c7425867761eea8e13eb9dc900975e3986bb7b3064883474267731c32f79c96d2029da0415dba8d5ed7ae3645f04c3fed44dbe25bd6
+DIST ibus-chewing-gob2.patch.xz 11760 BLAKE2B 929c6f09ddc22efa47eb53fd9bd5833a5a5105e9e8c6251009699548b4b3a1bf124f335f9d963c42efe00a9f9276f4df303a087632d894237ee3f69f5c08b74e SHA512 4317f5e807d6114f9d1057421db9c032670578ca83898c7495a27bf76aaa0fee88649a5df9f16df74e7961129cfe2029eda66dcea9407263344add7670de088c
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
index abed91d377d..0d4ddc7a783 100644
--- a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
@@ -1,6 +1,26 @@
+--- a/test/IBusChewingPreEdit-test.c
++++ b/test/IBusChewingPreEdit-test.c
+@@ -514,7 +514,7 @@ void process_key_down_arrow_test()
+ key_press_from_key_sym(IBUS_KEY_Down, 0);
+ key_press_from_key_sym(IBUS_KEY_Down, 0);
+ key_press_from_string("4");
+- assert_pre_edit_substring("世", 1, 1);
++ assert_pre_edit_substring("勢", 1, 1);
+
+ ibus_chewing_pre_edit_clear(self);
+ assert_outgoing_pre_edit("", "");
+@@ -752,7 +752,7 @@ void test_arrow_keys_buffer_empty()
+ key_press_from_key_sym(IBUS_KEY_Page_Up, 0);
+ g_assert(chewing_cand_CurrentPage(self->context) == 0);
+ key_press_from_key_sym(IBUS_KEY_Up, 0);
+- g_assert(!ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
++ g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
+
+ key_press_from_string("`");
+ g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
--- a/test/MakerDialogBackend-test.c
+++ b/test/MakerDialogBackend-test.c
-@@ -126,7 +126,7 @@
+@@ -132,7 +132,7 @@ gboolean mkdg_g_value_is_equal(GValue * value1, GValue * value2)
void backup_key_to_g_value(const gchar * key, GType gType, GValue * value)
{
g_value_init(value, gType);
@@ -8,8 +28,8 @@
+ mkdg_backend_read(backend, value, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
}
- void change_new_value_from_orig_value(GValue * newValue,
-@@ -169,7 +169,7 @@
+ void change_new_value_from_orig_value(GValue * newValue, GValue * origValue)
+@@ -175,7 +175,7 @@ void assert_new_value_is_written(const gchar * key, GValue * newValue)
{
GValue storedGValue = { 0 };
g_value_init(&storedGValue, G_VALUE_TYPE(newValue));
@@ -18,7 +38,7 @@
g_assert(mkdg_g_value_is_equal(newValue, &storedGValue));
g_value_unset(&storedGValue);
}
-@@ -219,7 +219,7 @@
+@@ -225,7 +225,7 @@ void int_w_test()
#define GCONF_KEY "max-chi-symbol-len"
GValue origValue = { 0 };
g_value_init(&origValue, G_TYPE_BOOLEAN);
@@ -27,7 +47,7 @@
GValue newValue = { 0 };
g_value_init(&newValue, G_TYPE_BOOLEAN);
-@@ -229,13 +229,13 @@
+@@ -235,13 +235,13 @@ void int_w_test()
GValue storedValue = { 0 };
g_value_init(&storedValue, G_TYPE_BOOLEAN);
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
deleted file mode 100644
index c1924f9c811..00000000000
--- a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils gnome2-utils virtualx
-
-MY_P="${P}-Source"
-
-DESCRIPTION="Chinese Chewing engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/definite/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gconf nls"
-
-RDEPEND="app-i18n/ibus
- app-i18n/libchewing
- dev-libs/glib:2
- dev-util/gob:2
- x11-libs/gtk+:2
- x11-libs/libX11
- gconf? ( gnome-base/gconf )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
-DOCS=( AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE )
-
-src_configure() {
- local mycmakeargs=(
- -DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
- -DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
- )
- use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
- cmake-utils_src_configure
-}
-
-src_test() {
- "${EPREFIX%/}/"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
-
- export GSETTINGS_BACKEND="memory"
- export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
- virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
- use gconf && gnome2_gconf_savelist
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- use gconf && gnome2_gconf_install
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
index 94525afb3ed..85e9e8c0e86 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
@@ -1,16 +1,19 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils gnome2-utils virtualx
+inherit cmake gnome2-utils vcs-snapshot virtualx
+
+EGIT_COMMIT="8e17848d3fe3bd7de052a1c26b4161092ba1df9f"
DESCRIPTION="Chinese Chewing engine for IBus"
HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~hattya/distfiles/${PN}-gob2.patch.xz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gconf nls"
@@ -18,17 +21,19 @@ IUSE="gconf nls"
RDEPEND="app-i18n/ibus
app-i18n/libchewing
dev-libs/glib:2
- dev-util/gob:2
- x11-libs/gtk+:2
+ x11-libs/gtk+:3
x11-libs/libX11
gconf? ( gnome-base/gconf )
nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- dev-util/cmake-fedora
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake-fedora
virtual/pkgconfig
nls? ( sys-devel/gettext )"
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+PATCHES=(
+ "${WORKDIR}"/${PN}-gob2.patch
+ "${FILESDIR}"/${PN}-test.patch
+)
DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
src_configure() {
@@ -37,15 +42,15 @@ src_configure() {
-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
)
use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
- cmake-utils_src_configure
+ cmake_src_configure
}
src_test() {
- "${EPREFIX%/}/"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
+ "${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
export GSETTINGS_BACKEND="memory"
export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
- virtx cmake-utils_src_test
+ virtx cmake_src_test -j1
}
pkg_preinst() {
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index d41c9426140..cf7f054fe39 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <use>
- <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
- </use>
- <upstream>
- <remote-id type="github">definite/ibus-chewing</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <use>
+ <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">definite/ibus-chewing</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch
new file mode 100644
index 00000000000..797592c3240
--- /dev/null
+++ b/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch
@@ -0,0 +1,48 @@
+--- a/backend/fbio.c
++++ b/backend/fbio.c
+@@ -204,7 +204,7 @@
+ int
+ fb_io_get_fd (FbIo *io)
+ {
+- g_return_if_fail (FB_IS_IO (io));
++ g_return_val_if_fail (FB_IS_IO (io), -1);
+ return io->priv->fd;
+ }
+
+--- a/backend/fbshell.c
++++ b/backend/fbshell.c
+@@ -17,11 +17,11 @@
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+-#include <glib.h>
+-
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 600
+ #define __USE_XOPEN
+
++#include <glib.h>
++
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <pty.h>
+--- a/backend/fbshellman.c
++++ b/backend/fbshellman.c
+@@ -81,7 +81,7 @@
+ FbShellManagerPrivate *priv;
+ int index, temp, i;
+
+- g_return_if_fail (FB_IS_SHELL_MANAGER (shell_manager));
++ g_return_val_if_fail (FB_IS_SHELL_MANAGER (shell_manager), NR_SHELLS);
+
+ #define STEP() do { \
+ if (forward) temp++; \
+@@ -267,7 +267,7 @@
+ FbShell *
+ fb_shell_manager_active_shell (FbShellManager *shell_manager)
+ {
+- g_return_if_fail (FB_IS_SHELL_MANAGER (shell_manager));
++ g_return_val_if_fail (FB_IS_SHELL_MANAGER (shell_manager), NULL);
+
+ return shell_manager->priv->active_shell;
+ }
diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch
new file mode 100644
index 00000000000..f3da1dd4ac6
--- /dev/null
+++ b/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,14 +4,12 @@
+
+ man_one_in_files = ibus-fbterm.1.in
+ man_one_files = $(man_one_in_files:.1.in=.1)
+-man_one_DATA =$(man_one_files:.1=.1.gz)
++man_one_DATA =$(man_one_files)
+ man_onedir = $(mandir)/man1
+ %.1: %.1.in
+ $(AM_V_GEN) sed \
+ -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
+ mv $@.tmp $@
+-%.1.gz: %.1
+- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
+
+ dist-hook:
+ if test -d .git ; then \
diff --git a/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild b/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
index 81fd871b7bf..148fb8ed475 100644
--- a/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
+++ b/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
+
+inherit autotools
DESCRIPTION="IBus client for FbTerm"
HOMEPAGE="https://github.com/fujiwarat/ibus-fbterm"
SRC_URI="https://github.com/fujiwarat/${PN}/releases/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
@@ -15,5 +17,17 @@ IUSE=""
RDEPEND="app-i18n/ibus
app-i18n/fbterm
dev-libs/glib:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-clang.patch
+ "${FILESDIR}"/${PN}-man.patch
+)
+
+AT_M4DIR="m4"
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/app-i18n/ibus-fbterm/metadata.xml b/app-i18n/ibus-fbterm/metadata.xml
index 884cfd6920f..4264869adc8 100644
--- a/app-i18n/ibus-fbterm/metadata.xml
+++ b/app-i18n/ibus-fbterm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch
new file mode 100644
index 00000000000..7954f2018c2
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch
@@ -0,0 +1,23 @@
+From fcffa8f1ed798db3c2c4db0dbfc953f3147d37ba Mon Sep 17 00:00:00 2001
+From: Peng Wu <pwu@redhat.com>
+Date: Mon, 31 Aug 2020 15:32:48 +0800
+Subject: [PATCH] Fix focus in/out issue
+
+---
+ src/engine.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index da01f06..d3d924e 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -155,9 +155,7 @@ static void ibus_handwrite_engine_focus_in(IBusHandwriteEngine *engine)
+
+ static void ibus_handwrite_engine_focus_out(IBusHandwriteEngine *engine)
+ {
+- UI_hide_ui(engine);
+ printf("%s \n", __func__);
+-
+ }
+
+ static void ibus_handwrite_engine_reset(IBusHandwriteEngine *engine)
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch
new file mode 100644
index 00000000000..96cbc118fa4
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch
@@ -0,0 +1,26 @@
+--- a/src/UI_gtk.c
++++ b/src/UI_gtk.c
+@@ -74,6 +74,11 @@
+ return TRUE;
+ }
+
++static void clicked(GtkButton *button, IBusHandwriteEngine *engine)
++{
++ ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order")));
++}
++
+ static void regen_loopuptable(GtkWidget * widget, IBusHandwriteEngine * engine)
+ {
+ int i;
+@@ -98,11 +103,6 @@
+
+ gtk_widget_show(bt);
+
+- void clicked(GtkButton *button, IBusHandwriteEngine *engine)
+- {
+- ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order")));
+- }
+-
+ g_object_set_data(G_OBJECT(bt),"order",GINT_TO_POINTER(i));
+ g_signal_connect(bt,"clicked",G_CALLBACK(clicked),engine);
+
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
index cbabf59f679..ffbab323476 100644
--- a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
DESCRIPTION="Hand write recognition/input for IBus"
HOMEPAGE="https://github.com/microcai/ibus-handwrite"
SRC_URI="https://github.com/microcai/${PN}/releases/download/${PV%.0}/${P}.tar.bz2"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="nls +zinnia"
@@ -19,11 +19,15 @@ RDEPEND="app-i18n/ibus
app-i18n/zinnia
app-i18n/zinnia-tomoe
)"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
nls? ( sys-devel/gettext )"
-PATCHES=( "${FILESDIR}"/${PN}-headers.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-blink.patch
+ "${FILESDIR}"/${PN}-headers.patch
+ "${FILESDIR}"/${PN}-nested-function.patch
+)
src_configure() {
econf \
diff --git a/app-i18n/ibus-handwrite/metadata.xml b/app-i18n/ibus-handwrite/metadata.xml
index 23f5c6be388..06f6070908f 100644
--- a/app-i18n/ibus-handwrite/metadata.xml
+++ b/app-i18n/ibus-handwrite/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 105124d7af3..45b735f1b8c 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,2 +1 @@
-DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
diff --git a/app-i18n/ibus-hangul/files/ibus-hangul-test.patch b/app-i18n/ibus-hangul/files/ibus-hangul-test.patch
new file mode 100644
index 00000000000..7a6ef479f0e
--- /dev/null
+++ b/app-i18n/ibus-hangul/files/ibus-hangul-test.patch
@@ -0,0 +1,20 @@
+--- a/tests/ibus-hangul.c
++++ b/tests/ibus-hangul.c
+@@ -261,6 +261,7 @@
+ G_CALLBACK (window_inserted_text_cb), entry);
+ gtk_container_add (GTK_CONTAINER (window), entry);
+ gtk_widget_show_all (window);
++ gtk_window_present (window);
+ }
+
+ static void
+--- a/tests/runtest
++++ b/tests/runtest
+@@ -7,7 +7,6 @@
+ : ${DISABLE_GUI_TESTS:=''}
+
+ ibus-daemon --xim --panel disable --config disable &
+-sleep 30
+
+ tst=$1
+
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
deleted file mode 100644
index 8c38721ea65..00000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Korean Hangul engine for IBus"
-HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
-SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- >=app-i18n/libhangul-0.1
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- $(use_enable nls) \
- --with-python=${EPYTHON}
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
index 4d13e3d9b11..a2c9a9f929a 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
+PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_COMPAT=( python3_{8,9} )
-inherit gnome2-utils python-single-r1 xdg
+inherit gnome2-utils python-single-r1 xdg virtualx
DESCRIPTION="Korean Hangul engine for IBus"
HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -27,12 +27,22 @@ DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+
src_configure() {
econf \
$(use_enable nls) \
--with-python=${EPYTHON}
}
+src_test() {
+ "${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${S}"/data || die
+
+ export GSETTINGS_BACKEND="memory"
+ export GSETTINGS_SCHEMA_DIR="${S}/data"
+ virtx default
+}
+
pkg_preinst() {
xdg_pkg_preinst
gnome2_schemas_savelist
diff --git a/app-i18n/ibus-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
index 23e099644a6..1b693a0e7f7 100644
--- a/app-i18n/ibus-hangul/metadata.xml
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-input-pad/metadata.xml b/app-i18n/ibus-input-pad/metadata.xml
index d4f9a8e15a0..88c4a9fc2a1 100644
--- a/app-i18n/ibus-input-pad/metadata.xml
+++ b/app-i18n/ibus-input-pad/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-kkc/Manifest b/app-i18n/ibus-kkc/Manifest
index 12c5b920649..8462b3787af 100644
--- a/app-i18n/ibus-kkc/Manifest
+++ b/app-i18n/ibus-kkc/Manifest
@@ -1 +1 @@
-DIST ibus-kkc-1.5.22.tar.gz 518844 BLAKE2B eb3d562960729ff4967781ca3cc2797915c4c3e3b60281ca05483da3180575500fd5688c1481d03a909e8a108082159197e23b3a6c4df672b7d57ccc774783b3 SHA512 767a995cb97ca7cf5434f64094351c4fcf1d3de9f31da6f6642ccec2d199ddfb58e27f281b4dd3c63f44dc29cd46b36808ecd1aacfe0b1320d0688d567eb6fd4
+DIST ibus-kkc-1.5.22_p20170607.tar.gz 55162 BLAKE2B 9d34a7da99a1792cad9ca1b82665b8008a2b11c7e09cdce7e0a5e9d0e9d482798a1facaf8d35e3daa296638383c267af70ae00d50b2c601b66895a0b1c8d2817 SHA512 519be83e17d9556c6839ecad2af4a46665a6aafd0f8072f4c1d2c8af33eb3ac814517b5b42513b898afe86ededf35b9082b9a1fb2a699dcb88757b159d5b74cf
diff --git a/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild b/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
index a2b21852753..a7cb005d4f3 100644
--- a/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild
+++ b/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit vala
+inherit autotools vala vcs-snapshot
+
+EGIT_COMMIT="f7516ae20cb648cd8b0904aec5853d3a3d2611c4"
DESCRIPTION="Japanese Kana Kanji conversion engine for IBus"
HOMEPAGE="https://github.com/ueno/ibus-kkc"
-SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="nls"
-CDEPEND="app-i18n/ibus
+DEPEND="app-i18n/ibus
app-i18n/libkkc
x11-libs/gtk+:3
nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
app-i18n/skk-jisyo"
-DEPEND="${CDEPEND}
- $(vala_depend)
+BDEPEND="$(vala_depend)
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )"
@@ -29,6 +30,7 @@ DEPEND="${CDEPEND}
src_prepare() {
vala_src_prepare
default
+ eautoreconf
}
src_configure() {
diff --git a/app-i18n/ibus-kkc/metadata.xml b/app-i18n/ibus-kkc/metadata.xml
index c52521a4a3b..74de0fde210 100644
--- a/app-i18n/ibus-kkc/metadata.xml
+++ b/app-i18n/ibus-kkc/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="github">ueno/ibus-kkc</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ueno/ibus-kkc</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml
index 103d4a0cb43..e8dfe300fdd 100644
--- a/app-i18n/ibus-libpinyin/metadata.xml
+++ b/app-i18n/ibus-libpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>graham@ulsterit.com</email>
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index aaff757784b..ec88cec6eb0 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-m17n-1.4.5.tar.gz 493250 BLAKE2B a5fd4de169997dea78acf6273a7e44cefbc9ab4499cbee92c30f394ef7267c15fb1af42d45d227bc160150f35195477f9ec3d2534f9764bab4fa86c0fae046eb SHA512 64bed564d59b0992ebc8a931e0845f687c176e5336d7c7fbc1d575433eb276714615f8fee412a532ec2c8870e46d8d6c41636c984b666c92427dadbdc84838b5
-DIST ibus-m17n-1.4.6.tar.gz 493592 BLAKE2B 1b9978277a008a4e72ffe03306d409532da7757d53cdb8bae9d6b5776b417e3b731fe432cb5f5c50f7f52d83ed9a2dd572a866111f9186ac42f5ce8afe511ad4 SHA512 d33c89735e5e6c93301a3c3985f46708e41d44b66e580b282e484a7497c0b9d2615c66931cdd7260b4a63d9e9af4d9ebbad5e23d4a3f8a7773dcab61a7600c57
+DIST ibus-m17n-1.4.7.tar.gz 493889 BLAKE2B 48a9b2ff1590d790d763014c0c9e5c08bf7ba84361a922aa71ab9cdb5b5e4c69fc5608a27c19eadc83578fdaafc3375c5bcedc1d81e2743a994d622042ffd436 SHA512 b011d4ee63a538a51f67012932d872fc2d527c6f3e5dd1642b7e70d3a32164532bc2ab69fb794eb985617b2698074af9079dac7991b5a2a30828595b129cce40
+DIST ibus-m17n-1.4.8.tar.gz 494516 BLAKE2B ec4cb36d465e25a6e0e334243e7df83444846f9109ef2142daea4949ddaa7cdf5290fc2749a978f7b8fb6d49bb080b2b826726fdc97e26bc722b019c93f13882 SHA512 3e808ffc3b7d03a745be1009a58c8d03ecabe15478f7bf36d70b777d342ad04d0f5574bb78743bcb67ab36674d316aef3cd7070d48ef9e11d07f960d75597aec
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
index 8ec1183befa..8ec1183befa 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
index 1fabfb50607..1fabfb50607 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index b120c362d92..c2feaa149eb 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-pinyin/metadata.xml b/app-i18n/ibus-pinyin/metadata.xml
index c80f82c2f17..71fb0d525ce 100644
--- a/app-i18n/ibus-pinyin/metadata.xml
+++ b/app-i18n/ibus-pinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dlan@gentoo.org</email>
diff --git a/app-i18n/ibus-rime/metadata.xml b/app-i18n/ibus-rime/metadata.xml
index def21200792..95149058e57 100644
--- a/app-i18n/ibus-rime/metadata.xml
+++ b/app-i18n/ibus-rime/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dlan@gentoo.org</email>
diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest
index a9224221ad7..a6bbd4582ab 100644
--- a/app-i18n/ibus-skk/Manifest
+++ b/app-i18n/ibus-skk/Manifest
@@ -1,2 +1 @@
-DIST ibus-skk-1.4.2.tar.gz 491882 BLAKE2B 999eb9f1b36406a8d665b2c929fcdef5e57bef5c6206075333435f46774445497d6d953bc695c22f6afa5700283c32a20c2d4e9227fd30e5552f5688cd524aab SHA512 cec7fbffaa78c406f3b9502bc64e2290fec579102a37ce61cb6424c3e06d159653f165b48e09f1256f38491bce6819460c6d226cd765ab150a8dfa80e2707fe1
DIST ibus-skk-1.4.3.tar.xz 321344 BLAKE2B f761cf7c97ecf5830715a7bbae657c72d437e0be69a0867780ee574f9ea17f3d612dc5a76e3b4499fd203878702abdd2e37fdc980123a80daf5f03db7645b1f4 SHA512 c05302878f9c4b0a59daa1d285ab44501f63c0f7890149412137d3f6124fc4a7ebfe16172de311cbb5f2b9035255b5784a715a7832e6734d76e11bf19e2c9d3b
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
deleted file mode 100644
index 4717ee5c437..00000000000
--- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit vala
-
-DESCRIPTION="Japanese SKK engine for IBus"
-HOMEPAGE="https://github.com/ueno/ibus-skk"
-SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-CDEPEND="app-i18n/ibus
- >=app-i18n/libskk-1.0.2
- x11-libs/gtk+:3
- nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
- app-i18n/skk-jisyo"
-DEPEND="${CDEPEND}
- $(vala_depend)
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- vala_src_prepare
- default
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
index 60f705da342..08bcec689cf 100644
--- a/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,17 +11,16 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls"
-CDEPEND="app-i18n/ibus
+DEPEND="app-i18n/ibus
>=app-i18n/libskk-1.0.2
x11-libs/gtk+:3
nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
app-i18n/skk-jisyo"
-DEPEND="${CDEPEND}
- $(vala_depend)
+BDEPEND="$(vala_depend)
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )"
diff --git a/app-i18n/ibus-skk/metadata.xml b/app-i18n/ibus-skk/metadata.xml
index 43368dedb0f..fd9010ae131 100644
--- a/app-i18n/ibus-skk/metadata.xml
+++ b/app-i18n/ibus-skk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
index db1b8135a9f..d07fba105be 100644
--- a/app-i18n/ibus-sunpinyin/metadata.xml
+++ b/app-i18n/ibus-sunpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-table-chinese/Manifest b/app-i18n/ibus-table-chinese/Manifest
index 6b391e744de..bc0febf88c5 100644
--- a/app-i18n/ibus-table-chinese/Manifest
+++ b/app-i18n/ibus-table-chinese/Manifest
@@ -1,2 +1 @@
-DIST ibus-table-chinese-1.8.2.tar.gz 10576111 BLAKE2B a80fa9c4780207efefba1118ee9dacc33dba4136b916a24971198b3325bf1b26f86cd4586db994db6dfaa85fffe087b021673d056b10df61c5f95ede4e967cd6 SHA512 30fd1c7ee8416cd62d8e26bc2646a667ac45c4579a7cb191c77e80fecccbc576c34f33ec0b5c55669c073a633298cfda1711e4b9d89a9ef8f6146acdc0167c1a
DIST ibus-table-chinese-1.8.3.tar.gz 10824912 BLAKE2B e9f4e377a794827196e04e197044b3fdcd81d84ed89067e17745879495df69cc6e95814863f856cc0a7b7db0aba3cbd93d1c1d172f607fdd410dbed02dc4ad54 SHA512 610455343d9c9bf6577c7fd7aef9435c339c2f23c4d5f7ae2cbbc2366a9eb6a8a124e86621387497cc624e3276bf739b55602355ad41c4127f45f6d85cc5b4dc
diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
deleted file mode 100644
index 193cb239656..00000000000
--- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-CMAKE_IN_SOURCE_BUILD="1"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake
-
-DESCRIPTION="Chinese tables for IBus-Table"
-HOMEPAGE="https://github.com/definite/ibus-table-chinese"
-SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-i18n/ibus-table"
-DEPEND="${RDEPEND}
- dev-util/cmake-fedora"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_FEDORA_TMP_DIR="${T}"
- -DDATA_DIR="${EPREFIX}"/usr/share
- -DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
- -DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
- )
- cmake_src_configure
-}
diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
index a34f0e60963..dd7ce904291 100644
--- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
+++ b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="app-i18n/ibus-table"
diff --git a/app-i18n/ibus-table-chinese/metadata.xml b/app-i18n/ibus-table-chinese/metadata.xml
index e5db64701f3..fd5e2e31d9e 100644
--- a/app-i18n/ibus-table-chinese/metadata.xml
+++ b/app-i18n/ibus-table-chinese/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-table-extraphrase/metadata.xml b/app-i18n/ibus-table-extraphrase/metadata.xml
index 13ee2c91ec7..6b9c941c189 100644
--- a/app-i18n/ibus-table-extraphrase/metadata.xml
+++ b/app-i18n/ibus-table-extraphrase/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-table-latin/metadata.xml b/app-i18n/ibus-table-latin/metadata.xml
index 13ee2c91ec7..6b9c941c189 100644
--- a/app-i18n/ibus-table-latin/metadata.xml
+++ b/app-i18n/ibus-table-latin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest
index 96669713821..4533a77fb9d 100644
--- a/app-i18n/ibus-table-others/Manifest
+++ b/app-i18n/ibus-table-others/Manifest
@@ -1,2 +1 @@
DIST ibus-table-others-1.3.11.tar.gz 662398 BLAKE2B a600535b51b731c482eeecb78b8bff6ca14795e411348ed0e2cd4207ad1a89aed7d338c6b706695dd734f405ee5203e23dfffa370cae12ad763eabf6bbdfe848 SHA512 bfa17338e3a6a3e392bb3e5e5736af9bfa5584a897aea4ca72aec0df2c84dc94a0737f8fb87ced382e6acac3f8169ed2aef93a2f94330a4829048d009cb96ee0
-DIST ibus-table-others-1.3.9.tar.gz 627253 BLAKE2B b4c72ead9364945a3f15a348aa14e0886ebc7c7fd35448d573540ffd9510139630ac22228229ee1a37687e01179a0ec880ce170e84a196b0defe5c059b662583 SHA512 4557ba981a00035226b6cbe0d97ae14df275d3e7c5c453097b85e433a524e00efeebe508621495e63d6ff9cdd590f9d54b51a143147b83e1e3748f05b03d2019
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
index 9a293c70f8c..604b323c739 100644
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="app-i18n/ibus-table
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
deleted file mode 100644
index c2f63c11cdb..00000000000
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Various tables for IBus-Table"
-HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
-SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-i18n/ibus-table
- !app-i18n/ibus-table-code
- !app-i18n/ibus-table-cyrillic
- !app-i18n/ibus-table-latin
- !app-i18n/ibus-table-tv"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/ibus-table-others/metadata.xml b/app-i18n/ibus-table-others/metadata.xml
index 1c7ec141883..5fa4487f4e2 100644
--- a/app-i18n/ibus-table-others/metadata.xml
+++ b/app-i18n/ibus-table-others/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 6d56bd2cca9..188cfd58207 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,2 +1 @@
-DIST ibus-table-1.13.3.tar.gz 1408143 BLAKE2B fda380e284a996d34053f6bae543ebc2c072ffbd870a9421b76f18a3fa5e45ca6e687818f40bd1335791f1b92dc7ffa1ccc35c7cb55d1a6ade26bc958a2bf8d4 SHA512 2959b2f96c9a490032dafbce2b4164fcc07797ab73e735f26003156a891e1e3760e6a4f42713084b5ce1e408cbe21c3060d99615d898fe50b8d51405dcd42a3b
-DIST ibus-table-1.14.0.tar.gz 1450310 BLAKE2B 72a655e378b39324ff849e6941dc28920760d030d748a5b4b0899e14b94874a52581d03ccbef2d72c5eaae51d20a0e19690bde5a1411960347fe49cf3137d21b SHA512 60e570b82c4f05200410e9e4e155089223a20ebcf66d1c039a783108005f63699e75bc528fc30cd370c1400b65e765ade0d069184bd2ab81e2eda9bade2e8ac9
+DIST ibus-table-1.14.1.tar.gz 1451943 BLAKE2B e8fc54daf89aaee813de6788bef9f56a654ffdf4751acf3e2f622d971134c3aba906ca2b106f51b2fa305b8c65fb4db862f57f5f9e3e82a569c5a72e3017e627 SHA512 a658c2d370d173d2fe2f38c02c6b822a17771754ac98a856f954c4c998e90a857f9d54ed652c74159af9545d445001d202e7b5578e7694f8767f928b42db9055
diff --git a/app-i18n/ibus-table/ibus-table-1.14.0.ebuild b/app-i18n/ibus-table/ibus-table-1.14.0.ebuild
deleted file mode 100644
index ff60ef200c5..00000000000
--- a/app-i18n/ibus-table/ibus-table-1.14.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Tables engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- virtual/libiconv
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- python_fix_shebang .
-
- default
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild b/app-i18n/ibus-table/ibus-table-1.14.1.ebuild
index 98017235346..98017235346 100644
--- a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.14.1.ebuild
diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml
index 2d1e1c6bebf..0b2f8235909 100644
--- a/app-i18n/ibus-table/metadata.xml
+++ b/app-i18n/ibus-table/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index d96e7b1ba97..e154561f047 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-typing-booster-2.10.5.tar.gz 9448121 BLAKE2B 32e332df5e68a81c4f86df298389bb1fd9daf97b1f281bdc150183bd939a97021540aa81db5fa94ee3890c9b9a031a8eb75241da3716763ed6262fc5d5b3fb9d SHA512 f3bc5536874227b5482e46a097ac634a522651b3d200b33207705f5b1d87b8894dd962e19c389281fa5f32c1edbf3186dbfba12d718cbc6fa159d648bc622bf6
-DIST ibus-typing-booster-2.11.5.tar.gz 9485824 BLAKE2B 41d9aa2ba310e2db725e7809a67988fa69fee117b560d945a3cd935e7b2bbc372f448a531ed4ebd2a131dc1ffe3cb7d86b7d10fdbce56a2e241157f08a84ca69 SHA512 a30c81903b3d99f23a606f7f083615283ba64a0e62ac54183327447c33f6f7212472742036634522d36776a45ac72ce7874bcada624361f930785e2823652f0c
+DIST ibus-typing-booster-2.14.12.tar.gz 10226257 BLAKE2B 5dae530a7ec425e8bd3c6009d0bdb9b8d321c8670769ddf80ba7f706d6b5140f21f184f877603de3cc6f425a4a1953c645eb177c9fa8183ecfd091ccfb32353a SHA512 09d1898c3ac8a1dc79768df7a44c33862a0b0fbb2122d184f1e8a839b8c3c71191fe5ef932f9e649ac715c8093a5c277d5783594f8defc06ecc13727b851ffa5
+DIST ibus-typing-booster-2.14.13.tar.gz 10239396 BLAKE2B 1c4db896f28f3f1b58bd3071fb6f2d5c1b2b4e0fbad43568ae25d69f301d4ce408ca6c2fb829818f6981c2f212c499c1dfabc3511f09f7a9f5c3d4ae2d08a212 SHA512 4e1f1c39fea030f1f056966007127afeb5c6c098a66ecd6fe0b4ea60f302438e072d6d409ef2bee9ea5b0d1048b5a22d7e4fad9f7f509362e2af251855f6e535
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild
index 60292db609e..3c0b95dc64f 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild
@@ -32,6 +32,12 @@ RDEPEND="${DEPEND}
BDEPEND="sys-devel/gettext
virtual/pkgconfig"
+src_prepare() {
+ default
+
+ sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
pkg_preinst() {
xdg_pkg_preinst
gnome2_schemas_savelist
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
index 4e8cb0ffc7f..c4ae2d6d903 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
@@ -32,6 +32,12 @@ RDEPEND="${DEPEND}
BDEPEND="sys-devel/gettext
virtual/pkgconfig"
+src_prepare() {
+ default
+
+ sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
pkg_preinst() {
xdg_pkg_preinst
gnome2_schemas_savelist
diff --git a/app-i18n/ibus-typing-booster/metadata.xml b/app-i18n/ibus-typing-booster/metadata.xml
index e1a49f49888..293189c6348 100644
--- a/app-i18n/ibus-typing-booster/metadata.xml
+++ b/app-i18n/ibus-typing-booster/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mike-fabian/ibus-typing-booster</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-i18n/ibus-unikey/Manifest b/app-i18n/ibus-unikey/Manifest
index 9c7ca4b1f1e..d0c05386d0c 100644
--- a/app-i18n/ibus-unikey/Manifest
+++ b/app-i18n/ibus-unikey/Manifest
@@ -1,2 +1,3 @@
DIST ibus-unikey-0.6.1-gcc6.patch 31686 BLAKE2B 5d04ba5e66b1a128a04d23e73e20a8e6a269240a07604e71f3e232e0087f0a47d9a4ff6aeaa10a001c5be9b113d8cdc2a917ecc5084d576d6f918b4c699f2ab3 SHA512 9e1b172a904076ba817c7bab80cbbf7d736c078d3ea285cb946be23552ff0f571ca8e0187cac4e5bfecc2b0032512d6f09af4435056d6b653a3648d07356d9b2
DIST ibus-unikey-0.6.1.tar.gz 516250 BLAKE2B edb5e46df983fe54ce84f778a23814ae946c6ace772d262a06f473013b84d87d3b1293e7faa62f070763ea837eccc08dfde51cf4b23353e84ac1ceca79a44d80 SHA512 f8d519802d9b304cdaebfcee3f9fef5f17756cde48aa48b9dd357d714e2eaaba0df8f91218b658fdd1d85343804e054b7987caff2734913b29dc76263c30d4e6
+DIST ibus-unikey-0.7.0_beta1.tar.gz 90086 BLAKE2B 450968ce10d5a455a9014cbd2cd9e6cbfbf559ae354dca8ca02b3a010edba4ff56caef7d79d5d80becbc51436e2192a8f9be5e936b606bae8ac65d003431188f SHA512 5e0bc188fe720014071c1c563c7bd3e92bc9e00d063c5c0647a9277fe3e05cb6c00a0aabb33e44ac5d31274f0fb03f495107195432bd7b0a89948ed3ba43d363
diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
new file mode 100644
index 00000000000..02551ba608f
--- /dev/null
+++ b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
@@ -0,0 +1,27 @@
+--- a/setup/Makefile.am
++++ b/setup/Makefile.am
+@@ -34,7 +34,8 @@
+
+ ibus_setup_unikey_LDFLAGS = \
+ @IBUS_LIBS@ \
+- @GTK_LIBS@ \
++ @GTK_LIBS@
++
++ibus_setup_unikey_LDADD = \
+ $(top_builddir)/ukengine/libunikey-ibus.la \
+ $(top_builddir)/src/ibus_engine_unikey-utils.o
+-
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,8 +25,9 @@
+
+ ibus_engine_unikey_LDFLAGS = \
+ @IBUS_LIBS@ \
+- @X11_LIBS@ \
+- $(top_builddir)/ukengine/libunikey-ibus.la
++ @X11_LIBS@
++
++ibus_engine_unikey_LDADD = $(top_builddir)/ukengine/libunikey-ibus.la
+
+ component_DATA = unikey.xml
+
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
index 63c9b7f5815..bbe90180754 100644
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
+
+inherit autotools
DESCRIPTION="Vietnamese UniKey engine for IBus"
-HOMEPAGE="https://github.com/mrlequoctuan/ibus-unikey"
+HOMEPAGE="https://github.com/vn-input/ibus-unikey"
SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
+IUSE="nls"
RDEPEND="app-i18n/ibus
x11-libs/libX11
- gtk? (
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? ( x11-libs/gtk+:3 )
- )
+ x11-libs/gtk+:3
nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
dev-util/intltool
nls? ( sys-devel/gettext )"
-PATCHES=( "${DISTDIR}"/${P}-gcc6.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-slibtool.patch
+ "${DISTDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
src_configure() {
econf \
$(use_enable nls) \
- --with-gtk-version=$(usex gtk2 3 2)
+ --with-gtk-version=3
}
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
new file mode 100644
index 00000000000..2aa330c6d61
--- /dev/null
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake gnome2-utils
+
+DESCRIPTION="Vietnamese UniKey engine for IBus"
+HOMEPAGE="https://github.com/vn-input/ibus-unikey"
+SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus
+ x11-libs/gtk+:3
+ virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ sys-devel/gettext"
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DGSETTINGS_COMPILE=OFF
+ )
+ cmake_src_configure
+}
+
+pkg_preinst() {
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml
index 880cfde265e..f0eec6b726a 100644
--- a/app-i18n/ibus-unikey/metadata.xml
+++ b/app-i18n/ibus-unikey/metadata.xml
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <longdescription lang="en">
- The UniKey engine for IBus. It provides a Vietnamese input method using
- UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
- </longdescription>
- <use>
- <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
- </use>
- <upstream>
- <remote-id type="github">mrlequoctuan/ibus-unikey</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <longdescription lang="en">
+ The UniKey engine for IBus. It provides a Vietnamese input method using
+ UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
+ </longdescription>
+ <upstream>
+ <remote-id type="github">vn-input/ibus-unikey</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index d855d77a1a0..f7c93136993 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,3 +2,4 @@ DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f
DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05
DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
DIST ibus-1.5.24.tar.gz 3614372 BLAKE2B 4b851ed9dc8283bf58957adfd5dd4bf7da8b019f95055dbbf7fa157502b3dcc11d561881ff6afa5db0b83b4e7d82f3bd228cd0e21ff77cb81b1eaca246deb135 SHA512 25f34a51a5c85352e61699ca36bf7ddb9b486b28d71e15ce3a52b78bc9db2f8cb558049e0652fdc5431215a5f826fcb5a7d5e44f0de9a2ff746aaf60672e2f22
+DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
new file mode 100644
index 00000000000..9dc461da301
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.50"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+ ${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="emoji? ( gtk )
+ gtk2? ( gtk )
+ kde? ( gtk )
+ python? (
+ ${PYTHON_REQUIRED_USE}
+ introspection
+ )
+ test? ( gtk )
+ vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-base/librsvg:2
+ sys-apps/dbus[X?]
+ X? (
+ x11-libs/libX11
+ >=x11-libs/libXfixes-6.0.0
+ !gtk? ( x11-libs/gtk+:2 )
+ )
+ gtk? (
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libXi
+ gtk2? ( x11-libs/gtk+:2 )
+ )
+ introspection? ( dev-libs/gobject-introspection )
+ kde? ( dev-qt/qtgui:5 )
+ nls? ( virtual/libintl )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ )
+ wayland? (
+ dev-libs/wayland
+ x11-libs/libxkbcommon
+ )"
+RDEPEND="${CDEPEND}
+ python? (
+ gtk? (
+ x11-libs/gtk+:3[introspection]
+ )
+ )"
+DEPEND="${CDEPEND}
+ $(vala_depend)
+ dev-util/glib-utils
+ virtual/pkgconfig
+ x11-misc/xkeyboard-config
+ emoji? (
+ app-i18n/unicode-cldr
+ app-i18n/unicode-emoji
+ )
+ nls? ( sys-devel/gettext )
+ unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+ vala_src_prepare --ignore-use
+ sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+ if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+ touch ui/gtk3/panelbinding.vala
+ fi
+ if ! use emoji; then
+ touch \
+ tools/main.vala \
+ ui/gtk3/panel.vala
+ fi
+ if ! use kde; then
+ touch ui/gtk3/panel.vala
+ fi
+ if [[ -n ${GENTOO_VER} ]]; then
+ einfo "Try to apply Gentoo specific patch set"
+ eapply "${WORKDIR}"/patches-gentoo/*.patch
+ fi
+
+ # for multiple Python implementations
+ sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+ # fix for parallel install
+ sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+ # require user interaction
+ sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+ sed -i "/^bash_completion/d" tools/Makefile.am
+
+ default
+ eautoreconf
+ xdg_environment_reset
+}
+
+src_configure() {
+ local unicodedir="${EPREFIX}"/usr/share/unicode
+ local python_conf=()
+ if use python; then
+ python_setup
+ python_conf+=(
+ $(use_enable gtk setup)
+ --with-python=${EPYTHON}
+ )
+ else
+ python_conf+=( --disable-setup )
+ fi
+
+ econf \
+ $(use_enable X xim) \
+ $(use_enable emoji emoji-dict) \
+ $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+ $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+ $(use_enable gtk gtk3) \
+ $(use_enable gtk ui) \
+ $(use_enable gtk2) \
+ $(use_enable introspection) \
+ $(use_enable kde appindicator) \
+ $(use_enable nls) \
+ $(use_enable test tests) \
+ $(use_enable unicode unicode-dict) \
+ $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+ $(use_enable vala) \
+ $(use_enable wayland) \
+ "${python_conf[@]}"
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ virtx emake -j1 check
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ if use python; then
+ python_install() {
+ emake -C bindings/pygobject \
+ pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+ DESTDIR="${D}" \
+ install
+
+ python_optimize
+ }
+ python_foreach_impl python_install
+ fi
+
+ keepdir /usr/share/ibus/engine
+
+ newbashcomp tools/${PN}.bash ${PN}
+
+ insinto /etc/X11/xinit/xinput.d
+ newins xinput-${PN} ${PN}.conf
+
+ # Undo compression of man page
+ find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+ use gtk && gnome2_query_immodules_gtk3
+ use gtk2 && gnome2_query_immodules_gtk2
+ xdg_icon_cache_update
+ gnome2_schemas_update
+ dconf update
+}
+
+pkg_postrm() {
+ use gtk && gnome2_query_immodules_gtk3
+ use gtk2 && gnome2_query_immodules_gtk2
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 0a198f3d160..38e7e2caecf 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/im-chooser/metadata.xml b/app-i18n/im-chooser/metadata.xml
index 434bdd89ac2..44a7fc1547e 100644
--- a/app-i18n/im-chooser/metadata.xml
+++ b/app-i18n/im-chooser/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/im-freewnn/metadata.xml b/app-i18n/im-freewnn/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/im-freewnn/metadata.xml
+++ b/app-i18n/im-freewnn/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/imhangul/metadata.xml b/app-i18n/imhangul/metadata.xml
index 20c10eff641..af2530e8fdd 100644
--- a/app-i18n/imhangul/metadata.xml
+++ b/app-i18n/imhangul/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 094115428fb..8120f5ba616 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/jfbterm/files/jfbterm-automake-1.13.patch b/app-i18n/jfbterm/files/jfbterm-automake-1.13.patch
new file mode 100644
index 00000000000..e20f068a838
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-automake-1.13.patch
@@ -0,0 +1,14 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1,7 +1,8 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(fbcommon.c)
+-AM_CONFIG_HEADER(config.h)
+-AM_INIT_AUTOMAKE(jfbterm, 0.4.7)
++AC_INIT([jfbterm], [0.4.7])
++AC_CONFIG_SRCDIR([fbcommon.c])
++AC_CONFIG_HEADERS([config.h])
++AM_INIT_AUTOMAKE
+
+ dnl Checks for programs.
+ AC_PROG_CC
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-gentoo.patch
index 8dc8bc097b0..48286aa8b22 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
+++ b/app-i18n/jfbterm/files/jfbterm-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
---- jfbterm-0.4.7.orig/fbcommon.c 2003-09-03 00:23:17.000000000 +0900
-+++ jfbterm-0.4.7/fbcommon.c 2007-08-18 10:55:30.000000000 +0900
+--- a/fbcommon.c
++++ b/fbcommon.c
@@ -46,7 +46,6 @@
#endif
#include <linux/vt.h>
@@ -19,9 +18,8 @@ diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
close(fd);
snprintf(fbdn, 15, "/dev/fb%d", c2m.framebuffer);
}
-diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sample
---- jfbterm-0.4.7.orig/jfbterm.conf.sample 2003-09-16 00:16:35.000000000 +0900
-+++ jfbterm-0.4.7/jfbterm.conf.sample 2007-08-18 10:19:00.000000000 +0900
+--- a/jfbterm.conf.sample
++++ b/jfbterm.conf.sample
@@ -19,29 +19,29 @@
# Absolute path or relative path to PWD
#
@@ -71,9 +69,8 @@ diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sam
###############################################################################
-diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.sample.ja
---- jfbterm-0.4.7.orig/jfbterm.conf.sample.ja 2003-09-16 00:16:35.000000000 +0900
-+++ jfbterm-0.4.7/jfbterm.conf.sample.ja 2007-08-18 10:19:11.000000000 +0900
+--- a/jfbterm.conf.sample.ja
++++ b/jfbterm.conf.sample.ja
@@ -25,29 +25,29 @@
# Хѥ or PWDХѥ
#
@@ -123,9 +120,8 @@ diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.
################################################################################
#
-diff -Naur jfbterm-0.4.7.orig/util.h jfbterm-0.4.7/util.h
---- jfbterm-0.4.7.orig/util.h 2003-09-16 00:45:31.000000000 +0900
-+++ jfbterm-0.4.7/util.h 2007-08-18 08:48:49.000000000 +0900
+--- a/util.h
++++ b/util.h
@@ -31,6 +31,7 @@
#include <sys/types.h>
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch
index 06c6e603348..aa0b39ed269 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
+++ b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch
@@ -3,8 +3,8 @@ Patch by Shunichi Fuji <palgowr@gmail.com>.
See bug #156306
---- jfbterm-0.4.7.orig/fbdpsp.c 2003-08-30 03:48:16.000000000 +0900
-+++ jfbterm-0.4.7/fbdpsp.c 2006-11-27 01:22:20.000000000 +0900
+--- a/fbdpsp.c
++++ b/fbdpsp.c
@@ -827,8 +827,7 @@
#ifdef JFB_VGA16FB
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch
index 2e803640077..60deee49422 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
+++ b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch
@@ -1,5 +1,5 @@
---- jfbterm-0.4.7.orig/main.c
-+++ jfbterm-0.4.7/main.c
+--- a/main.c
++++ b/main.c
@@ -184,7 +184,7 @@
p->gExecShellArgv = NULL;
p->gConfFile = FILE_JFBTERM_CONF;
@@ -9,8 +9,8 @@
atexit(tapp_final_at_exit);
}
---- jfbterm-0.4.7.orig/term.h
-+++ jfbterm-0.4.7/term.h
+--- a/term.h
++++ b/term.h
@@ -44,7 +44,7 @@
} TTerm;
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch
index 974ccbc4130..aa41d5e02ce 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
+++ b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch
@@ -1,7 +1,7 @@
-Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-wrong-inline-gcc5.patch
+https://src.fedoraproject.org/rpms/jfbterm/blob/rawhide/f/jfbterm-0.4.7-wrong-inline-gcc5.patch
---- jfbterm-0.4.7/pen.c.inline_gcc5 2003-08-30 03:48:16.000000000 +0900
-+++ jfbterm-0.4.7/pen.c 2015-02-09 10:36:47.182751545 +0900
+--- a/pen.c
++++ b/pen.c
@@ -62,7 +62,7 @@
p->attr = q->attr;
}
@@ -11,8 +11,8 @@ Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-
{
p->bcol = 0;
p->fcol = 7;
---- jfbterm-0.4.7/pen.h.inline_gcc5 2002-07-17 01:21:23.000000000 +0900
-+++ jfbterm-0.4.7/pen.h 2015-02-09 10:36:52.058705503 +0900
+--- a/pen.h
++++ b/pen.h
@@ -58,7 +58,7 @@
void tpen_init(TPen* p);
void tpen_final(TPen* p);
diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
index 93989a66a5a..3fb31512982 100644
--- a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="7"
inherit autotools flag-o-matic
@@ -15,16 +15,16 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE="debug"
DEPEND="sys-libs/ncurses:0"
-RDEPEND="
- media-fonts/unifont
- media-fonts/font-misc-misc
- media-fonts/intlfonts"
+RDEPEND="media-fonts/font-misc-misc
+ media-fonts/intlfonts
+ media-fonts/unifont"
PATCHES=(
- "${FILESDIR}"/${P}-sigchld-debian.patch
- "${FILESDIR}"/${P}-no-kernel-headers.patch
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-wrong-inline-gcc5.patch
+ "${FILESDIR}"/${PN}-sigchld-debian.patch
+ "${FILESDIR}"/${PN}-no-kernel-headers.patch
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-wrong-inline-gcc5.patch
+ "${FILESDIR}"/${PN}-automake-1.13.patch
)
src_prepare() {
@@ -38,15 +38,15 @@ src_configure() {
}
src_install() {
- dodir /etc /usr/share/fonts/jfbterm
+ dodir /etc /usr/share/fonts/${PN}
default
- mv "${ED%/}"/etc/jfbterm.conf{.sample,} || die
+ mv "${ED}"/etc/${PN}.conf{.sample,} || die
- doman jfbterm.1 jfbterm.conf.5
+ doman ${PN}.{1,conf.5}
# install example config files
docinto examples
- dodoc jfbterm.conf.sample*
+ dodoc ${PN}.conf.sample*
docompress -x /usr/share/doc/${PF}/examples
}
diff --git a/app-i18n/jfbterm/metadata.xml b/app-i18n/jfbterm/metadata.xml
index 5393e0d2936..ed078c77d67 100644
--- a/app-i18n/jfbterm/metadata.xml
+++ b/app-i18n/jfbterm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/kakasi/metadata.xml b/app-i18n/kakasi/metadata.xml
index 6f2ca22da23..a94766977fa 100644
--- a/app-i18n/kakasi/metadata.xml
+++ b/app-i18n/kakasi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/kanjipad/metadata.xml b/app-i18n/kanjipad/metadata.xml
index c921b96adf6..1d892a124fa 100644
--- a/app-i18n/kanjipad/metadata.xml
+++ b/app-i18n/kanjipad/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/kcc/metadata.xml b/app-i18n/kcc/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/kcc/metadata.xml
+++ b/app-i18n/kcc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/kcm-fcitx/metadata.xml b/app-i18n/kcm-fcitx/metadata.xml
index f8dafcfefc2..a7d9a659adf 100644
--- a/app-i18n/kcm-fcitx/metadata.xml
+++ b/app-i18n/kcm-fcitx/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/kinput2/metadata.xml
+++ b/app-i18n/kinput2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/libcangjie/metadata.xml b/app-i18n/libcangjie/metadata.xml
index f6b9bba14e9..f08720eca1f 100644
--- a/app-i18n/libcangjie/metadata.xml
+++ b/app-i18n/libcangjie/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/libchewing/metadata.xml b/app-i18n/libchewing/metadata.xml
index 384eafa9978..4fa19434a1e 100644
--- a/app-i18n/libchewing/metadata.xml
+++ b/app-i18n/libchewing/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml
index 3d31c8bdc09..f1979cc30a0 100644
--- a/app-i18n/libhangul/metadata.xml
+++ b/app-i18n/libhangul/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/libkkc-data/Manifest b/app-i18n/libkkc-data/Manifest
new file mode 100644
index 00000000000..c0fc91c8c73
--- /dev/null
+++ b/app-i18n/libkkc-data/Manifest
@@ -0,0 +1 @@
+DIST libkkc-data-0.2.7.tar.xz 22262552 BLAKE2B 2c735ee9fabf8f8f201591c9ed584cece22ddcd15da5f36b39bb422b1bce1dbcbcd66f71b5713e2dd4c5e2862b06b014c24a4a3db63c86ecee20519434da9261 SHA512 61c0cd8c0fa41ed8df49cac6709eebb245cc965d7e192b1ba945e95f2fc46aca8aa48c16e1977a12c157c55dab6b9f4c30f4905806725eca6e697b762eb7cbd7
diff --git a/app-i18n/libkkc-data/files/libkkc-data-python3.patch b/app-i18n/libkkc-data/files/libkkc-data-python3.patch
new file mode 100644
index 00000000000..46109a92dff
--- /dev/null
+++ b/app-i18n/libkkc-data/files/libkkc-data-python3.patch
@@ -0,0 +1,138 @@
+From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001
+From: Takao Fujiwara <tfujiwar@redhat.com>
+Date: Mon, 30 Jul 2018 15:26:37 +0900
+Subject: [PATCH] build: Enable python3
+
+---
+ tools/genfilter.py | 18 +++++++--------
+ tools/sortlm.py | 23 ++++++++-----------
+ 2 files changed, 19 insertions(+), 22 deletions(-)
+
+diff --git a/tools/genfilter.py b/tools/genfilter.py
+index 5ffab32..0c5f75a 100644
+--- a/tools/genfilter.py
++++ b/tools/genfilter.py
+@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size):
+
+ def generate(self):
+ size = os.fstat(self.infile.fileno()).st_size
+- n = size / self.record_size
++ n = size // self.record_size
+ m = int(math.ceil(-n*math.log10(ERROR_RATE) /
+ math.pow(math.log10(2), 2)))
+- m = (m/8 + 1)*8
++ m = (m//8 + 1)*8
+ inmem = mmap.mmap(self.infile.fileno(),
+ size,
+ access=mmap.ACCESS_READ)
+- outmem = bytearray(m/8)
+- for i in xrange(0, n):
++ outmem = bytearray(m//8)
++ for i in range(0, n):
+ offset = i*self.record_size
+ b0, b1 = struct.unpack("=LL", inmem[offset:offset+8])
+- for k in xrange(0, 4):
++ for k in range(0, 4):
+ h = murmur_hash3_32(b0, b1, k)
+ h = int(h * (m / float(0xFFFFFFFF)))
+- outmem[h/8] |= (1 << (h%8))
++ outmem[h//8] |= (1 << (h%8))
+ inmem.close()
+- # Convert bytearray to str, for Python 2.6 compatibility.
+- self.outfile.write(str(outmem))
++ # Convert bytearray to bytes, for Python 3 compatibility.
++ self.outfile.write(bytes(outmem))
+
+ if __name__ == '__main__':
+ import sys
+@@ -110,7 +110,7 @@ def generate(self):
+ parser = argparse.ArgumentParser(description='filter')
+ parser.add_argument('infile', type=argparse.FileType('r'),
+ help='input file')
+- parser.add_argument('outfile', type=argparse.FileType('w'),
++ parser.add_argument('outfile', type=argparse.FileType('wb'),
+ help='output file')
+ parser.add_argument('record_size', type=int,
+ help='record size')
+diff --git a/tools/sortlm.py b/tools/sortlm.py
+index a0dd8fe..40f0837 100644
+--- a/tools/sortlm.py
++++ b/tools/sortlm.py
+@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix):
+ self.__min_cost = 0.0
+
+ def read(self):
+- print "reading N-grams"
++ print("reading N-grams")
+ self.__read_tries()
+ self.__read_ngrams()
+- print "min cost = %lf" % self.__min_cost
++ print("min cost = %lf" % self.__min_cost)
+
+ def __read_tries(self):
+ while True:
+@@ -58,7 +58,7 @@ def __read_tries(self):
+ line = self.__infile.readline()
+ if line == "":
+ break
+- line = line.strip()
++ line = line.strip('\n')
+ if line == "":
+ break
+ match = self.__ngram_line_regex.match(line)
+@@ -89,7 +89,7 @@ def __read_ngrams(self):
+ line = self.__infile.readline()
+ if line == "":
+ break
+- line = line.strip()
++ line = line.strip('\n')
+ if line == "":
+ break
+ match = self.__ngram_line_regex.match(line)
+@@ -125,14 +125,11 @@ def __write_ngrams(self):
+ def quantize(cost, min_cost):
+ return max(0, min(65535, int(cost * 65535 / min_cost)))
+
+- def cmp_header(a, b):
+- return cmp(a[0], b[0])
+-
+- print "writing 1-gram file"
++ print("writing 1-gram file")
+ unigram_offsets = {}
+ unigram_file = open("%s.1gram" % self.__output_prefix, "wb")
+ offset = 0
+- for ids, value in sorted(self.__ngram_entries[0].iteritems()):
++ for ids, value in sorted(self.__ngram_entries[0].items()):
+ unigram_offsets[ids[0]] = offset
+ s = struct.pack("=HHH",
+ quantize(value[0], self.__min_cost),
+@@ -143,13 +140,13 @@ def cmp_header(a, b):
+ offset += 1
+ unigram_file.close()
+
+- print "writing 2-gram file"
++ print("writing 2-gram file")
+ bigram_offsets = {}
+ bigram_file = open("%s.2gram" % self.__output_prefix, "wb")
+ keys = self.__ngram_entries[1].keys()
+ items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys]
+ offset = 0
+- for header, ids in sorted(items, cmp=cmp_header):
++ for header, ids in sorted(items, key=lambda x: x[0]):
+ value = self.__ngram_entries[1][ids]
+ bigram_offsets[ids] = offset
+ s = struct.pack("=HH",
+@@ -160,11 +157,11 @@ def cmp_header(a, b):
+ bigram_file.close()
+
+ if len(self.__ngram_entries[2]) > 0:
+- print "writing 3-gram file"
++ print("writing 3-gram file")
+ trigram_file = open("%s.3gram" % self.__output_prefix, "wb")
+ keys = self.__ngram_entries[2].keys()
+ items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys]
+- for header, ids in sorted(items, cmp=cmp_header):
++ for header, ids in sorted(items, key=lambda x: x[0]):
+ value = self.__ngram_entries[2][ids]
+ s = struct.pack("=H",
+ quantize(value[0], self.__min_cost))
diff --git a/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild b/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
new file mode 100644
index 00000000000..cde6550d244
--- /dev/null
+++ b/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-any-r1
+
+DESCRIPTION="Language model data for libkkc"
+HOMEPAGE="https://github.com/ueno/libkkc"
+SRC_URI="https://github.com/ueno/${PN%-*}/releases/download/v0.3.5/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')"
+
+PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
diff --git a/app-i18n/libkkc-data/metadata.xml b/app-i18n/libkkc-data/metadata.xml
new file mode 100644
index 00000000000..6853c12be89
--- /dev/null
+++ b/app-i18n/libkkc-data/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ueno/libkkc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest
index 46aec7d3c2d..226b9d7a94f 100644
--- a/app-i18n/libkkc/Manifest
+++ b/app-i18n/libkkc/Manifest
@@ -1 +1 @@
-DIST libkkc-0.3.6_pre20190809104047.tar.gz 389976 BLAKE2B 03c43384f4f1f0e48a3eec2afb9f90a39e42469439a7dbc06692e020d83b8362f19c41ea8960cd5147edca04dcf67be5e74315f494dd017a6ce018f217b6a5a7 SHA512 87c5294900b29e4b2225c24ee744c619691a5f25edc453c2ece44133695a8d0e1a1a07bb5a00d615cc95057ae5b451c845c7ce476df555e025097c38aff87a69
+DIST libkkc-0.3.5_p20210928.tar.gz 390022 BLAKE2B d4b44861f4526f4f9581cd9343fb4d8dd361967cce153ab92fb9a3334502bd583081d4ae3c01879c94aee710d347c23d3372c0deb20d711b9792eb73a28b3beb SHA512 9c46ef09242ecf3d4864fff0e7df7ff362d71c382bb92fe1e784bd20bdf737dc6a528b57342093ab4415926b15f09db44a10b8088d1c9f8b9cebcb428aaee8c6
diff --git a/app-i18n/libkkc/files/libkkc-marisa-glib.patch b/app-i18n/libkkc/files/libkkc-marisa-glib.patch
new file mode 100644
index 00000000000..2b013d4f577
--- /dev/null
+++ b/app-i18n/libkkc/files/libkkc-marisa-glib.patch
@@ -0,0 +1,23 @@
+--- a/libkkc/Makefile.am
++++ b/libkkc/Makefile.am
+@@ -49,7 +49,11 @@
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -I $(top_srcdir) \
+ $(NULL)
+-libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la
++libkkc_la_LIBADD = \
++ $(LIBKKC_LIBS) \
++ $(top_builddir)/marisa-glib/libmarisa-glib.la \
++ $(MARISA_GLIB_STATIC_DEPENDENCIES) \
++ $(NULL)
+ libkkc_la_LDFLAGS = \
+ $(CODE_COVERAGE_LDFLAGS) \
+ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \
+@@ -66,7 +70,6 @@
+ libkkc_internals_la_LIBADD = \
+ $(libkkc_la_LIBADD) \
+ $(libkkc_la_OBJECTS) \
+- $(MARISA_GLIB_STATIC_DEPENDENCIES) \
+ $(NULL)
+ libkkc_internals_la_LDFLAGS = \
+ $(CODE_COVERAGE_LDFLAGS) \
diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild
index d563af26c2c..fec5bceb750 100644
--- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
+++ b/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{7..10} )
inherit autotools python-any-r1 vala
@@ -10,16 +10,18 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_pre* ]]; then
- LIBKKC_GIT_REVISION="b2e5a152980ee627c39ca8a49082e6df7694b8fc"
+elif [[ "${PV}" == *_p* ]]; then
+ inherit vcs-snapshot
+
+ EGIT_COMMIT="cdcaf4dceaf273bfe7b018a4a651a92f786c6ec6"
fi
DESCRIPTION="Japanese Kana Kanji conversion input method library"
HOMEPAGE="https://github.com/ueno/libkkc"
if [[ "${PV}" == "9999" ]]; then
SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
- SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+elif [[ "${PV}" == *_p* ]]; then
+ SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
else
SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
fi
@@ -29,30 +31,29 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="nls static-libs"
+RDEPEND="app-i18n/libkkc-data
+ dev-libs/glib:2
+ dev-libs/json-glib
+ dev-libs/libgee:0.8
+ dev-libs/marisa
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
$(vala_depend)
dev-libs/gobject-introspection
virtual/pkgconfig
nls? ( sys-devel/gettext )"
-DEPEND="dev-libs/glib:2
- dev-libs/json-glib
- dev-libs/libgee:0.8
- dev-libs/marisa
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-if [[ "${PV}" == *_pre* ]]; then
- S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}"
-fi
+PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )
python_check_deps() {
has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
}
src_prepare() {
+ vala_src_prepare
default
eautoreconf
- vala_src_prepare
}
src_configure() {
diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild
index 1743990197e..cbad641cc79 100644
--- a/app-i18n/libkkc/libkkc-9999.ebuild
+++ b/app-i18n/libkkc/libkkc-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{7..10} )
inherit autotools python-any-r1 vala
@@ -10,16 +10,18 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_pre* ]]; then
- LIBKKC_GIT_REVISION=""
+elif [[ "${PV}" == *_p* ]]; then
+ inherit vcs-snapshot
+
+ EGIT_COMMIT=""
fi
DESCRIPTION="Japanese Kana Kanji conversion input method library"
HOMEPAGE="https://github.com/ueno/libkkc"
if [[ "${PV}" == "9999" ]]; then
SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
- SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+elif [[ "${PV}" == *_p* ]]; then
+ SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
else
SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
fi
@@ -29,30 +31,29 @@ SLOT="0"
KEYWORDS=""
IUSE="nls static-libs"
+RDEPEND="app-i18n/linkkc-data
+ dev-libs/glib:2
+ dev-libs/json-glib
+ dev-libs/libgee:0.8
+ dev-libs/marisa
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
$(vala_depend)
dev-libs/gobject-introspection
virtual/pkgconfig
nls? ( sys-devel/gettext )"
-DEPEND="dev-libs/glib:2
- dev-libs/json-glib
- dev-libs/libgee:0.8
- dev-libs/marisa
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-if [[ "${PV}" == *_pre* ]]; then
- S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}"
-fi
+PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )
python_check_deps() {
has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
}
src_prepare() {
+ vala_src_prepare
default
eautoreconf
- vala_src_prepare
}
src_configure() {
diff --git a/app-i18n/libkkc/metadata.xml b/app-i18n/libkkc/metadata.xml
index 060c243a1ba..6686fae672e 100644
--- a/app-i18n/libkkc/metadata.xml
+++ b/app-i18n/libkkc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/libpinyin/metadata.xml b/app-i18n/libpinyin/metadata.xml
index 5b6b1843aef..1fa6baa055e 100644
--- a/app-i18n/libpinyin/metadata.xml
+++ b/app-i18n/libpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/librime-lua/librime-lua-20201011103348.ebuild b/app-i18n/librime-lua/librime-lua-20201011103348.ebuild
index 5abed7223b0..996b1508ab8 100644
--- a/app-i18n/librime-lua/librime-lua-20201011103348.ebuild
+++ b/app-i18n/librime-lua/librime-lua-20201011103348.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -24,7 +24,7 @@ fi
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-i18n/librime-lua/metadata.xml b/app-i18n/librime-lua/metadata.xml
index d46ae4c46ad..91961556816 100644
--- a/app-i18n/librime-lua/metadata.xml
+++ b/app-i18n/librime-lua/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/librime/librime-1.7.3-r1.ebuild b/app-i18n/librime/librime-1.7.3-r1.ebuild
index 568aa94ae70..a500978314a 100644
--- a/app-i18n/librime/librime-1.7.3-r1.ebuild
+++ b/app-i18n/librime/librime-1.7.3-r1.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/1-${PV}"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
IUSE="debug test"
RESTRICT="!test? ( test )"
diff --git a/app-i18n/librime/metadata.xml b/app-i18n/librime/metadata.xml
index 5ec8c66c846..45f4d033515 100644
--- a/app-i18n/librime/metadata.xml
+++ b/app-i18n/librime/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
index df8b78b8541..96281f41a24 100644
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@@ -1,2 +1,2 @@
-DIST libskk-1.0.2.tar.gz 867572 BLAKE2B 32f599e83bf7ced796d2f37f6f4bf5e45f47c90e144784b7b3e082866cc619a26e3aca4f16051685baa4d8ac54b0462930193f978bc1e8220b378679269c5833 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0
DIST libskk-1.0.5.tar.xz 564488 BLAKE2B e7108bd2f44e5a0a0756cd25da4b07376b36604d6d2159b283e8a5f4ef76006210ff993d58b653cbce01ae4c9e003acf4acbd93ebc40711fec2600e514c49e9f SHA512 6db675edba89b83da0c29afb42644c39bcb0ccfc47f067a18e0eda817df4f58a86c86e8747080018c132d8734754a6fd8a30fe6578050eb93ff636edeed534ab
+DIST libskk-1.0.5_p20210830.tar.gz 190676 BLAKE2B 6b9f058669929efb292692b5047084e2e95e2003a9ecd093205b198bf201249811f672d74e8ee283e6b1f5a94b6a72c79dddb12c950ffe6958ca6aef3aaea5d9 SHA512 2a34111627a43de2d854e2236fd69ec5577b162b097b6e964b891cf09eafaed0d9c3f657bcb1f78ec985a3e2adbed079d37e5e873d1ec35e5f7c66960135ee2b
diff --git a/app-i18n/libskk/libskk-1.0.5.ebuild b/app-i18n/libskk/libskk-1.0.5.ebuild
index eab92a1f7f0..3d761d619f7 100644
--- a/app-i18n/libskk/libskk-1.0.5.ebuild
+++ b/app-i18n/libskk/libskk-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection nls static-libs"
RDEPEND="dev-libs/glib:2
@@ -20,8 +20,8 @@ RDEPEND="dev-libs/glib:2
x11-libs/libxkbcommon
introspection? ( dev-libs/gobject-introspection )
nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- $(vala_depend)
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)
virtual/pkgconfig
nls? ( sys-devel/gettext )"
diff --git a/app-i18n/libskk/libskk-1.0.2.ebuild b/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild
index 593469dc303..b0caa5c5a71 100644
--- a/app-i18n/libskk/libskk-1.0.2.ebuild
+++ b/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-inherit vala virtualx
+inherit autotools vala vcs-snapshot virtualx
+
+EGIT_COMMIT="5f5e5c2d3facfec9f577fb66032e6f1994ed5d44"
DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
HOMEPAGE="https://github.com/ueno/libskk"
-SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="+introspection nls static-libs"
RDEPEND="dev-libs/glib:2
dev-libs/json-glib
dev-libs/libgee:0.8
+ x11-libs/libxkbcommon
introspection? ( dev-libs/gobject-introspection )
nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)
virtual/pkgconfig
nls? ( sys-devel/gettext )"
src_prepare() {
vala_src_prepare
default
+ eautoreconf
}
src_configure() {
diff --git a/app-i18n/libskk/metadata.xml b/app-i18n/libskk/metadata.xml
index 8d9f83d4f2e..8fa0fa3b5c7 100644
--- a/app-i18n/libskk/metadata.xml
+++ b/app-i18n/libskk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/libtabe/Manifest b/app-i18n/libtabe/Manifest
deleted file mode 100644
index ef4285baf21..00000000000
--- a/app-i18n/libtabe/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libtabe_0.2.6-1.2.diff.gz 74362 BLAKE2B d09e91bad9e9e3240cdc261140012977f318436af420564692152a8b7a99cd7c427433a6180c1f9490995b43cd95200318ffb5dab68fc18561d7ced58fd00bd6 SHA512 011a76f3c8a1c13a6cfd0e96eb41557a8bfbf1aca8cb79daee0f0941b920d25614df5e0479368bf7075cb511851cab4c9113b30656d55b4d29128eb7312d0ef1
-DIST libtabe_0.2.6.orig.tar.gz 1792199 BLAKE2B fec2259678a57b144eccf49ba459d2930f89f871873b3547040fd570a0f8510bc84e27609b1ca2d82596d5a025f0bd7251870655f4a83758be806f75db5abb48 SHA512 88f1cb279ccf487de5d0f8a1e9eede8d5ca16e4507b59db0b66241d0cdae609ed0b04093a82eabe0569f885aa397c1d5fa3f0ae3c3270a348ce045d73e01fbc7
diff --git a/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch b/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch
deleted file mode 100644
index 79964602e75..00000000000
--- a/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- * QA Notice: Package has poor programming practices which may compile
- * fine but exhibit random runtime failures.
- * tabe_tsi.c:385: warning: incompatible implicit declaration of built-in function ‘fabs’
- * tabe_tsi.c:437: warning: incompatible implicit declaration of built-in function ‘fabs’
- * tabe_tsi.c:496: warning: incompatible implicit declaration of built-in function ‘fabs’
- * Please do not file a Gentoo bug and instead report the above QA
- * issues directly to the upstream developers of this software.
- * Homepage: https://packages.qa.debian.org/libt/libtabe.html
-
-diff -NrU5 libtabe-0.2.6.orig.really/src/tabe_tsi.c libtabe-0.2.6.orig/src/tabe_tsi.c
---- libtabe-0.2.6.orig.really/src/tabe_tsi.c 2008-04-20 01:35:56.000000000 +0200
-+++ libtabe-0.2.6.orig/src/tabe_tsi.c 2008-04-20 01:36:46.000000000 +0200
-@@ -12,10 +12,11 @@
- #endif
-
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <math.h>
-
- #include "tabe.h"
-
- struct TsiInfo *
- tabeTsiInfoNew(char *str)
diff --git a/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch b/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch
deleted file mode 100644
index 0f51b19b71f..00000000000
--- a/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/Makefile.in b/src/Makefile.in
-index ada3dca..6acd71c 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@
- DEFS = @DEFS@
- RANLIB = @RANLIB@
- LN_S = @LN_S@
--LDFLAGS = @with_db_lib@
-+LDFLAGS = @with_db_lib@ @LDFLAGS@
- INC = @with_db_inc@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -55,7 +55,7 @@ all: $(LIBNAME) @build_supports@
-
- $(LIBNAME): $(LIBOBJS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
-- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
-+ -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS)
-
- bims:
- (cd supports/bims; $(MAKE))
-diff --git a/src/supports/bims/Makefile.in b/src/supports/bims/Makefile.in
-index dc2534d..0e3041b 100644
---- a/src/supports/bims/Makefile.in
-+++ b/src/supports/bims/Makefile.in
-@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@
- DEFS = @DEFS@
- RANLIB = @RANLIB@
- LN_S = @LN_S@
--LDFLAGS = @with_db_lib@
-+LDFLAGS = @with_db_lib@ @LDFLAGS@
- INC = -I../..
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -45,7 +45,7 @@ all: $(LIBNAME)
-
- $(LIBNAME): $(LIBOBJS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
-- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
-+ -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS)
-
- bims.lo: bims.c bims.h
- $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c
-diff --git a/util/Makefile.in b/util/Makefile.in
-index cb82736..16425d1 100644
---- a/util/Makefile.in
-+++ b/util/Makefile.in
-@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@
- DEFS = @DEFS@
- RANLIB = @RANLIB@
- LN_S = @LN_S@
--LDFLAGS = ../src/libtabe.la @with_db_lib@
-+LDFLAGS = ../src/libtabe.la @with_db_lib@ @LDFLAGS@
- INC = -I../src @with_db_inc@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
deleted file mode 100644
index 62e347d8caf..00000000000
--- a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools
-
-DEBIAN_PV=$(ver_rs 3 '-')
-DEBIAN_PATCH=${PN}_${DEBIAN_PV}.diff
-ORIG_PV=${DEBIAN_PV%-*}
-ORIG_P=${PN}-${ORIG_PV}
-
-DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+"
-HOMEPAGE="https://packages.qa.debian.org/libt/libtabe.html"
-SRC_URI="
- mirror://debian/pool/main/${PN:0:4}/${PN}/${PN}_${ORIG_PV}.orig.tar.gz
- mirror://debian/pool/main/${PN:0:4}/libtabe/${DEBIAN_PATCH}.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-RDEPEND=">=sys-libs/db-4.5:="
-DEPEND="
- ${RDEPEND}
- x11-libs/libX11"
-
-S=${WORKDIR}/${ORIG_P}.orig
-
-PATCHES=(
- "${WORKDIR}"/${DEBIAN_PATCH}
- "${FILESDIR}"/${ORIG_P}-fabs.patch
- "${FILESDIR}"/${ORIG_P}-ldflags.patch
-)
-
-src_prepare() {
- default
-
- ln -s script/configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-db-inc="${EPREFIX}"/usr/include \
- --with-db-lib="${EPREFIX}"/usr/$(get_libdir) \
- --with-db-bin="${EPREFIX}"/usr/bin \
- --with-db-name=db \
- --enable-shared \
- --disable-static \
- $(use_enable debug)
-}
-
-src_compile() {
- # We execute this serially because the Makefiles don't handle
- # proper cross-directory references.
- emake -C src
- emake -C util
- emake -C tsi-src
-}
-
-src_install() {
- default
- dodoc -r doc/.
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-i18n/libtabe/metadata.xml b/app-i18n/libtabe/metadata.xml
deleted file mode 100644
index c921b96adf6..00000000000
--- a/app-i18n/libtabe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
deleted file mode 100644
index b442c578791..00000000000
--- a/app-i18n/man-pages-it/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST man-pages-it-5.06.tar.xz 363716 BLAKE2B 57ac90d11a76217ead0f201ed4f8cfd0bc5f08b97662023a540f1150fc8fb6804980e6770cc7d707097d732645ebc9b3b85feb15736d7e925df2711a3f32ba6e SHA512 d4d89bba004265c70b6f0220b0172798677174e8034ece4a15c21432423ec904d0a3b7614987a165950c4f28af02c1b9374f536982771307b78617479139f900
diff --git a/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild b/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild
deleted file mode 100644
index f64599a295c..00000000000
--- a/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
-HOMEPAGE="http://it.tldp.org/man/"
-SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
- default
- # Remove man page provided by sys-apps/shadow
- rm man-pages/man5/passwd.5 || die
-}
-
-src_compile() { :; } # emake does bad things here
-
-src_install() {
- doman -i18n=it man-pages/man[1-9]/* binutils/man[1-9]/* inetutils/man[1-9]/* \
- util-linux/man[1-9]/* misc/man[1-9]/*
-
- dodoc description README CHANGELOG
-}
diff --git a/app-i18n/man-pages-it/metadata.xml b/app-i18n/man-pages-it/metadata.xml
deleted file mode 100644
index 65484e7dc6c..00000000000
--- a/app-i18n/man-pages-it/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <maintainer status="active">
- <email>giulio@pluto.it</email>
- <name>Giulio Daprelà</name>
- </maintainer>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/man-pages-ja/metadata.xml b/app-i18n/man-pages-ja/metadata.xml
index 763d8988523..9bb1f0c5e5c 100644
--- a/app-i18n/man-pages-ja/metadata.xml
+++ b/app-i18n/man-pages-ja/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index 79bf0d247c4..2cc15288b32 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,2 +1 @@
DIST manpages-l10n-v4.10.0.tar.bz2 64760050 BLAKE2B b70d8b0a48050538f7af90c248f3132dadd69e9eca0e3f438aeb6b8086aed8f70ee4d54af3608c602910fcfac68d1283971a9a1869b3854d1802794c56837b58 SHA512 59f5daa7acf29252af2c733d7084bfe9bccbbec19f5e8cf1855df420835fd934e072479149d679a90ae4e52330763599a20fbb5bc8459b8a44e5bcc1628ab501
-DIST manpages-l10n-v4.2.0.tar.bz2 51747352 BLAKE2B 97c3e3fdb11b47753c9c179751fb001af0a9f79324d594d297981735f82b3917bd31fc5c100462d6093e621a98773f23543548efb957113ade39e9c315cd4d72 SHA512 b2de542fdb97868b5fa96f24947c7a37216dc6a6a5ee66142023dd1036017f7128ca26ac8367b0edbd76cfa049174892749efafef9dbf4221e90dd9166b82652
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
index cc7410ba453..2875b1dc8a5 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
MY_L10N=(de es fr it nl pl pt-BR ro)
IUSE="${MY_L10N[@]/#/l10n_}"
REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
deleted file mode 100644
index 5d58f5e413a..00000000000
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN/-}-v${PV}"
-DESCRIPTION="A somewhat comprehensive collection of man page translations"
-HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
-SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-# build failure for es and it, so omit them for now #769314
-MY_L10N=(de fr nl pl pt-BR ro)
-IUSE="${MY_L10N[@]/#/l10n_}"
-REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
-
-RDEPEND="virtual/man
- l10n_de? ( !app-i18n/man-pages-de )
- l10n_fr? ( !app-i18n/man-pages-fr )
- l10n_nl? ( !app-i18n/man-pages-nl )
- l10n_pl? ( !app-i18n/man-pages-pl )"
-
-BDEPEND="app-text/po4a
- dev-lang/perl"
-
-DOCS=(AUTHORS.md CHANGES.md README.md)
-
-src_prepare() {
- default
- sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
-
- # some packages have their own translations
- local noinst_manpages=(
- # app-arch/xz-utils
- de/xz.1
- de/xzdec.1
- de/xzdiff.1
- de/xzgrep.1
- de/xzless.1
- de/xzmore.1
- # sys-apps/shadow
- {de,nl,pl}/groups.1
- de/su.1
- # sys-process/procps
- {de,fr,pl}/free.1
- {de,fr}/pgrep.1
- {de,fr}/pmap.1
- {de,fr,pl}/ps.1
- {de,fr}/pwdx.1
- {de,fr}/tload.1
- {de,fr,pl}/uptime.1
- {de,fr}/sysctl.conf.5
- {de,fr}/sysctl.8
- {de,fr}/vmstat.8
- # sys-process/psmisc
- {de,nl,pl}/fuser.1
- {de,pl}/killall.1
- de/peekfd.1
- de/prtstat.1
- de/pslog.1
- {de,pl}/pstree.1
- )
- printf '%s\n' "${noinst_manpages[@]}" \
- | sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm
- assert
-}
-
-src_configure() {
- econf --enable-compression=none
-}
diff --git a/app-i18n/man-pages-l10n/metadata.xml b/app-i18n/man-pages-l10n/metadata.xml
index 7fccbc10bd1..07376844207 100644
--- a/app-i18n/man-pages-l10n/metadata.xml
+++ b/app-i18n/man-pages-l10n/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ulm@gentoo.org</email>
diff --git a/app-i18n/man-pages-ru/metadata.xml b/app-i18n/man-pages-ru/metadata.xml
index d38c2811a3a..41b7bcaf88a 100644
--- a/app-i18n/man-pages-ru/metadata.xml
+++ b/app-i18n/man-pages-ru/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>pinkbyte@gentoo.org</email>
diff --git a/app-i18n/man-pages-zh_CN/metadata.xml b/app-i18n/man-pages-zh_CN/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-i18n/man-pages-zh_CN/metadata.xml
+++ b/app-i18n/man-pages-zh_CN/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-i18n/mecab-skkserv/metadata.xml b/app-i18n/mecab-skkserv/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/mecab-skkserv/metadata.xml
+++ b/app-i18n/mecab-skkserv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/metadata.xml b/app-i18n/metadata.xml
index 9129ba2a84b..cd63023e4ca 100644
--- a/app-i18n/metadata.xml
+++ b/app-i18n/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The app-i18n category contains internationalisation-related packages.
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 8cc0ab6bbf3..db3170ba53c 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/multiskkserv/metadata.xml b/app-i18n/multiskkserv/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/multiskkserv/metadata.xml
+++ b/app-i18n/multiskkserv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/nabi/metadata.xml b/app-i18n/nabi/metadata.xml
index 41500dcdee8..64fe93509dc 100644
--- a/app-i18n/nabi/metadata.xml
+++ b/app-i18n/nabi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/nkf/metadata.xml b/app-i18n/nkf/metadata.xml
index a74bb9c23eb..9110c23f6c4 100644
--- a/app-i18n/nkf/metadata.xml
+++ b/app-i18n/nkf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index e937e5a5aeb..fe8b98b53eb 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
@@ -18,17 +18,16 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="perl python l10n_ja"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="python? (
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="python? (
${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
+ dev-python/setuptools[${PYTHON_USEDEP}]
)"
-DEPEND="${RDEPEND}"
src_unpack() {
use python && vcs-snapshot_src_unpack || default
@@ -42,9 +41,9 @@ src_prepare() {
if use python; then
mv "${WORKDIR}"/${PY_P} NKF.python || die
eapply "${FILESDIR}"/${PN}-python.patch
- cd NKF.python
+ cd NKF.python || die
distutils-r1_src_prepare
- cd - >/dev/null
+ cd - >/dev/null || die
fi
default
@@ -53,37 +52,37 @@ src_prepare() {
src_configure() {
default
if use perl; then
- cd NKF.mod
+ cd NKF.mod || die
perl-module_src_configure
- cd - >/dev/null
+ cd - >/dev/null || die
fi
if use python; then
- cd NKF.python
+ cd NKF.python || die
distutils-r1_src_configure
- cd - >/dev/null
+ cd - >/dev/null || die
fi
}
src_compile() {
emake CC="$(tc-getCC)"
if use perl; then
- cd NKF.mod
+ cd NKF.mod || die
perl-module_src_compile
- cd - >/dev/null
+ cd - >/dev/null || die
fi
if use python; then
- cd NKF.python
+ cd NKF.python || die
distutils-r1_src_compile
- cd - >/dev/null
+ cd - >/dev/null || die
fi
}
src_test() {
default
if use perl; then
- cd NKF.mod
+ cd NKF.mod || die
perl-module_src_test
- cd - >/dev/null
+ cd - >/dev/null || die
fi
}
@@ -98,16 +97,16 @@ src_install() {
dodoc ${PN}.doc
if use perl; then
- cd NKF.mod
+ cd NKF.mod || die
docinto perl
perl-module_src_install
- cd - >/dev/null
+ cd - >/dev/null || die
fi
if use python; then
- cd NKF.python
+ cd NKF.python || die
docinto python
DOCS= distutils-r1_src_install
dodoc CHANGES README.md
- cd - >/dev/null
+ cd - >/dev/null || die
fi
}
diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index bfcc2f62831..713fbd592ff 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/opencc/opencc-1.1.2.ebuild b/app-i18n/opencc/opencc-1.1.2.ebuild
index 936472477cd..2121392df3d 100644
--- a/app-i18n/opencc/opencc-1.1.2.ebuild
+++ b/app-i18n/opencc/opencc-1.1.2.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="Apache-2.0"
SLOT="0/1.1"
-KEYWORDS="~amd64 ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/app-i18n/poedit/metadata.xml b/app-i18n/poedit/metadata.xml
index 59291cd93ec..7a0523de49f 100644
--- a/app-i18n/poedit/metadata.xml
+++ b/app-i18n/poedit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>wxwidgets@gentoo.org</email>
diff --git a/app-i18n/pyzy/metadata.xml b/app-i18n/pyzy/metadata.xml
index f6afd400fc2..1edad7d250d 100644
--- a/app-i18n/pyzy/metadata.xml
+++ b/app-i18n/pyzy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dlan@gentoo.org</email>
diff --git a/app-i18n/qkc/metadata.xml b/app-i18n/qkc/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/qkc/metadata.xml
+++ b/app-i18n/qkc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/rime-data/metadata.xml b/app-i18n/rime-data/metadata.xml
index 128bf3bdf63..09e5add9327 100644
--- a/app-i18n/rime-data/metadata.xml
+++ b/app-i18n/rime-data/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/scim-anthy/metadata.xml b/app-i18n/scim-anthy/metadata.xml
index 410ff476847..bf53f133838 100644
--- a/app-i18n/scim-anthy/metadata.xml
+++ b/app-i18n/scim-anthy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-bridge/metadata.xml b/app-i18n/scim-bridge/metadata.xml
index 01855eefe13..8c8ccaa2a14 100644
--- a/app-i18n/scim-bridge/metadata.xml
+++ b/app-i18n/scim-bridge/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-hangul/metadata.xml b/app-i18n/scim-hangul/metadata.xml
index 01855eefe13..8c8ccaa2a14 100644
--- a/app-i18n/scim-hangul/metadata.xml
+++ b/app-i18n/scim-hangul/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-input-pad/metadata.xml b/app-i18n/scim-input-pad/metadata.xml
index cd1750246e4..278e0202bae 100644
--- a/app-i18n/scim-input-pad/metadata.xml
+++ b/app-i18n/scim-input-pad/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-m17n/metadata.xml b/app-i18n/scim-m17n/metadata.xml
index 01855eefe13..8c8ccaa2a14 100644
--- a/app-i18n/scim-m17n/metadata.xml
+++ b/app-i18n/scim-m17n/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-pinyin/metadata.xml b/app-i18n/scim-pinyin/metadata.xml
index 01855eefe13..8c8ccaa2a14 100644
--- a/app-i18n/scim-pinyin/metadata.xml
+++ b/app-i18n/scim-pinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-sayura/metadata.xml b/app-i18n/scim-sayura/metadata.xml
index c921b96adf6..1d892a124fa 100644
--- a/app-i18n/scim-sayura/metadata.xml
+++ b/app-i18n/scim-sayura/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-sunpinyin/metadata.xml b/app-i18n/scim-sunpinyin/metadata.xml
index 20533d05e2c..1c401324a2f 100644
--- a/app-i18n/scim-sunpinyin/metadata.xml
+++ b/app-i18n/scim-sunpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-tables/metadata.xml b/app-i18n/scim-tables/metadata.xml
index 01855eefe13..8c8ccaa2a14 100644
--- a/app-i18n/scim-tables/metadata.xml
+++ b/app-i18n/scim-tables/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-tomoe/metadata.xml b/app-i18n/scim-tomoe/metadata.xml
index f01b1e07af4..82a1115e613 100644
--- a/app-i18n/scim-tomoe/metadata.xml
+++ b/app-i18n/scim-tomoe/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim-uim/metadata.xml b/app-i18n/scim-uim/metadata.xml
index 01855eefe13..8c8ccaa2a14 100644
--- a/app-i18n/scim-uim/metadata.xml
+++ b/app-i18n/scim-uim/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/scim/metadata.xml b/app-i18n/scim/metadata.xml
index 9115a5e98ac..05b68dc3708 100644
--- a/app-i18n/scim/metadata.xml
+++ b/app-i18n/scim/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/skk-jisyo/metadata.xml b/app-i18n/skk-jisyo/metadata.xml
index 6f2ca22da23..a94766977fa 100644
--- a/app-i18n/skk-jisyo/metadata.xml
+++ b/app-i18n/skk-jisyo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/skkfep/metadata.xml b/app-i18n/skkfep/metadata.xml
index 6f2ca22da23..a94766977fa 100644
--- a/app-i18n/skkfep/metadata.xml
+++ b/app-i18n/skkfep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/skkserv/metadata.xml b/app-i18n/skkserv/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/skkserv/metadata.xml
+++ b/app-i18n/skkserv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/skktools/metadata.xml b/app-i18n/skktools/metadata.xml
index 32b1de9c163..bc9c0bf49ed 100644
--- a/app-i18n/skktools/metadata.xml
+++ b/app-i18n/skktools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
index 3ce0e2257d3..c458036026f 100644
--- a/app-i18n/sunpinyin-data/metadata.xml
+++ b/app-i18n/sunpinyin-data/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/sunpinyin/metadata.xml b/app-i18n/sunpinyin/metadata.xml
index da2c1e97edc..de8f4d24515 100644
--- a/app-i18n/sunpinyin/metadata.xml
+++ b/app-i18n/sunpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/tagainijisho/metadata.xml b/app-i18n/tagainijisho/metadata.xml
index 1df8cba85e2..c3d7f3c2261 100644
--- a/app-i18n/tagainijisho/metadata.xml
+++ b/app-i18n/tagainijisho/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
diff --git a/app-i18n/tegaki-zinnia-japanese/metadata.xml b/app-i18n/tegaki-zinnia-japanese/metadata.xml
index c921b96adf6..1d892a124fa 100644
--- a/app-i18n/tegaki-zinnia-japanese/metadata.xml
+++ b/app-i18n/tegaki-zinnia-japanese/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch b/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch
new file mode 100644
index 00000000000..05fba04a194
--- /dev/null
+++ b/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,7 +4,7 @@
+ -DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\"
+
+ INCLUDES = $(GTK2_CFLAGS) $(TOMOE_CFLAGS) $(GUCHARMAP_CFLAGS)
+-LIBS = $(GTK2_LIBS) $(TOMOE_LIBS) $(GUCHARMAP_LIBS)
++LIBS = $(GTK2_LIBS) $(TOMOE_LIBS) $(GUCHARMAP_LIBS) -lm
+
+ lib_LTLIBRARIES = libtomoe-gtk.la
+ libtomoe_gtk_la_SOURCES = \
diff --git a/app-i18n/tomoe-gtk/metadata.xml b/app-i18n/tomoe-gtk/metadata.xml
index bb5bed5adfa..697481050a9 100644
--- a/app-i18n/tomoe-gtk/metadata.xml
+++ b/app-i18n/tomoe-gtk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild
index 24a7bebf239..e18c92f169e 100644
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
+inherit autotools
+
DESCRIPTION="Tomoe GTK+ interface widget library"
HOMEPAGE="http://tomoe.osdn.jp/"
SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
@@ -20,6 +22,15 @@ BDEPEND="dev-util/glib-utils
sys-devel/gettext
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/${PN}-math.patch )
+
+AT_M4DIR="macros"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
econf \
--disable-static \
diff --git a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
index 5d296cdcdd3..2bade4ef764 100644
--- a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
+++ b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
@@ -1,5 +1,5 @@
---- /lib/tomoe-xml-parser.c
-+++ /lib/tomoe-xml-parser.c
+--- a/lib/tomoe-xml-parser.c
++++ b/lib/tomoe-xml-parser.c
@@ -441,7 +441,7 @@
f = fopen (filename, "rb");
if (!f) {
diff --git a/app-i18n/tomoe/metadata.xml b/app-i18n/tomoe/metadata.xml
index 216815207e4..fa2aa28edf6 100644
--- a/app-i18n/tomoe/metadata.xml
+++ b/app-i18n/tomoe/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
index ad6822db39c..27f3f0c86a8 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2006-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-
+EAPI="7"
USE_RUBY="ruby25 ruby26 ruby27"
+
inherit autotools ruby-utils
DESCRIPTION="Japanese handwriting recognition engine"
@@ -14,9 +14,8 @@ LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="hyperestraier mysql ruby ${USE_RUBY//ruby/ruby_targets_ruby} subversion"
-REQUIRED_USE="ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
-
RESTRICT="test"
+REQUIRED_USE="ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
RDEPEND="dev-libs/glib:2
hyperestraier? ( app-text/hyperestraier )
@@ -30,8 +29,8 @@ RDEPEND="dev-libs/glib:2
done)
)
subversion? ( dev-vcs/subversion )"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils
dev-util/gtk-doc-am
dev-util/intltool
virtual/pkgconfig"
@@ -66,9 +65,9 @@ src_configure() {
econf \
$(use_enable ruby dict-ruby) \
+ $(use_with ruby ruby "$(type -P ${ruby})") \
--disable-static \
--without-python \
- $(use_with ruby ruby "$(type -P ${ruby})") \
--with-svn-include="${EPREFIX}"/usr/include \
--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
}
diff --git a/app-i18n/transifex-client/metadata.xml b/app-i18n/transifex-client/metadata.xml
index 1aaba3b62f4..80a01af3d78 100644
--- a/app-i18n/transifex-client/metadata.xml
+++ b/app-i18n/transifex-client/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo.2019@r123.de</email>
diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml
index 7ad4be9c864..442932bbc25 100644
--- a/app-i18n/translate-shell/metadata.xml
+++ b/app-i18n/translate-shell/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>erkiferenc@gmail.com</email>
diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml
index 7a5ba7b3c34..44ce9906406 100644
--- a/app-i18n/uchardet/metadata.xml
+++ b/app-i18n/uchardet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>coppens.matthias.abc@gmail.com</email>
diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild
index 5f8e8c095fc..f49961e7549 100644
--- a/app-i18n/uchardet/uchardet-0.0.7.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse2 static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-i18n/uim-tomoe-gtk/metadata.xml b/app-i18n/uim-tomoe-gtk/metadata.xml
index f01b1e07af4..82a1115e613 100644
--- a/app-i18n/uim-tomoe-gtk/metadata.xml
+++ b/app-i18n/uim-tomoe-gtk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
index ff99b8ad6a2..0775f747988 100644
--- a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
+++ b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
inherit autotools
@@ -16,8 +16,8 @@ IUSE=""
RDEPEND="app-i18n/uim
~app-i18n/tomoe-gtk-0.6.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_prepare() {
default
diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml
index 5954a1c59d1..a493ebd2e59 100644
--- a/app-i18n/uim/metadata.xml
+++ b/app-i18n/uim/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/unicode-cldr/metadata.xml b/app-i18n/unicode-cldr/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/unicode-cldr/metadata.xml
+++ b/app-i18n/unicode-cldr/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index 229e95b1c6c..1f86d481c60 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -4,3 +4,5 @@ DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf20
DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
DIST unicode-data-13.0.0-UCD.zip 7537310 BLAKE2B 5bcc8f010f81fea22cd0b5806ee190bbe9e58348c5cc3627141de3b1df5a00cbdcd800ebd0eb3bc0499b2c26920f6cadf42804b539e5be0aeeeb9eaee334a817 SHA512 aed6d06c370dd87bc5713e19ff4cde47b065b76a18149194fa843e4efc5269f749ec8905cad9132d3b803ab621a46e372052b8f3c3e9b6a65afa6516b0f2b4f2
DIST unicode-data-13.0.0-Unihan.zip 7044963 BLAKE2B fffcd322c87c607e9e689bfef4ec79b4ec576b4ffd84465ed6d38f485ac4fccc7d0f46662f76dbb79630e070b12bf9e1530bbbd5b32c043b71f696018e1f3ad2 SHA512 87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be
+DIST unicode-data-14.0.0-UCD.zip 6985828 BLAKE2B 2d36d35ded44fe1ad7966dae93e388c8c92d4404c811e495c0b4ea1c6482c4ed1488dff37b608cae230163bc4dd66cf8ec40d5db6e60541cd7719673c91dc5b1 SHA512 17fbfb3ebd3a75227526d87e19feb70c1b0ccee656e421e955aadc88847ed2597437eb8cf19619e2a49470d286b285e219aec18d6b29dab47cfa8317a212b458
+DIST unicode-data-14.0.0-Unihan.zip 7116482 BLAKE2B feafb77e8a1694efe940be226735f88c2e08be43408b8c12de87b86860d3cfacffb3d7d287e4fbf6b7fcef1055f3fe6b74f312312dd7d1886cbc7a394a7df983 SHA512 1827e512dd1bd27f3553746275dc90e3c3add38590d56da3901eccb56b94fee9e2dd806514a866ca73dfe4770ec585d200a6b6a7a4293c2ff572a2f5b50ef091
diff --git a/app-i18n/unicode-data/metadata.xml b/app-i18n/unicode-data/metadata.xml
index 6d1ac9db2d8..477954d6064 100644
--- a/app-i18n/unicode-data/metadata.xml
+++ b/app-i18n/unicode-data/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>fonts@gentoo.org</email>
diff --git a/app-i18n/unicode-data/unicode-data-14.0.0.ebuild b/app-i18n/unicode-data/unicode-data-14.0.0.ebuild
new file mode 100644
index 00000000000..e0780f6a33f
--- /dev/null
+++ b/app-i18n/unicode-data/unicode-data-14.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Unicode data from unicode.org"
+HOMEPAGE="https://unicode.org/ucd/"
+SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
+ https://unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="app-arch/unzip"
+S="${WORKDIR}"
+
+src_unpack() {
+ # Unihan.zip needs to be installed as a zip for reverse deps
+ # https://bugzilla.gnome.org/show_bug.cgi?id=768210
+ unpack ${P}-UCD.zip
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r "${S}"/*
+ newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
+}
diff --git a/app-i18n/unicode-emoji/metadata.xml b/app-i18n/unicode-emoji/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-i18n/unicode-emoji/metadata.xml
+++ b/app-i18n/unicode-emoji/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/xcin/Manifest b/app-i18n/xcin/Manifest
deleted file mode 100644
index 3ac538ec8ac..00000000000
--- a/app-i18n/xcin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz 1321937 BLAKE2B 4213f585d62d37215495354890203272fda0d7068bd6ceb8c0d75a2d1cd8c6626997607ab5b821887248f2e4207733eb3a26d021873893488b8dee83fddd3e52 SHA512 d1c6a667a8dcf996e02d694a0ff73eca409f542ce11b0e4d8563ed04c62e12c1d8feb6307153c5cfe982e66848b414dd65fc23d022ccc54cf2a0e3978b8c33e5
-DIST xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz 1530591 BLAKE2B 1c68d8bd4f11c458c2fefe974fc5f565a59deee23129f1c53e5714655d5be543e7a97f72eab2dc56aa098b78b53bfa77a4c0fbcb56cb93b936cc8b4ee5435135 SHA512 1068a9cf7f3b7ff3c2ff7e0443e487e660f3ec8c7f0114f1ad614fb1c7a73d15613ce0c198514816f00afaaa22434660ed11d329413bf010aa52b27513a5ac14
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch
deleted file mode 100644
index 3d472f95b0f..00000000000
--- a/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En
---- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En 2000-12-13 18:55:41.000000000 +0200
-+++ xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En 2009-12-29 18:09:20.000000000 +0200
-@@ -481,13 +481,13 @@
- char *lc_ctype; /* LC_CTYPE locale category name */
- char *lc_messages; /* LC_MESSAGES locale category name */
- char *encoding; /* encoding name */
-- } locale_t;
-+ } xcin_locale_t;
-
- typedef struct {
- char *rcfile; /* rcfile name. */
- char *default_dir; /* Default module directory. */
- char *user_dir; /* User data directory. */
-- locale_t locale; /* Locale name. */
-+ xcin_locale_t locale; /* Locale name. */
- } xcin_rc_t;
-
- The return value of this function is True when excuting successfully,
-diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module
---- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module 2002-10-29 13:53:42.000000000 +0200
-+++ xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module 2009-12-29 18:09:24.000000000 +0200
-@@ -423,13 +423,13 @@
- char *lc_ctype; /* LC_CTYPE locale category name */
- char *lc_messages; /* LC_MESSAGES locale category name */
- char *encoding; /* encoding name */
-- } locale_t;
-+ } xcin_locale_t;
-
- typedef struct {
- char *rcfile; /* rcfile name. */
- char *default_dir; /* Default module directory. */
- char *user_dir; /* User data directory. */
-- locale_t locale; /* Locale name. */
-+ xcin_locale_t locale; /* Locale name. */
- } xcin_rc_t;
-
- 禡Y\Ǧ^ True, ѶǦ^ FalseC
-diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h 2002-10-29 13:53:42.000000000 +0200
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h 2009-12-29 18:09:01.000000000 +0200
-@@ -202,12 +202,12 @@
- char *lc_messages;
- char *encoding;
- int encid, locid;
--} locale_t;
-+} xcin_locale_t;
-
- typedef struct {
- int argc; /* Command line arguement list */
- char **argv;
-- locale_t locale; /* Locale name. */
-+ xcin_locale_t locale; /* Locale name. */
- char *usrhome; /* User home directory. */
- char *default_dir; /* Default module directory. */
- char *user_dir; /* User data directory. */
-diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c 2009-12-29 18:07:44.000000000 +0200
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c 2009-12-29 18:09:12.000000000 +0200
-@@ -233,7 +233,7 @@
- }
-
- static void
--cin2tab_setlocale(locale_t *locale)
-+cin2tab_setlocale(xcin_locale_t *locale)
- {
- char loc_return[128], enc_return[128];
- int ret;
-diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c 2003-01-20 19:50:05.000000000 +0200
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c 2009-12-29 18:09:06.000000000 +0200
-@@ -56,7 +56,7 @@
- static void
- xcin_setlocale(void)
- {
-- locale_t *locale = &(xcin_core.xcin_rc.locale);
-+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
- char loc_return[128], enc_return[128];
-
- set_perr("xcin");
-@@ -332,7 +332,7 @@
- char *cmd[2], value[256], *s, loc_buf[64], *loc_name=NULL;
- char *fmt = N_("%s:\n\tlocale section \"%s\": %s: value not specified.\n");
- xcin_rc_t *xrc = &(xcin_core.xcin_rc);
-- locale_t *locale = &(xcin_core.xcin_rc.locale);
-+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
- /*
- * Determine the true locale setting name.
- */
-@@ -409,7 +409,7 @@
- char *cmd[2], value[256], *s, *s1, objname[100], objenc[100];
- char *fmt = N_("%s:\n\tIM section \"%s\": %s: %s.\n");
- xcin_rc_t *xrc = &(xcin_core.xcin_rc);
-- locale_t *locale = &(xcin_core.xcin_rc.locale);
-+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
- int setkey;
- /*
- * Go to each CINPUT sub-node and read important keywords.
-diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c xcin-2.5.2.99.pre2+cvs20030224/src/xim.c
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c 2009-12-29 18:07:44.000000000 +0200
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/xim.c 2009-12-29 18:09:06.000000000 +0200
-@@ -1032,7 +1032,7 @@
- XIMTriggerKeys on_keys;
- XIMEncodings encodings;
- Window mainwin;
-- locale_t *locale;
-+ xcin_locale_t *locale;
- char* imlocale = NULL;
- int i;
-
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch
deleted file mode 100644
index 37449084898..00000000000
--- a/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in 2001-11-11 21:50:46.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in 2011-11-21 01:08:21.736965412 +0900
-@@ -15,7 +15,7 @@
-
- $(TARGET): $(OBJ)
- $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
-- $(OBJ) $(LIB) -rpath $(moddir)
-+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
- include .depend
-
- depend:
-diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in 2011-11-21 01:07:12.878761904 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in 2011-11-21 08:32:24.024474064 +0900
-@@ -21,7 +21,7 @@
-
- $(TARGET): $(OBJ)
- $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
-- $(OBJ) $(LIB) -rpath $(moddir)
-+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
- include .depend
-
- sort_word: sort_word.c key2pho.c
-diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in 2001-11-11 21:50:46.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in 2011-11-21 01:08:21.736965412 +0900
-@@ -15,7 +15,7 @@
-
- $(TARGET): $(OBJ)
- $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
-- $(OBJ) $(LIB) -rpath $(moddir)
-+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
- include .depend
-
- depend:
-diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in 2001-11-11 21:50:47.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in 2011-11-21 01:08:21.736965412 +0900
-@@ -14,7 +14,7 @@
-
- $(TARGET): $(OBJ)
- $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
-- $(OBJ) -rpath $(moddir)
-+ $(OBJ) $(LDFLAGS) -rpath $(moddir)
- include .depend
-
- depend:
-diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in 2001-11-05 01:47:26.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in 2011-11-21 01:08:53.576059606 +0900
-@@ -26,7 +26,7 @@
-
- $(BIN): subsys $(OBJ)
- @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -export-dynamic \
-- $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB)
-+ $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB)
- include .depend
-
- subsys:
-diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in 2001-09-21 02:00:57.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in 2011-11-21 01:08:21.736965412 +0900
-@@ -23,7 +23,7 @@
-
- $(LXCIN_NAME): make_subdir
- ( OBJS=`ls $(LXCIN_OBJ)`; \
-- $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LIB) -rpath $(libdir) \
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LDFLAGS) $(LIB) -rpath $(libdir) \
- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) )
-
- make_subdir:
-diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in 2001-11-05 01:47:29.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in 2011-11-21 01:08:21.736965412 +0900
-@@ -14,7 +14,7 @@
- all: $(BIN)
-
- $(BIN): $(OBJ)
-- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB)
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB)
- include .depend
-
- depend:
-diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in 2002-01-01 22:49:17.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in 2011-11-21 08:33:44.547672718 +0900
-@@ -15,7 +15,7 @@
- all: $(BIN)
-
- $(BIN): $(OBJ)
-- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LIB)
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIB)
- include .depend
-
- depend:
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch
deleted file mode 100644
index d5967c31476..00000000000
--- a/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in 2001-09-07 00:41:32.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in 2011-11-21 00:44:20.979695505 +0900
-@@ -9,43 +9,43 @@
- all: all-$(OS_TYPE)
-
- all-LINUX:
-- ( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules make-big5 make-big5hkscs )
-+ ( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules make-big5 make-big5hkscs )
-
- all-FREEBSD:
-- ( BIG5ENC=big5 make -f Rules make-big5 )
-+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
-
- all-OPENBSD:
-- ( BIG5ENC=big5 make -f Rules make-big5 )
-+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
-
- all-NETBSD:
-- ( BIG5ENC=big5 make -f Rules make-big5 )
-+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
-
- all-HPUX:
-- ( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules make-big5 make-big5hkscs )
-+ ( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules make-big5 make-big5hkscs )
-
- all-SOLARIS:
-- ( BIG5ENC=big5 make -f Rules make-big5 )
-+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
-
-
- install: all install-$(OS_TYPE)
-
- install-LINUX:
-- ( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules install_big5 install_big5hkscs )
-+ ( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules install_big5 install_big5hkscs )
-
- install-FREEBSD:
-- ( BIG5ENC=big5 make -f Rules install_big5 )
-+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
-
- install-OPENBSD:
-- ( BIG5ENC=big5 make -f Rules install_big5 )
-+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
-
- install-NETBSD:
-- ( BIG5ENC=big5 make -f Rules install_big5 )
-+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
-
- install-HPUX:
-- ( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules install_big5 install_big5hkscs )
-+ ( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules install_big5 install_big5hkscs )
-
- install-SOLARIS:
-- ( BIG5ENC=big5 make -f Rules install_big5 )
-+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
-
-
- clean:
-diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in
---- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in 2001-09-07 00:41:33.000000000 +0900
-+++ xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in 2011-11-21 00:44:07.491653510 +0900
-@@ -9,43 +9,43 @@
- all: all-$(OS_TYPE)
-
- all-LINUX:
-- ( GB2312ENC=gb2312 GBKENC=gbk make -f Rules make-gb2312 make-gbk )
-+ ( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules make-gb2312 make-gbk )
-
- all-FREEBSD:
-- ( GB2312ENC=euc make -f Rules make-gb2312 )
-+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
-
- all-OPENBSD:
-- ( GB2312ENC=euc make -f Rules make-gb2312 )
-+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
-
- all-NETBSD:
-- ( GB2312ENC=euccn make -f Rules make-gb2312 )
-+ ( GB2312ENC=euccn $(MAKE) -f Rules make-gb2312 )
-
- all-HPUX:
-- ( GB2312ENC=hp15cn make -f Rules make-gb2312 )
-+ ( GB2312ENC=hp15cn $(MAKE) -f Rules make-gb2312 )
-
- all-SOLARIS:
-- ( GB2312ENC=euc make -f Rules make-gb2312 )
-+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
-
-
- install: all install-$(OS_TYPE)
-
- install-LINUX:
-- ( GB2312ENC=gb2312 GBKENC=gbk make -f Rules install_gb2312 install_gbk )
-+ ( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules install_gb2312 install_gbk )
-
- install-FREEBSD:
-- ( GB2312ENC=euc make -f Rules install_gb2312 )
-+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
-
- install-OPENBSD:
-- ( GB2312ENC=euc make -f Rules install_gb2312 )
-+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
-
- install-NETBSD:
-- ( GB2312ENC=euccn make -f Rules install_gb2312 )
-+ ( GB2312ENC=euccn $(MAKE) -f Rules install_gb2312 )
-
- install-HPUX:
-- ( GB2312ENC=hp15cn make -f Rules install_gb2312 )
-+ ( GB2312ENC=hp15cn $(MAKE) -f Rules install_gb2312 )
-
- install-SOLARIS:
-- ( GB2312ENC=euc make -f Rules install_gb2312 )
-+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
-
- clean:
- rm -f *.tab* core
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch
deleted file mode 100644
index 747c8c5ca02..00000000000
--- a/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 376d5276758b7eb2ee2b5e11d60f2105aac263f2
-Author: orbea <orbea@riseup.net>
-Date: Sat Apr 10 16:40:33 2021 -0700
-
- build: Fix linking with slibtool.
-
- Linking with the static libraries is not ideal, but since
- that is what is provided...
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 62e6154..ac15131 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -6,8 +6,8 @@ top_srcdir = @top_srcdir@
- include $(top_srcdir)/Rules
-
- INC = ${xcininc} ${intl_inc} ${x_includes} -I${ximd_inc}
--LIB = ${xcinlib} -lXimd -lim_comm lib/libxcin.la \
-- ${x_libraries} ${locale_lib} ${dl_lib} ${intl_lib} -lm
-+LIB = lib/libxcin.la lib/libim_comm.a lib/libXimd.a ${x_libraries} \
-+ ${locale_lib} ${dl_libs} ${intl_lib} -lm
-
- BIN = xcin
- SRC = xcin_main.c module.c gui.c xim.c xim_IC.c fkey.c gui_main.c \
-diff --git a/src/util/cin2tab/Makefile.in b/src/util/cin2tab/Makefile.in
-index a2ad6f8..0663c5e 100644
---- a/src/util/cin2tab/Makefile.in
-+++ b/src/util/cin2tab/Makefile.in
-@@ -3,7 +3,7 @@ top_srcdir = @top_srcdir@
- include $(top_srcdir)/Rules
-
- INC = $(x_includes) $(xcininc) $(intl_inc)
--LIB = $(xcinlib) -lim_comm ../../lib/libxcin.la $(locale_lib) $(intl_lib) -lm
-+LIB = ../../lib/libxcin.la ../../lib/libim_comm.a $(locale_lib) $(intl_lib) -lm
-
- BIN = cin2tab
- SRC = cin2tab.c syscin.c gencin.c bimscin.c
diff --git a/app-i18n/xcin/metadata.xml b/app-i18n/xcin/metadata.xml
deleted file mode 100644
index c921b96adf6..00000000000
--- a/app-i18n/xcin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
deleted file mode 100644
index 9be714d2af2..00000000000
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=${PN}_2.5.2.99.pre2+cvs20030224
-
-DESCRIPTION="Chinese X Input Method"
-HOMEPAGE="http://cle.linux.org.tw/xcin/"
-SRC_URI="
- mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
- mirror://debian/pool/main/x/${PN}/${MY_P}-1.4.diff.gz"
-
-LICENSE="XCIN GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug nls unicode"
-
-RDEPEND="
- app-i18n/libchewing
- >=app-i18n/libtabe-0.2.6
- >=sys-libs/db-4.5:*
- x11-libs/libX11
- unicode? ( media-fonts/arphicfonts )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-PATCHES=(
- "${WORKDIR}"/${MY_P}-1.4.diff
- "${FILESDIR}"/${P}-glibc-2.10.patch
- "${FILESDIR}"/${P}-make.patch
- "${FILESDIR}"/${P}-ldflags.patch
- "${FILESDIR}"/${P}-slibtool.patch
-)
-
-src_prepare() {
- default
-
- rm configure || die
- cd script || die
- mv configure.{in,ac} || die
- eautoreconf
- mv configure .. || die
-}
-
-src_configure() {
- econf \
- --disable-static \
- --with-xcin-rcdir="${EPREFIX}"/etc \
- --with-xcin-dir="${EPREFIX}"/usr/$(get_libdir)/xcin25 \
- --with-db-lib="${EPREFIX}"/usr/$(get_libdir) \
- --with-tabe-inc="${EPREFIX}"/usr/include/tabe \
- --with-tabe-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable debug)
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- emake \
- prefix="${ED}/usr" \
- program_prefix="${D}" \
- install
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-
- local docdir
- for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
- docinto ${docdir#doc/}
-
- local doc
- while IFS="" read -d $'\0' -r doc; do
- if use unicode; then
- iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc} || die
- mv ${doc}.UTF-8 ${doc} || die
- fi
- dodoc ${doc}
- done < <(find ${docdir} -maxdepth '1' -type f -print0)
- done
-}
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
index 271ef4abaa8..e9f122857cf 100644
--- a/app-i18n/xsunpinyin/metadata.xml
+++ b/app-i18n/xsunpinyin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index 595ce7a35ab..c6e7264d80b 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1 +1,2 @@
+DIST xvnkb-0.2.11.tar.bz2 76397 BLAKE2B 8ebe4c389f5174b74af32fb001ef5f94d388b16a7c1ca0f409faffc6d63a4543d4daf7dc3609a8e7066324280eaf2d980e4a4e379ae478010269b808effb61cd SHA512 10d24ec159a89dd5fa68540bb8a92ae4d925f11039e7a7b77ed273862e4eb28ccd66d53ca1d0304f2a6d38182eddd304362d2bfd8c6804a2e7bfb354b20e5e83
DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
new file mode 100644
index 00000000000..8cae65fda77
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -19,10 +19,10 @@
+ $(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
+
+ $(CORE): $(CORE_OBJS)
+- $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -lX11
++ $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) -lX11
+
+ $(GUI): $(GUI_OBJS)
+- $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++ $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+
+ main: $(CORE) $(GUI)
+ @echo >/dev/null
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -16,10 +16,10 @@
+ $(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
+
+ xvnkb_ctrl: $(CONTROL_OBJS)
+- $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
+
+ xvnkb_setup: $(SETUP_OBJS)
+- $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++ $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+
+ main-tools: $(TOOLS)
+
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
index f089f0dde89..b954b291417 100644
--- a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.common b/Makefile.common
-index 06f0b78..d9f8976 100644
--- a/Makefile.common
+++ b/Makefile.common
-@@ -19,10 +19,10 @@ all: do-it-all
+@@ -19,10 +19,10 @@
$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
$(CORE): $(CORE_OBJS)
@@ -15,11 +13,9 @@ index 06f0b78..d9f8976 100644
main: $(CORE) $(GUI)
@echo >/dev/null
-diff --git a/tools/Makefile.common b/tools/Makefile.common
-index fe16cc1..16ec511 100644
--- a/tools/Makefile.common
+++ b/tools/Makefile.common
-@@ -16,10 +16,10 @@ all: do-it-all
+@@ -16,10 +16,10 @@
$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
xvnkb_ctrl: $(CONTROL_OBJS)
diff --git a/app-i18n/xvnkb/files/xvnkb-cc.patch b/app-i18n/xvnkb/files/xvnkb-cc.patch
new file mode 100644
index 00000000000..1104998f788
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-cc.patch
@@ -0,0 +1,10 @@
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -49,6 +49,6 @@
+ Makefile.dep:
+ @echo
+ @echo -n Create $@ ...
+- @gcc -I$(XLIB_INC) -MM *.c > $@
++ @$(CC) -I$(XLIB_INC) -MM *.c > $@
+ @echo " done"
+ @echo
diff --git a/app-i18n/xvnkb/metadata.xml b/app-i18n/xvnkb/metadata.xml
index 73d5d9ae8a5..0df6a83c250 100644
--- a/app-i18n/xvnkb/metadata.xml
+++ b/app-i18n/xvnkb/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">xvnkb</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">xvnkb</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
new file mode 100644
index 00000000000..66a1c6ccd41
--- /dev/null
+++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Vietnamese input keyboard for X"
+HOMEPAGE="http://xvnkb.sourceforge.net/"
+SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="spell xft"
+
+RDEPEND="x11-libs/libX11:=
+ xft? ( x11-libs/libXft:= )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="xft? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-cc.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+ default
+ tc-export CC
+}
+
+src_configure() {
+ # *not* autotools
+ ./configure \
+ $(usex spell '' '--no-spellcheck') \
+ $(usex xft '' '--no-xft') \
+ --use-extstroke \
+ || die "./configure failed"
+}
+
+src_install() {
+ dobin ${PN}
+ dobin tools/${PN}_ctrl
+
+ dolib.so ${PN}.so.${PV}
+ dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
+
+ einstalldocs
+ dodoc -r doc/. scripts contrib
+}
+
+pkg_postinst() {
+ elog "Remember to"
+ elog "$ export LANG=en_US.UTF-8"
+ elog "(or any other UTF-8 locale) and"
+ elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so"
+ elog "before starting X Window"
+ elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
+
+ ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
+ ewarn "You have to unset suid/sgid to use with ${PN}"
+}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index 3f52d6d81c3..5281e302442 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -1,47 +1,50 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI="7"
inherit toolchain-funcs
DESCRIPTION="Vietnamese input keyboard for X"
-SRC_URI="http://xvnkb.sourceforge.net/${P}.tar.bz2"
HOMEPAGE="http://xvnkb.sourceforge.net/"
+SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="spell xft"
-RDEPEND="
- x11-libs/libX11:=
+RDEPEND="x11-libs/libX11:=
xft? ( x11-libs/libXft:= )"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}
x11-base/xorg-proto"
+BDEPEND="xft? ( virtual/pkgconfig )"
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-cc.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
-src_configure() {
+src_prepare() {
+ default
tc-export CC
+}
- local myconf=()
- ! use spell && myconf+=( --no-spellcheck )
- ! use xft && myconf+=( --no-xft )
-
+src_configure() {
# *not* autotools
./configure \
- --use-extstroke "${myconf[@]}" \
+ $(usex spell '' '--no-spellcheck') \
+ $(usex xft '' '--no-xft') \
+ --use-extstroke \
|| die "./configure failed"
}
src_install() {
- dobin xvnkb
- dobin tools/xvnkb_ctrl
+ dobin ${PN}
+ dobin tools/${PN}_ctrl
- dolib.so xvnkb.so.${PV}
- dosym xvnkb.so.${PV} /usr/$(get_libdir)/xvnkb.so
+ dolib.so ${PN}.so.${PV}
+ dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
einstalldocs
dodoc -r doc/. scripts contrib
@@ -51,10 +54,10 @@ pkg_postinst() {
elog "Remember to"
elog "$ export LANG=en_US.UTF-8"
elog "(or any other UTF-8 locale) and"
- elog "$ export LD_PRELOAD=/usr/$(get_libdir)/xvnkb.so"
+ elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so"
elog "before starting X Window"
elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
- ewarn "You have to unset suid/sgid to use with xvnkb"
+ ewarn "You have to unset suid/sgid to use with ${PN}"
}
diff --git a/app-i18n/yaskkserv/metadata.xml b/app-i18n/yaskkserv/metadata.xml
index 6e6dda1b2b3..e706a3e7bc8 100644
--- a/app-i18n/yaskkserv/metadata.xml
+++ b/app-i18n/yaskkserv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/yaskkserv2/Manifest b/app-i18n/yaskkserv2/Manifest
new file mode 100644
index 00000000000..9d4d1288cd7
--- /dev/null
+++ b/app-i18n/yaskkserv2/Manifest
@@ -0,0 +1,184 @@
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
+DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
+DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
+DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST bincode-1.1.4.crate 14412 BLAKE2B e1ccc8e9954893c3f4efec56522281050b9567090fc37f6bcdd28804eccaf4e619892b1d64c9da6b555ffe10c9c47414414bcfff589cfa80e3fba5b086b513cb SHA512 31f32a3dfcb76f113b2e993938b4c708d98d3c75efa9414d74168b2ef8af544bfe64fe39dbc4ea556842ec11100c56f14bbad15aaab919c67a7c5be1aa584f28
+DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST boxfnonce-0.1.1.crate 9698 BLAKE2B 678cd597d002850a2ed7ae430b23fb71f7218cda3a874339f98e698c570fb1be466862db1365e80f62d0b5d9c0561cf65fed004ed460896f1f9dbb704c4c3cff SHA512 e027de23cb7c58fcf47dcdf1dc2adf7477408f2b4e6303b51a72e2b87de232d4898dcc064f43d7bd86e337f7e1b0c1f6324daa1cb8e9ba0e530674fb358eecc6
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
+DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
+DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
+DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST cookie-0.12.0.crate 25953 BLAKE2B 630dcb365132e952c81813a772f94266230fb1e83cac63d39713aefb0a4fc6449c144a7e9630ba8aa65194bbd732fb42b3fc150530f950ddeb6a2d6373a78197 SHA512 4a802118306d25f1e53444e143913ca2a14a9e5584b26c5aca67b5ce0ac5111c4469fc5d7ee6b5877f8ac59143739b749edac83ceedcef7b53ba1e15cd97a821
+DIST cookie_store-0.7.0.crate 25211 BLAKE2B 1c201c5baace2c595b2bd7c214140d1c97fab1c4143eb91adcdcaaba4cba8f1c97ebc8ecea626c77a1b482ca6c326f220920458c11f23e5a497b75f220c9bff3 SHA512 40584ddc3189ee798b5ba262934d0a48455376d9cab4d715e6c4dd476b75c62ec09fe0c2f1b748b266d20f2b84fd97e58cf1ec88cc6b245290a572fb29fbc4d4
+DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
+DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
+DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crossbeam-deque-0.7.1.crate 19407 BLAKE2B e2fa467b88ef0d6c7f6656bd87ade1306665bb5b56b1e494ed3a7bc59050ebf847de4c57c5dcc5d63688b60edd3645300cf4b3a2020280dcf0e47f434a9f3221 SHA512 6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2
+DIST crossbeam-epoch-0.7.2.crate 38134 BLAKE2B 1a71b24f507e95c9552a3d5906bdfa77add4723144e1f5275dad65a5de7cd82305eb2c4ad0d99b3f08a06ce050dbcfefff08790a4a65744f4d578c7106abc671 SHA512 672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8
+DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST daemonize-0.4.1.crate 14494 BLAKE2B 807b6270122b78cbd19792101d9be258b87b316d5bea4a25b4c600debe0a89f43ff69f4f9eb1366f905fc9d1adf4b1cfcb140a725769b1e04930d1eb6e906bd0 SHA512 acde0f361ad152e523877ebc714f4e5706b3c506914612ea8b2cace473df58c6153b327011acdfe039379d1bf13f45173092cf6ead3190fb77b5c27bd91e74de
+DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
+DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST encoding_rs-0.8.20.crate 1403599 BLAKE2B 23b3ed8c65d0002abd7d2deaf6ac04ef9bce374adb6ad3f4ca993a0f487d57543188ad8b58756d5268bcb130f0a4d6c7e3199c9c9c0c952510cb0ca925cdfc4f SHA512 601e0a8ac8eb39def2336463b38de3052123f62653e22f5a48b8015912f946ab7e78610eca65e7663b2158c908e7f7f4f9f6b48f188c18319ef5594fb7e86e9d
+DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b
+DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
+DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
+DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
+DIST flate2-1.0.11.crate 68628 BLAKE2B a375952ec5ad14050e741fab7d62a56413bf50961c2c4e174bdc978b2e17681d4ae0398cdceeb5d4500e60c6b0a7d8b4c3692545bd2305d73a20d50874fcb7b6 SHA512 d2d67be2fa687d4a4e2f4486a14e95d2d73704e862940b9cf0072378916d8e41b70081d30ada2184827740450f5f73edd35ba3d960931e3edb4da8ffb4e35a4a
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6d688449a99f9f1885912cbc79327115514ad93d28bbdf1b8a91b2d22f8f62d7e5f5feb61f3024e9a749e11da5 SHA512 16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200
+DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
+DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
+DIST h2-0.1.26.crate 153921 BLAKE2B 4a84716e37abeeebbf0771720c5af636576cff47158eca1c7bc76f21c0531b41a75bf3ad7b6bd88aca960e96e15679a7908720d316321e319021624834a97c4c SHA512 37686cbb102eeb15de3f76d0607cf64210b11f5272ed83dbbb145650fbf11916027be3acb487cbb3e02654469b9f78167a7f18551f39af142e659cb149363d49
+DIST http-0.1.18.crate 101326 BLAKE2B fa8dcf6cb5dbafb5883dd27110cf583c4e656852170abba050568ced0241d4d62e0c299d9bcb50b707b495ed0ffbbf3688d7a5a5f29e6aac07657fdd0f279b58 SHA512 850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726
+DIST http-body-0.1.0.crate 4618 BLAKE2B 2320b5b52a64cfa32550ffeebd950fb56135a0dbb8e43122521a760cfd574083b19a5a41ead0809f5ae764d797eca7007397931b2e63a79dbd9b4a26055d81bd SHA512 b1c9fff799f6581160ef232ceff82a0c222a9f1ed3ec24760fb6b156d42739e06512086e4819323aee7e19b1d0b30ac8915f775f9c36d63b4f901546d331cc80
+DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST hyper-0.12.35.crate 127971 BLAKE2B bd2b1cf87d30fba32fe96312164b5a55d595bb6f6495df4c0b219f9756c1ae9180f9380191ca202f5cfc49002416ccf05d4799bba62c7038578c59860c36a4ec SHA512 40f3285b4de23ac8404b191a44a78399ed3186d9e6abf77d759615cc4678292411df798cbe4c2d5405677cd5c108468c015d6b42fd8d833484f8ca9c1128f68c
+DIST hyper-tls-0.3.2.crate 8901 BLAKE2B 2b3810160156c584057101a25c8f7decec4fb4632631f4c048353d3d2f90a37cec7b20a85ceef61941f02c5264932c8d0255823c2d615825d2499951f5e25a0c SHA512 9179878b95e8e390b17d45bb02c24219066405f671fddc4e044ecac0a00646e9ae03e7cda31b0f6f7beddd8fbccfc873d28d52e6b46aab2d252a2472302a483c
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST indexmap-1.2.0.crate 46101 BLAKE2B da8be80f85b1f43beb487840cfda9feda8f71ceb14120af3efc642ca57ec18b227d4ff34ba1d8869d23ce4dd210f1e5d94835cd3e7b6ac059b071ad2aa36fe9e SHA512 de0fa70403f5874133c0b9c97892ffa65b3adf4a1e307fff7039e3a37be0a07de5133d33edeb4d1ac9791b6ead7bffc53f2cf5876a732fadd58977d6d36bed38
+DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST json-0.12.0.crate 46747 BLAKE2B 7fd6d6a548950160c8beec12d575480f793b3adcf6909a4c26de4f02846e1c444bb34a92e01012531e9d6b6e94043e015419f81b2427c6b54d205273c5753026 SHA512 6c0365ed00a41eadae2de44c75ee518b9f2c57e8a12b2d606796e900c20277bd5fa13c9661442a9f17961a2f5503b600ac49a15a84c93f243035452cf72fc56b
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
+DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memoffset-0.5.1.crate 5958 BLAKE2B 2ac071da35c45d498889d38805223b46a0ec81b3fcd95da85ffc0f4512ca45f1eaa9fcffa8931e92fd11d16806a887d62d8bf15d2f3f759cf9c27695595d0881 SHA512 8bd14c74a65464061acc5594eb108e630e8dd7a9dedccfab0606c255bd43e7b30241ba0bea11bfa80f9afd8fdbf0879ad7d998628f938a558716ec10da31008e
+DIST mime-0.3.14.crate 15035 BLAKE2B ab9fcc2247637465d99006899fc120ff60fb4b61f603ea65b15da594bef80ed2b9788e2d893126ed46c5e8cecc0aad2a93be855a043f9224ac07c07fd601734d SHA512 7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471
+DIST mime_guess-2.0.1.crate 26646 BLAKE2B e0ef30850cb07de190677229161bb9ce37c7f7cfeda2cd2c54c6ebf8b7009e56a9c84935c55e5ed0430f546d4b259867132a702bcd29d3f25a2dd1b3a59da5ca SHA512 c4d83d8c05b1173c531eea48073762dcc5e80efc2609e06dfc1413ae2f3a3f7d89e533453aeaa75182a8b663c51c7ad0d4eb0b5b4450afc8e11fd74b84a9799f
+DIST miniz_oxide-0.3.2.crate 54536 BLAKE2B c804e4a261ef2444ae539ced683af5d0358baf625d7e8a16979b7ae2f10549d08ed97cd1d3ccc2ab4b96867326775b769b451e5dbac168cc9494be627eda9e6d SHA512 ea5eb9236a8797892f0f4bdda07c37cb8a6e48cd2fa8e81e2a07c13961675688307f77533e79cda65a72312451ff46b31cf167507456e4186e2b19a86cf14b95
+DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST native-tls-0.2.3.crate 29087 BLAKE2B 0304db852e3b1261a791a5a8aba5dc6fd2e13bc32e6ade5ab0f58403583ea45324a4ae4359061c2a9137cc7f127404ef663702a22fe64f2489691de71eafc914 SHA512 9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09
+DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
+DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
+DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
+DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
+DIST openssl-0.10.24.crate 182149 BLAKE2B 048d0c86c718b856cd2cb9a3ec0ab4074603439b23d17ec6511a5b1f37c8a6804157cfa1129fe14842559eab705029642f6aabe78a84b4ad3c13bfe9ed812c2b SHA512 2127ff5f9b8feb3b567362ea9988a125f39e524432c629481e5ab27f08e2bec20147fb14bfa2d10cecf357fef5f6d6447e8d045f157bac7c1a4e0175903e19ec
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-sys-0.9.49.crate 44767 BLAKE2B 613926e3f88379061c570917d24dfe5bb18af33ad339af5d76a498f3d9c1ed73362bcae34d1e95142ca747a74a2896303f33d34532f0cbc6ac39588522ce0466 SHA512 814febad99cc74eb5fee60d58d685b2c956893db8f3f4994a6f5226261c8dc8ab569067959aec2aaf3fc684eaef6654f102a1f82a215e42b4a087c357693b6a4
+DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
+DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed
+DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
+DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
+DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.3.crate 34868 BLAKE2B f97fa38afb8abca38d814673e0cc7d17e3bf623984afa7fc2601636508d8b32160fff4079d2e266e2d2e4519d0d8942e88cbabcde54a869dde0a7f0961d2afaa SHA512 ff4e32e42d206191741880e362e39e33149fec4f94cb38e2693e956e4c0dd680dba4712f436fddbc092a7ebef23b7cd4693345fb93d5b9713a516960c2bfd82e
+DIST publicsuffix-1.5.3.crate 16886 BLAKE2B d734f9b6fb5ce32b864e09fa541fbca6c7646c56196c2ae9fe3f7b47fb3ea4af5ec6208ad4e908681faf504c415433cef5f702fdaf65180f0a293e40ab1b85b4 SHA512 6ce7c1e37190892d454f9b858041640eac6749a392264cecf6a64696dddcdb038a9b81b580991aa0727b1b015e05e0b7582baea17b82ed327eea30ca01cd555c
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
+DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
+DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
+DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST reqwest-0.9.20.crate 105224 BLAKE2B b75633f08592303cd755758f0744637bc798614f9c9f81f5c20f529cc862efd6feac437d3ed9c50d16b448795a1701819cd0cfd854f6946946c506d6139b88c8 SHA512 c6683099c79ab48acd2b7abb903686f64e985bd239f3e348a7c6f80d248e3f2860d7f8eeca768244c8925794e96f6253d786e91d94b926bad2581f22f5a824e0
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST rustc-hash-1.0.1.crate 8976 BLAKE2B 847953648136fe54213e169b7ff414a42984ba9a591a52b3347c5b4a8503920b884b586d01573a975c464821d8667b631b49e83107573afb77503299a0bc9387 SHA512 e90af9d21da88c4da1deed8d5de65cedaae659819d0f5be8972a125b86d62d72ad710745f195a7a04a92442a6684ca9e7e85c734935852718434577df3dbb34b
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
+DIST security-framework-0.3.1.crate 46179 BLAKE2B 99cd9d5555908ecd082a7f934cae218b4dc106c799c7d4458e1e470169a657692170c2860a0c04eea89ad219280619e9cd4535e240a0bf2cd5286959b147f3f9 SHA512 69b1e32cc4cdd3a069e9f1de08d6b5563a90e094e0fce07b4949386072632cdfa5ee7711ae16904148936dafebd77321160b28acce239f0cbd5547ba1d77edc5
+DIST security-framework-sys-0.3.1.crate 9283 BLAKE2B 723d2df6a0d6cfffce0435feaba479159833e6a07fd851a6062ee0f5a65e23a7a07781a6596daad50a6e540e943c3df16eecbaf93e9785f6464eeeeac8d67e46 SHA512 28c731aba35ff80dedf73978ba18f47a80ed308ad6f123467ab435f825680386f665d06f93a5703b8dd0b6893f805f5ae6875a0a7c8669a478c71c69448b2a54
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
+DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
+DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
+DIST serde_urlencoded-0.5.5.crate 12429 BLAKE2B e91e4c6a41d2077a45656814b6291de75dd361e0be39bc952ddb23e06b1b2f29f0fb612fef472bbf6fe10b089639417b3aa8603ca09c70b471c6804e8772c0c0 SHA512 9c4a82907619aa211a5768628ae1cc749980b2df267f325cc1457031720d4166edb0b67e2144324e7f655384000583ac2ddeda33f7ab995a390324e2ef4de145
+DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
+DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
+DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
+DIST string-0.2.1.crate 5081 BLAKE2B 27f02ed6a6545eac02d0b98852b2c362711dffe6dace552a24f8f3d69b8c9b0b60a147837c538f2fbdaeaab16b27eb7c554e9bc1aad6c2563b08f3c1a759ef9e SHA512 4d7ab65f12d63065e895947285d5aa1b9003324002b0f657e7ded975c90eebd63c1033ae9a01969c42d446b0ea878571af62776bcb4a8834cace173f908c76cd
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
+DIST syslog-4.0.1.crate 7131 BLAKE2B a6555d6eed6a0701cca7d58554f2ee612a5d18975dc1979414ac536128e0e7d4a67dde0ad2e40b5ffec823f7edd55dc45d646097fcd457fa6124de95411b4c55 SHA512 faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.20.crate 15950 BLAKE2B 747ff4ccdaddbbcc80225164b203cacc8669796e3c1515db9011f053486ce8d77a4560ae58756641fde7465ae6c818ddbb5b60641d1e5ae288ddcc549eef1848 SHA512 7f8e201f8d173112c7009fffa79e6d2bda5614cfb0439b81a9a990b777261de792d7e7750d75f7638bd58e6d72d183cffbada902595f425f037d6df04c0528a9
+DIST thiserror-impl-1.0.20.crate 13197 BLAKE2B f7da61d0dea4864bc3fbccad178b67f85223ab9f9529c118b07229d55a2568f23888041f2cd813efe51dacf8e01de62397092f56c43c640ba97a32dae2b7cd6d SHA512 3ca4dbdeff76c12c5a716d811891ce14bb16013749a45b8d8fae9cdc599e304065665dab051713d7e8e5bd2d2485ff9fa0904ca3cb5bf9e19f2cf66b42f10209
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1
+DIST tokio-buf-0.1.1.crate 10815 BLAKE2B 0d3970a3722e3be109f8808bb7e26db618ceb22a8a1156ce219e6af9930b7f9f9948dab61fa4fa146e5eefcb7deb1332fcd643e0c3e64a879ce32305d0efeb94 SHA512 42f5db4f9ff1d0c6728c9ca899b85e40eaa92910d23f01dd7570c5988178879f3977ee2ad14f0f224562fa73ff8b01687dc963def2c62e93ac471903d5ce4e81
+DIST tokio-current-thread-0.1.6.crate 19339 BLAKE2B c3fe401178089864fe59286566b84a325d8a4101b0b72dda11fefef945d5e14b5e6b6c7de7d87cf222f0ea3d1c95aa65f2c43fe37c2e766f8d70da66c7d060ec SHA512 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6
+DIST tokio-executor-0.1.8.crate 11775 BLAKE2B 0cef2a4848f624ef8c3a450b06d8530ca64be193980cf1cf6f4c1c74b6602e9e0f47ac070caded410a843938d2c3defe8696e4a27329d42d04ca9cb4f6d7811c SHA512 b6340dfa0cb67da1b00288b3250cfa4f0b55907d3448768f99a7cfcd46ebd1155c84cd35659d740501f0575e9c5b660a2f769335acc14da7dd5cea59b10b6334
+DIST tokio-io-0.1.12.crate 33555 BLAKE2B 5646f1d0c226d223fdbf648d95cd690ad6f755c5dfa9a6bc4d5fe4b5df634029db6178d852d3a4c2d481d06eec763985186753088157557871e5ba6e8aa650af SHA512 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149
+DIST tokio-reactor-0.1.9.crate 20657 BLAKE2B 433b1302ab41d1c028c1fa726b796d41484526400801df2375de04faa1699cece0d55717f8ba4fc292d33fbc7fb343f766c1d474a36e36d72947bc7572e27a24 SHA512 134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1
+DIST tokio-sync-0.1.6.crate 41598 BLAKE2B 855421bc62d8e09358c40c6692f770e78d2dc7acecfdac499d31aefd4feb70b93c104ae46fd7b64196d7667b232ca5debaa71d9f09d20b497a5b170133f87a8f SHA512 bebfe2173d544595cbc162fce2afe1574f267a08b77c8e056358cc4e959a94f1e899e47e76927e374ab1f51751079b283e0d13479a4a40c7f754cacad2578a1f
+DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336
+DIST tokio-threadpool-0.1.15.crate 50047 BLAKE2B 74c7be4e542b9505052e29a97e0516a6d0ff3c9588da744881890cfa576d2c707f11c32a751169aac52d2478fd9108cad5b978c94cda639cf29338243943c797 SHA512 aa36de397b8a0dc9376073bcb2e661ff5fddf2754b391b854d8683398cf56a69e79a6dbd3f6e76d9d851752757a75b79673cff36b9e1987ed4c30dd38f9d483f
+DIST tokio-timer-0.2.11.crate 37578 BLAKE2B e9dd19db8bbba5edf74f7354d4d5e489780b5dbf009be095e7f00bb9e2276e10ebb643605beb6ffb035d1a7a0cfb23eede14e5ebdd228ee05ad9244ac3d1273d SHA512 2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57
+DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
+DIST try_from-0.3.2.crate 4264 BLAKE2B 13a4f1698e711981c183478b4bd4138cc90e8451000e56c965691e7d0be96e3cd7ae78aca891ae4a0d6726ef9a1d3beb26e4a4c18042b409a232a467ac36c11a SHA512 a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739
+DIST twoway-0.2.0.crate 30569 BLAKE2B f8f9f15b531a91aecb4e52ec228b5c3845edb263813841c566d75f43c955831aaf5e4c058794f489127c01bf4dd16c47783f4430348c1c5db1c4e104827556ee SHA512 1d2f75492089b9233756bec05eefccf09c7c602a3a12ab4b880fe712ff5b3328cba5bbc608e970576f3cb20b088dfb8551ab74a2f17a64132941ccc87076d5fd
+DIST unchecked-index-0.2.2.crate 8325 BLAKE2B 25c7bbee1d3b90bad05a91131ce1647a48b97e08a745e9cc8b829e1e9c2e1a6b650715ae7747105df07096607fc929ad7b8d54f06e23c662c1750bb4c7e7ca1b SHA512 3634e077fab98284e6e99bbb1fa6691f58d2c39ece67c65c89f8142820f0bb1836553a107f49eec0c72455c47807bd8bc1aba940029a6e27b4b79b9be79b2ca5
+DIST unicase-2.5.1.crate 23105 BLAKE2B 70e6c6b61e4a1e4de56174eacd08cef19d68202d40f403a0958d56690546a4b72f2fd0957a1d591bbe49fe6f6f5acf8c1b03b7eb884873b469c61aee7466335d SHA512 fe77fe7dacc1a340a760f3f474b2bcaf3cc0ad1b71ae6b5811dab77faaaf8bdf4bc8158682254971702bd648769ec776689560f4c2ed5c8c544cc04ace4608fd
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
+DIST uuid-0.7.4.crate 36325 BLAKE2B cc27afbfb37e01cf83ffbfe239e175019cc1ba77ac14d6392bff833b3482712a8d808cf17aa4e922a24e4728cfa60bc96bf03b0053b0126b65fb7fb583adc1c3 SHA512 5c0d5f85b05db505ba6736437c78fc62e7a961ec1fd7d262749c282ae41bc1b1adda373644790de64ebebf59a200f8e610767f3e5fe0caf87305ecd5a229c265
+DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST want-0.2.0.crate 6265 BLAKE2B 4db642e6016fcb0e2b1ae595836af4ccfa3798a1333b71347ea5fb30c95dd6aa0fb8dc827fffe274503e284abb0bc73ad11955f26dd77c5c265cc4a041ffb698 SHA512 1264e8095ba41b6cde85517538449d99f05a40207437bad9b618af3668ad675a3517b3d190e8b962820e2c302146d8d0571b665a1176c090ed75a4e83e8c5b59
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+DIST yaskkserv2-0.1.1.tar.gz 179125 BLAKE2B 28f55e7f584f977b1bc767af69211229d707752fb67782d75b9826c7cff7fda0c33efe9700fc95eae42eb7bd0d964df0f37e037416f0c1ac51182db3f788b413 SHA512 6c7749f7f36bf67ce5864b359eae1d3b6bf40bde7376c825274274cd42103e5c536ef000d8a00968a5a3d2099745f238d314b30352a2906cb315a710744549dd
+DIST yaskkserv2-testdata-202110.tar.xz 6789332 BLAKE2B fc7c44ca9899972095f37f01e9c08c95c763ff3fa027a785f8d979e4a8c6f0ad2defc965e1d3263d9fbc595368ab83022a2b615712b0795854538a68c138fc93 SHA512 351a5a67014bfcf0f8ed16ba171c59936e26c3aad960a44484304a0df86d26b2a6f75a3c4762149c5dbcc7c7717cc29559e7ce1b2f0e79f913c33501ee63e3c2
diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.confd b/app-i18n/yaskkserv2/files/yaskkserv2.confd
new file mode 100644
index 00000000000..88aa250a012
--- /dev/null
+++ b/app-i18n/yaskkserv2/files/yaskkserv2.confd
@@ -0,0 +1,2 @@
+# Options to pass to yaskkserv2
+YASKKSERV2_OPTS=
diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.initd b/app-i18n/yaskkserv2/files/yaskkserv2.initd
new file mode 100644
index 00000000000..c07a1b30ead
--- /dev/null
+++ b/app-i18n/yaskkserv2/files/yaskkserv2.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}"
+command_args="--no-daemonize ${YASKKSERV2_OPTS}"
+command_background="true"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+
+depend() {
+ need net
+ use logger
+}
diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.service b/app-i18n/yaskkserv2/files/yaskkserv2.service
new file mode 100644
index 00000000000..860da38ff83
--- /dev/null
+++ b/app-i18n/yaskkserv2/files/yaskkserv2.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Yet Another SKK server
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=nobody
+EnvironmentFile=/etc/conf.d/yaskkserv2
+ExecStart=/usr/sbin/yaskkserv2 --no-daemonize ${YASKKSERV2_OPTS}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-i18n/yaskkserv2/metadata.xml b/app-i18n/yaskkserv2/metadata.xml
new file mode 100644
index 00000000000..488bef8ae6a
--- /dev/null
+++ b/app-i18n/yaskkserv2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">wachikun/yaskkserv2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-i18n/yaskkserv2/yaskkserv2-0.1.1-r1.ebuild b/app-i18n/yaskkserv2/yaskkserv2-0.1.1-r1.ebuild
new file mode 100644
index 00000000000..1233b64365a
--- /dev/null
+++ b/app-i18n/yaskkserv2/yaskkserv2-0.1.1-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.6
+ansi_term-0.11.0
+arrayvec-0.4.11
+atty-0.2.13
+autocfg-0.1.6
+backtrace-0.3.37
+backtrace-sys-0.1.31
+base64-0.10.1
+bincode-1.1.4
+bitflags-1.1.0
+boxfnonce-0.1.1
+byteorder-1.3.2
+bytes-0.4.12
+c2-chacha-0.2.2
+cc-1.0.45
+cfg-if-0.1.9
+clap-2.33.0
+cloudabi-0.0.3
+cookie-0.12.0
+cookie_store-0.7.0
+core-foundation-0.6.4
+core-foundation-sys-0.6.2
+crc32fast-1.2.0
+crossbeam-deque-0.7.1
+crossbeam-epoch-0.7.2
+crossbeam-queue-0.1.2
+crossbeam-utils-0.6.6
+daemonize-0.4.1
+dtoa-0.4.4
+either-1.5.3
+encoding_rs-0.8.20
+env_logger-0.7.1
+error-chain-0.11.0
+error-chain-0.12.1
+failure-0.1.5
+failure_derive-0.1.5
+flate2-1.0.11
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-cprng-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.29
+futures-cpupool-0.1.8
+getrandom-0.1.12
+h2-0.1.26
+http-0.1.18
+http-body-0.1.0
+httparse-1.3.4
+humantime-1.3.0
+hyper-0.12.35
+hyper-tls-0.3.2
+idna-0.1.5
+idna-0.2.0
+indexmap-1.2.0
+iovec-0.1.2
+itoa-0.4.4
+json-0.12.0
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+lock_api-0.1.5
+log-0.4.11
+matches-0.1.8
+memchr-2.2.1
+memoffset-0.5.1
+mime-0.3.14
+mime_guess-2.0.1
+miniz_oxide-0.3.2
+mio-0.6.19
+miow-0.2.1
+native-tls-0.2.3
+net2-0.2.33
+nodrop-0.1.13
+num_cpus-1.10.1
+once_cell-1.4.1
+openssl-0.10.24
+openssl-probe-0.1.2
+openssl-sys-0.9.49
+owning_ref-0.4.0
+parking_lot-0.7.1
+parking_lot_core-0.4.0
+percent-encoding-1.0.1
+percent-encoding-2.1.0
+pkg-config-0.3.16
+ppv-lite86-0.2.5
+proc-macro2-0.4.30
+proc-macro2-1.0.3
+publicsuffix-1.5.3
+quick-error-1.2.3
+quote-0.6.13
+quote-1.0.2
+rand-0.6.5
+rand-0.7.2
+rand_chacha-0.1.1
+rand_chacha-0.2.1
+rand_core-0.3.1
+rand_core-0.4.2
+rand_core-0.5.1
+rand_hc-0.1.0
+rand_hc-0.2.0
+rand_isaac-0.1.1
+rand_jitter-0.1.4
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.56
+regex-1.3.1
+regex-syntax-0.6.12
+remove_dir_all-0.5.2
+reqwest-0.9.20
+rustc-demangle-0.1.16
+rustc-hash-1.0.1
+rustc_version-0.2.3
+ryu-1.0.0
+schannel-0.1.16
+scopeguard-0.3.3
+scopeguard-1.0.0
+security-framework-0.3.1
+security-framework-sys-0.3.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.40
+serde_urlencoded-0.5.5
+sha1-0.6.0
+slab-0.4.2
+smallvec-0.6.10
+stable_deref_trait-1.1.1
+string-0.2.1
+strsim-0.8.0
+syn-0.15.44
+syn-1.0.11
+synstructure-0.10.2
+syslog-4.0.1
+tempfile-3.1.0
+termcolor-1.1.0
+textwrap-0.11.0
+thiserror-1.0.20
+thiserror-impl-1.0.20
+thread_local-0.3.6
+time-0.1.42
+tokio-0.1.22
+tokio-buf-0.1.1
+tokio-current-thread-0.1.6
+tokio-executor-0.1.8
+tokio-io-0.1.12
+tokio-reactor-0.1.9
+tokio-sync-0.1.6
+tokio-tcp-0.1.3
+tokio-threadpool-0.1.15
+tokio-timer-0.2.11
+try-lock-0.2.2
+try_from-0.3.2
+twoway-0.2.0
+unchecked-index-0.2.2
+unicase-2.5.1
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-1.7.2
+url-2.1.0
+uuid-0.7.4
+vcpkg-0.2.7
+vec_map-0.8.1
+version_check-0.1.5
+want-0.2.0
+wasi-0.7.0
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.6.2
+ws2_32-sys-0.2.1
+"
+TESTDATA="${PN}-testdata-202110"
+
+inherit cargo systemd
+
+DESCRIPTION="Yet Another SKK server"
+HOMEPAGE="https://github.com/wachikun/yaskkserv2"
+SRC_URI="https://github.com/wachikun/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})
+ test? ( https://dev.gentoo.org/~hattya/distfiles/${TESTDATA}.tar.xz )"
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+ app-i18n/skk-jisyo"
+BDEPEND="test? (
+ app-emacs/ddskk
+ app-i18n/yaskkserv
+)"
+
+QA_FLAGS_IGNORED=".*"
+
+src_prepare() {
+ default
+
+ sed -i "/^dictionary =/s|= .*|= ${EPREFIX}/usr/lib/${PN}/default.euc|" etc/${PN}.conf
+ export OPENSSL_NO_VENDOR=true
+}
+
+src_test() {
+ export YASKKSERV2_TEST_DIRECTORY="${T}"/${PN}
+ mkdir -p "${YASKKSERV2_TEST_DIRECTORY}" || die
+ cp -r "${WORKDIR}"/${TESTDATA}/* "${YASKKSERV2_TEST_DIRECTORY}" || die
+ cargo_src_test
+}
+
+src_install() {
+ dosbin target/release/${PN}
+ dobin target/release/${PN}_make_dictionary
+ einstalldocs
+
+ keepdir /usr/lib/${PN}
+
+ insinto /etc
+ doins etc/${PN}.conf
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst() {
+ "${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.euc "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die
+ "${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.utf8 --utf8 "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die
+}
diff --git a/app-i18n/zinnia-tomoe/metadata.xml b/app-i18n/zinnia-tomoe/metadata.xml
index 0601843f122..65232f90227 100644
--- a/app-i18n/zinnia-tomoe/metadata.xml
+++ b/app-i18n/zinnia-tomoe/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-i18n/zinnia/metadata.xml b/app-i18n/zinnia/metadata.xml
index 0601843f122..65232f90227 100644
--- a/app-i18n/zinnia/metadata.xml
+++ b/app-i18n/zinnia/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>