gentoo resync : 21.06.2020

3 files changed, 10 insertions, 45 deletions

diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 35a0bd8cb8d4..e2d66354e062 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,6 +1,5 @@
-AUX 2.2.3-compile-fix.patch 593 BLAKE2B b6b47cd9af438766fb46a3bc7fdeabfde5af18bd119d2cff3743499fe32a14efbe8d0c206f82fbd84153b25a08df15967c7c818f67cd1caf81c3286ca46105e3 SHA512 c12be968ded30aeec90e2a176c1f5e452bc89951724b575467710f5e6a181a71f91bf4acb182b000793f0b543f3776c54160651ab0754f3ff7ee63a79758014d
-DIST poedit-2.2.3.tar.gz 2834106 BLAKE2B bf3670f612ca673893eb9f6cb23b67d329669266345fb4c29af44da28ff536825935bb209a250053e6eb65d937a7ae4b183dccc855e4747cbcc1cbb94161b6e6 SHA512 566f397add593d0b05b995cbd1cff1b063b6eb49b02058511f13c27ed5887685816f8dd9280e1a6be2dd594049c6eecd73efc5cf7835475d3cb5a94fe38f280f
 DIST poedit-2.2.4.tar.gz 2840389 BLAKE2B 1f88aeba2d4dc5ad802843cc39c298936d6619d98839257c302858f14f8d0ef3fabbda290d83192e501a7679ad2ebc63d1a87314e885d8d7e465b54de0feb297 SHA512 e7388e0657755752bc9eacd95d0a2f8f70d5a759fa15f054be3a8d07df821e8dceb9994652b576553808840bac520fcd292fd15987659f8cb4e4c8c7930ae919
-EBUILD poedit-2.2.3.ebuild 1440 BLAKE2B 5dcd19d0652cc29e1d49fbcf349ff00fd15c8b6e8f520480b07c825bcb5fe98e0bf610c688949633797f6ab7ac784d04c65ff79f3aae2f4c407e3e0452f110df SHA512 1c201a50e63f564324ea0aa1f6a955aa69b3cb9e76711a936c6e40321b4eadeb7490433586b35ee6811429cb6c2a73c4fd9f57061998c4e88e404526b261afaf
+DIST poedit-2.3.1.tar.gz 2891956 BLAKE2B 11fb8c19f439edc2c9df08529e815d47f5bdfe3cac486bd07bfaef90932edf05ce099b61f058d8d08ba1a3a41f35ed59bf2901de1d1d80ecc6178536cdcff908 SHA512 73439ae96d3e04d8f6fc7e49f72cd259606e669f01490bd9a59f3fa7b33a6e11fb3af70a3a6e155b1edcee49ac9222b16e05e937088748a9c0f3ed9a6c97a208
 EBUILD poedit-2.2.4.ebuild 1287 BLAKE2B e2c2cba68d5061d6f377542336229a87459aea604e6ea3248e240467b1d611cfc28cd800cbe1d95d1019d8b60585a63b97116d2763dd932ad21d1e7f9448838d SHA512 2f5cb803b5dd4fb8e0468712e7aa6feb25f0baafc2a8569b1753fc86d0ac020276a4b7c1f180825bce65a1f9d85968b9887f0f1bff714c7b985227d671481c77
+EBUILD poedit-2.3.1.ebuild 1292 BLAKE2B 11d086058d523a82130e592a9c748852829b6c7714d957c86132091d62a05663574bb71d4a167b08d882c44864b66ae5f624e6adaab0a6f1b76e586395afa27b SHA512 213a136bdd9b3709cb84af247e6cb8c9994483e1e8b9a16bd81237af427de870830d624ebf13fec35fef9359154fd2b063152da7f717ba5bcad8758e67a357fb
 MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
diff --git a/app-i18n/poedit/files/2.2.3-compile-fix.patch b/app-i18n/poedit/files/2.2.3-compile-fix.patch
deleted file mode 100644
index ed4d296e4d8a..000000000000
--- a/app-i18n/poedit/files/2.2.3-compile-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 683788d49eb9cee391984659c39c3e2ac236b420 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <tk@giga.or.at>
-Date: Thu, 23 May 2019 08:11:34 +0200
-Subject: [PATCH] Fix PCH-less compilation on Unix (#576)
-
----
- src/welcomescreen.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/welcomescreen.cpp b/src/welcomescreen.cpp
-index 65eb7d0d92..a24b4d7d23 100644
---- a/src/welcomescreen.cpp
-+++ b/src/welcomescreen.cpp
-@@ -26,6 +26,7 @@
- #include "welcomescreen.h"
- 
- #include "colorscheme.h"
-+#include "customcontrols.h"
- #include "crowdin_gui.h"
- #include "edapp.h"
- #include "edframe.h"
diff --git a/app-i18n/poedit/poedit-2.2.3.ebuild b/app-i18n/poedit/poedit-2.3.1.ebuild
index f86a266fedfc..8297cef3d06c 100644
--- a/app-i18n/poedit/poedit-2.2.3.ebuild
+++ b/app-i18n/poedit/poedit-2.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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
@@ -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"
 
@@ -25,13 +25,10 @@ RDEPEND="
 	dev-libs/icu:=
 	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
 "
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-compile-fix.patch
-)
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	my_rm_loc() {
@@ -47,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
@@ -55,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
-}