gentoo resync : 04.08.2018

4 files changed, 45 insertions, 5 deletions

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)
+}