[PR PATCH] Remove key-mon and python-xlib, create python3-xlib

[PR PATCH] Remove key-mon and python-xlib, create python3-xlib

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1667 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages keymon
https://github.com/void-linux/void-packages/pull/29179

Remove key-mon and python-xlib, create python3-xlib
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@ahesford please check if you agree with the changes.

A patch file from https://github.com/void-linux/void-packages/pull/29179.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-keymon-29179.patch --]
[-- Type: text/x-diff, Size: 6287 bytes --]

From e961192a8dd94b3e181e908cf9bb2b3e1ab7a10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:19:52 -0300
Subject: [PATCH 1/3] key-mon: remove package.

Unmaintained by upstream, python2 and gtk2 only.
---
 srcpkgs/key-mon/template          | 18 ------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 srcpkgs/key-mon/template

diff --git a/srcpkgs/key-mon/template b/srcpkgs/key-mon/template
deleted file mode 100644
index bd412a560fd..00000000000
--- a/srcpkgs/key-mon/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'key-mon'
-pkgname=key-mon
-version=1.17
-revision=5
-build_style=python2-module
-hostmakedepends="python"
-depends="dbus-glib pygtk python-dbus python-xlib"
-short_desc="Utility to show live keyboard and mouse status"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://code.google.com/p/key-mon"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/key-mon-${version}.tar.gz"
-checksum=b8d029b375e7f876d44db6b72ed3e7e6c0372a9e9dc21ea85d9055cc7a033fd2
-
-post_install() {
-	vinstall icons/key-mon.desktop 644 usr/share/applications
-	vinstall icons/key-mon.xpm 644 usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 256e5e69954..bdce95640a4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -161,6 +161,7 @@ replaces="
  kadu<=4.3_6
  keepassx<=0.4.4_2
  keepassx2<=2.0.3_2
+ key-mon<=1.17_5
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4
  libfcitx-qt<=4.2.9.8_1

From 707abd700ef43f6190f08580357b6abe4e6d0a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:44:40 -0300
Subject: [PATCH 2/3] python-xlib: become python3-xlib, update to 0.29.

---
 srcpkgs/python-xlib/template                 | 35 --------------------
 srcpkgs/python3-xlib                         |  1 -
 srcpkgs/python3-xlib/template                | 20 +++++++++++
 srcpkgs/{python-xlib => python3-xlib}/update |  0
 srcpkgs/removed-packages/template            |  1 +
 5 files changed, 21 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-xlib/template
 delete mode 120000 srcpkgs/python3-xlib
 create mode 100644 srcpkgs/python3-xlib/template
 rename srcpkgs/{python-xlib => python3-xlib}/update (100%)

diff --git a/srcpkgs/python-xlib/template b/srcpkgs/python-xlib/template
deleted file mode 100644
index 9a816ae5af1..00000000000
--- a/srcpkgs/python-xlib/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-xlib'
-pkgname=python-xlib
-version=0.29
-revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools_scm"
-depends="python-six"
-checkdepends="python3-pytest python3-six python3-mock
- python-pytest python-six python-mock"
-short_desc="Fully functional X client library for Python2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/python-xlib/python-xlib"
-distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
-checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
-
-pre_build() {
-	sed -i '/setup_requires/d' setup.py
-}
-
-do_check() {
-	# Ignore tests that require an X11 DISPLAY
-	PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
-		python2 -m pytest --ignore test/test_xlib_display.py
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
-		python3 -m pytest --ignore test/test_xlib_display.py
-}
-
-python3-xlib_package() {
-	depends="python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-xlib b/srcpkgs/python3-xlib
deleted file mode 120000
index c2832fd0e80..00000000000
--- a/srcpkgs/python3-xlib
+++ /dev/null
@@ -1 +0,0 @@
-python-xlib
\ No newline at end of file
diff --git a/srcpkgs/python3-xlib/template b/srcpkgs/python3-xlib/template
new file mode 100644
index 00000000000..a2e7dbb476d
--- /dev/null
+++ b/srcpkgs/python3-xlib/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-xlib'
+pkgname=python3-xlib
+version=0.29
+revision=2
+wrksrc=python-xlib-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-six"
+checkdepends="$depends xvfb-run python3-nose python3-mock"
+short_desc="Fully functional X client library for Python3"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/python-xlib/python-xlib"
+distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
+checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
+conflicts="python-xlib>=0"
+
+do_check() {
+	python3 runtests.py
+}
diff --git a/srcpkgs/python-xlib/update b/srcpkgs/python3-xlib/update
similarity index 100%
rename from srcpkgs/python-xlib/update
rename to srcpkgs/python3-xlib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bdce95640a4..ebc540c09ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -211,6 +211,7 @@ replaces="
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
  python-sqlite<=2.8.3_1
+ python-xlib<0.27_3
  python3-Django<=3.0.7_2
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4

From b418326a877d7cfd063a255de86aee64fdf05a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:46:07 -0300
Subject: [PATCH 3/3] removed-packages: revbump for removal of some python
 packages.

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ebc540c09ae..d067c8e2981 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=32
+revision=33
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

Re: [PR PATCH] [Updated] Remove key-mon and python-xlib, create python3-xlib

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages keymon
https://github.com/void-linux/void-packages/pull/29179

Remove key-mon and python-xlib, create python3-xlib
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@ahesford please check if you agree with the changes.

A patch file from https://github.com/void-linux/void-packages/pull/29179.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-keymon-29179.patch --]
[-- Type: text/x-diff, Size: 6288 bytes --]

From e961192a8dd94b3e181e908cf9bb2b3e1ab7a10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:19:52 -0300
Subject: [PATCH 1/3] key-mon: remove package.

Unmaintained by upstream, python2 and gtk2 only.
---
 srcpkgs/key-mon/template          | 18 ------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 srcpkgs/key-mon/template

diff --git a/srcpkgs/key-mon/template b/srcpkgs/key-mon/template
deleted file mode 100644
index bd412a560fd..00000000000
--- a/srcpkgs/key-mon/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'key-mon'
-pkgname=key-mon
-version=1.17
-revision=5
-build_style=python2-module
-hostmakedepends="python"
-depends="dbus-glib pygtk python-dbus python-xlib"
-short_desc="Utility to show live keyboard and mouse status"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://code.google.com/p/key-mon"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/key-mon-${version}.tar.gz"
-checksum=b8d029b375e7f876d44db6b72ed3e7e6c0372a9e9dc21ea85d9055cc7a033fd2
-
-post_install() {
-	vinstall icons/key-mon.desktop 644 usr/share/applications
-	vinstall icons/key-mon.xpm 644 usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 256e5e69954..bdce95640a4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -161,6 +161,7 @@ replaces="
  kadu<=4.3_6
  keepassx<=0.4.4_2
  keepassx2<=2.0.3_2
+ key-mon<=1.17_5
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4
  libfcitx-qt<=4.2.9.8_1

From ba7ab035fe8d2abc34618e56637ad888fa6b197c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:44:40 -0300
Subject: [PATCH 2/3] python-xlib: become python3-xlib, simplify testing

---
 srcpkgs/python-xlib/template                 | 35 --------------------
 srcpkgs/python3-xlib                         |  1 -
 srcpkgs/python3-xlib/template                | 20 +++++++++++
 srcpkgs/{python-xlib => python3-xlib}/update |  0
 srcpkgs/removed-packages/template            |  1 +
 5 files changed, 21 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-xlib/template
 delete mode 120000 srcpkgs/python3-xlib
 create mode 100644 srcpkgs/python3-xlib/template
 rename srcpkgs/{python-xlib => python3-xlib}/update (100%)

diff --git a/srcpkgs/python-xlib/template b/srcpkgs/python-xlib/template
deleted file mode 100644
index 9a816ae5af1..00000000000
--- a/srcpkgs/python-xlib/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-xlib'
-pkgname=python-xlib
-version=0.29
-revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools_scm"
-depends="python-six"
-checkdepends="python3-pytest python3-six python3-mock
- python-pytest python-six python-mock"
-short_desc="Fully functional X client library for Python2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/python-xlib/python-xlib"
-distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
-checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
-
-pre_build() {
-	sed -i '/setup_requires/d' setup.py
-}
-
-do_check() {
-	# Ignore tests that require an X11 DISPLAY
-	PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
-		python2 -m pytest --ignore test/test_xlib_display.py
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
-		python3 -m pytest --ignore test/test_xlib_display.py
-}
-
-python3-xlib_package() {
-	depends="python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-xlib b/srcpkgs/python3-xlib
deleted file mode 120000
index c2832fd0e80..00000000000
--- a/srcpkgs/python3-xlib
+++ /dev/null
@@ -1 +0,0 @@
-python-xlib
\ No newline at end of file
diff --git a/srcpkgs/python3-xlib/template b/srcpkgs/python3-xlib/template
new file mode 100644
index 00000000000..a2e7dbb476d
--- /dev/null
+++ b/srcpkgs/python3-xlib/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-xlib'
+pkgname=python3-xlib
+version=0.29
+revision=2
+wrksrc=python-xlib-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-six"
+checkdepends="$depends xvfb-run python3-nose python3-mock"
+short_desc="Fully functional X client library for Python3"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/python-xlib/python-xlib"
+distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
+checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
+conflicts="python-xlib>=0"
+
+do_check() {
+	python3 runtests.py
+}
diff --git a/srcpkgs/python-xlib/update b/srcpkgs/python3-xlib/update
similarity index 100%
rename from srcpkgs/python-xlib/update
rename to srcpkgs/python3-xlib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bdce95640a4..ebc540c09ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -211,6 +211,7 @@ replaces="
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
  python-sqlite<=2.8.3_1
+ python-xlib<0.27_3
  python3-Django<=3.0.7_2
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4

From 51eaf7ffc99b679fb71680327be2bc9e487c95e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:46:07 -0300
Subject: [PATCH 3/3] removed-packages: revbump for removal of some python
 packages.

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ebc540c09ae..d067c8e2981 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=32
+revision=33
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

Re: Remove key-mon and python-xlib, create python3-xlib

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29179#issuecomment-789144744

Comment:
Thanks for noticing, I had made the commit without pulling latest changes :)

Re: [PR PATCH] [Updated] Remove key-mon and python-xlib, create python3-xlib

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages keymon
https://github.com/void-linux/void-packages/pull/29179

Remove key-mon and python-xlib, create python3-xlib
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@ahesford please check if you agree with the changes.

A patch file from https://github.com/void-linux/void-packages/pull/29179.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-keymon-29179.patch --]
[-- Type: text/x-diff, Size: 6260 bytes --]

From e961192a8dd94b3e181e908cf9bb2b3e1ab7a10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:19:52 -0300
Subject: [PATCH 1/3] key-mon: remove package.

Unmaintained by upstream, python2 and gtk2 only.
---
 srcpkgs/key-mon/template          | 18 ------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 srcpkgs/key-mon/template

diff --git a/srcpkgs/key-mon/template b/srcpkgs/key-mon/template
deleted file mode 100644
index bd412a560fd..00000000000
--- a/srcpkgs/key-mon/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'key-mon'
-pkgname=key-mon
-version=1.17
-revision=5
-build_style=python2-module
-hostmakedepends="python"
-depends="dbus-glib pygtk python-dbus python-xlib"
-short_desc="Utility to show live keyboard and mouse status"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://code.google.com/p/key-mon"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/key-mon-${version}.tar.gz"
-checksum=b8d029b375e7f876d44db6b72ed3e7e6c0372a9e9dc21ea85d9055cc7a033fd2
-
-post_install() {
-	vinstall icons/key-mon.desktop 644 usr/share/applications
-	vinstall icons/key-mon.xpm 644 usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 256e5e69954..bdce95640a4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -161,6 +161,7 @@ replaces="
  kadu<=4.3_6
  keepassx<=0.4.4_2
  keepassx2<=2.0.3_2
+ key-mon<=1.17_5
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4
  libfcitx-qt<=4.2.9.8_1

From 528a32e602bf9415e8eb376a7c0b4e0d784870b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:44:40 -0300
Subject: [PATCH 2/3] python-xlib: become python3-xlib, simplify testing

---
 srcpkgs/python-xlib/template                 | 35 --------------------
 srcpkgs/python3-xlib                         |  1 -
 srcpkgs/python3-xlib/template                | 19 +++++++++++
 srcpkgs/{python-xlib => python3-xlib}/update |  0
 srcpkgs/removed-packages/template            |  1 +
 5 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-xlib/template
 delete mode 120000 srcpkgs/python3-xlib
 create mode 100644 srcpkgs/python3-xlib/template
 rename srcpkgs/{python-xlib => python3-xlib}/update (100%)

diff --git a/srcpkgs/python-xlib/template b/srcpkgs/python-xlib/template
deleted file mode 100644
index 9a816ae5af1..00000000000
--- a/srcpkgs/python-xlib/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-xlib'
-pkgname=python-xlib
-version=0.29
-revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools_scm"
-depends="python-six"
-checkdepends="python3-pytest python3-six python3-mock
- python-pytest python-six python-mock"
-short_desc="Fully functional X client library for Python2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/python-xlib/python-xlib"
-distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
-checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
-
-pre_build() {
-	sed -i '/setup_requires/d' setup.py
-}
-
-do_check() {
-	# Ignore tests that require an X11 DISPLAY
-	PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
-		python2 -m pytest --ignore test/test_xlib_display.py
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
-		python3 -m pytest --ignore test/test_xlib_display.py
-}
-
-python3-xlib_package() {
-	depends="python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-xlib b/srcpkgs/python3-xlib
deleted file mode 120000
index c2832fd0e80..00000000000
--- a/srcpkgs/python3-xlib
+++ /dev/null
@@ -1 +0,0 @@
-python-xlib
\ No newline at end of file
diff --git a/srcpkgs/python3-xlib/template b/srcpkgs/python3-xlib/template
new file mode 100644
index 00000000000..ba653b4786f
--- /dev/null
+++ b/srcpkgs/python3-xlib/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-xlib'
+pkgname=python3-xlib
+version=0.29
+revision=2
+wrksrc=python-xlib-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-six"
+checkdepends="$depends xvfb-run python3-nose python3-mock"
+short_desc="Fully functional X client library for Python3"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/python-xlib/python-xlib"
+distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
+checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
+
+do_check() {
+	python3 runtests.py
+}
diff --git a/srcpkgs/python-xlib/update b/srcpkgs/python3-xlib/update
similarity index 100%
rename from srcpkgs/python-xlib/update
rename to srcpkgs/python3-xlib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bdce95640a4..ebc540c09ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -211,6 +211,7 @@ replaces="
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
  python-sqlite<=2.8.3_1
+ python-xlib<0.27_3
  python3-Django<=3.0.7_2
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4

From 08718a3734b95acd576346466c63de5dc76918fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:46:07 -0300
Subject: [PATCH 3/3] removed-packages: revbump for removal of some python
 packages.

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ebc540c09ae..d067c8e2981 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=32
+revision=33
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

Re: [PR PATCH] [Updated] Remove key-mon and python-xlib, create python3-xlib

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages keymon
https://github.com/void-linux/void-packages/pull/29179

Remove key-mon and python-xlib, create python3-xlib
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@ahesford please check if you agree with the changes.

A patch file from https://github.com/void-linux/void-packages/pull/29179.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-keymon-29179.patch --]
[-- Type: text/x-diff, Size: 6260 bytes --]

From e961192a8dd94b3e181e908cf9bb2b3e1ab7a10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:19:52 -0300
Subject: [PATCH 1/3] key-mon: remove package.

Unmaintained by upstream, python2 and gtk2 only.
---
 srcpkgs/key-mon/template          | 18 ------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 srcpkgs/key-mon/template

diff --git a/srcpkgs/key-mon/template b/srcpkgs/key-mon/template
deleted file mode 100644
index bd412a560fd..00000000000
--- a/srcpkgs/key-mon/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'key-mon'
-pkgname=key-mon
-version=1.17
-revision=5
-build_style=python2-module
-hostmakedepends="python"
-depends="dbus-glib pygtk python-dbus python-xlib"
-short_desc="Utility to show live keyboard and mouse status"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://code.google.com/p/key-mon"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/key-mon-${version}.tar.gz"
-checksum=b8d029b375e7f876d44db6b72ed3e7e6c0372a9e9dc21ea85d9055cc7a033fd2
-
-post_install() {
-	vinstall icons/key-mon.desktop 644 usr/share/applications
-	vinstall icons/key-mon.xpm 644 usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 256e5e69954..bdce95640a4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -161,6 +161,7 @@ replaces="
  kadu<=4.3_6
  keepassx<=0.4.4_2
  keepassx2<=2.0.3_2
+ key-mon<=1.17_5
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4
  libfcitx-qt<=4.2.9.8_1

From d91d82f7043a7a354887583f61e7e34da3224b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:44:40 -0300
Subject: [PATCH 2/3] python-xlib: become python3-xlib, simplify testing

---
 srcpkgs/python-xlib/template                 | 35 --------------------
 srcpkgs/python3-xlib                         |  1 -
 srcpkgs/python3-xlib/template                | 19 +++++++++++
 srcpkgs/{python-xlib => python3-xlib}/update |  0
 srcpkgs/removed-packages/template            |  1 +
 5 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-xlib/template
 delete mode 120000 srcpkgs/python3-xlib
 create mode 100644 srcpkgs/python3-xlib/template
 rename srcpkgs/{python-xlib => python3-xlib}/update (100%)

diff --git a/srcpkgs/python-xlib/template b/srcpkgs/python-xlib/template
deleted file mode 100644
index 9a816ae5af1..00000000000
--- a/srcpkgs/python-xlib/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-xlib'
-pkgname=python-xlib
-version=0.29
-revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools_scm"
-depends="python-six"
-checkdepends="python3-pytest python3-six python3-mock
- python-pytest python-six python-mock"
-short_desc="Fully functional X client library for Python2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/python-xlib/python-xlib"
-distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
-checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
-
-pre_build() {
-	sed -i '/setup_requires/d' setup.py
-}
-
-do_check() {
-	# Ignore tests that require an X11 DISPLAY
-	PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
-		python2 -m pytest --ignore test/test_xlib_display.py
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
-		python3 -m pytest --ignore test/test_xlib_display.py
-}
-
-python3-xlib_package() {
-	depends="python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-xlib b/srcpkgs/python3-xlib
deleted file mode 120000
index c2832fd0e80..00000000000
--- a/srcpkgs/python3-xlib
+++ /dev/null
@@ -1 +0,0 @@
-python-xlib
\ No newline at end of file
diff --git a/srcpkgs/python3-xlib/template b/srcpkgs/python3-xlib/template
new file mode 100644
index 00000000000..ba653b4786f
--- /dev/null
+++ b/srcpkgs/python3-xlib/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-xlib'
+pkgname=python3-xlib
+version=0.29
+revision=2
+wrksrc=python-xlib-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-six"
+checkdepends="$depends xvfb-run python3-nose python3-mock"
+short_desc="Fully functional X client library for Python3"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/python-xlib/python-xlib"
+distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
+checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
+
+do_check() {
+	python3 runtests.py
+}
diff --git a/srcpkgs/python-xlib/update b/srcpkgs/python3-xlib/update
similarity index 100%
rename from srcpkgs/python-xlib/update
rename to srcpkgs/python3-xlib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bdce95640a4..084e0e263e4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -211,6 +211,7 @@ replaces="
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
  python-sqlite<=2.8.3_1
+ python-xlib<0.29_1
  python3-Django<=3.0.7_2
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4

From 3ca0ee9ac8db9fffba852b8c3a63f2decdfcee7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:46:07 -0300
Subject: [PATCH 3/3] removed-packages: revbump for removal of some python
 packages.

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 084e0e263e4..73dde9284a6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=32
+revision=33
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

Re: [PR PATCH] [Merged]: Remove key-mon and python-xlib, create python3-xlib

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1517 bytes --]

There's a merged pull request on the void-packages repository

Remove key-mon and python-xlib, create python3-xlib
https://github.com/void-linux/void-packages/pull/29179

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@ahesford please check if you agree with the changes.