[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-util/gtk-builder-convert/files/, dev-util/gtk-builder-convert/

[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-util/gtk-builder-convert/files/, dev-util/gtk-builder-convert/

[Sam James]

commit:     4192a8a2ac751d40de78a84c7ffdc272f5cfeb71
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 15:47:25 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 15:52:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4192a8a2

dev-util/gtk-builder-convert: add Python 3 patch

Closes: https://bugs.gentoo.org/741410
Closes: https://bugs.gentoo.org/741412
Closes: https://bugs.gentoo.org/741408
Closes: https://bugs.gentoo.org/735324
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gtk-builder-convert-2.24.32-python3.patch      | 56 ++++++++++++++++++++++
 ...build => gtk-builder-convert-2.24.32-r1.ebuild} | 12 +++--
 profiles/package.mask                              |  4 --
 3 files changed, 63 insertions(+), 9 deletions(-)

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 00000000000..01dc3d0aaff
--- /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
similarity index 91%
rename from dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
rename to dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
index 323ce94de3e..889c321a3bc 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() {

diff --git a/profiles/package.mask b/profiles/package.mask
index 216fd455c3a..c805d6e5b48 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -45,14 +45,10 @@ net-voip/telepathy-haze
 # unresponsive.  Please do not remove any packages from this list unless
 # you actually port them to Python 3.
 # Removal in 30 days.  Please find relevant bugs on tracker bug #694800.
-app-misc/klavaro
-dev-util/gtk-builder-convert
 games-arcade/diameter
 games-board/gnome-hearts
 net-analyzer/sguil-server
 net-analyzer/tcpflow
-sci-chemistry/rasmol
-sys-apps/gsmartcontrol
 
 # Michał Górny <mgorny@gentoo.org> (2020-09-26)
 # Dead Python 2-only package.  No significant revdeps left.