gentoo resync : 25.08.2020

4 files changed, 70 insertions, 28 deletions

diff --git a/dev-libs/eekboard/Manifest b/dev-libs/eekboard/Manifest
index 382ddafb723f..4a8672008b73 100644
--- a/dev-libs/eekboard/Manifest
+++ b/dev-libs/eekboard/Manifest
@@ -1,4 +1,5 @@
+AUX eekboard-python-3.patch 1309 BLAKE2B c8161d95ade6f64e800e2937681d82fc40e6be4c0a925f8047b445faaa62692c509ec2f2200c444685454753136a80f1a3bec5d58447b87acf444081648ca821 SHA512 7900b74a1a363409d06595d91772077f8e61557a9f454d7f8d28ec7ef0345d16c5adad0a9e8f3782b4f7ed3c05b9b24feeae21ad025b2af2a5e8af149054478c
 AUX eekboard-vala.patch 971 BLAKE2B 61e8185b8946593bff928bf51e86e133c2e4b0880265a96a56da0fbb2792fba147a4aff605f9e73080fd0e41845805636b23dc4ba47378b5649aa2d73c4ea45a SHA512 0e33141e6e8bbdee661b12083e5e261b013a1c83603dd06ef93b5b9360d89153ff53225e1c8068ebccd5d92c3dfd1c439f7b0fb27ed5e8f21d9ca201c7db01fc
 DIST eekboard-1.0.8_p20121001.tar.gz 330923 BLAKE2B 74bc0a9e4d3bea73828020895726e12b986100812ff7260758a881899c7ff92dc706c6b7a57bc4d17a9524d1305658c8c29e441ba4b7b4b8023d8f2ddebc2d10 SHA512 3c6ccbaac55a4680ba4d2bd5d214b1738b7fb17f83b66b11621149b6f8a945eb6b39c47be51dfcf53f84317d860ae28b8f83e3071d5d4474fbcfbdc72f6e4c87
-EBUILD eekboard-1.0.8_p20121001.ebuild 1760 BLAKE2B 5abcc9293a1a60b8847e3329bcdf6a975bd1b288ac0e4f43f10669040e0d179808989a31350bfbbf99d044484a716cd1e910538dd51de8d7bfded9d3f545381b SHA512 0655c670c6c100a0058dd21d0ba6482f06480d5e6cb9d35e2e0160809e795e455ebd27daec501f68efd415d9b448274732ad4d3b391b3bd9742038d472391558
-MISC metadata.xml 678 BLAKE2B 18e1494e9a6761d511dfbb99dea84044838cb13974662f6244014647fc414dc4dca585549a44d534ed7d3a63a2b94c7bc4e5a533a817bb2b77194e1b4988b88e SHA512 6ae8cfdff8c6df95729329152c2d853301b2d795c1aa22fe0a45fe0d37c1e3b60339523e35fb58fcf90ca7ab82aea8061baf816f694f8fde25afa53ddc98f0e5
+EBUILD eekboard-1.0.8_p20121001-r1.ebuild 1760 BLAKE2B c15e4f54c3fe887a19f97ff1974abcedeb4076558a680ec6d458800672f56457d16967b1a847b06f2f2e2d771ed276f803d824bd3d66c07ae6584e5111f76dc3 SHA512 6363945ccf4cd2e6447d53808ef507651a4b091bb5799663be631bb67982e8338f9648363d6499bce57633a80520225a9129a79a70a631184aba9504a5622571
+MISC metadata.xml 656 BLAKE2B b76f609d45f294c0737405e47b3f47407fd03bca7733d504d83316aa0932b77ae4cdcaa8b41a1f1ea37e712278ab9c06015123111a9598e84084100b88b58617 SHA512 6d5d60ade78cbfa6bcd40b42d6bebaa7c9b860cab32ed19338facdbfaf380ab71238be0926af4d2c0948970791845e037ffc15794933240ab5ea771750a3a87a
diff --git a/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild b/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild
index b534ae9a443f..9340f77503ae 100644
--- a/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild
+++ b/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools gnome2-utils python-any-r1 vala vcs-snapshot virtualx xdg-utils
+inherit autotools gnome2-utils python-any-r1 vala vcs-snapshot virtualx xdg
 
 DESCRIPTION="An easy to use virtual keyboard toolkit"
 HOMEPAGE="https://github.com/ueno/eekboard"
@@ -30,8 +30,8 @@ RDEPEND="app-accessibility/at-spi2-core
 	libcanberra? ( media-libs/libcanberra[gtk3(+)] )
 	vala? ( $(vala_depend) )
 	xtest? ( x11-libs/libXtst )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
@@ -39,13 +39,15 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-vala.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-python-3.patch
+	"${FILESDIR}"/${PN}-vala.patch
+)
 
 src_prepare() {
 	use vala && vala_src_prepare
 	default
 	eautoreconf
-	xdg_environment_reset
 }
 
 src_configure() {
@@ -68,16 +70,16 @@ src_test() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
 	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 	gnome2_schemas_update
 }
diff --git a/dev-libs/eekboard/files/eekboard-python-3.patch b/dev-libs/eekboard/files/eekboard-python-3.patch
new file mode 100644
index 000000000000..1bb75feb76fd
--- /dev/null
+++ b/dev-libs/eekboard/files/eekboard-python-3.patch
@@ -0,0 +1,39 @@
+--- a/eek/gen-keysym-entries.py
++++ b/eek/gen-keysym-entries.py
+@@ -18,17 +18,20 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ # 02110-1301 USA
+ 
++from __future__ import print_function
+ import sys
+ import re
+ 
+ if len(sys.argv) != 2:
+-    print >> sys.stderr, "Usage: %s TABLE-NAME" % sys.argv[0]
++    print("Usage: %s TABLE-NAME" % sys.argv[0], file=sys.stderr)
+     sys.exit(-1)
+ 
++py2 = sys.version_info[0] < 3
+ table = dict()
+ for line in sys.stdin:
+-    line = line.decode('UTF-8')
+-    match = re.match(r'\s*(0x[0-9A-F]+)\s+(\S*)\s+(\S*)', line, re.I)
++    if py2:
++        line = line.decode('UTF-8')
++    match = re.match(r'\s*(0x[0-9A-F]+)\s+(\w*)\s+(\w*)', line, re.I)
+     if match:
+         table[int(match.group(1), 16)] = (match.group(2), match.group(3))
+ 
+@@ -37,8 +40,10 @@
+ 
+ for index, (keysym, (l, c)) in enumerate([(keysym, table[keysym])
+                                           for keysym in sorted(table.keys())]):
+-    sys.stdout.write("    { 0x%X, %s, %s }" %
+-                     (keysym, l.encode('UTF-8'), c.encode('UTF-8')))
++    if py2:
++        l = l.encode('UTF-8')
++        c = c.encode('UTF-8')
++    sys.stdout.write("    { 0x%X, %s, %s }" % (keysym, l, c))
+     if index < len(table) - 1:
+         sys.stdout.write(",")
+     sys.stdout.write("\n")
diff --git a/dev-libs/eekboard/metadata.xml b/dev-libs/eekboard/metadata.xml
index 8b3df112eeb3..9c2b63ff15dc 100644
--- a/dev-libs/eekboard/metadata.xml
+++ b/dev-libs/eekboard/metadata.xml
@@ -1,19 +1,19 @@
 <?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>
-  <longdescription lang="en">
-    eekboard is a virtual keyboard software package, including a set of tools
-    to implement desktop virtual keyboards.
-  </longdescription>
-  <use>
-    <flag name="libcanberra">Enable support for <pkg>media-libs/libcanberra</pkg></flag>
-    <flag name="xtest">Enable support for <pkg>x11-libs/libXtst</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">ueno/eekboard</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		eekboard is a virtual keyboard software package, including a set of tools
+		to implement desktop virtual keyboards.
+	</longdescription>
+	<use>
+		<flag name="libcanberra">Enable support for <pkg>media-libs/libcanberra</pkg></flag>
+		<flag name="xtest">Enable support for <pkg>x11-libs/libXtst</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ueno/eekboard</remote-id>
+	</upstream>
 </pkgmetadata>