gentoo resync : 28.04.2021

4 files changed, 2 insertions, 94 deletions

diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index b3e9f15d4fe2..fd46783294f5 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,9 +1,5 @@
 AUX fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch 859 BLAKE2B 6dc1a1d4b942600ec953cb18134a9e5fd9a812af8eb1629f942edd0e2a927596eba3ca276be1228d09a2ac14fbb4735d299473e915a90644fb869d979a10283d SHA512 39657019234402ee385667dcb8071209502d4b8e471bdff7fa13980afe2a358891d78447fb95d0f2c14a5aaccdb878d4cc8b9e95a85bb9c22cbdea475523c3a4
-DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af SHA512 e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3
-DIST fcitx-qt5-1.2.4.tar.xz 107620 BLAKE2B 3577555192d2eda9e48fbd31149100f0d21fd1b0b7d162d14cef89818f86d5e32e2bb835f4f47acf150cfd0b0fc506031454e4ffe1315424314fc7512d391f8f SHA512 c9ceaaedeb26ac4c7fa1e0bf34096725afc14642b795d9c624f4fc7fbf56c04acad12d8d3ffb60c164281b6373554c0524e56209a2d1d123fbf348d15dcc282a
 DIST fcitx-qt5-1.2.5.tar.xz 98604 BLAKE2B 07f3d62c3c47e5ce0805a087cc4819dec44d8038cc428a3f9b39d640e409372eeaf0f8326a00be8b4af1ef6ec21870dd5ebdabfe39a2cf92ab9cec8c32be059f SHA512 238ebd02e4b07a1bffcbf2d1534492589bce206c3bce0197e075e8cd3f1b16a2867b5e9beb3bc2a0a5e9391acbf20c07d4d5a35f1550b4e71ee663712a8d56c6
-EBUILD fcitx-qt5-1.2.3.ebuild 953 BLAKE2B f73f95dc706619866904fc03cacad15b13faf7a5e28045d2e6e5b72dfe1fa04d979406dbddf02bc62499466b7ad804462f806b4bf0dfc76df045fabce29cd0c8 SHA512 eac8c0ad2a284f54f6487ac203fd29f1fc63b2ff6c8e193cccd9ce92ad182eafe68e8aa39c2686dd26fac4ced569933b32ea3dd286560f3764d623891e5e0edd
-EBUILD fcitx-qt5-1.2.4.ebuild 957 BLAKE2B a126752b8b2e5233f31eb1387a2537b6e87a9fd4d2c10896c756447e36263b067dd7e2628c7f3dba93a5ace3bb4471069c0876fc6025e79591badc190fb8a4c4 SHA512 d3f8568e472b53e2eb7d918ffde3f280f4437074c6e184776f4c240191a37b5f2fcb67d42a03750374a517de7aa8280cbb92525696e7006b06c3d163f5156344
-EBUILD fcitx-qt5-1.2.5.ebuild 1029 BLAKE2B abd2326715f7a239efb1d517dd52e4cade3aed14cce3c330f31b6c232670bada43a64a1d5ba9ef4b6f0add1fc5e31cb880548c92f5a7ce583c79b90745dcdbc6 SHA512 ea2c0ef63d29912db710f29a0b5b2f985d86a973dce1958b1695b58a08c31d0266dd359edd72f992984a3ff2fa8ae7b239431a037859fed3772202ba2b213215
+EBUILD fcitx-qt5-1.2.5.ebuild 1036 BLAKE2B 26032825d5dd23cb39131cea21bf6caf7fcbb6320e0e02bb859c343c4cc585d7c520311a7376aba379f8863e938b4532baa68d39e1e444d711a3c38b18ca7e94 SHA512 b22e0c9ae346a80890a277b8445186fa8b998acf5a6102dbbf91f348de57a9b48013bc3330187ec269fe8e9c6c88d240574e671b371970801c697eb00bc35f22
 EBUILD fcitx-qt5-4.9999.ebuild 928 BLAKE2B 5967c2e2b9ea9fc3accf378978ad1c5d29d452502c8614ad70feae710fc72266f1974850871bd96ce522ce6b27c4240afd805a461528a165a969ba1c9af5cb4e SHA512 25a3395f1309f09aaace89cfe2e38c7693108b8b72891994d73f15a847c8a9e5c38a0a686890e50ecd0a98a8580d6a1c7d99deb149e6ea8e4c4289b1a1fd572e
 MISC metadata.xml 462 BLAKE2B 7a233fce87fd36fe60e197aacd130b79e3f74d2cd2d4080643c3f4382f3d890806ac31447188a6d914f79932363c0fb8c04f3ea09fa2767db181f06e381d8a35 SHA512 07d45d9e7d3616dcdaae37f59cd100f58bdba0da66a13122161a154dd2d7a2f5f5cbe7c13c2f9c673314fd74bebf7314966853fcd1be51e565e97d9f96063a4b
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
deleted file mode 100644
index 1699cf4ea4aa..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-BDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild
deleted file mode 100644
index 610eb112d602..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
index 6b458b4252ba..ab3c7cd48900 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 BDEPEND=">=app-i18n/fcitx-4.2.9:4