[PR PATCH] Add missing python_version=2 to packages the require it

[ahesford <ahesford@users.noreply.github.com>]

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

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

https://github.com/ahesford/void-packages python
https://github.com/void-linux/void-packages/pull/21328

Add missing python_version=2 to packages the require it
This fixes #21323, where packages use `pycompile_dirs` without declaring `python_version` or installing packages to `/usr/lib/pythonX.Y` to allow automatic detection of the Python version.

Adding the `python_version` (and a few `xlint` fixes) will not change the build outputs, so I have not revbumped these templates and am skipping CI.

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

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

From 8beba755c5a14f3b7aa38b7dcb1a10124e33e513 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:39 -0400
Subject: [PATCH 01/15] bleachbit: add explicit python_version=2

---
 srcpkgs/bleachbit/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template
index a1835beedd8..68646087d87 100644
--- a/srcpkgs/bleachbit/template
+++ b/srcpkgs/bleachbit/template
@@ -14,3 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.bleachbit.org/"
 distfiles="https://github.com/bleachbit/bleachbit/archive/v${version}.tar.gz"
 checksum=c0e25253781d768da4eacf56739bf547dc59f2fe212f44e464f4fcc1bc855e44
+python_version=2

From fad42a786689d3057501ea30de84a9a2ece1cff1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:39 -0400
Subject: [PATCH 02/15] bumblebee-status: add explicit python_version=2

---
 srcpkgs/bumblebee-status/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template
index da3a2429c21..dcd612237b2 100644
--- a/srcpkgs/bumblebee-status/template
+++ b/srcpkgs/bumblebee-status/template
@@ -11,6 +11,7 @@ license="MIT"
 homepage="https://github.com/tobi-wan-kenobi/bumblebee-status"
 distfiles="https://github.com/tobi-wan-kenobi/bumblebee-status/archive/v${version}.tar.gz"
 checksum=ba483f07f5726454aeaf929069bc82dce85be198b969b96c9bd8d85eab5a619c
+python_version=2
 
 do_install() {
 	vmkdir usr/share/${pkgname}

From 4e9364c6cd954c04da34ccdbc59b8f8c74d504d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:39 -0400
Subject: [PATCH 03/15] couchpotato: add explicit python_version=2

---
 srcpkgs/couchpotato/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/couchpotato/template b/srcpkgs/couchpotato/template
index f89f504233a..762c365984c 100644
--- a/srcpkgs/couchpotato/template
+++ b/srcpkgs/couchpotato/template
@@ -14,6 +14,7 @@ license="GPL-3.0-or-later"
 homepage="http://couchpota.to"
 distfiles="https://github.com/RuudBurger/CouchPotatoServer/archive/build/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=f08f9c6ac02f66c6667f17ded1eea4c051a62bbcbadd2a8673394019878e92f7
+python_version=2
 couchpotato_homedir="/var/lib/couchpotato"
 system_accounts="couchpotato"
 

From 55a92d816e8a877ef31cef6a340c548703bf38a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:39 -0400
Subject: [PATCH 04/15] cross-arm-none-eabi-gdb: add explicit python_version=2

---
 srcpkgs/cross-arm-none-eabi-gdb/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template
index 48329e16f2c..636690cc388 100644
--- a/srcpkgs/cross-arm-none-eabi-gdb/template
+++ b/srcpkgs/cross-arm-none-eabi-gdb/template
@@ -31,6 +31,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/${_pkgname}"
 distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
 checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
+python_version=2
 build_options="guile python"
 # don't enable guile and python interfaces until they are moved into
 # platform independent packages

From b509023050f16e3b3f4478a48642dc589f4964fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:39 -0400
Subject: [PATCH 05/15] cycle: add explicit python_version=2

---
 srcpkgs/cycle/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cycle/template b/srcpkgs/cycle/template
index a3d253a0ce8..25a95e8aac3 100644
--- a/srcpkgs/cycle/template
+++ b/srcpkgs/cycle/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/jose1711/cycle"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=6ca5a8191653d435ed04968b91b4a52c8e0d3d90d31d2c008aba1e9edcc1adc9
+python_version=2
 
 do_install() {
 	# Program

From c8ae2483b080a8807289f348fe2e25038f8c04e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 06/15] eog-plugins: add explicit python_version=2

---
 srcpkgs/eog-plugins/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index cf339b8beaa..0920fbd7ebc 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -2,13 +2,12 @@
 pkgname=eog-plugins
 version=3.26.5
 revision=1
-lib32disabled=yes
 build_style=gnu-configure
+pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-pycompile_dirs="usr/lib/eog/plugins"
 depends="eog gsettings-desktop-schemas"
 short_desc="Eye of GNOME plugins"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,3 +15,5 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
+python_version=2
+lib32disabled=yes

From 03f40053dc9fb3c023124d06fc2ba0fd8511be9d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 07/15] gdb: add explicit python_version=2

---
 srcpkgs/gdb/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 883873b8913..d37954e2eea 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -17,6 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737
+python_version=2
 patch_args="-Np1"
 
 if [ "${CROSS_BUILD}" ]; then

From 1c95b8e638ab7cef9527f1ba9e37be9dcdc76198 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 08/15] hugin: add explicit python_version=2

---
 srcpkgs/hugin/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 3c60ab2346c..3a675967286 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -18,6 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://hugin.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=8ba6bdfea246313f142f17f42e066c6888f51b72e4f8814b5e1c84ff56a95a3e
+python_version=2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From b59e9d1ec5987d073f72e55121936a11004379e1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 09/15] menumaker: add explicit python_version=2

---
 srcpkgs/menumaker/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template
index a3f3b123525..cc411e311a3 100644
--- a/srcpkgs/menumaker/template
+++ b/srcpkgs/menumaker/template
@@ -14,6 +14,7 @@ license="BSD-2-Clause"
 homepage="http://menumaker.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=9d831adbaef2101d8b8d82e48d764c2c1a80a38e97dcf90740eb540e6db3f936
+python_version=2
 
 post_install() {
 	vlicense COPYING

From 5d8e9c6be565afa24336189905a9a4e246cce586 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 10/15] nemo: add explicit python_version=2

---
 srcpkgs/nemo/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 090ecd70343..3a23245bbae 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
 checksum=cda3b99c8275c57bb285f8718ef3e463349a8eebe97cc126b0daebffeb242c95
+python_version=2
 
 
 do_check() {

From 27f844df9698ee3a1774aadbce40947f705a204a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 11/15] nitroshare: add explicit python_version=2

---
 srcpkgs/nitroshare/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/nitroshare/template b/srcpkgs/nitroshare/template
index 01bc59c5b14..b2b1f51feea 100644
--- a/srcpkgs/nitroshare/template
+++ b/srcpkgs/nitroshare/template
@@ -16,6 +16,7 @@ license="MIT"
 homepage="http://nitroshare.net"
 distfiles="https://github.com/nitroshare/nitroshare-desktop/archive/${version}.tar.gz"
 checksum=29874e5909c29211a3c9e13f8c0f49b901ec2996e5d60d80af80d2fb80c3d7ec
+python_version=2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From e36f045c650f071fed6aff9d0bbaaf02d791ad81 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 12/15] qytdl: add explicit python_version=2

---
 srcpkgs/qytdl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/qytdl/template b/srcpkgs/qytdl/template
index 86ccd9d98e1..0ce7b6ccc47 100644
--- a/srcpkgs/qytdl/template
+++ b/srcpkgs/qytdl/template
@@ -12,6 +12,7 @@ license="GPL-3"
 homepage="http://www.someplacedumb.net/content/progs/#qytdl"
 distfiles="http://www.someplacedumb.net/content/progs/qytdl/qytdl-${version}.tar.gz"
 checksum=fe811fc7f91aa7c83aa381f754237df5be48e13be803accc08a1cd879aee630c
+python_version=2
 
 do_install() {
 	make PREFIX=${DESTDIR}/usr install

From 7c27a86b3b1eb2cda5b3ec6f43072b786369e778 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 13/15] sabnzbd: add explicit python_version=2

---
 srcpkgs/sabnzbd/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template
index 38bd8db0731..16884d120b9 100644
--- a/srcpkgs/sabnzbd/template
+++ b/srcpkgs/sabnzbd/template
@@ -10,10 +10,11 @@ depends="par2cmdline python-cheetah python-configobj python-feedparser
 short_desc="Open Source Binary Newsreader written in Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-changelog="https://github.com/sabnzbd/sabnzbd/releases"
 homepage="https://sabnzbd.org/"
+changelog="https://github.com/sabnzbd/sabnzbd/releases"
 distfiles="https://github.com/sabnzbd/sabnzbd/releases/download/${version}/SABnzbd-${version}-src.tar.gz"
 checksum=f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c
+python_version=2
 
 post_extract() {
 	rm -rf gntp sabnzbd/utils/{feedparser,configobj}.py

From f0ad11ed14caf61e21e1c9c96a8bb740b2923cc9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 14/15] sickbeard: add explicit python_version=2

---
 srcpkgs/sickbeard/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/sickbeard/template b/srcpkgs/sickbeard/template
index 87978006613..761e254b154 100644
--- a/srcpkgs/sickbeard/template
+++ b/srcpkgs/sickbeard/template
@@ -12,6 +12,7 @@ license="GPL-3"
 homepage="http://sickbeard.com"
 distfiles="https://github.com/midgetspy/Sick-Beard/archive/build-${version}.tar.gz"
 checksum=eaf95ac78e065f6dd8128098158b38674479b721d95d937fe7adb892932e9101
+python_version=2
 
 system_accounts="sickbeard"
 sickbeard_homedir="/var/lib/sickbeard"

From 524c959e58624dd16db739f72d318ce8c6f0295c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Apr 2020 09:47:40 -0400
Subject: [PATCH 15/15] soundconverter: add explicit python_version=2 [ci skip]

---
 srcpkgs/soundconverter/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template
index bf027d541d1..b1e2c0ffe62 100644
--- a/srcpkgs/soundconverter/template
+++ b/srcpkgs/soundconverter/template
@@ -15,6 +15,7 @@ license="GPL-3.0-or-later"
 homepage="http://soundconverter.org/"
 distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
 checksum=21d0b97bd4800a8e07840cf0ec035fa84a71a10c8cdadf5ea671880805aa68cb
+python_version=2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gtk+3-devel gstreamer1-devel"