gentoo resync : 21.06.2020

10 files changed, 16 insertions, 283 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 7602bb312eb4..564020af3e11 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
deleted file mode 100644
index 1955f93c6270..000000000000
--- a/app-i18n/atokx3/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xinput-iiimf 259 BLAKE2B 02091d870ca82447aadfc6c33bffc38d2bfca596f4f5958917a07bf3bfd924818a1d805022616076da699a063fcfac1867060ae14a9911223102ea697bbf793c SHA512 bbc852628d17c56124cf977c8fba28d9819944ca1bc7994da38222707ac9f785aafe9d854a70fec968d87382be053753ae599f0d47d666d133c49c62096eb3cd
-DIST a20y1406lx.tgz 8491493 BLAKE2B d5823dbc49661434c48d056d0d1d082be3d1d136e8eb8aab6b48f27b8198102201d5daeaca11717fba512b6260b928e165e6f500e8f1d70665c8907b9b1e5ce2 SHA512 bf350be4f15db63b384ff10ec7e362c469a836d052e8885aac1bab049f7d4f0b04dacaecbe5c1303211405938bc3f674136ba5ae3b55ff31aa5e4f14dbec0273
-DIST atokx3gtk216.tar.gz 69246 BLAKE2B 73d246e5c79da0888ffc32deed9d8770500c64377845c553f1ef4ca18b6c9ce93e20dd9188983d9a7664ead60dfb66f53f605a2ab7bf065db336266b5fb38178 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd
-DIST atokx3up2.tar.gz 8427265 BLAKE2B 6af19673dd443f69870316413bd53712a5b1f148f07d7b7f9dddff3290a4b6d65866e7d38a3c6a3d1ff15990560b706d46a558a77ff4c8200b36b4f1345c62bb SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d
-EBUILD atokx3-3.0.0-r12.ebuild 6702 BLAKE2B 69365c565e2db13dd5b9df051f1051b9d946914687c1fb26614dbccee6714fdbba5d8b300f6a098468760040df8a0e90c616a23dcd9e0e8e032c49087f7cbe2b SHA512 a0ab9bfdc60ee3cff010fe62ba9bef477f40f6c064f361605c25885dc90c0f2e693778de7a70e1863601aae4dd1bf4a7273a66cee44eecf261fd4118b2ebd217
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
deleted file mode 100644
index c1178520384d..000000000000
--- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit cdrom eutils gnome2-utils multilib-build
-
-MY_UPDATE_P="${PN}up2"
-MY_UPDATE_GTK="${PN}gtk216"
-MY_ZIPCODE_P="a20y1406lx"
-
-DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
-HOMEPAGE="https://www.justsystems.com/jp/products/atok_linux/"
-SRC_URI="https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
-	https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
-	https://gate.justsystems.com/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
-
-LICENSE="ATOK MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip mirror"
-
-RDEPEND="dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	media-libs/fontconfig
-	media-libs/libpng
-	sys-apps/tcp-wrappers
-	sys-libs/pam
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.4.13:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/pangox-compat
-	amd64? (
-		>=dev-libs/atk-2.10.0[abi_x86_32(-)]
-		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)]
-		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.51[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/pam-0-r1[abi_x86_32(-)]
-		>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
-		>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-		>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-		>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-		>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
-		>=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)]
-		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-		>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-		>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-		>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-		>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
-		>=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
-	)"
-S="${WORKDIR}"
-
-EMULTILIB_PKG="true"
-
-pkg_setup() {
-	if ! cdrom_get_cds ${PN}index ; then
-		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
-	fi
-
-	QA_PREBUILT="opt/${PN}/lib/server/*
-		opt/${PN}/lib/client/xaux/*
-		opt/${PN}/lib/client/*
-		opt/${PN}/bin/*
-		usr/libexec/*
-		usr/bin/*
-		usr/$(get_libdir)/*
-		usr/$(get_libdir)/gtk-2.0/immodules/*
-		usr/$(get_libdir)/iiim/le/${PN}/64/*
-		usr/$(ABI=x86 get_libdir)/*
-		usr/$(ABI=x86 get_libdir)/gtk-2.0/immodules/*
-		usr/$(ABI=x86 get_libdir)/iiim/*
-		usr/$(ABI=x86 get_libdir)/iiim/le/${PN}/*"
-}
-
-src_unpack() {
-	local targets="
-		IIIMF/iiimf-client-lib-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-gtk-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-protocol-lib-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-server-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-x-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-client-lib-devel-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-protocol-lib-devel-trunk_r3104-js*.i386.tar.gz
-		ATOK/atokx-20.0-*.0.0.i386.tar.gz"
-	#	IIIMF/iiimf-properties-trunk_r3104-js*.i386.tar.gz
-	#	IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
-	#	IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz
-
-	if use abi_x86_64 ; then
-		targets+="
-			IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
-			IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
-			IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz
-			ATOK/atokx-64-20.0-*.0.0.x86_64.tar.gz"
-		#	IIIMF/iiimf-client-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
-		#	IIIMF/iiimf-protocol-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
-		#	IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz
-	fi
-
-	targets+=" ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
-
-	unpack ${MY_UPDATE_P}.tar.gz
-
-	local i
-	for i in ${targets} ; do
-		if [[ -f "${S}"/${MY_UPDATE_P}/bin/${i} ]] ; then
-			einfo "unpack" $(basename "${S}"/${MY_UPDATE_P}/bin/${i})
-			tar xzf "${S}"/${MY_UPDATE_P}/bin/${i} || die "Failed to unpack ${i}"
-		elif [[ -f "${CDROM_ROOT}"/bin/tarball/${i} ]] ; then
-			einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
-			tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
-		else
-			die "${i} not found."
-		fi
-	done
-	unpack ${MY_UPDATE_GTK}.tar.gz
-	unpack ${MY_ZIPCODE_P}.tgz
-}
-
-src_prepare() {
-	if use abi_x86_64 ; then
-		local lib32="$(ABI=x86 get_libdir)"
-		local lib64="$(get_libdir)"
-		if [[ "lib" != "${lib32}" ]] ; then
-			mv usr/lib "usr/${lib32}" || die
-		fi
-		if [[ "lib64" != "${lib64}" ]] ; then
-			mv usr/lib64 "usr/${lib64}" || die
-		fi
-		mkdir -p "usr/${lib64}/iiim/le/${PN}" || die
-		mv "usr/${lib32}/iiim/le/${PN}/64" "usr/${lib64}/iiim/le/${PN}/64" || die
-		rm "usr/${lib32}/iiim/le/${PN}/amd64" || die
-		sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimcf.la" > "usr/${lib64}/libiiimcf.la" || die
-		sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimp.la" > "usr/${lib64}/libiiimp.la" || die
-		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimcf.la" || die
-		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimp.la" || die
-	fi
-}
-
-src_install() {
-	DOCS=( ${MY_UPDATE_P}/README_UP2.txt "${CDROM_ROOT}"/doc/atok.pdf )
-	HTML_DOCS=( "${CDROM_ROOT}"/readme.html )
-	einstalldocs
-	rm -rf ${MY_UPDATE_P}
-
-	cp -dpR * "${ED}" || die
-
-	# amd64 hack
-	if use abi_x86_64 ; then
-		local lib32="$(ABI=x86 get_libdir)"
-		local lib64="$(get_libdir)"
-		if [[ "${lib32}" != "${lib64}" ]] ; then
-			local f
-			for f in xiiimp.so xiiimp.a iiim-xbe xiiimp.so.2 xiiimp.so.2.0.0 iiimd-watchdog xiiimp.la ; do
-				dosym "../../${lib32}/iiim/${f}" "/usr/${lib64}/iiim/${f}"
-			done
-			for f in ${PN}aux.so ${PN}.so ; do
-				dosym "../../../../${lib32}/iiim/le/${PN}/${f}" "/usr/${lib64}/iiim/le/${PN}/${f}"
-			done
-			dosym "../../../../${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/64"
-			dosym "../../../../${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/amd64"
-		fi
-	fi
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-iiimf" > "${T}/iiimf.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/iiimf.conf"
-}
-
-pkg_preinst() {
-	# bug #343325
-	if use abi_x86_64 && has_multilib_profile && [[ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ]] ; then
-		rm -f "${EPREFIX}/usr/$(get_libdir)/iiim"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
-	elog
-	elog ". /opt/${PN}/bin/${PN}start.sh"
-	elog
-	multilib_foreach_abi gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	multilib_foreach_abi gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/atokx3/files/xinput-iiimf b/app-i18n/atokx3/files/xinput-iiimf
deleted file mode 100644
index bc2330c49970..000000000000
--- a/app-i18n/atokx3/files/xinput-iiimf
+++ /dev/null
@@ -1,11 +0,0 @@
-XIM=iiimx
-XIM_PROGRAM="@EPREFIX@/usr/bin/iiimx"
-XIM_ARGS=-iiimd
-GTK_IM_MODULE=iiim
-QT_IM_MODULE=xim
-
-export HTT_DISABLE_STATUS_WINDOW=t
-export HTT_GENERATES_KANAKEY=t
-export HTT_USES_LINUX_XKEYSYM=t
-export HTT_IGNORES_LOCK_MASK=t
-export JS_FEEDBACK_CONVERT=t
diff --git a/app-i18n/atokx3/metadata.xml b/app-i18n/atokx3/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-i18n/atokx3/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-i18n/kakasi/Manifest b/app-i18n/kakasi/Manifest
index 6f23bd2ba4d0..4a266d820027 100644
--- a/app-i18n/kakasi/Manifest
+++ b/app-i18n/kakasi/Manifest
@@ -1,3 +1,3 @@
 DIST kakasi-2.3.4.tar.gz 1099258 BLAKE2B e3644e8688082df393ab3b1dc356b682b3ea4a66c46d33c3e3c65ffd882a357600ec99f017e72bea491ad7779cbbaa044479101322a14baccc5385edc20a7b22 SHA512 33fa17251ba00163f6d9df208f18c88ff2dfa9891320f1d00fc0c72686bbcc59cf3ccbfb76fa66dfb135a6e942ef4d5d907edc3f1ca9d380c5b7a7d4df090a66
-EBUILD kakasi-2.3.4-r2.ebuild 706 BLAKE2B e704c19d2b3562d07388c703440eabdbd6da5250b6578df77abcd0b71a5354b0f9392e95a5f76f0a28d5557830384e1fad659669c3347382b49d3fb93c7dd2ca SHA512 72f2c976bed0eec7430cf43ef6f5ece427a9b1d1376c832a600f0240ffb1b1f9141da17630147b7a9532bc041d0544f1c1ccc29e4b8bd02dddba97b5c36d4616
+EBUILD kakasi-2.3.4-r2.ebuild 820 BLAKE2B 5a51df72a8c14d14e74f6ba02f96ea8a2bb443cded7e63beb8454132f1cc384e7083067996c59c6f3492dec115a977713c55617877bc2afce1815efc20d7039d SHA512 e4042dbdf406cfd20d88847182575e8777e26f0036131922bcfdc4e051d99a4446b81f1d71fb8eda7d0bbefbbf319a2563e947c7dc4aebdb5ce8ef0324700771
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild b/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
index 30107f0de0d1..feb65bcb9d84 100644
--- a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
+++ b/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
@@ -9,10 +9,10 @@ DESCRIPTION="Converts Japanese text between kanji, kana, and romaji"
 HOMEPAGE="http://kakasi.namazu.org/"
 SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
+IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} )
 
@@ -23,6 +23,8 @@ src_compile() {
 src_install() {
 	default
 	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.a' -delete || die
 
 	iconv -f EUC-JP -t UTF-8 doc/${PN}.1 > doc/${PN}.ja.1
 	doman doc/${PN}.ja.1
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
-}