From 6784e984d10be1f9c9e49cf6c0e2c804c09cdab3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 2 Aug 2022 15:14:04 -0400
Subject: [PATCH 1/2] speedometer: update to 2.9.

---
 srcpkgs/speedometer/template | 14 +++++++-------
 srcpkgs/speedometer/update   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/speedometer/update

diff --git a/srcpkgs/speedometer/template b/srcpkgs/speedometer/template
index c0fe822bee940e..2ff31717f10fc3 100644
--- a/srcpkgs/speedometer/template
+++ b/srcpkgs/speedometer/template
@@ -1,16 +1,16 @@
 # Template file for 'speedometer'
 pkgname=speedometer
-version=2.8
-revision=4
-wrksrc="speedometer-release-${version}"
-depends="python-urwid"
+version=2.9
+revision=1
+wrksrc="${pkgname}-release-${version}"
+depends="python3-urwid python3-psutil"
 short_desc="Monitor network traffic or speed/progress of a file transfer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://excess.org/speedometer/"
-distfiles="https://github.com/wardi/speedometer/archive/release-${version}.tar.gz"
-checksum=7aab7c59ee03bbeb719dc494f7c9edd993a6c342aaaa5b47b7029e941d098cc2
-python_version=2
+distfiles="https://github.com/wardi/speedometer/archive/refs/tags/release-${version}.tar.gz"
+checksum=a85aedb81af6dae9ac59cd6079f3f47fbcad0877910d647c41fa2cba5a88a2b0
+python_version=3
 
 do_install() {
 	vbin speedometer.py speedometer
diff --git a/srcpkgs/speedometer/update b/srcpkgs/speedometer/update
new file mode 100644
index 00000000000000..d309484699391d
--- /dev/null
+++ b/srcpkgs/speedometer/update
@@ -0,0 +1 @@
+pkgname=release

From aaa6618ec31dc920da029b71550567efc906a959 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 2 Aug 2022 15:19:32 -0400
Subject: [PATCH 2/2] python-urwid: remove.

---
 srcpkgs/python-urwid/template     | 23 -----------------------
 srcpkgs/python3-urwid             |  1 -
 srcpkgs/python3-urwid/template    | 16 ++++++++++++++++
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/python-urwid/template
 delete mode 120000 srcpkgs/python3-urwid
 create mode 100644 srcpkgs/python3-urwid/template

diff --git a/srcpkgs/python-urwid/template b/srcpkgs/python-urwid/template
deleted file mode 100644
index 98066b21d3d10e..00000000000000
--- a/srcpkgs/python-urwid/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-urwid'
-pkgname=python-urwid
-version=2.1.2
-revision=3
-wrksrc="urwid-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Console user interface library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="http://urwid.org/"
-changelog="https://raw.githubusercontent.com/urwid/urwid/master/docs/changelog.rst"
-distfiles="${PYPI_SITE}/u/urwid/urwid-${version}.tar.gz"
-checksum=588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae
-
-python3-urwid_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-urwid b/srcpkgs/python3-urwid
deleted file mode 120000
index 35d328e4a81d6d..00000000000000
--- a/srcpkgs/python3-urwid
+++ /dev/null
@@ -1 +0,0 @@
-python-urwid
\ No newline at end of file
diff --git a/srcpkgs/python3-urwid/template b/srcpkgs/python3-urwid/template
new file mode 100644
index 00000000000000..a83dbf7ed1cec1
--- /dev/null
+++ b/srcpkgs/python3-urwid/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-urwid'
+pkgname=python3-urwid
+version=2.1.2
+revision=3
+wrksrc="urwid-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Console user interface library for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="http://urwid.org/"
+changelog="https://raw.githubusercontent.com/urwid/urwid/master/docs/changelog.rst"
+distfiles="${PYPI_SITE}/u/urwid/urwid-${version}.tar.gz"
+checksum=588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 881748f7610038..4a325984709b3f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -331,6 +331,7 @@ replaces="
  python-sqlite<=2.8.3_1
  python-unicorn>=0
  python-urllib3<=1.26.6_2
+ python-urwid<=2.1.2_3
  python-xdg<=0.27_2
  python-xlib<=0.29_1
  python3-Django<=3.0.7_2