gentoo resync : 30.05.2020

3 files changed, 16 insertions, 21 deletions

diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index b21f679f8e7b..a131fb814fb6 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,6 +1,5 @@
-DIST boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 55907 BLAKE2B 16ac81094457c80b418109104139c1604e38ec58d6065474cc512668601f12896c4d470fe15c9a366a5ec63d50135265df71f28f4202fa283231879fafb0efbc SHA512 382c7f8a94059ae9816783b12c2d27ee6ca69e23ef7085bf2ee5a31109e6ab0c3d0b0042a3dc290b89276b6315d767aedf073dca390fa688a9aae07e837f83c9
-DIST ibus-libpinyin-1.10.0.tar.gz 1693440 BLAKE2B 5e0d9debddfbb81fcb45ac86d1fe8fb1220a50c527222fb3c3431149231f41dcc59ae87da9ae9485e2585f0e3051ac4d1792407ba62d90e5e0323c482d52318f SHA512 c9fdc28562714bddc889805e1d439a7dd425f721a8236b8f8ec4727ce24e5053693b3e5bd9b06ced22ceb66bc7621715f7ee52e00af3b8b113503a5ce6963ca0
 DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e039c0a181981d20ed94662184e161e8639ad3d548de981d7bbae950ab8b5019bedaed9593e03282e2f9d207f831929d422bc SHA512 48691952a10f4ab545d8e233dc3cd75fc54270c03a687820048152636df26d233ee0fba89e4ec2ccd5a6e410b41e556872e3dd2468d59d44b3440e904b93528b
-EBUILD ibus-libpinyin-1.10.0-r1.ebuild 1535 BLAKE2B ba5b503f5c0724adc46ed8c63bed0486d880a881a968da41d613185b2182a077cc5ab98c7d82ba61ea4ff35cf928ae3bd045757f9fb8916aabdd9aab75723af2 SHA512 d490ea04593c0eba188b3fb4c0fdf7d93a962b91fa0a15e5bda13da12e1032ea97be1292ea4145d30ecbce6e2176e3a3358da3db5f6052d3698ed1fa76fc9c4a
-EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1235 BLAKE2B 9503b44dc768975032afc2efb7a744f65a184bc7240448484a0bc758e357354c7bd8f0b3f3cd27a7a6f1f53fbb6db7d9d96da8507a765582cd6a646cf0826e0b SHA512 7a42024472def6263fe9668bfb172bbb74c667e7eea98a5aff49d33137e4618614eca7f41ba26e018b8cce6b67c50355661658b22d616a574ac029998ea4cb57
+DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851
+EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1233 BLAKE2B 9b1587e1c4d5b1d48e2f7d4f1ab3638146b051930ae9cddc0dacbca7e649831932991d214861bb961504d7d1cd113873a63b2fc871ca74498332a723a7d9faf3 SHA512 197112d524a17ef36f8d1ff1d3b89ffef0ae06c00238d6e385232af98dd3d4251fb79fdcc67f12e1f161f32e089ccf673e1a457e73bf5076972f3d470715dc92
+EBUILD ibus-libpinyin-1.11.92.ebuild 1239 BLAKE2B 62defde979d60c4433dbb2dbaa004d9cb978859d7ed4ecbcc5d42aeab5bbbc80fa8fd38d37c293ed94a418234c845aacdfeba605a4a2b42d235b62247d1934fe SHA512 953af51dee5887b986afccbdd59e79e0efdd7ae98f2239e12c163b31eebc517b3faed7000b52dc5daca88b17b090696d88c402efbd4dac7ea7e436bc75065983
 MISC metadata.xml 807 BLAKE2B 864c61e2dac53fc0b95541bf79e8f27a183f879bab95574f7cf462bfe276c89c8a5d2b65c899f4734c487feff1113a20ee02debd48b4ff955a24ace70ed5006e SHA512 c92e0e2c47a1272285c3a36cfc18c739df2a69dc911a8849cdc9c517183309908fdae894e88ed7511645b1c90c3611670b046f1a2c7c48fd0ff7c79d2de0a5b0
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
index 280d6386f779..6975e7f0c49f 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92.ebuild
index 3d7dd517debe..8a889ffe9868 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite(+)"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit autotools gnome2-utils python-single-r1
 
-BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
-
 DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
 HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
 SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
 "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+BDEPEND="dev-db/sqlite:3
+	virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
 	>=app-i18n/libpinyin-2.1.0:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	virtual/libintl
 	$(python_gen_cond_dep '
 		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
@@ -32,15 +34,9 @@ RDEPEND="${PYTHON_DEPS}
 	lua? ( dev-lang/lua:0 )
 	opencc? ( app-i18n/opencc:= )"
 
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	if use boost; then
-		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
-			|| die "copying newer version of boost.m4 file failed"
-	fi
 	default
 	eautoreconf
 }