From f551c9a08cc623ab0ddc0c310f8d435706dda158 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 23 Sep 2023 21:04:09 -0400
Subject: [PATCH] bumblebee-status: update to 2.1.6.

---
 .../patches/manual-location.patch             | 23 +++++++++++++++++++
 .../bumblebee-status/patches/python3.12.patch | 14 +++++++++++
 srcpkgs/bumblebee-status/template             | 19 +++++++--------
 3 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/bumblebee-status/patches/manual-location.patch
 create mode 100644 srcpkgs/bumblebee-status/patches/python3.12.patch

diff --git a/srcpkgs/bumblebee-status/patches/manual-location.patch b/srcpkgs/bumblebee-status/patches/manual-location.patch
new file mode 100644
index 00000000000..6875e81edcd
--- /dev/null
+++ b/srcpkgs/bumblebee-status/patches/manual-location.patch
@@ -0,0 +1,23 @@
+From 7ae95ad6b6f57fae2526e410bac75aa4039c5d93 Mon Sep 17 00:00:00 2001
+From: Ben Westover <kwestover.kw@gmail.com>
+Date: Tue, 20 Sep 2022 23:15:38 -0400
+Subject: [PATCH] Don't install manpages to /usr/usr
+
+`data_files` shouldn't have `usr/` in it; this causes the manpages to be installed to `/usr/usr/share/man/man1` instead of `/usr/share/man/man1`.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index a63be643..a756c8af 100755
+--- a/setup.py
++++ b/setup.py
+@@ -56,7 +56,7 @@ def read_module(filename):
+         ("share/bumblebee-status/themes", glob.glob("themes/*.json")),
+         ("share/bumblebee-status/themes/icons", glob.glob("themes/icons/*.json")),
+         ("share/bumblebee-status/utility", glob.glob("bin/*")),
+-        ("usr/share/man/man1", glob.glob("man/*.1")),
++        ("share/man/man1", glob.glob("man/*.1")),
+     ],
+     packages=find_packages(exclude=["tests", "tests.*"])
+ )
diff --git a/srcpkgs/bumblebee-status/patches/python3.12.patch b/srcpkgs/bumblebee-status/patches/python3.12.patch
new file mode 100644
index 00000000000..5e9025a5d6f
--- /dev/null
+++ b/srcpkgs/bumblebee-status/patches/python3.12.patch
@@ -0,0 +1,14 @@
+--- ./versioneer.py.orig	2023-09-29 10:02:24.403985079 -0400
++++ ./versioneer.py	2023-09-29 10:02:36.679060444 -0400
+@@ -339,9 +339,9 @@
+     # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
+     # the top of versioneer.py for instructions on writing your setup.cfg .
+     setup_cfg = os.path.join(root, "setup.cfg")
+-    parser = configparser.SafeConfigParser()
++    parser = configparser.ConfigParser()
+     with open(setup_cfg, "r") as f:
+-        parser.readfp(f)
++        parser.read_file(f)
+     VCS = parser.get("versioneer", "VCS")  # mandatory
+ 
+     def get(parser, name):
diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template
index 2f7bfa487c1..ea126cb4331 100644
--- a/srcpkgs/bumblebee-status/template
+++ b/srcpkgs/bumblebee-status/template
@@ -1,20 +1,18 @@
 # Template file for 'bumblebee-status'
 pkgname=bumblebee-status
-version=2.1.4
-revision=3
+version=2.1.6
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-psutil python3-requests"
-checkdepends="python3-pytest python3-pytest-mock python3-freezegun $depends"
+checkdepends="python3-pytest-xdist python3-pytest-mock python3-freezegun
+ psmisc $depends"
 short_desc="Modular, theme-able status line generator for the i3 window manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tobi-wan-kenobi/bumblebee-status"
-distfiles="$PYPI_SITE/b/bumblebee-status/bumblebee-status-$version.tar.gz
- https://raw.githubusercontent.com/tobi-wan-kenobi/bumblebee-status/v$version/LICENSE"
-checksum="8dcd8ae54b1d66a2b337c1197014dcd32d83134d4699a0cae028bd5da777fa71
- 7cf86a994584e9e1bfe64c63f4e4b9d9bf757148d7ee2af960a267e79b16eab3"
-skip_extraction=LICENSE
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=db71030058ea2041d9e441b5615975893635801194974cc03e1c6271f5b356d9
 
 do_check() {
 	# fail on musl due to lack of locales
@@ -30,7 +28,6 @@ post_patch() {
 }
 
 post_install() {
-	rm -rf $DESTDIR/$py3_sitelib/tests
-	rm -f $DESTDIR/usr/share/bumblebee-status/utility/pacman-updates
-	vlicense $XBPS_SRCDISTDIR/bumblebee-status-$version/LICENSE
+	rm $DESTDIR/usr/share/bumblebee-status/utility/pacman-updates
+	vlicense LICENSE
 }