gentoo resync : 18.11.2019

3 files changed, 11 insertions, 20 deletions

diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 4348ad0d11a8..8a7c0ecfa365 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,8 +1,8 @@
 AUX 2.2.3-compile-fix.patch 593 BLAKE2B b6b47cd9af438766fb46a3bc7fdeabfde5af18bd119d2cff3743499fe32a14efbe8d0c206f82fbd84153b25a08df15967c7c818f67cd1caf81c3286ca46105e3 SHA512 c12be968ded30aeec90e2a176c1f5e452bc89951724b575467710f5e6a181a71f91bf4acb182b000793f0b543f3776c54160651ab0754f3ff7ee63a79758014d
 DIST poedit-2.1.1.tar.gz 2722379 BLAKE2B 3e5102ab9b2b6b6701abd3f44dab846d6989e5abdbcadf924cf7032d725fa1b405425cefa37eb0230d3de68ea0c60ec05e7bfe84f906cdec0230d8c1284f5779 SHA512 0b5e13c3e59c9bde78b95b45aa8765c16c03d12ca9fbabe4448e409ff4cd627676d1b77c011c75a54dc0e10acda23ceb49ca063e76a29154344dc5fdb9e5f8a8
 DIST poedit-2.2.3.tar.gz 2834106 BLAKE2B bf3670f612ca673893eb9f6cb23b67d329669266345fb4c29af44da28ff536825935bb209a250053e6eb65d937a7ae4b183dccc855e4747cbcc1cbb94161b6e6 SHA512 566f397add593d0b05b995cbd1cff1b063b6eb49b02058511f13c27ed5887685816f8dd9280e1a6be2dd594049c6eecd73efc5cf7835475d3cb5a94fe38f280f
-DIST poedit-2.2.tar.gz 2746800 BLAKE2B b093e5c1cd66eada6238af3b731752cc8dbf9feb3238c9b53ca972b805033f9f00b3ec92cae2b87353100653e7d7bd60a68bd109f07e523d4875e0f8ca8114e5 SHA512 14a5cc997e6cdc0d1fc14b05ea293a010537d71f846537270296e2a14bdfd7a352b6d0a88a3d4f60193192a918b276509e31926715e69725e595423adfac5fbc
+DIST poedit-2.2.4.tar.gz 2840389 BLAKE2B 1f88aeba2d4dc5ad802843cc39c298936d6619d98839257c302858f14f8d0ef3fabbda290d83192e501a7679ad2ebc63d1a87314e885d8d7e465b54de0feb297 SHA512 e7388e0657755752bc9eacd95d0a2f8f70d5a759fa15f054be3a8d07df821e8dceb9994652b576553808840bac520fcd292fd15987659f8cb4e4c8c7930ae919
 EBUILD poedit-2.1.1.ebuild 1388 BLAKE2B 040a78630d85e2c4c0005071fa159b6021a9b1759016eec281b93d83a87c931d7c52f5f52035c312e3cfb55991c07304fdfdbdc8e6d9ff94246a51e3c6314b92 SHA512 e40a70aa919ad1e51aa3f98e1f5a9aa581df065b86063d31a7c5a204fcc63a229ff1f6a9111139fbb791ab53f5b548e5b92a8f6511f60a1282b6d6d88c39224a
-EBUILD poedit-2.2.3.ebuild 1445 BLAKE2B b103e958f2b9066df320e9662540f7a21f376d2cf2a3069d336be6518e10a9efd2174423a163c458b08161eaaba8e32ba02fec8fb5ef3a7dd41526b5038f7e42 SHA512 46f7349d4fffbcd89b6e7a88dc27540fbadb946feaaeff74b21c152b122cc720b8531196a08d6692c9630b353a58f6886026261c32492b8e4bcd0ce09f09f654
-EBUILD poedit-2.2.ebuild 1393 BLAKE2B e411372c520b371afe101dd3dbf1e91cc08688ee9b0f9f0935e11160b2c58891dffc6a0da2e698b72a5828e97fb68eff932fa4022b41bf6c445c0259a830ab4c SHA512 ba4ca12c6077984b2fbeee96ec0af748050d8807a16b9164558e2ce210b2e43b7412ca0c0484c4cfb13aff287df1cc02ce1b1d47688db83e2fb68dff341d3eae
+EBUILD poedit-2.2.3.ebuild 1444 BLAKE2B 36793ed9c620a22cf383aee2a1f316104fa1163352a7d605007bb3f6a75d102fb9b8a5dc973d75a60a8003b28a62a40676e05c23f6895581097792cb978597e5 SHA512 0f3051368ea1885f6f967b215928aabf7fc27cdf2853115da93990d311531b5e126d0f3fb28e3563c351c23a6bec73614d1c786f05fbda43c10316f27ec033e8
+EBUILD poedit-2.2.4.ebuild 1292 BLAKE2B 2cb4cda71d07911383126b70e1435355a38d7646df9e3ead8876cc361389e863abd3b97e72298b3a823f1f55ef8cd25b13b45f06b82f5f85274c4b2a0f707a6b SHA512 7b6a84f1dceb550e8b2e99328dfbe377f65e34f7b5868f869b615e434c1fd1a13d09762b8c7c7554e396f64e972d2d4a448297d358b600e9ba379981a467bfcb
 MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
diff --git a/app-i18n/poedit/poedit-2.2.3.ebuild b/app-i18n/poedit/poedit-2.2.3.ebuild
index 414397734d6e..0c12933994ef 100644
--- a/app-i18n/poedit/poedit-2.2.3.ebuild
+++ b/app-i18n/poedit/poedit-2.2.3.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/poedit/poedit-2.2.ebuild b/app-i18n/poedit/poedit-2.2.4.ebuild
index ad916d29df2f..fd485f8975e8 100644
--- a/app-i18n/poedit/poedit-2.2.ebuild
+++ b/app-i18n/poedit/poedit-2.2.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="af an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
 WX_GTK_VER=3.0-gtk3
@@ -25,9 +25,10 @@ RDEPEND="
 	dev-libs/icu:=
 	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
 "
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	my_rm_loc() {
@@ -43,7 +44,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# CLD2 and C++ Rest are not available in Gentoo
+	# CLD2 and C++ Rest are not available in Gentoo, bug 674916
 	local myeconfargs=(
 		--without-cld2
 		--without-cpprest
@@ -51,13 +52,3 @@ src_configure() {
 
 	econf "${myeconfargs[@]}"
 }
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}