gentoo resync : 18.08.2019

5 files changed, 77 insertions, 8 deletions

diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index f6be7020f4be..3c48624a82f8 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,7 +1,9 @@
 DIST librime-1.2.9.tar.gz 5516609 BLAKE2B 7b05fedb093f7595c7bf7f4893624b35b0cdde1816c9c99f9ed5d408c8fd21d34a361d16b94c43b3e5e23b10945f075711762f08ca30abee35849a332ecfee2d SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a
 DIST librime-1.3.1.tar.gz 8598357 BLAKE2B cd6bc6b63a89f7f11e78ceaf92007c099be34ce38f26d611b67a3d8f868a27a0e4de7b94da44d8483618f37a0c2bcfd3a1bc1c1ecb4f81829f8e12fdd777e283 SHA512 b35d3635fd776ed9be32c0998e4aac441433bc9e624765a57582690108cccf5c3beaedad4f8f1682d99533384cd10996ee8c18fd5adcea70878d6a410124922e
 DIST librime-1.4.0.tar.gz 8609316 BLAKE2B cce58c398057ac82f076e3b9e9a25cd6410e738460bd58277a9e3ed6cd11e80922bbb30e8b42828cdd5dd83f6058794b4b32fedb359315186b018ca88161794d SHA512 da68983638c6f25d994060a607f2ccab8917a71dbf10b9c6f1140c87c9ef4124e29a1d0ef16bbd0edc9a3a22bd5845aa894888d678607db372750f300638f562
-EBUILD librime-1.2.9.ebuild 789 BLAKE2B 7dfe12de3358c792d966dbda125976bf8c49dcd53f277d0d4e6e7ab1e5aa135810685f1586dc26d5faa4920e306d4dc98205f5376c0e6d0713b3c7ef452d5207 SHA512 8cf6bdfdac20eccfc361be603b6e8e170360655898024463e8d29cb1073a8cfa4fd5808492c759ac460ec0e6a0b72368b8c510cca9bc10d9fa5faacc8e05e10b
-EBUILD librime-1.3.1.ebuild 820 BLAKE2B ddaaf7b8d38b2a344043c4582b63c07b85aa7bf540c46a0b83ec3eef2c3cad7d786c7d0ad982c9b2c3cf7df34d0a99b44078d32c5255ebd20eabecff5cf9e519 SHA512 cedf9f7fc5b31468fb4b5ea649d058b9c732de739ae6c546248b8baadf2d23399090568d968473da7511c329a3e9c3ad63cef3c1fb3eeda008bb31789cb36220
-EBUILD librime-1.4.0.ebuild 818 BLAKE2B c099f1c729f570c92c2d059d9d8645a9f67818589f6f5cc2d3c2e8480c265af5c44e9553c7513ee00554a359c3fbcd2dc664d83689ade098a6baa57c2a15a36f SHA512 a1122708179e0cdd0d75d1c3da811711ba93cb79dc24071f787206b031cac83c0b19e66cfdad9aea3e3478905e73970d53d98c4edd8f1e7c7552775a2237b212
+DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3
+EBUILD librime-1.2.9.ebuild 822 BLAKE2B efd4b54152a4251ddb8351e6be2387b3671227dd13500a670fb7ee0398e5a5a8a28543bdd29740cb617b911ab870e8fe29ef5abb00ed4400c57aa232379208a2 SHA512 2031060b96288f7e2e146d3f044369911ffb3f0a3df12016583a00f2d80c638fa39e4022ca0dd24da23defb93f63d2b0d06495305459f74db4aa38b28140d597
+EBUILD librime-1.3.1.ebuild 851 BLAKE2B 91a6651e7b7dc00faf653c4ed539174ce3c6efda8e4161c5edb23aeeefbd574f3c8874a7c1ff2a89ab80b9bd61276c810fb9f8ae7a501255b01d51453468a868 SHA512 2048f949b95239924ea40515fdfd7158912b3cae0a158b69031e7f388ed5633c21cb3d9a3ce1d23802c9cf5808db2cf90c7c41f83357962a998535e1c710aabb
+EBUILD librime-1.4.0.ebuild 839 BLAKE2B cccdb15cf60fa3cdb163e0e02210e84855c52d3f8fde58c6ecee1645ff90a0d3711474a088ac9292b56d5b2426f911713a36c0ca5afc1a22f9be72ebf4856467 SHA512 c63a7fd8f6dfb89fcb4566f63efccda29c962e9679aeaa384685822da9f7586ef1e96e04c024bf1c4737e620a18dcd99754ce5d0e41de5b62a60ff77fad71b98
+EBUILD librime-1.5.3.ebuild 1431 BLAKE2B ba8f6993ea9fc606c2d48d3644049604ca3769bbb1be8bad44e0e5222253b20ea99cffe22a9d826e83fee2935c422478a8e219888a39c96a8b50637463e876cc SHA512 8df0bdfe9e473bc1ad1640a210c7fc467a7c813b69aba47d9d16dce46f4ee70c3a63af56a64fb6886fb4134e23ab948f784560d5983334ad5e1b386989e9ff6a
 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 3a095f779484..da4b3ecb895a 100644
--- a/app-i18n/librime/librime-1.2.9.ebuild
+++ b/app-i18n/librime/librime-1.2.9.ebuild
@@ -13,11 +13,12 @@ LICENSE="GPL-3"
 SLOT="0/1"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-i18n/opencc:=
 	dev-cpp/glog:=
 	dev-cpp/yaml-cpp:=
-	dev-libs/boost:=[threads]
+	<dev-libs/boost-1.69:=[threads]
 	dev-libs/leveldb:=
 	dev-libs/marisa:="
 DEPEND="${RDEPEND}
diff --git a/app-i18n/librime/librime-1.3.1.ebuild b/app-i18n/librime/librime-1.3.1.ebuild
index 6adbfbf2ddc8..d2ed92eef3b2 100644
--- a/app-i18n/librime/librime-1.3.1.ebuild
+++ b/app-i18n/librime/librime-1.3.1.ebuild
@@ -9,15 +9,16 @@ 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"
+LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-i18n/opencc:=
 	dev-cpp/glog:=
 	dev-cpp/yaml-cpp:=
-	dev-libs/boost:=[threads]
+	<dev-libs/boost-1.69:=[threads]
 	dev-libs/leveldb:=
 	dev-libs/marisa:="
 DEPEND="${RDEPEND}
diff --git a/app-i18n/librime/librime-1.4.0.ebuild b/app-i18n/librime/librime-1.4.0.ebuild
index 0b7c3762df21..fe6219f824f3 100644
--- a/app-i18n/librime/librime-1.4.0.ebuild
+++ b/app-i18n/librime/librime-1.4.0.ebuild
@@ -9,10 +9,11 @@ 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"
+LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-i18n/opencc:=
 	dev-cpp/glog:=
diff --git a/app-i18n/librime/librime-1.5.3.ebuild b/app-i18n/librime/librime-1.5.3.ebuild
new file mode 100644
index 000000000000..0a8bfd8b1370
--- /dev/null
+++ b/app-i18n/librime/librime-1.5.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/rime/librime"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="RIME (Rime Input Method Engine) core library"
+HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+RDEPEND="app-i18n/opencc:0=
+	dev-cpp/glog:0=
+	dev-cpp/yaml-cpp:0=
+	dev-libs/boost:0=[threads]
+	dev-libs/leveldb:0=
+	dev-libs/marisa:0="
+DEPEND="${RDEPEND}
+	dev-libs/darts
+	dev-libs/utfcpp
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+
+DOCS=(CHANGELOG.md README.md)
+
+src_prepare() {
+	# Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto.
+	sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die
+	rm -r thirdparty || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local -x CXXFLAGS="${CXXFLAGS} -I/usr/include/utf8cpp"
+
+	local mycmakeargs=(
+		-DBOOST_USE_CXX11=ON
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Iconv=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}