gentoo resync : 29.06.2020

3 files changed, 11 insertions, 76 deletions

diff --git a/net-p2p/tremc/Manifest b/net-p2p/tremc/Manifest
index 9deb92103253..1cc014021fd4 100644
--- a/net-p2p/tremc/Manifest
+++ b/net-p2p/tremc/Manifest
@@ -1,4 +1,3 @@
-AUX 0.9.1-fix-startup-crash.patch 2298 BLAKE2B 0cc6ecfb473d93a6bda34a3d8ebcc9a66d176280bad2d6f356077a2f026540fdcaf5d130475fb687c8292d0402ea6f264a7b67d6a9abd8f9f4356802c0c746b6 SHA512 90d4eebf3913a58bbf8c4e8175c486d1819d6804598320df9cd58a04b6c6c88e06640ca8affc495e6f9c6ceed30b2290982ba774013fbc7f07011f2948936fee
-DIST tremc-0.9.1.tar.gz 315482 BLAKE2B c4e94ef13cc9d716cdbcbff061b1956d17c6babe765e192d675d08ad5d76a22cf171a4fb3f5f2952b971f59a16a2768ccd360d10df5b0f3325fd63ff9716f209 SHA512 ed16080c6544ce9019e6a0c4d660310992cae0f139a2a78e9eaa51841e293cefb22160a105794b5f03a4bfd47a2c50402879f2a17302a96265a9c9acb3174c39
-EBUILD tremc-0.9.1.ebuild 1031 BLAKE2B ec315485a068309eddaa5854bbf83ce5c781d11a30712345be4a1a895ff956ec74b2814c57493f968f30a289388784cb1e7244d232366bd2b0c0432ac213ba46 SHA512 e508957f347a3b59244d7228e6b794bdc79c54b76d3b1ac2966e04a469161dd93d54d83c3e2a861a5fb6019fda1a5bffcb896bc44bf7d23fc1d2c35927f996a0
+DIST tremc-0.9.2.tar.gz 315631 BLAKE2B f5ed154fbfcbdb3e77b678a5827d3f68a6be4033530d6d4e451d57808d43cd5737fff32cf62445d246bfce4d8f02e4cac0c1156603e220e228e61b725d6deaf8 SHA512 d6d6d155ddac918d329226d5c3b53c63fd4fa0b98e30f1eb2cd2226ea598bd7dd81d72f747dc11f4a508bcc0453d90d774c1d8db6dac05ae1ecbc217290b7db3
+EBUILD tremc-0.9.2.ebuild 1002 BLAKE2B 1dcb7a16fb9b0882a464c49ada7b4ca28b5d10f27528202b276f3d9f90a925a4e326b478d18faad5cd8d72814ba2f6f732c3a82c3513a624ef907e54d6037190 SHA512 022c67f441c1b949c9d9a899b9a5338cc1e877796a81afe6795a2f2a38d428e6a4acd9299d49ffa86ee5965dd58ed4d422e9fdffd6a86a96418024224d45228e
 MISC metadata.xml 446 BLAKE2B 3736ac4b139f7c444823e0cf0b5adc3ffcde92bc00543fcc2bd9e23139a3ccb2c192dbbbc6b5e96586ceb61b31b7ac2d3298ee30e0b651880074788c25c2822f SHA512 75208e11a6c89db930bba12b4f120538757ccac5a45fa54b3c6c7e717131d93845453233585f68f8e77fb5abed72a7e91e94a4c1e04f8e3f8986b4de5a7d3e54
diff --git a/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch b/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch
deleted file mode 100644
index 5e67e5d31555..000000000000
--- a/net-p2p/tremc/files/0.9.1-fix-startup-crash.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0cb919b446eeda41aea8578ae26796ae92a973e5 Mon Sep 17 00:00:00 2001
-From: George Angelopoulos <george@usermod.net>
-Date: Mon, 2 Jul 2018 17:55:38 +0200
-Subject: [PATCH] fix addch ERR crash when starting with no torrents
-
-There was a bug introduced by commit e06d08d:
-    scale_bytes: Simplify this function
-
-tremc would crash when started against a transmission-daemon with no
-torrents.
-
-This was because scale_bytes(0) used to return 0K but now it returns
-0.0K. The expected width of 2 was hardcoded. The new width of 4 causes
-addch() to return ERR because it tries to draw outside the window.
-
-Hardcoding the new width to 4 would resolve this issue. Instead,
-this patch dynamically sets the width returned by scale_bytes().
-This should make the code a tiny bit more readable and maybe avoid this
-issue in the future.
-
-There is one more magic number involved here which I don't see a good
-way of getting rid of. So I made an illustrative comment.
-
-Resolves #15
----
- tremc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tremc b/tremc
-index 36ae67b..ed898fb 100755
---- a/tremc
-+++ b/tremc
-@@ -883,7 +883,7 @@ class Interface(object):
-         self.focus        = -1  # -1: nothing focused; 0: top of list; <# of torrents>-1: bottom of list
-         self.scrollpos    = 0   # start of torrentlist
-         self.torrents_per_page  = 0 # will be set by manage_layout()
--        self.rateDownload_width = self.rateUpload_width = 2
-+        self.rateDownload_width = self.rateUpload_width = len(scale_bytes())
- 
-         self.details_category_focus = 0  # overview/files/peers/tracker in details
-         self.focus_detaillist       = -1 # same as focus but for details
-@@ -2667,6 +2667,8 @@ class Interface(object):
-                     pass
- 
-     def draw_global_rates(self):
-+        # ↑1.2K ↓3.4M
-+        # ^    ^^     => +3
-         rates_width = self.rateDownload_width + self.rateUpload_width + 3
- 
-         if self.stats['alt-speed-enabled']:
-@@ -3373,7 +3375,7 @@ def timestamp(timestamp, format="%x %X"):
-     return "%s (%s)" % (absolute, relative)
- 
- 
--def scale_bytes(bytes, type='short'):
-+def scale_bytes(bytes=0, type='short'):
-     if bytes >= 1099511627776:
-         scaled_bytes = round((bytes / 1099511627776.0), 1)
-         unit = 'T'
--- 
-2.26.0
-
diff --git a/net-p2p/tremc/tremc-0.9.1.ebuild b/net-p2p/tremc/tremc-0.9.2.ebuild
index 8306b1e2dfac..2c02ce97e8da 100644
--- a/net-p2p/tremc/tremc-0.9.1.ebuild
+++ b/net-p2p/tremc/tremc-0.9.2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="ncurses"
-inherit bash-completion-r1 python-single-r1
+inherit bash-completion-r1 eutils python-single-r1
 
 DESCRIPTION="Ncurses interface for the Transmission BitTorrent client"
 HOMEPAGE="https://github.com/tremc/tremc"
@@ -14,17 +14,9 @@ SRC_URI="https://github.com/tremc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="geoip"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	')
-"
-
-# This fixes a crash when starting that was committed after 0.9.1
-PATCHES=( "${FILESDIR}/${PV}-fix-startup-crash.patch" )
+RDEPEND="${PYTHON_DEPS}"
 
 # Specify a no-op src_compile so upstream's broken Makefile doesn't get used
 src_compile() {
@@ -39,3 +31,9 @@ src_install() {
 	doman tremc.1
 	dodoc NEWS README.md
 }
+
+pkg_postinst() {
+	optfeature "GeoIP support" dev-python/geoip-python
+	optfeature "Extract ipv4 from ipv6 addresses" dev-python/ipy
+	optfeature "Clipboard support" dev-python/pyperclip
+}