gentoo resync : 30.09.2020

3 files changed, 65 insertions, 6 deletions

diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 82e4e3c523d5..4f57fbdddf24 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,3 +1,4 @@
+AUX gtk-builder-convert-2.24.32-python3.patch 2165 BLAKE2B 2c70d438614cfbe09f5742fb6f0f8519831612058de36bd4173d4f8968ca6f5f546b6c212f6c54a997d43406a0bc787f9b0a5eb117c93d137861e39896a3b066 SHA512 9b52db1bff0a9cbebfac2d2d737c8a75e3ef704993e1bcc2117289b6bc05f1bf797da4763f50b9e9f2f2e93734c8cb747b301191842fee915232614347e7b26d
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.32.ebuild 1128 BLAKE2B 2825466c954bccebc69b8b70b90dd3bfbeecdd4dedeb682f2c41d2fae1a2f2cfda990ebd379be42f2ea47128b9ec5de4ec87cad8bc4fbe4c99fc4bb3d2da3e3d SHA512 b4b4a33d84f0363e22d322391206811b47ddd59cc8a8d885eb6c319574cc0de69ec8dfb5045da512dfa013481f91b747ba0d4f0b0feef6757e3a0c2b8a19c9ba
+EBUILD gtk-builder-convert-2.24.32-r1.ebuild 1188 BLAKE2B 168692daf4e7f77ccc0445bd34e34319a7b5e9fcc8f68a0aa26316cfcc66b560db0899e4362c32bf0a64d71795aa91ad0e90500c56e6d8ea183a1648a7be1bbf SHA512 6c61eb0f5fdab93c62357a3c18068afad7354fa07a513b6dcc6baad9ce17f78b4e580b0cc4e62e2dcfb230d02302f8cdd5876de37a38f242ec463dd68d009cf2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch b/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch
new file mode 100644
index 000000000000..01dc3d0aaff2
--- /dev/null
+++ b/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch
@@ -0,0 +1,56 @@
+https://trac.macports.org/export/50710/trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff
+--- a/gtk/gtk-builder-convert	2009-04-27 14:02:41.000000000 +0300
++++ b/gtk/gtk-builder-convert	2009-04-27 13:58:26.000000000 +0300
+@@ -258,7 +258,7 @@
+         for node in objects:
+             self._convert(node.getAttribute("class"), node)
+             if self._get_object(node.getAttribute('id')) is not None:
+-		print "WARNING: duplicate id \"" + node.getAttribute('id') + "\""
++                print("WARNING: duplicate id \"" + node.getAttribute('id') + "\"")
+             self.objects[node.getAttribute('id')] = node
+ 
+         # Convert Gazpachos UI tag
+@@ -441,8 +441,8 @@
+             if signal_name in ['activate', 'toggled']:
+                 action.appendChild(signal)
+             else:
+-                print 'Unhandled signal %s::%s' % (node.getAttribute('class'),
+-                                                   signal_name)
++                print('Unhandled signal %s::%s' % (node.getAttribute('class'),
++                                                   signal_name))
+ 
+         if not uimgr.childNodes:
+             child = self._dom.createElement('child')
+@@ -461,8 +461,8 @@
+         for accelerator in get_accelerator_nodes(node):
+             signal_name = accelerator.getAttribute('signal')
+             if signal_name != 'activate':
+-                print 'Unhandled accelerator signal for %s::%s' % (
+-                    node.getAttribute('class'), signal_name)
++                print('Unhandled accelerator signal for %s::%s' % (
++                    node.getAttribute('class'), signal_name))
+                 continue
+             accelerator.removeAttribute('signal')
+             child.appendChild(accelerator)
+@@ -711,7 +711,7 @@
+     return s.stdout.read()
+ 
+ def usage():
+-    print __doc__
++    print(__doc__)
+ 
+ def main(args):
+     try:
+@@ -745,10 +745,10 @@
+ 
+     xml = _indent(conv.to_xml())
+     if output_filename == "-":
+-        print xml
++        print(xml)
+     else:
+         open(output_filename, 'w').write(xml)
+-        print "Wrote", output_filename
++        print("Wrote", output_filename)
+ 
+     return 0
+ 
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
index 323ce94de3e6..889c321a3bcd 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome.org python-single-r1
@@ -14,12 +15,9 @@ HOMEPAGE="https://www.gtk.org/"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="${PYTHON_DEPS}"
-
 # gtk-builder-convert was part of gtk+ until 2.24.10-r1
 # man page transitioned in 2.24.31-r1
 RDEPEND="${COMMON_DEPEND}
@@ -32,10 +30,14 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.24.32-python3.patch"
+)
+
 src_configure() { :; }
 
 src_compile() {
-	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml
+	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml || die
 }
 
 src_install() {