From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3385E138359 for ; Sun, 27 Sep 2020 15:52:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C32CE0798; Sun, 27 Sep 2020 15:52:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13175E0798 for ; Sun, 27 Sep 2020 15:52:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42168340C6C for ; Sun, 27 Sep 2020 15:52:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5CE6339 for ; Sun, 27 Sep 2020 15:52:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1601221946.4192a8a2ac751d40de78a84c7ffdc272f5cfeb71.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-util/gtk-builder-convert/files/, dev-util/gtk-builder-convert/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild profiles/package.mask X-VCS-Directories: dev-util/gtk-builder-convert/ dev-util/gtk-builder-convert/files/ profiles/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4192a8a2ac751d40de78a84c7ffdc272f5cfeb71 X-VCS-Branch: master Date: Sun, 27 Sep 2020 15:52:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac5c2baf-7a51-4759-ad17-65cfd8f3ff90 X-Archives-Hash: b59f20e8d08377ea4d071aa871e73ef0 commit: 4192a8a2ac751d40de78a84c7ffdc272f5cfeb71 Author: Sam James gentoo org> AuthorDate: Sun Sep 27 15:47:25 2020 +0000 Commit: Sam James gentoo 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 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 (2020-09-26) # Dead Python 2-only package. No significant revdeps left.