summaryrefslogtreecommitdiff
path: root/app-i18n
diff options
context:
space:
mode:
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/Manifest.gzbin21458 -> 21302 bytes
-rw-r--r--app-i18n/ibus-m17n/Manifest4
-rw-r--r--app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild34
-rw-r--r--app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild4
-rw-r--r--app-i18n/ibus-rime/Manifest10
-rw-r--r--app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild28
-rw-r--r--app-i18n/ibus-rime/ibus-rime-1.1.ebuild28
-rw-r--r--app-i18n/ibus-rime/ibus-rime-1.2.ebuild30
-rw-r--r--app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild33
-rw-r--r--app-i18n/ibus-rime/metadata.xml3
-rw-r--r--app-i18n/ibus-tutcode/Manifest3
-rw-r--r--app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild33
-rw-r--r--app-i18n/ibus-tutcode/metadata.xml14
-rw-r--r--app-i18n/librime/Manifest4
-rw-r--r--app-i18n/librime/librime-1.2.9.ebuild15
-rw-r--r--app-i18n/librime/librime-1.3.1.ebuild37
-rw-r--r--app-i18n/man-pages-fr/Manifest2
-rw-r--r--app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild4
-rw-r--r--app-i18n/man-pages-ja/Manifest2
-rw-r--r--app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild2
-rw-r--r--app-i18n/nkf/Manifest7
-rw-r--r--app-i18n/nkf/files/nkf-2.1.4-python.patch13
-rw-r--r--app-i18n/nkf/nkf-2.1.3-r1.ebuild73
-rw-r--r--app-i18n/nkf/nkf-2.1.3-r2.ebuild90
-rw-r--r--app-i18n/nkf/nkf-2.1.3.ebuild68
-rw-r--r--app-i18n/nkf/nkf-2.1.4.ebuild90
-rw-r--r--app-i18n/poedit/Manifest2
-rw-r--r--app-i18n/poedit/poedit-2.0.9.ebuild2
-rw-r--r--app-i18n/rime-data/Manifest6
-rw-r--r--app-i18n/rime-data/metadata.xml3
-rw-r--r--app-i18n/rime-data/rime-data-0.35.ebuild11
-rw-r--r--app-i18n/rime-data/rime-data-0.38.20180515.ebuild30
-rw-r--r--app-i18n/tomoe-gtk/Manifest2
-rw-r--r--app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild4
-rw-r--r--app-i18n/uim-tomoe-gtk/Manifest2
-rw-r--r--app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild2
-rw-r--r--app-i18n/uim/Manifest3
-rw-r--r--app-i18n/uim/files/uim-xkb.patch18
-rw-r--r--app-i18n/uim/uim-1.8.8.ebuild3
-rw-r--r--app-i18n/yaskkserv/Manifest4
-rw-r--r--app-i18n/yaskkserv/metadata.xml14
-rw-r--r--app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild6
42 files changed, 393 insertions, 350 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 529bcfcb22af..ddfa9f0a4f7b 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
Binary files differ
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index afdbed564acf..5aced37d4416 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-m17n-1.3.2.tar.gz 414324 BLAKE2B de477d8d0ec8e6498946799d2369755ec4b82856df7be91b426535290442dcffc43538b06b9e9aaffc6f1eae794a232b86935230bb3590f165a91bda9e4a1629 SHA512 6cbff2bf08043eb46d5e97c9303ebbb795c69b77c14d113c22fee2111eaee04ba8bc27bbd44b6640be02dd43f4b3711aba1b02fcbb350b8bca8d90dd20b4ba54
DIST ibus-m17n-1.3.4.tar.gz 436687 BLAKE2B 66c1138101b1c3634ebeef4657ef9d4accb30e9db0047d7232d1c25a5d061e705fb1f1bd2800c951baadeddf999a4eb24a581d59e261df4fd68d23b29ef3c530 SHA512 9e9bc290b0f0d68558d408f6e69aa3bd9bb767db827a95839b576b58c7a5056dedcbd9b0bf1aab5e26ab21e601acd67a53404a5fd54b436efaf2a706489f25c4
-EBUILD ibus-m17n-1.3.2.ebuild 754 BLAKE2B adca146317671d3468f9f00a037deb7a9a3390b5ad1dd0828c0164d9cc57f08387fbcff645777ee17dd9d5fed8966c4422ed4c9a3b33d89cf42a6605ae30a518 SHA512 37eb35f1dfc5bdb06eff61e91c0ee319b0ecc2f670e8e7b9daf8eac381a4b67eb56b0bd1542581e7f0b67405fbe9c00ab51855bce9c76459ab4006b844c48eef
-EBUILD ibus-m17n-1.3.4.ebuild 756 BLAKE2B 6a17aecbbaa5d68a57378bc5b63e0e315779e0ce93670b4d0a18ae0d98ef2e94c41369915d20f683362295ab24bccfc93945654a1c6f18ee0c7ae32d2c9057cc SHA512 61dd652c11acdb6f0040fbfa2723b63014d1b408b88556d1ad73d3b2748d5cb780350040d4f8970824002a3cb8add59234349e75dc7eafd796254ade315ec782
+EBUILD ibus-m17n-1.3.4.ebuild 754 BLAKE2B 6564070e8d07b4ea14b9272785c12610d061ef05c88c3427fe37b4dbb2a6ff4c0bf6216d77453cc3789d4f7349a7d2a8106d66f4cb9b160aefd84a03492123df SHA512 ee3ae78bc8aede6146d9d5460ee053711927db126f7cdcbf090f73c41bc840aaae455e5be683222a5ec95b50cde3e67125c3a8da6c204c302099efd6e2e2bc46
MISC metadata.xml 706 BLAKE2B 26b96ef11039182056e63f34f5bfa5f105e3eff9cd996aabaf0fde26bc650b51e1a176f700c7189cc568310c1ea6f8ef15c0316801526b3556142a0473731736 SHA512 b5da8f8cf77fe9028b052e0a546667342116e16c79ef044032443f30ff2814c5e534ee70b99419fbb509db2d4d755d570f8a8900a139594518eb7b6a5971b0f2
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
deleted file mode 100644
index d6b31d987ab6..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk gtk2 nls"
-
-CDEPEND="app-i18n/ibus
- dev-libs/m17n-lib
- gtk? (
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? ( x11-libs/gtk+:3 )
- )
- nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
- >=dev-db/m17n-db-1.7"
-DEPEND="${CDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-REQUIRED_USE="gtk2? ( gtk )"
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_with gtk gtk $(usex gtk2 2.0 3.0))
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
index b69cce49a38c..c17acb485e0b 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
@@ -9,8 +9,9 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gtk gtk2 nls"
+REQUIRED_USE="gtk2? ( gtk )"
CDEPEND="app-i18n/ibus
dev-libs/m17n-lib
@@ -25,7 +26,6 @@ DEPEND="${CDEPEND}
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig"
-REQUIRED_USE="gtk2? ( gtk )"
src_configure() {
econf \
diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest
index 9f395f1ece7c..0fb6c9d60f14 100644
--- a/app-i18n/ibus-rime/Manifest
+++ b/app-i18n/ibus-rime/Manifest
@@ -1,7 +1,5 @@
-DIST ibus-rime-0.9.9.tar.gz 23912 BLAKE2B 894f4858e59e95792a713d6f05a64ec150381edd308c622c26cca806e8f990811f4218b13729ce5731959c2a289453b253f9b292a6400a3f53d681ebcffaac64 SHA512 b18e6f3ba6c97e3b55900d9c4cb70d58f24b202bf2ae894ca861af10ddb028c193d9ac97e609f3b4f0f183b212b74180a02e5d823f235b4c799733933a48afb7
-DIST ibus-rime-1.1.tar.gz 23418 BLAKE2B ae4abe0ab134c0ce3ac70da378c22d068bb329da22a8166ab60d5f0a316a88d937a241fb877f255d2be7847672ab20d9c7e11fa6724ff74f32e7e70350a2b475 SHA512 2510f9019045013f85af5b8401286b338b739fa0e908a3e30e1d59971a43c32212f388d367b51942292e236859feb1a70d7e7b8deb17eafd8b4f878cc7ba018f
DIST ibus-rime-1.2.tar.gz 33396 BLAKE2B 39930ea31d40e622cd69d6f5a218729f460161dd9681e49bc35a1eb9b3875b6f5acbdaf36f7cf8200440bc27ed84a2f23ec1578b19a1fe6abbbc54c7078be11c SHA512 e1851781a6d069a79d04890b5b0aa2a706e611c08df3fcb99f883eeedd4dc4eefcac207f35b5cf1d856a41f0153ec3fbb040b4e6f610727384baa19b52a64155
-EBUILD ibus-rime-0.9.9.ebuild 633 BLAKE2B 2fb7f403c1ba22c284929ccbcbe7c71763efa08919bafcc64ca98e17757e4587e74a44c226e960fd2cb2f672331b8ce353f72fd1030585caf4ef6bb0a307da1f SHA512 460a3fe3cf16d743c0885504b3ad336533411d96cddad8e85925657710a936991dbe553609d82d131ee823516d106f6f4280dedae5d5d6c92b31fb4ed3fb6572
-EBUILD ibus-rime-1.1.ebuild 633 BLAKE2B 6afff9fd68329df81dd398d9d03e734cfbcb8bb226e18e13138656e3d0b8b8f82d17c184b8bea31a5d5530de5d56020832bbb20859ebe3c7db4c41bea13f634b SHA512 8fc8b74448abbb8a48a89e45fa8d1b5410105c15a3f771e5547fa95601c2b27125a1fd36691e8a2bdaf5c8356d5fe207dfef4bcab0a7b747274820c9a127049d
-EBUILD ibus-rime-1.2.ebuild 629 BLAKE2B 5b9123bb0c138f58ae83586e1b12c23eaff94bd68dc2afe8b17a40974266e6247f76008bdb91abf5e76f2b81185ccbd7cfe9a5616bdc4475ac99389ac62bcc35 SHA512 a9a177c70a874fcf27ca593f691aa87fd8cc21f0bf05bf52dd4479d86a280d5ab2ea65f250361613d0823a10895bac552877ad0e3cda32cac972ecb6e976d663
-MISC metadata.xml 601 BLAKE2B 95ae811151d2cd561bdeb0792404fb43a1c80b1be1c065e2ffbe797943bdfde926c56fed576bfde69bdba6aed29bc849a8c127ac6157b77311aec48fa623e01b SHA512 b99f85bda84da0fe35cda523709d24cea8065b72c57de666a615dcb0acec3b2745b6c06eb53a2cd63bdbc77c8abda232e9020b02965e6dde0f24211361efc34b
+DIST ibus-rime-1.3.0.tar.gz 33930 BLAKE2B 14e086382d89c990ca9f07401b68dbe26d58da061a3e8154232809ff29d766b630dcd06723bb0a8e18ebd089a640b7ab6787f8c70a6405dfa82472c1abfe5d4e SHA512 f0991184805bfe19931e297779179661f98bdfea952e310b2d8618550002cfa5bb08df05d1c5e31b535ad9959a919fdc98fa771a90d4d82b9c50e2f592cb7dfd
+EBUILD ibus-rime-1.2.ebuild 751 BLAKE2B 397cb33ae08e88ff287fa03c93f72347f0915a9095ab4cb75ed7c85213db495873401cbd451a42ef53f105c3e022cba3a02b955b54bb2e5ecc17ace192aea287 SHA512 5a03dcf39d8aa3dfc40161b7dfca3151bcd0d286e9e750daba67224f155ae1906652ef77c887242916bdcec789bc26d12a092d5734a71d99203e1fa032a86eb7
+EBUILD ibus-rime-1.3.0.ebuild 751 BLAKE2B 9dfc7269ad374741783c4cdbe10140ce953f1b5568ca55ba50b2d546240579b4b2290e4a686311aa10be2b435c749fc7fbb0882931d8ad2e39f6e59e705e4c75 SHA512 07b8bb40726a3f92a3684e41ad5c8a3ed6986dc0d2875e6b95a5b7a2bda268f288592bc7f0fa68b4e401553b3e0e0a71ff078c89bbd239df50c6993b6e00dfe2
+MISC metadata.xml 534 BLAKE2B 0d1888080b3fcf1b2bd5ef07456c8ed3f91dad7e11bb1c34882a43ad2396bc6b5bb62f49bf8af4936d3d5df84b6af30dd4dfcf48ef343865ac36e50da26d061b SHA512 78e2d7631f65652305b451e5b4ab95886dd8a1c2436fb95c0f344daae87feab1eb57486a0815348363858faf91f9b931f32166a9b22b7613bd3b1407ac19e317
diff --git a/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild b/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild
deleted file mode 100644
index 78e4ecd1c83a..000000000000
--- a/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
-HOMEPAGE="http://rime.im/"
-SRC_URI="https://rimeime.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="app-i18n/ibus
- app-i18n/librime
- x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
- dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
- app-i18n/rime-data"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
- sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
-}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.1.ebuild b/app-i18n/ibus-rime/ibus-rime-1.1.ebuild
deleted file mode 100644
index c0a98b4c36a0..000000000000
--- a/app-i18n/ibus-rime/ibus-rime-1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
-HOMEPAGE="http://rime.im/"
-SRC_URI="https://rimeime.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="app-i18n/ibus
- app-i18n/librime
- x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
- dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
- app-i18n/rime-data"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
- sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
-}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
index 81810d970e6a..46087ce10e52 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI="6"
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
-HOMEPAGE="http://rime.im/"
+DESCRIPTION="Rime Input Method Engine for IBus"
+HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
LICENSE="GPL-3"
@@ -12,17 +12,23 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-COMMON_DEPEND="app-i18n/ibus
+CDEPEND="app-i18n/ibus
app-i18n/librime
x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
- dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
app-i18n/rime-data"
-
-S=${WORKDIR}/${PN}
+DEPEND="${CDEPEND}
+ dev-util/cmake
+ virtual/pkgconfig"
+S="${WORKDIR}/${PN}"
src_prepare() {
- sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
- sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
+ sed -i \
+ -e "/^libexecdir/s:/lib:/libexec:" \
+ -e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
+ -e "s/ make/ \$(MAKE)/" \
+ Makefile
+ sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
+
+ default
}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
new file mode 100644
index 000000000000..8bea4e437097
--- /dev/null
+++ b/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Rime Input Method Engine for IBus"
+HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
+SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="app-i18n/ibus
+ app-i18n/librime
+ x11-libs/libnotify"
+RDEPEND="${CDEPEND}
+ app-i18n/rime-data"
+DEPEND="${CDEPEND}
+ dev-util/cmake
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i \
+ -e "/^libexecdir/s:/lib:/libexec:" \
+ -e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
+ -e "s/ make/ \$(MAKE)/" \
+ Makefile
+ sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
+
+ default
+}
diff --git a/app-i18n/ibus-rime/metadata.xml b/app-i18n/ibus-rime/metadata.xml
index f0aced69ea0e..def212007923 100644
--- a/app-i18n/ibus-rime/metadata.xml
+++ b/app-i18n/ibus-rime/metadata.xml
@@ -14,7 +14,6 @@
<email>chen.sst@gmail.com</email>
<name>Gong Chen</name>
</maintainer>
- <bugs-to>https://code.google.com/p/rimeime/issues/list</bugs-to>
- <remote-id type="google-code">rimeime</remote-id>
+ <remote-id type="github">rime/ibus-rime</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-i18n/ibus-tutcode/Manifest b/app-i18n/ibus-tutcode/Manifest
deleted file mode 100644
index 5d5c2a9fa80a..000000000000
--- a/app-i18n/ibus-tutcode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ibus-tutcode-1.0.2.tar.bz2 217894 BLAKE2B b1140e14845e99b1b6a908c7783eef210f928c9281fa924acebef80677ea2b0f6947015aa7c5d64f94ca0147737cb42dbc2c09e61df904505444da8cf93c50d9 SHA512 f7845323396d24a3097cf475c8fa40890b923434e551b8941a6f4cb4d84a4aed7d7b293295ba515603131a8e03a99d58b19dc3d81a7ee13d8d7d904edb5ece02
-EBUILD ibus-tutcode-1.0.2-r1.ebuild 718 BLAKE2B 09477de5f4a0008cfaaca923b0a6233e6af8ce843032b78d16e01ccf7e46e691835bcfafa36673e985281aadc9889f33dbbab9c96a9755efe70161ae6238dfe9 SHA512 1b80fb02a068cc127602ac33125912c519a7f14412c4f4b7a42d491961dba1e87c5435498a9be3040f76f39d85e2be9a2c8f12e27f445804987a02dc1744fe82
-MISC metadata.xml 408 BLAKE2B c9adbbde61f0d292e70da2b4148bffcc2290883cddee562e0ea6f248e0fe701ff83764c9c973450e6763158350a25e2dfe7bc95df340deb359def00cf4e8b15c SHA512 7ada81191429a8ebb16460376ea17c1035ed03265423aeaef1ff5a91abc6983f80e5b6c63d3b439e9b48fcb70513039da6564d7600e3ca6cc5af3cab495cad65
diff --git a/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild b/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild
deleted file mode 100644
index b39c6bbfb76b..000000000000
--- a/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="a Japanese TUT-Code input engine for IBus"
-HOMEPAGE="https://github.com/deton/ibus-tutcode/"
-SRC_URI="mirror://github/deton/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
- >=sys-devel/gettext-0.16.1"
-DEPEND="${CDEPEND}
- test? ( app-i18n/ibus )"
-RDEPEND="${CDEPEND}
- app-i18n/ibus"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
- sed -i -e "s/python/${EPYTHON}/" engine/ibus-engine-tutcode.in || die
-}
-
-src_install() {
- default
- dodoc ${PN}.json.example
-}
diff --git a/app-i18n/ibus-tutcode/metadata.xml b/app-i18n/ibus-tutcode/metadata.xml
deleted file mode 100644
index 07c7706e43ff..000000000000
--- a/app-i18n/ibus-tutcode/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>naota@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="github">deton/ibus-tutcode</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 9edf620ec981..70a1b127e15f 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,3 +1,5 @@
DIST librime-1.2.9.tar.gz 5516609 BLAKE2B 7b05fedb093f7595c7bf7f4893624b35b0cdde1816c9c99f9ed5d408c8fd21d34a361d16b94c43b3e5e23b10945f075711762f08ca30abee35849a332ecfee2d SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a
-EBUILD librime-1.2.9.ebuild 895 BLAKE2B 07b6892c4f14fb61e21849fcf337460d1042a7f78708905db97623f6b5d4dcc8d28c0f6456fbb7055e4dffa297b42c581c9a8c08d9ae6d30b09b7972f6f4476f SHA512 27e10fae37861e123e955f9342449204a091116f1324382b778fcb78f4940a6585cf5896a7df9af2d7d31d16eb41430be7054f99df44230e844d7c377df8942c
+DIST librime-1.3.1.tar.gz 8598357 BLAKE2B cd6bc6b63a89f7f11e78ceaf92007c099be34ce38f26d611b67a3d8f868a27a0e4de7b94da44d8483618f37a0c2bcfd3a1bc1c1ecb4f81829f8e12fdd777e283 SHA512 b35d3635fd776ed9be32c0998e4aac441433bc9e624765a57582690108cccf5c3beaedad4f8f1682d99533384cd10996ee8c18fd5adcea70878d6a410124922e
+EBUILD librime-1.2.9.ebuild 841 BLAKE2B f1c16e633f8eb39e718c71819cc3155732a526c08002934ec9f5d47aea8ab54124df9790b3dd6d062d33168f7f0f07e64f31c204dcd0180011af85439f8be7f5 SHA512 3ce4210a19e62528729b5eaefffdec2963473c39fc716720af329da11abfbea262a84b75b6ae7fa3bada2f67566252c1e4294973b2b4cbef958428d02adbb1c5
+EBUILD librime-1.3.1.ebuild 872 BLAKE2B 4204e207ccb82c672e87a6b43edc477c01c9f2f12d26829f3b1d6fc28e378f313da40bb890c7b450f0b95808fd914d5fba91b031c19ff3aabbdc7f415aef2727 SHA512 072986a077862696db15f071945a79d24111490f3eac30c2bd779be2be110d5cbd107a65253251392252ebba985e92efb78aecd00f5ebbbe1646ea5d599434ee
MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800
diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild
index e897af759e35..0cee02a76e84 100644
--- a/app-i18n/librime/librime-1.2.9.ebuild
+++ b/app-i18n/librime/librime-1.2.9.ebuild
@@ -5,8 +5,8 @@ EAPI="6"
inherit cmake-utils vcs-snapshot
-DESCRIPTION="Rime Input Method Engine library"
-HOMEPAGE="http://rime.im/ https://github.com/rime/librime"
+DESCRIPTION="Rime Input Method Engine, the core library"
+HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
SRC_URI="https://github.com/rime/${PN}/archive/rime-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
@@ -16,8 +16,8 @@ IUSE="static-libs test"
RDEPEND="app-i18n/opencc:=
dev-cpp/glog:=
- >=dev-cpp/yaml-cpp-0.5.0:=
- >=dev-libs/boost-1.46.0:=[threads]
+ dev-cpp/yaml-cpp:=
+ dev-libs/boost:=[threads]
dev-libs/leveldb:=
dev-libs/marisa:="
DEPEND="${RDEPEND}
@@ -26,13 +26,10 @@ DEPEND="${RDEPEND}
src_configure() {
local mycmakeargs=(
- -DBOOST_USE_CXX11=ON
- -DBUILD_DATA=OFF
- -DBUILD_SEPARATE_LIBS=OFF
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-DBUILD_STATIC=$(usex static-libs)
-DBUILD_TEST=$(usex test)
+ -DBOOST_USE_CXX11=ON
+ -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
)
-
cmake-utils_src_configure
}
diff --git a/app-i18n/librime/librime-1.3.1.ebuild b/app-i18n/librime/librime-1.3.1.ebuild
new file mode 100644
index 000000000000..c0422746cca3
--- /dev/null
+++ b/app-i18n/librime/librime-1.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Rime Input Method Engine, the core library"
+HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
+SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="app-i18n/opencc:=
+ dev-cpp/glog:=
+ dev-cpp/yaml-cpp:=
+ dev-libs/boost:=[threads]
+ dev-libs/leveldb:=
+ dev-libs/marisa:="
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ test? ( dev-cpp/gtest )"
+
+DOCS=( {CHANGELOG,README}.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_STATIC=$(usex static-libs)
+ -DBUILD_TEST=$(usex test)
+ -DBOOST_USE_CXX11=ON
+ -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
index 9b6ea9b655f7..285b523a8aa7 100644
--- a/app-i18n/man-pages-fr/Manifest
+++ b/app-i18n/man-pages-fr/Manifest
@@ -1,5 +1,5 @@
DIST man-pages-fr-3.40.1.tar.bz2 1136351 BLAKE2B ed175105dbcccc6c1fd8e888d5c015e91d166949821ff4441aa62e9bb002a0b79c493bba7b9a247103201c9f6a12f9d2a8618a00930669196a02e99dc9bb2cfa SHA512 58027da7b78a442a84448ed6d7c6c89ccbe97fd811afb26a9c6580da2e15b86f7fae4c876d773f7ceca1fbe92c265693eae01b76ad4795b52c0298ba25ac1330
DIST man-pages-fr-3.70-1.tar.xz 1143156 BLAKE2B 09a86733caf03246e530e898688d0f93ef401a74cc66eb1f5ee05ded5dee0be45fc27fcbcf458f2c5a3286a6655c7b7302eb1b2759be6e0205e69db95ce989dc SHA512 7bb6991b2278c898d67d465ebe434dc3a969e9ec5c962ed6b6fdb41e66121a1924573f529d310adf30cd8494515888627b3226f26b906452a8882c4851c290d8
-EBUILD man-pages-fr-3.40.1.ebuild 618 BLAKE2B fcdd2fdc153a9ff981c7fda20389413b017e26081a17fe2bff26743538fc25d797f73e33c2cddeb3871834715b8fef598a43b5b79204202969808772fd4d0a76 SHA512 b3b1066de261417d929656f4004758a28d5f0866b29da89e361c2f3934b7ba0fabde514fa6a0d4dbc2fac4e8649a8b91c75093f5af32de3b7cbf87cd0560e7ba
+EBUILD man-pages-fr-3.40.1.ebuild 617 BLAKE2B b01216e1864eaba5fe0f0e4cedee41a91db8b58f74b6c5c60e94ed8110abb06420e2d1a346ea5d8c863e63c3b767f7a2c5983f0cd371585bd595a7578eea5501 SHA512 7dd9cf6c085ee30d81e087d84ed9f1829704693db46b94ca18a5003ab75840a0b5e4539b4067509b995c580c1abb63c3c15f19527f3baa7449541103fe646d92
EBUILD man-pages-fr-3.70.ebuild 599 BLAKE2B 948aa31261c8d499ce0e67b3b640cddc414e8288983ed51e0a8f6bec2cfbcbfd288d65a1edface963fcfa4d7dfdf83e064d6b47680de1c82b0f5c3586abfb925 SHA512 af5795905c6ad7125ab80435af15742591d6307d49a1fa88a856eb9b34b976b1bf4da58ab055bbca9c86c7a5cfbb25b310251a6245523af4c917c0388c3f3f26
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild
index dc423e147e4f..a136dde7a406 100644
--- a/app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild
+++ b/app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/3722/${P}.tar.bz2"
LICENSE="man-pages GPL-1+ GPL-2+ GPL-2 BSD BSD-2 MIT rc LDP-1 public-domain"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index 3f96f9e99387..ff92be581005 100644
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,6 +1,6 @@
DIST man-pages-ja-20171215.tar.gz 4802604 BLAKE2B 24ded9e82f20df322fa7e96a05806f37f26796475f64e2b075a60b60762e4b331c96e82e0582896da323a643070779204fb50eb8e68156ba2e74a1a41649f10e SHA512 8cef4489e3210c2e30fd880c1639aaf314005c7f3987001677cd869924275cbf9df27fdc855cba9d887e5a185da72779167227a68a080d370b233bcd4eca4d30
DIST man-pages-ja-20180315.tar.gz 4808885 BLAKE2B 961cb265d2a5034368ac5766555440019e3f80710644f9ca6389e9932391f806ab37803b198d4f3619ad2a3fb34a91092b7c50c8f5c69dd1a909268c739fb931 SHA512 5cc8d247f24aeeb5f9ef9b89f214f7d74cf3d1db8f46140cb307f8398bde785c13041ec2947173d3a79121285afb3a5b383d3bff972eba017e88d17d722c173a
DIST portage-man-pages-ja-20060415.tar.gz 67347 BLAKE2B 77be89a79be1d4fc3c09cd7c74cd8ccfd18649cdf0121daec008b21114c5a77618a88f4abed266599b944aa5bf11fe55c5b6e89fbba51ebe2a548eb85d9a2c6d SHA512 37364cdcb27b460663bdae31fea1ac653317ba4d928a5325c51814eb1677d7d9fb9bcc55cf64d63a8e6daaefa34d8604e0efe3582308957397cad31325a6eaad
-EBUILD man-pages-ja-20171215.ebuild 2026 BLAKE2B 8206aff3e0fc7188882b4541efdffc7829aa124ffd7718c855340a901a9d67b08c58d7bc8557eb3f0a28d52b25accf77e7af8ad4bfc827e41d63bddf79697a03 SHA512 6b22c156fc08bddbb7f372965062c528183a1540455e5bb3d50beb9f25b6155766996040df2cb5479242461573d9bff9274a8f2ab0ac9c3f4afb72d65f38235b
+EBUILD man-pages-ja-20171215.ebuild 2025 BLAKE2B 41af40ca6bbb32d233cb4699901019b7fcd5ac6520fddd92a4c0a93bdf2db08413fc46303f8a2b49b76005da0d6f0897ffabd87f01c84f5e7af6a22dfd744779 SHA512 3a55205a2a0e976cf62c24d7bf048c8b59a736d87df78f53b634de1b24881ad42c3565eac499737f678e8912b392feef3d860ecb595ca1e31b8e24887ad3c076
EBUILD man-pages-ja-20180315.ebuild 2036 BLAKE2B 75358ed3c4ef602079350d41614df056fd6783176030fd892e5692a95eb193735b802a08175902ec37dc567667120982e329c0e5fb1a3d6782bfd2ce445bdc23 SHA512 dccbb2386ffeed2d6ca228efb68017b7e208f273cb13130a5ffeada0aa658e1cb40bdbabcf9697d68e1841547a6cf83faf91783c8c816f4d5251d23dc180198f
MISC metadata.xml 674 BLAKE2B 52381f36a78ec6aaf9855e9828d0f6e25f46c78d9049f90c604ef6ddd339e56831731c5e2a6c25731725767763cc37e9ece2a6d862500ed3de63c9501d305fa7 SHA512 4930172347182e65fa0fa30e2fcef5bfc391e6fb1dfefaa872ebe609c9583b58a5d8a62bfbddaf8b8ecf2a80ec30752c71fb658dfd4569a4493bc9eeff6de2b3
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
index c6dec00c02ab..5edc84fc59a4 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
IUSE=""
RDEPEND="virtual/man"
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 24a420f5b121..6498bfadba7b 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,7 +1,10 @@
AUX nkf-2.1.3-strip.patch 328 BLAKE2B 8cf9585ce7285ab5227bb5ace9d92fa559e5cee377b665e76792bd0d921ab8c638a60bdab1510879dbbc2dc4ac131fcd7e9d6ef7f525a02d44cbcbaa6b5a3db1 SHA512 a23bf0164bcf765f3b846a564c55bd783362e6f84b6f582d4d84b5ec8b711ca07d23d104ef5de2e84de5d6754b064034736ecadc5ceab6bda9ad59f00f2f527d
+AUX nkf-2.1.4-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
DIST NKF_python20090602.tgz 2318 BLAKE2B 54399912fce0f4486e4051825319294a214089a59fa9b40e93bdc77859e79e5586abf2d197511cb158b094663993a692c981885e9db8fe260a5a746771168509 SHA512 3baee969daaba43e7ddee0d3b6d3d73ed67cfb0a3c3cbdabcdcda9fa1e61ccf374cd686ee096d031c3c48541c6be6daacf82e3b05885de63b88344d137c306d9
DIST nkf-2.1.3.tar.gz 195020 BLAKE2B 7ffd2acdc16d98cfe1e7a73ff5999756a1c46e5dbbbf349d296f11526c077c42a64b1657d3a6bf8bee1326768ec06fe9d2aea02e5f8ba02e77626bb1316d1484 SHA512 e40798d4084657b545bdaa9904229b0a424a9be076c16993b97d206c3e82490c45288eaab417c6eea70b770f89530f90e98e1a659f8f7e4b928eea4396d1e738
+DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9
DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
-EBUILD nkf-2.1.3-r1.ebuild 1555 BLAKE2B 00cdbe4640317471c98c918f467c44fd1c079550294ca78d6d369823422d484de72d71003d6c2c223d0f361116e9a0aba002b18e9463991e9f0d6968fbd2acf9 SHA512 873a402d6cd444119fc3cc806a97e0f057343b26c724b38076168c416cdb3f9ee5d65fe50ae475469f8d55ae51fe5a45a7487f42277513c4b25dbd3202ecc5e0
-EBUILD nkf-2.1.3.ebuild 1424 BLAKE2B d672889f8d8b195d9a1ed1e655fdf5fc6d5a0fd8e2cb835cd145f09fd1c736c20f6f5feb901559cdd2028d0ed3d8c212689649c34d86616eb897875e84c9873f SHA512 c3055e5c093fade5bf12ef16b46fb6f6a9c8b74c60d98a7e5c0e8b9e6beb68ae8fb9f11fa9e00afaf304945adc7133f06bfc05772ab2eb667c1f2b2a443da13b
+DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
+EBUILD nkf-2.1.3-r2.ebuild 1713 BLAKE2B 67720f1fb282fcbb006336a357b5a97824147d97788065157e8e5ed139a1f3c19df620d1a1cf80f25b7634a7a6c9cd1e709c23be35b8c3018d84ee8c1c1a98bb SHA512 24b3317c3203f148e171f0c211cafe1214b4c1b110ffcf01989b4c42830303f6d843533231051d0daddf86921769eb8ab7fd2bea2527ff1acf2a175248be9b4d
+EBUILD nkf-2.1.4.ebuild 1832 BLAKE2B 07177c1eace2718e5288a56aacc52ee4436cfc6b3774ac3a8da2eb7d4d000afd8e73fa91b2e09830d39e77aa3c637e99a99455b640702cb6a10f9fea2de1d2a6 SHA512 5534788beb13116dfbbfe547c273cf06c12c817d398ab71217819d817ab1d5da65b077f9aab036f5b9254603fb6739e0c765049209913a79f83d818f4e345359
MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/files/nkf-2.1.4-python.patch b/app-i18n/nkf/files/nkf-2.1.4-python.patch
new file mode 100644
index 000000000000..6f9e2e687e07
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.4-python.patch
@@ -0,0 +1,13 @@
+--- a/NKF.python/nkf.c
++++ b/NKF.python/nkf.c
+@@ -78,8 +78,8 @@
+ }
+
+ #define PERL_XS 1
+-#include "nkf-dist/utf8tbl.c"
+-#include "nkf-dist/nkf.c"
++#include "../utf8tbl.c"
++#include "../nkf.c"
+
+ static PyObject *
+ pynkf_convert(unsigned char* str, int strlen, char* opts, int optslen)
diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
deleted file mode 100644
index 240a559e772a..000000000000
--- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 perl-module toolchain-funcs
-
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
- l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j )
- python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
-IUSE="perl python l10n_ja"
-
-src_prepare() {
- sed -i \
- -e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
- -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
- Makefile || die
-
- if use l10n_ja; then
- cp "${DISTDIR}"/nkf.1j "${S}" || die
- fi
-
- if use python; then
- mv "${WORKDIR}/NKF.python" "${S}" || die
- epatch "${FILESDIR}"/${P}-strip.patch
- fi
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" nkf || die
- if use perl; then
- cd "${S}/NKF.mod"
- perl-module_src_compile
- fi
- if use python; then
- cd "${S}/NKF.python"
- distutils-r1_src_compile
- fi
-}
-
-src_test() {
- emake test || die
- if use perl; then
- cd "${S}/NKF.mod"
- perl-module_src_test
- fi
-}
-
-src_install() {
- dobin nkf || die
- doman nkf.1
-
- if use l10n_ja; then
- ./nkf -e nkf.1j > nkf.1
- doman -i18n=ja nkf.1
- fi
- dodoc nkf.doc
-
- if use perl; then
- cd "${S}/NKF.mod"
- perl-module_src_install
- fi
- if use python; then
- cd "${S}/NKF.python"
- distutils-r1_src_install
- fi
-}
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
new file mode 100644
index 000000000000..21daf284bc4f
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 perl-module toolchain-funcs
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="http://sourceforge.jp/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
+ l10n_ja? ( https://dev.gentoo.org/~naota/files/${PN}.1j )
+ python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+IUSE="perl python l10n_ja"
+
+src_prepare() {
+ sed -i \
+ -e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+ -e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+ Makefile
+ if use l10n_ja; then
+ cp "${DISTDIR}"/${PN}.1j ${PN}.ja.1 || die
+ fi
+ if use python; then
+ mv "${WORKDIR}"/NKF.python . || die
+ eapply "${FILESDIR}"/${P}-strip.patch
+ fi
+
+ default
+}
+
+src_configure() {
+ default
+ if use perl; then
+ cd NKF.mod
+ perl-module_src_configure
+ cd - >/dev/null
+ fi
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+ if use perl; then
+ cd NKF.mod
+ perl-module_src_compile
+ cd - >/dev/null
+ fi
+ if use python; then
+ cd NKF.python
+ distutils-r1_src_compile
+ cd - >/dev/null
+ fi
+}
+
+src_test() {
+ default
+ if use perl; then
+ cd NKF.mod
+ perl-module_src_test
+ cd - >/dev/null
+ fi
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+
+ if use l10n_ja; then
+ doman ${PN}.ja.1
+ fi
+ dodoc ${PN}.doc
+
+ if use perl; then
+ cd NKF.mod
+ docinto perl
+ perl-module_src_install
+ cd - >/dev/null
+ fi
+ if use python; then
+ cd NKF.python
+ docinto python
+ DOCS= distutils-r1_src_install
+ dodoc README
+ cd - >/dev/null
+ fi
+}
diff --git a/app-i18n/nkf/nkf-2.1.3.ebuild b/app-i18n/nkf/nkf-2.1.3.ebuild
deleted file mode 100644
index 4c6a6142c01b..000000000000
--- a/app-i18n/nkf/nkf-2.1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 perl-module toolchain-funcs
-
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
- python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
-IUSE="perl python l10n_ja"
-
-src_prepare() {
- sed -i \
- -e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
- -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
- Makefile || die
-
- if use python; then
- mv "${WORKDIR}/NKF.python" "${S}" || die
- epatch "${FILESDIR}"/${P}-strip.patch
- fi
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" nkf || die
- if use perl; then
- cd "${S}/NKF.mod"
- perl-module_src_compile
- fi
- if use python; then
- cd "${S}/NKF.python"
- distutils-r1_src_compile
- fi
-}
-
-src_test() {
- emake test || die
- if use perl; then
- cd "${S}/NKF.mod"
- perl-module_src_test
- fi
-}
-
-src_install() {
- dobin nkf || die
- doman nkf.1
-
- if use l10n_ja; then
- ./nkf -e nkf.1j > nkf.1
- doman -i18n=ja nkf.1
- fi
- dodoc nkf.doc
-
- if use perl; then
- cd "${S}/NKF.mod"
- perl-module_src_install
- fi
- if use python; then
- cd "${S}/NKF.python"
- distutils-r1_src_install
- fi
-}
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
new file mode 100644
index 000000000000..9f6f6f5d6308
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
+
+PY_P="python-${PN}-0.2.0_p20141211"
+PY_COMMIT="000915e115acac57a1fdbceb1e6361788af83a3d"
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="http://sourceforge.jp/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
+ python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )"
+
+LICENSE="ZLIB python? ( BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+IUSE="perl python l10n_ja"
+
+src_prepare() {
+ sed -i \
+ -e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+ -e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+ Makefile
+ if use python; then
+ mv "${WORKDIR}"/${PY_P} NKF.python || die
+ eapply "${FILESDIR}"/${P}-python.patch
+ fi
+
+ default
+}
+
+src_configure() {
+ default
+ if use perl; then
+ cd NKF.mod
+ perl-module_src_configure
+ cd - >/dev/null
+ fi
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+ if use perl; then
+ cd NKF.mod
+ perl-module_src_compile
+ cd - >/dev/null
+ fi
+ if use python; then
+ cd NKF.python
+ distutils-r1_src_compile
+ cd - >/dev/null
+ fi
+}
+
+src_test() {
+ default
+ if use perl; then
+ cd NKF.mod
+ perl-module_src_test
+ cd - >/dev/null
+ fi
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+
+ if use l10n_ja; then
+ iconv -f ISO-2022-JP-3 -t UTF-8 ${PN}.1j > ${PN}.ja.1 || die
+ doman ${PN}.ja.1
+ fi
+ dodoc ${PN}.doc
+
+ if use perl; then
+ cd NKF.mod
+ docinto perl
+ perl-module_src_install
+ cd - >/dev/null
+ fi
+ if use python; then
+ cd NKF.python
+ docinto python
+ DOCS= distutils-r1_src_install
+ dodoc CHANGES README.md
+ cd - >/dev/null
+ fi
+}
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index f86b7ade62d8..4f58cb427e03 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -3,5 +3,5 @@ DIST poedit-2.0.7.tar.gz 2558220 BLAKE2B e4a958e516a5c4b56331b6f9f37d9fa627072a4
DIST poedit-2.0.9.tar.gz 2567156 BLAKE2B 29e616256a19430cb3efd3db5d6c2cc450155009e30ee056f6be712bac9e631e5aa20b0758262e9fbe00937eedf6ac777cd8e7407a3060f04503e3fa4d9cd6d0 SHA512 9981339ae0c3f11f972ed2f25e0c96e5c0cc0210771cc44d163e219c32eb951fa4180c8a03acdd7f0232a5e4b535f3202dda703b57ccfb02773eb24e6a1eb02d
EBUILD poedit-2.0.6.ebuild 1273 BLAKE2B 9f2a627317290fb4ac7acb8b80f29297ec20c2a8c31b8f38bf995f461e7518bc767d49fed66c5953d2dbe4ffbe5dd1c981189601aaed8516ce7059aa372f9f7c SHA512 97cbb993e0b2583277d2ba88accf36e4bcf4b113d95b87140d80b3c07b705a0f38eb85721b81e1aced2b27e24ec6905308a916d3caa6b2ab7ad494957adcc0a5
EBUILD poedit-2.0.7.ebuild 1278 BLAKE2B 345e579a3447a333c4633cee6f1742f64082549aeef84dcbcb32407e219a7edd68aeef53d883ae6269a464b6e6a41cd124d6403fce8645c7f95c44a55da34ada SHA512 c1b7cddd4c5051e142bf1e663cf4df22543f16168ab4413fcba9a56ec9c1ef5ec507d462dd46e773bd92d89e1a9c51ebe0d9ed536cc4b111cfd6314f67993e84
-EBUILD poedit-2.0.9.ebuild 1369 BLAKE2B a758a6d4a7290c05409f4e21503839414e56707553b9eaf1fcb306bdcca806e4683715dfb49ea711230a9b13bacfa1a7d00bd72d85d3d8905e98e446663b3f2c SHA512 76cb2475edadd233c53e7184f3185de521dca96d49327a95836b814bc9f64b1128e687f948d6cae8b6385e231486da9f6aae2d93fd75c100e40358b8c3bd3495
+EBUILD poedit-2.0.9.ebuild 1367 BLAKE2B 3f950048558ad4e6278992fefa9c92c62a66738910685983f9d0558b67283021d96ab836b41276e4c4e1af8b1a4ba37e1af51540ca395e61d9848c64df520cd7 SHA512 99a1ca30977f737d58cc3ca7b0b4561ab464bb989b2ec166dee7e9948d1d74b83e24cdb3cf68e11ce09c1c975aec7a39a11370f3c45ba5aed04e46889db0d58f
MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
diff --git a/app-i18n/poedit/poedit-2.0.9.ebuild b/app-i18n/poedit/poedit-2.0.9.ebuild
index f985ecb9e16c..d048d558b434 100644
--- a/app-i18n/poedit/poedit-2.0.9.ebuild
+++ b/app-i18n/poedit/poedit-2.0.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GUI gettext translations editor"
HOMEPAGE="https://poedit.net"
SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
LICENSE="MIT"
SLOT="0"
diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest
index 589c2e5137dd..da7fc5cd1b08 100644
--- a/app-i18n/rime-data/Manifest
+++ b/app-i18n/rime-data/Manifest
@@ -1,3 +1,5 @@
DIST brise-0.35.tar.gz 6707277 BLAKE2B 610ea2e58800676b88bc79ce7075ed5fa8ec041f2ee34e3dfbcbfa642f84413d8b188af8e49de56d815eac2e5188d18287749976aa4e28ba5c7c7dfc6dece30a SHA512 1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d
-EBUILD rime-data-0.35.ebuild 466 BLAKE2B df930eae62f7258d15426082066c072c38134052dbdbf6e991ad9c347d02340be9a5368af8143529950a1659f62726caaec825dbe95b9511460896e6f8c6f07e SHA512 3f0511d823119f5f17cb57910d7ed739b4dd4333b82d50e00d3343efbb07a8aab92d50ad1e1d38c154f95318f0c4e6a38bbab44ff6f965fb7c21000653e4152a
-MISC metadata.xml 530 BLAKE2B e2e632708080487ab2499dfccb257e01c173a68bcf818b5bb448461584eeadcef507b8d890598b2352da68e61fc80d366663162cbb9cd9374fcdc1fbd3655c50 SHA512 3d5960ae6ccf23726f4213a0fb0f5ea2d43d2cf15e75499ef5cd19fc9deb1d5bda621c5571a77f50a99bc91ea8bd64339de53ee6a5ab2ef13ee6b30ed454d9e7
+DIST brise-0.38.20180515.tar.gz 7116807 BLAKE2B abf73b5813b18f4cd3ef68b3f6e8ad2c54ac90a0969a57e7786b53b99c162efeea9e82d962b3e8d7b8b1742852beb5d0eb4b07de65bdc1881c43388de552ee4a SHA512 60b3d37486b6858114036664327c9be00d09d3f7d3f5aaf337c6bc5a46134e5785fc1732db5aad15e1e628241a70c9c34b03f982fb13cae6d91220731b451bb9
+EBUILD rime-data-0.35.ebuild 558 BLAKE2B ea665052bd0668d772e2c556b7ffa9784eb1d89d8aa082deab295f8cea5c1b65597e5390a9a96aaeeca1cf5c2891270454f9ba35867fdd91da220c75dd561e9f SHA512 fa661b513b6a36e180d791230f293f950f4274f7349500d871df325fe995967e993bcee9e6569e76ba604efb3a2b46bac72503117c16c0a6e2e75bc134b8779b
+EBUILD rime-data-0.38.20180515.ebuild 675 BLAKE2B b49321650256105bd272ee6242e615e9df86bfe28aec980897b06f76a601ad223817d52a81208548ee88bffa2f8f761c4730f23c038ec1fe2000ebd2b901e28f SHA512 c4b22812e37d0f3d36f58ed36fa3db96307a6473d83a0bd6331864fb7e8712ed356d1ff0d6c04411ca435bf90b33ad583b2dc0f311c1b798dcbfe14f1f462064
+MISC metadata.xml 600 BLAKE2B 3c4ba0371ca7088b9142f7fdad617c1b149cf7d5e6b9f93a5a4f12af1de4d276e3973a8092450bcc86e1acab4389d04f6a1ec9ee5cf599b7b7c1ee43cb0064bb SHA512 759252765da22d73f9e907c0095d7e60fa73aac194929da36757eab25ecb57311381459c444345eb4da5305ea15ba5ee5b89d458f39101ad887d5d9766282723
diff --git a/app-i18n/rime-data/metadata.xml b/app-i18n/rime-data/metadata.xml
index c91a76f3d447..21b0e91de72c 100644
--- a/app-i18n/rime-data/metadata.xml
+++ b/app-i18n/rime-data/metadata.xml
@@ -9,6 +9,9 @@
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
+ <use>
+ <flag name="extra">Install extra packages</flag>
+ </use>
<upstream>
<maintainer>
<email>chen.sst@gmail.com</email>
diff --git a/app-i18n/rime-data/rime-data-0.35.ebuild b/app-i18n/rime-data/rime-data-0.35.ebuild
index d047cace41e2..4290b96b3631 100644
--- a/app-i18n/rime-data/rime-data-0.35.ebuild
+++ b/app-i18n/rime-data/rime-data-0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -7,7 +7,7 @@ MY_PN="brise"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Data resources for Rime Input Method Engine"
-HOMEPAGE="http://rime.im/ https://github.com/rime/brise"
+HOMEPAGE="https://rime.im/ https://github.com/rime/brise"
SRC_URI="https://dl.bintray.com/lotem/rime/${MY_P}.tar.gz"
LICENSE="GPL-3"
@@ -17,5 +17,10 @@ IUSE=""
DEPEND="app-i18n/librime"
RDEPEND="${DEPEND}"
-
S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+ sed -i "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" Makefile
+
+ default
+}
diff --git a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
new file mode 100644
index 000000000000..ecbace625b4d
--- /dev/null
+++ b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PN="brise"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Data resources for Rime Input Method Engine"
+HOMEPAGE="https://rime.im/ https://github.com/rime/brise"
+SRC_URI="https://github.com/rime/${MY_PN}/releases/download/${MY_P%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 extra? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="extra"
+
+DEPEND="app-i18n/librime"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+ sed -i "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" Makefile
+
+ default
+}
+
+src_compile() {
+ emake $(usex extra all preset)
+}
diff --git a/app-i18n/tomoe-gtk/Manifest b/app-i18n/tomoe-gtk/Manifest
index 8a7d8f93bccb..68fce0e8de02 100644
--- a/app-i18n/tomoe-gtk/Manifest
+++ b/app-i18n/tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
DIST tomoe-gtk-0.6.0.tar.gz 448058 BLAKE2B 06db81c971bf06ae1b625afb90950e7a76ad2acfb6abf038ce0c6114c4f7bc42a76a7f07dc848cfa5e6aef3039e6bab32b0d7496fea1fb67bf936b5f9631a130 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43
-EBUILD tomoe-gtk-0.6.0-r4.ebuild 943 BLAKE2B b1f7f8097fb39a53a0e559e59784365a2ec50f46ca3233f5834326847ffcbc3f0237a4145a20d3e23630363eb43c226bd3a03e853974ec56291a10b3663ae971 SHA512 924a073b6e03c0db053f4ed36546fbb414d355fe04cbc2f53de98db676445bd6813e0ed168f16635db48ea247ac51c69a406efd91cfa6cf796614f0f819173a6
+EBUILD tomoe-gtk-0.6.0-r4.ebuild 942 BLAKE2B 04382726db18df35e3091673a99bce5d52d7f08371d391c07658f2da5db1464e7c40d8d9eeb60ac4a6b8f14cdc63fbdf64d31e06b34e5e60940ef8886b330f28 SHA512 802399212e06935d495e62ab369d6e7972c7e110b319669942af9396932b94a6f4b39383ef00e44537d9a0146d0dee4b5dba3795c3d4541156845739da2bf5a5
MISC metadata.xml 374 BLAKE2B 39965153f406f0dab239af88b4da0823befba31b026a262e1dd42373514fdd91b21cf582c3a00184459f62253f5fed7828bae911d82c3ba31331bb7f6d6abc6e SHA512 8b35eb486271612ca74076681fc7c84a27ec5bf49b8523996d14f7cb26d22952569497656378d07ca03ec7f9e05a30e851b9220f905fcc2265d4a4568badf15e
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
index ee72ae4622bb..52bdcab8445f 100644
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-i18n/uim-tomoe-gtk/Manifest b/app-i18n/uim-tomoe-gtk/Manifest
index 1685c5c27fda..7318f4e31f9f 100644
--- a/app-i18n/uim-tomoe-gtk/Manifest
+++ b/app-i18n/uim-tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
DIST uim-tomoe-gtk-0.6.0.tar.gz 372357 BLAKE2B 4624dcaa209dd1f89bbcff6232b72673b9a9e22609c326104e1fbef9e007c33e8711cd435ef5239d43e0104a65fc652ff74eb9b8787b1e0123e10f71bb07b241 SHA512 201c6a755feaef22b11f88a27b0d004d22ab13e806684ad839f7491ca17626eaf0f866a026c3fcf3b981c41c9c6a880d7f9f7a5156d3dad70d8edb78568b1d5d
-EBUILD uim-tomoe-gtk-0.6.0.ebuild 477 BLAKE2B 1f99c0f6dab6d649c31042f7767b8ddfd90490f8e610a2604524548f08aada432be2b8738495aa7c31831a683a031d94be37b7fdccbf8ac4ccd43a33e3d3ca0c SHA512 473e6b8e6f76d8ed127d4e88c051b7c33c5b9c75fe44818f4f7f8a687727d26cbe5480c1dcd8938b3574b44b69c999ca4079bf09164751ae873fb67dc0e5ef50
+EBUILD uim-tomoe-gtk-0.6.0.ebuild 475 BLAKE2B e748ece07f48b7c65100576ccb260280135643cecb36c423ab160a4ab0c5e4e9a6c6a882d9708601fa59455112e57f44d2529c27dcdd612e3ef4a6dba5ad0e6a SHA512 42af7aae71522172715c5cfc4cf71a2c76962ca41b110ff142e2ef770f105749ac17c8a24f318d355d68ec9e33716ab47ee180d9551c5b109efd784c1a75660c
MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
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 6d00f5ece70d..ff99b8ad6a2a 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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="app-i18n/uim
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index eeb5d4e68437..fd105b9c79f0 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -5,11 +5,12 @@ AUX uim-1.8.6-qt.patch 755 BLAKE2B dccef1b392e331b230f99f34c3dfc2829a49d5c5a15ac
AUX uim-1.8.6-tinfo.patch 2646 BLAKE2B edb4fde474b7264ed8a4a4db329ac06068ddb68e4b0bb6bd33e011018b5450de8ecc2b94716ca486a8a3b965867ee62eb0b3be2b2e939155a0cc34a02264a7a6 SHA512 34c2df710f0053c40b858369036d2e4bbac6a5da6f81794c3d97f6c58713d14c4bffffda555d9fc10ce2d70406578b2a50c9397b23c008ec4b106aa0a4582338
AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
+AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716e1c27200a9b4d29a649beb333fe61c30cd36718494b05cb5217d486fb929cd617fe7038bf168d7 SHA512 4e86e051dd05ec0b56d423a079b0b285fdd9b256ae66528781a68ee0bfcf1be15530346facb28eab0a1401f2f27f9dce8cc8e215fe3195879f66e7e4241d80fc
AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
EBUILD uim-1.8.6-r1.ebuild 5052 BLAKE2B 67f7e600a86a2f74ee49def7684bed41182946a6f0591892ef3b79609a5ae0002514ea941eeae6dca13ce93627fce28efbf1c9fb84f3fec805d301a347309edc SHA512 521d6bb0c8e40cf4a8b2a8c7ecbf650bbb24d6143ecfb4fa2e6ab3b0aa1df2d6e243345bb6bee9412c3fd5af8cfe20b88a05fb4ab3e048406ac3f674ac587aab
EBUILD uim-1.8.6-r2.ebuild 5157 BLAKE2B 87909b8657beb68f9148b937ccdbaf97cc515d556fd7bbd97b9c5e08a202d7e3f1b835a0d1394dba7d98236642cf3eb94199ae764f45435cb769961d0b537672 SHA512 405dc2308abd24708c3b4fb68e866b83300a48909d5b60c1c21127235e2a7d69e984fda7e4131774de3c86da1c442cac36010569bf9d573ea89a79ee298522b0
-EBUILD uim-1.8.8.ebuild 5300 BLAKE2B c778627e7f1868b6c8c54133965c24619f8450a5ebcae0f58cc093d6b23f3176fa7e67ac7b1622434a10fa96d1202a1693c81c554514a28f8a4d6221ba0bf36b SHA512 ab7edd45870830ae7a5149a4f69903624dc8ec323cc9274384b50076da2c7375284368690dbd64b1b05cc4f051a25a30760fdda0fcabef0d7980fe28312258e5
+EBUILD uim-1.8.8.ebuild 5330 BLAKE2B 49c5eacb304c025502ef1ff2348de4fc270809f8855db29d6fc209a9a9797073f7d2c8f34bd113f1a59b361cdd5e59e1e78a41de864fc04e7286f4b10aeefd36 SHA512 a470b4e4907072dbc98a9b0d0505e895ad7c1ecc665b030fe5b9ba0131412ecabd3472fe8fdb86a92f50afb5f28d76f23351bad99daa9fb68bcd2e9aa3caf9cd
MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/uim-xkb.patch b/app-i18n/uim/files/uim-xkb.patch
new file mode 100644
index 000000000000..538fd964bfb7
--- /dev/null
+++ b/app-i18n/uim/files/uim-xkb.patch
@@ -0,0 +1,18 @@
+--- a/uim/Makefile.am
++++ b/uim/Makefile.am
+@@ -181,6 +181,7 @@
+ libuim_eb_la_CFLAGS = @EBCONF_PTHREAD_CFLAGS@ -Wall
+ endif
+
++if LIBUIM_X_UTIL
+ if XKB
+ uim_plugin_LTLIBRARIES += libuim-xkb.la
+ libuim_xkb_la_SOURCES = uim-xkb.c
+@@ -189,6 +190,7 @@
+ libuim_xkb_la_CFLAGS = @X11_CFLAGS@
+ libuim_xkb_la_CPPFLAGS = -I$(top_srcdir)
+ endif
++endif
+
+ if OSX_DCS
+ uim_plugin_LTLIBRARIES += libuim-osx-dcs.la
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 96c19d017d73..fc0e9ef744ea 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
LICENSE="BSD GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ppc64 ~x86"
IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
RESTRICT="test"
REQUIRED_USE="gtk? ( X )
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-tinfo.patch
+ "${FILESDIR}"/${PN}-xkb.patch
"${FILESDIR}"/${PN}-zh-TW.patch
)
DOCS=( AUTHORS NEWS README RELNOTE doc )
diff --git a/app-i18n/yaskkserv/Manifest b/app-i18n/yaskkserv/Manifest
index 59b31ba49975..bf29d0e4af35 100644
--- a/app-i18n/yaskkserv/Manifest
+++ b/app-i18n/yaskkserv/Manifest
@@ -3,5 +3,5 @@ AUX yaskkserv.confd 280 BLAKE2B 465561acdcf1daa1589d84a74708ceff777dee5ed04510e2
AUX yaskkserv.initd 341 BLAKE2B 1e26304d24ecb6a931936ff06d9f24bb92b4aa01a3ea7d5db0ec7cd12c48c062f5ce664624b51592d87bb971cb82855fbc2220ca82cd6d0f4d55172e7ba2b0f5 SHA512 2fd63604283c811c7f6fe192e3d8f2b5b3542106b54d39707aa8d6116328634ae43421d6a620fcd1555cdbd53985b2444a381bc32e071cac7e040f6a337a3d8e
AUX yaskkserv.service 277 BLAKE2B 7755728e443ceccdd359864bea9e9e25926c860f13fb3acbecebfdedd919db7fd65ecc1e922f662dc676b2aa90b325a7aaed049abcae9291602f0bb5097b0015 SHA512 8ff4aa6ec41c3df17f560de157a60cd3bf3fcc03a2613c603d533f2891207b7001e2469dd3e9ac8c8cfc7ab5909978467922906e22ba4b4635627b234008ce32
DIST yaskkserv-1.1.0.tar.xz 75108 BLAKE2B ac567d4715d1767f0690462de934768335eafe4a61010534c16b430876f81ce43ac175dcc0a2546af996dd0bef8fd4c744b475985365abe3d571a4ed3f1c3a4c SHA512 9956a9b2fe587491b7c5f76482f13f91d1c87d445f2ff7effa5ffb68efe076f54f1c63e95b980d889963ac507ed49fa37f76f9deb239da7b7409da5be025c000
-EBUILD yaskkserv-1.1.0.ebuild 1634 BLAKE2B 9d38a535488ba0470aef7bed156208e5c92d12207a659458c9a355ffa6dd36b5b98d4e641531073b5b1424b37102ac83a5f7a0887ec7f8384f884b806770ed28 SHA512 64bfc3d49f57b5098c82aa0e325eaedb7b2b52055288b9ba78fd00643cfcaa63d69e63d3d9d469c87eb49505907b67e12d5a99997fc0387c25c4c1e87e2a5016
-MISC metadata.xml 327 BLAKE2B e7280f2de60adaf8396e8530232e5c100ceb19ff3938d0635135b5664f2bd5175dff3556f07b35278b6835b8df8a6b32299d17d840fcf23a77806f038bd6ad2b SHA512 4e5e5cc7feecfa981ffbacc46f83a56d0dac8f2c5f2cc745ad9dff4ee0f674d40e3b8b8cf46389ffebc0f19281081f9b96d0066588412db91519ec880a10ea73
+EBUILD yaskkserv-1.1.0.ebuild 1614 BLAKE2B 7e7ce15a04f78f7970cae46791dec3c0cea110dcc084393a2082e1669719105c21232289255bb83e2fc22d13f39501d026efe526043797ee8f3d09cc00983ced SHA512 1e7550b8f6f3f50d971df75aa13540f551ca471f450c82526c0f3c6e5a23042c1b2116aa05679fbdb1adcaa24041cf927bcb6cf779ff215f228208e27159e03a
+MISC metadata.xml 317 BLAKE2B fbc4f3d636930729ccd570bcdcfd2ff7a12f856b6d5a39fc0d8f65870557fb950a856123beff19c601058016d7353db674221ec823a495298f37ceb295728067 SHA512 01ef8712d73a0b66562c2c90c76271c590a6d07ed3641db256e10b7a079ea21e3d7dfcc2542f3452234a7f24d81645e64172a3e745bbcf537e0e857e68a3b446
diff --git a/app-i18n/yaskkserv/metadata.xml b/app-i18n/yaskkserv/metadata.xml
index 11ae35030635..6e6dda1b2b32 100644
--- a/app-i18n/yaskkserv/metadata.xml
+++ b/app-i18n/yaskkserv/metadata.xml
@@ -1,11 +1,11 @@
<?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>
- <upstream>
- <remote-id type="github">wachikun/yaskkserv</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">wachikun/yaskkserv</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
index 0d0ae48356cc..255ca5d5e631 100644
--- a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
+++ b/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="gnutls libressl systemd"
+REQUIRED_USE="?? ( gnutls libressl )"
RDEPEND="app-i18n/skk-jisyo
gnutls? ( net-libs/gnutls )
@@ -24,10 +25,7 @@ RDEPEND="app-i18n/skk-jisyo
DEPEND="${RDEPEND}
dev-lang/perl"
-REQUIRED_USE="?? ( gnutls libressl )"
-
PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-DOCS=( README.md )
HTML_DOCS=( documentation/. )
src_configure() {