From 6ffff887d45d916fcabcb94af0a1da02583fdf95 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 19 Sep 2020 13:07:02 +0200
Subject: net-irc/telepathy-idle: Port to py3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/735410
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 net-irc/telepathy-idle/Manifest                    |  2 +
 .../telepathy-idle/telepathy-idle-0.2.0-r2.ebuild  | 45 --------------------
 .../telepathy-idle/telepathy-idle-0.2.0-r3.ebuild  | 48 ++++++++++++++++++++++
 3 files changed, 50 insertions(+), 45 deletions(-)
 delete mode 100644 net-irc/telepathy-idle/telepathy-idle-0.2.0-r2.ebuild
 create mode 100644 net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild

(limited to 'net-irc/telepathy-idle')

diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
index 848f83124691..0983e3c4f7bf 100644
--- a/net-irc/telepathy-idle/Manifest
+++ b/net-irc/telepathy-idle/Manifest
@@ -1 +1,3 @@
+DIST telepathy-idle-0.2.0-py3-1.patch 3849 BLAKE2B 48617c65e8c3af4aa40332eed66c1839b4a9db9c99a4e350fae89879dcbd67c133e0a05fd9a778a5e0ac737ddbf8f999f23095b9a2a3cdef233485b1c9422908 SHA512 41c90befc3bb2df84f35a2f53bbe29885f67a2ceb5dfbf906436655b9400368e74a1a4a6b408f669fa951ae9d50d89bc7e0e2285f50a6fecf1a1d719c307cb24
+DIST telepathy-idle-0.2.0-py3-2.patch 1441 BLAKE2B ea32a2c94216ff320f43c3bf8b537b197c0398507f812eecfab86359e43c53fc2724b2c0d0a0e0a7b342243b07cce38a86f802d9fbc777bba942df939f52a56b SHA512 c9f868f50c5300f4ed06953de935f44e2e87729a36a61d4c1e998d322c1dcdac2759200b66a04c965e9ef591475dfbd5997c83816c6fc2bfb178bfd4bcd260e8
 DIST telepathy-idle-0.2.0.tar.gz 566492 BLAKE2B d0e12bb23b96b7df5afb101ae2c62994777de616d5ea70a10fb2141e68066c7dfaae713340c7f8a2d8ce1f259f302729efa1927eaf7d2a9555120c58e89046f2 SHA512 f5e36afc3ab4b52eb865f2c1e6565b99011a7540fc1a7783d3bbd7bbf50bc671a2147df6bde646c82059a466cc1df9bdb10e2500db5b7bb06d57a989a75c261b
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r2.ebuild
deleted file mode 100644
index 7a2b194475db..000000000000
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Full-featured IRC connection manager for Telepathy"
-HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-idle"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-python/twisted-words )
-"
-RDEPEND="
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/glib-2.32:2
-	>=net-libs/telepathy-glib-0.21
-	sys-apps/dbus
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fixes.patch"
-)
-
-src_prepare() {
-	default
-
-	# Failed in 0.1.16 and code has not moved since october
-	# Upstream is working on 1.0
-	sed -e 's:connect/server-quit-ignore.py::' \
-		-e 's:connect/server-quit-noclose.py::' \
-		-i tests/twisted/Makefile.{am,in} || die
-}
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild
new file mode 100644
index 000000000000..7310419e9ee5
--- /dev/null
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-single-r1
+
+DESCRIPTION="Full-featured IRC connection manager for Telepathy"
+HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-idle"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
+	https://src.fedoraproject.org/rpms/telepathy-idle/raw/93c37581c570200c3f646d0872a9c1327d3b3cb1/f/0001-tools-Fix-errors-running-glib-ginterface-gen-under-P.patch -> ${P}-py3-1.patch
+	https://src.fedoraproject.org/rpms/telepathy-idle/raw/93c37581c570200c3f646d0872a9c1327d3b3cb1/f/0002-tools-Remove-outdated-is-unicode-checks.patch -> ${P}-py3-2.patch"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-python/twisted-words )
+"
+RDEPEND="
+	>=dev-libs/dbus-glib-0.51
+	>=dev-libs/glib-2.32:2
+	>=net-libs/telepathy-glib-0.21
+	sys-apps/dbus
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fixes.patch"
+	"${DISTDIR}"/${P}-py3-{1,2}.patch
+)
+
+src_prepare() {
+	default
+
+	# Failed in 0.1.16 and code has not moved since october
+	# Upstream is working on 1.0
+	sed -e 's:connect/server-quit-ignore.py::' \
+		-e 's:connect/server-quit-noclose.py::' \
+		-i tests/twisted/Makefile.{am,in} || die
+}
-- 
cgit v1.2.3-65-gdbad