[PR PATCH] Onmibus linting pass for SPDX warnings

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] Onmibus linting pass for SPDX warnings - most packages starting with G
@ 2021-04-13 20:05 heliocat
  2021-04-14 19:22 ` [PR PATCH] [Updated] " heliocat
  2021-04-14 19:44 ` [PR PATCH] [Merged]: " Piraty
  0 siblings, 2 replies; 3+ messages in thread
From: heliocat @ 2021-04-13 20:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/heliocat/void-packages lint_g
https://github.com/void-linux/void-packages/pull/30218

Onmibus linting pass for SPDX warnings - most packages starting with G
<!-- 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
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



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

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

From 9ee6a3c4fac5dc1f4db9cb27de181ca8883ab722 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:49:43 -0700
Subject: [PATCH 01/28] geis: fix license

---
 srcpkgs/geis/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template
index e31cd8bc785c..ddad320d93a7 100644
--- a/srcpkgs/geis/template
+++ b/srcpkgs/geis/template
@@ -1,15 +1,15 @@
 # Template file for 'geis'
 pkgname=geis
 version=2.2.17
-revision=7
-hostmakedepends="pkg-config python3-devel"
-makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
+revision=8
 build_style="gnu-configure"
 configure_args="--disable-static"
+hostmakedepends="pkg-config python3-devel"
+makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
+short_desc="Gesture Engine Interface and Support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://launchpad.net/geis"
-short_desc="Gesture Engine Interface and Support"
 distfiles="https://launchpad.net/geis/trunk/$version/+download/geis-$version.tar.xz"
 checksum=8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb
 
@@ -27,7 +27,6 @@ geis-devel_package() {
 	}
 }
 geis-python3_package() {
-	pycompile_module="geis geisview"
 	short_desc+=" - Python3 bindings"
 	pkg_install() {
 		vmove usr/bin/pygeis

From 1830582147ef3c25d9ba79ef5226716323b82f00 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:51:50 -0700
Subject: [PATCH 02/28] genext2fs: fix license

---
 srcpkgs/genext2fs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/genext2fs/template b/srcpkgs/genext2fs/template
index 987cfaaa272e..284df8428720 100644
--- a/srcpkgs/genext2fs/template
+++ b/srcpkgs/genext2fs/template
@@ -1,12 +1,12 @@
 # Template file for 'genext2fs'
 pkgname=genext2fs
 version=1.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_have_working_snprintf=yes ac_cv_have_working_vsnprintf=yes"
 short_desc="Generates an ext2 filesystem as a normal (i.e. non-root) user"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://genext2fs.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc

From 8d9bcd497b583627579da305b3fbac87f0e45fc3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:58:47 -0700
Subject: [PATCH 03/28] geoip: fix license

---
 srcpkgs/geoip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template
index 2c08ba395a7d..dcdf58971869 100644
--- a/srcpkgs/geoip/template
+++ b/srcpkgs/geoip/template
@@ -1,7 +1,7 @@
 # Template file for 'geoip'
 pkgname=geoip
 version=1.6.12
-revision=2
+revision=3
 wrksrc="GeoIP-${version}"
 build_style=gnu-configure
 configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip"
@@ -9,8 +9,8 @@ hostmakedepends="automake libtool"
 makedepends="zlib-devel"
 short_desc="Non-DNS IP-to-country resolver C library and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://www.maxmind.com/app/c"
-license="GPL-2"
 distfiles="https://github.com/maxmind/geoip-api-c/releases/download/v$version/GeoIP-$version.tar.gz"
 checksum=1dfb748003c5e4b7fd56ba8c4cd786633d5d6f409547584f6910398389636f80
 

From cc4e48681397086933b1f159ca5910e3eb877886 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:01:47 -0700
Subject: [PATCH 04/28] gforth: fix license

---
 srcpkgs/gforth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gforth/template b/srcpkgs/gforth/template
index 71117b69f470..f0df03991086 100644
--- a/srcpkgs/gforth/template
+++ b/srcpkgs/gforth/template
@@ -1,17 +1,17 @@
 # Template file for 'gforth'
 pkgname=gforth
 version=0.7.3
-revision=2
+revision=3
 build_style=gnu-configure
-disable_parallel_build=yes
 hostmakedepends="m4"
 makedepends="libffi-devel"
 short_desc="GNU Forth, a fast and portable implementation of ANS Forth"
 maintainer="ZweiSpeedruns <zcm727@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gforth/"
 distfiles="${GNU_SITE}/gforth/gforth-${version}.tar.gz"
 checksum=2f62f2233bf022c23d01c920b1556aa13eab168e3236b13352ac5e9f18542bb0
+disable_parallel_build=yes
 
 nocross="Configure script is picky: https://api.travis-ci.org/jobs/158049419/log.txt?deansi=true"
 case "${XBPS_TARGET_MACHINE}" in

From 6c03ca6785fb0baa89884770f291792206a195e4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:05:16 -0700
Subject: [PATCH 05/28] gftp: fix license

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 2ce0a9e872f4..0820b29da2d3 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,13 +1,13 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.gftp.org"
 distfiles="https://sources.voidlinux.org/gftp-${version}/gftp-${version}.tar.bz2"
 checksum=5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd

From a15841b295ea97eb69156f352617ebfd820feea3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:21:27 -0700
Subject: [PATCH 06/28] git-crypt: fix license

---
 srcpkgs/git-crypt/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 0f81c8dc313c..f5c4c79b664d 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,16 +1,16 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=7
+revision=8
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="openssl-devel"
-hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"
+hostmakedepends="libxslt docbook-xsl"
+makedepends="openssl-devel"
 short_desc="Transparent file encryption in git"
 maintainer="Andy Cobaugh <andrewcobaugh@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.agwa.name/projects/git-crypt/"
 distfiles="https://github.com/AGWA/git-crypt/archive/${version}.tar.gz"
 checksum=777c0c7aadbbc758b69aff1339ca61697011ef7b92f1d1ee9518a8ee7702bb78
@@ -21,6 +21,4 @@ post_install() {
 	vdoc NEWS
 	vdoc doc/multiple_keys.md
 	vman man/man1/git-crypt.1
-	vlicense COPYING
 }
-

From 520b3b1d75f2babec7ad5a2947048b1a89c8a76a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:21:37 -0700
Subject: [PATCH 07/28] glpk: fix license

---
 srcpkgs/glpk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glpk/template b/srcpkgs/glpk/template
index b98f24f344a7..6724c10e5dd0 100644
--- a/srcpkgs/glpk/template
+++ b/srcpkgs/glpk/template
@@ -1,13 +1,13 @@
 # Template file for 'glpk'
 pkgname=glpk
 version=5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-gmp"
 makedepends="gmp-devel"
 short_desc="GNU Linear Programming Kit to solve LP, MIP and other problems"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/glpk/glpk.html"
 distfiles="${GNU_SITE}/glpk/${pkgname}-${version}.tar.gz"
 checksum=4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15

From b223d52c866d659d67f73b18e6831c0f38729613 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:27:27 -0700
Subject: [PATCH 08/28] glu: fix license

---
 srcpkgs/glu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glu/template b/srcpkgs/glu/template
index f6f079e03b5e..b655d49fe569 100644
--- a/srcpkgs/glu/template
+++ b/srcpkgs/glu/template
@@ -1,14 +1,14 @@
 # Template file for 'glu'
 pkgname=glu
 version=9.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel"
 short_desc="Mesa OpenGL utility library (GLU)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="SGI-B-2.0"
 homepage="http://cgit.freedesktop.org/mesa/glu/"
 distfiles="https://mesa.freedesktop.org/archive/glu/glu-${version}.tar.gz"
 checksum=f6f484cfcd51e489afe88031afdea1e173aa652697e4c19ddbcb8260579a10f7

From abd48b3dad6d5d7d5a4b656451dc9c461c38bdf7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:32:51 -0700
Subject: [PATCH 09/28] glyr: fix license

---
 srcpkgs/glyr/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/glyr/template b/srcpkgs/glyr/template
index eb59ece2e9cc..30dbe4e87f8e 100644
--- a/srcpkgs/glyr/template
+++ b/srcpkgs/glyr/template
@@ -1,20 +1,20 @@
 # Template file for 'glyr'
 pkgname=glyr
-version="1.0.10"
-revision=1
+version=1.0.10
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel glib-devel sqlite-devel"
-short_desc="A music metadata searchengine utility and library"
+short_desc="Music metadata searchengine utility and library"
 maintainer="Michal Koutenský <koutak.m@gmail.com>"
-license="LGPL-3"
+license="LGPL-3.0-or-later"
 homepage="https://github.com/sahib/glyr"
 distfiles="https://github.com/sahib/glyr/archive/${version}.tar.gz"
 checksum=77e8da60221c8d27612e4a36482069f26f8ed74a1b2768ebc373c8144ca806e8
 
 glyr-devel_package() {
 	depends="glyr>=${version}_${revision}"
-	short_desc="A music metadata searchengine utility and library - development files"
+	short_desc="Music metadata searchengine utility and library - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From 64281ba581ba0da2891edb918926f6b05bffad1b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:42:18 -0700
Subject: [PATCH 10/28] gmtp: fix license

---
 srcpkgs/gmtp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gmtp/template b/srcpkgs/gmtp/template
index 69de28c2c3d4..55516a916605 100644
--- a/srcpkgs/gmtp/template
+++ b/srcpkgs/gmtp/template
@@ -1,14 +1,14 @@
 # Template file for 'gmtp'
 pkgname=gmtp
 version=1.3.11
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config glib-devel"
 makedepends="libmtp-devel libflac-devel libid3tag-devel libvorbis-devel gtk+3-devel"
 depends="desktop-file-utils"
-short_desc="A simple MP3 player client for MTP based devices"
+short_desc="Simple MP3 player client for MTP based devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://gmtp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/gmtp/gmtp-${version}.tar.gz"
 checksum=5a830c9c448aa2caf7a844aaa9ba38c2ac0239547366c1e6874e0080bd5f0613

From cd8f8c5fb61e3ab664ea55772341f81f96f0dfba Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:43:46 -0700
Subject: [PATCH 11/28] gnome-epub-thumbnailer: fix license

---
 srcpkgs/gnome-epub-thumbnailer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-epub-thumbnailer/template b/srcpkgs/gnome-epub-thumbnailer/template
index c6e1c02b9d30..a9fae3dc6804 100644
--- a/srcpkgs/gnome-epub-thumbnailer/template
+++ b/srcpkgs/gnome-epub-thumbnailer/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-epub-thumbnailer'
 pkgname=gnome-epub-thumbnailer
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gdk-pixbuf-devel libarchive-devel libxml2-devel"
 short_desc="Thumbnailer for EPub and MOBI books"
 maintainer="Alif Rachmawadi <arch@subosito.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://git.gnome.org/browse/gnome-epub-thumbnailer"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
 checksum=b502420d9b02ea0b0fc7986ef5a091a12b2286be14fed9e47594fe9fa0c5898e

From 5ba360b05f2bb3aad84aa8d324c0adf11fb42242 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 00:56:39 -0700
Subject: [PATCH 12/28] gnugo: fix license

---
 srcpkgs/gnugo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnugo/template b/srcpkgs/gnugo/template
index 81c21903ea86..30b4f91184bc 100644
--- a/srcpkgs/gnugo/template
+++ b/srcpkgs/gnugo/template
@@ -1,14 +1,14 @@
 # Template file for 'gnugo'
 pkgname=gnugo
 version=3.8
-revision=1
-nocross=yes
+revision=2
 build_style=gnu-configure
 short_desc="Free program that plays the game Go"
 maintainer="Brandon Wilson <x@wilsonb.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gnugo/"
 distfiles="${GNU_SITE}/gnugo/${pkgname}-${version}.tar.gz"
 checksum=da68d7a65f44dcf6ce6e4e630b6f6dd9897249d34425920bfdd4e07ff1866a72
+nocross=yes
 
 CFLAGS="-fcommon"

From c60151f8f587d468251aba89cc2a63e4eaaeaaf3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 00:59:56 -0700
Subject: [PATCH 13/28] gnupod: fix license

---
 srcpkgs/gnupod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnupod/template b/srcpkgs/gnupod/template
index 91b093221354..09c35988a9d8 100644
--- a/srcpkgs/gnupod/template
+++ b/srcpkgs/gnupod/template
@@ -1,14 +1,14 @@
 # Template file for 'gnupod'
 pkgname=gnupod
 version=0.99.8
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="perl-Digest-SHA1 perl-XML-Parser perl-Unicode-String perl-MP3-Info perl-TimeDate"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Command line tools for managing data on iPods"
 maintainer="Evan Deaubl <evan@deaubl.name>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/gnupod/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tgz"
 checksum=bd566295a2e14352e6d05f5c816cab36b0e80d3ab36d29c4bbb45c581d3f3c31

From bba3370852d12000151f6e3d5d4959ab3968a642 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:45:54 -0700
Subject: [PATCH 14/28] gnurobbo: fix license, use vsed

---
 srcpkgs/gnurobbo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnurobbo/template b/srcpkgs/gnurobbo/template
index 49d4b52577f2..d8225df323d2 100644
--- a/srcpkgs/gnurobbo/template
+++ b/srcpkgs/gnurobbo/template
@@ -1,14 +1,14 @@
 # Template file for 'gnurobbo'
 pkgname=gnurobbo
 version=0.68
-revision=3
+revision=4
 build_wrksrc=gnurobbo
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Reimplementation of Janusz Pelc's Robbo for Atari XE/XL"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://gnurobbo.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gnurobbo/gnurobbo/gnurobbo%20${version}/gnurobbo-${version}-source.tar.gz"
 checksum=6c7e9e425655da02c2442d13b5fa8f542af62d2c8f253db2fb63470c5c0c3db8
@@ -16,7 +16,7 @@ checksum=6c7e9e425655da02c2442d13b5fa8f542af62d2c8f253db2fb63470c5c0c3db8
 CFLAGS="-fcommon"
 
 pre_build() {
-	sed -i Makefile \
+	vsed -i Makefile \
 		-e "s;\(CFLAGS\?+=\)-d;\1;" \
 		-e "s;CFLAGS+\?=;\0 ${CFLAGS} ;" \
 		-e "s;LDFLAGS+\?=;\0 ${LDFLAGS} ;" \

From bf6285f0cd70f0de27803bf3f3e27428e62a69a9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:48:32 -0700
Subject: [PATCH 15/28] gopm: fix license, fix homepage

---
 srcpkgs/gopm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index cf9e8258395d..ae3a0d2ca491 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,14 +1,14 @@
-# Template build file for 'gopm'
+# Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=14
+revision=15
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 wrksrc="${pkgname}-${_commit}"
 build_style=go
 go_import_path="github.com/gpmgo/gopm"
 short_desc="Go Package Manager"
 maintainer="John Regan <john@jrjrtech.com>"
-license="Apache"
-homepage="http://gopm.io/"
+license="Apache-2.0"
+homepage="https://github.com/gpmgo/gopm"
 distfiles="https://github.com/gpmgo/gopm/archive/${_commit}.tar.gz"
 checksum="67fd6c8940eab9adca178f880d217095ef54db8c608b0d000144d9ba7880c3f8"

From c944383d4b658b7ce7617f21fb3a9a24b2f5e4ae Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:56:11 -0700
Subject: [PATCH 16/28] gosh: fix license

---
 srcpkgs/gosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template
index 34388757f28e..dc364cfba67a 100644
--- a/srcpkgs/gosh/template
+++ b/srcpkgs/gosh/template
@@ -1,12 +1,12 @@
 # Template file for 'gosh'
 pkgname=gosh
 version=0.2.3
-revision=12
+revision=13
 build_style=go
 go_import_path="github.com/mkouhei/gosh"
 short_desc="Interactive shell for Golang"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/mkouhei/gosh"
 distfiles="https://github.com/mkouhei/gosh/archive/v${version}.tar.gz"
 checksum=0b601b467a57d809134a13c8e52c4986eb328931a4db3c237630cdcd9891a707

From 7e4423734b97b7ee846c1eefd2afe7b523f7720c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:56:16 -0700
Subject: [PATCH 17/28] govendor: fix license

---
 srcpkgs/govendor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/govendor/template b/srcpkgs/govendor/template
index 76b83b36abb7..e18a8fb0d11c 100644
--- a/srcpkgs/govendor/template
+++ b/srcpkgs/govendor/template
@@ -1,12 +1,12 @@
 # Template file for 'govendor'
 pkgname=govendor
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kardianos/govendor"
 short_desc="Go vendor tool that works with the standard vendor file"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://github.com/kardianos/govendor"
 distfiles="https://github.com/kardianos/govendor/archive/v${version}.tar.gz"
 checksum=d303abf194838792234a1451c3a1e87885d1b2cd21774867b592c1f7db00551e

From c718aef9dfaf83559099a6c7969ff86b9555b324 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:57:58 -0700
Subject: [PATCH 18/28] gperf: fix license

---
 srcpkgs/gperf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gperf/template b/srcpkgs/gperf/template
index 4fb373ec885b..023fe89d6c56 100644
--- a/srcpkgs/gperf/template
+++ b/srcpkgs/gperf/template
@@ -1,11 +1,11 @@
 # Template file for 'gperf'
 pkgname=gperf
 version=3.1
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Perfect hash function generator"
-homepage="https://www.gnu.org/software/gperf/"
-license="GPL-3"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/gperf/"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2

From 063b54cde3b5668bd842320d967e45026254e92c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 09:00:53 -0700
Subject: [PATCH 19/28] gpm: fix license

---
 srcpkgs/gpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gpm/template b/srcpkgs/gpm/template
index d95a6c1a6377..360f58668c53 100644
--- a/srcpkgs/gpm/template
+++ b/srcpkgs/gpm/template
@@ -1,13 +1,13 @@
 # Template file for 'gpm'
 pkgname=gpm
 version=1.20.7
-revision=9
+revision=10
 build_style=gnu-configure
 hostmakedepends="automake libtool flex texinfo"
 makedepends="ncurses-devel libfl-devel"
 short_desc="Mouse server for the console and xterm"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.nico.schottelius.org/software/gpm/"
 distfiles="http://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.lzma"
 checksum=a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c

From 0505f2e5588413ce2e430a1475d8ec1ce73634f8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 09:42:09 -0700
Subject: [PATCH 20/28] grail: fix license, other lint

---
 srcpkgs/grail/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/grail/template b/srcpkgs/grail/template
index 7d4a374512b3..3f4382a7f3f4 100644
--- a/srcpkgs/grail/template
+++ b/srcpkgs/grail/template
@@ -1,17 +1,17 @@
-# Template build file for 'grail'
+# Template file for 'grail'
 pkgname=grail
 version=3.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-x11"
+hostmakedepends="pkg-config"
+makedepends="frame-devel libXfixes-devel libXi-devel"
 short_desc="Gesture Recognition And Instantiation Library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3"
+license="LGPL-3.0-only"
 homepage="https://launchpad.net/grail"
 distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.bz2"
 checksum=5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3
-hostmakedepends="pkg-config"
-makedepends="frame-devel libXfixes-devel libXi-devel"
-configure_args="--with-x11"
 
 grail-devel_package() {
 	depends="grail>=${version}_${revision}"

From 4b955bb5c4bf25a6b2288c2d352a4f59e0d5762b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:11:23 -0700
Subject: [PATCH 21/28] gsimplecal-gtk2: fix license, other lint

---
 srcpkgs/gsimplecal-gtk2/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gsimplecal-gtk2/template b/srcpkgs/gsimplecal-gtk2/template
index 4712e1d854d3..73cf3bd39b88 100644
--- a/srcpkgs/gsimplecal-gtk2/template
+++ b/srcpkgs/gsimplecal-gtk2/template
@@ -1,20 +1,21 @@
 # Template file for 'gsimplecal-gtk2'
 pkgname=gsimplecal-gtk2
 version=2.1
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--enable-gtk2"
-makedepends="gtk+-devel"
 hostmakedepends="automake pkg-config"
-replaces="gsimplecal-gtk3>=0"
+makedepends="gtk+-devel"
 short_desc="Simple and lightweight GTK calendar"
 maintainer="Jarbowski <jarbowski@gmail.com>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://dmedvinsky.github.io/gsimplecal/"
 distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
 checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
 
+replaces="gsimplecal-gtk3>=0"
+
 pre_configure() {
 	./autogen.sh
 }

From 178c78eb155f13fa50a4aab6791ee8aaaa1baa11 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:21:46 -0700
Subject: [PATCH 22/28] gsl-ucg: fix license

---
 srcpkgs/gsl-ucg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsl-ucg/template b/srcpkgs/gsl-ucg/template
index 840a2be23e02..5ae1d27e5f8f 100644
--- a/srcpkgs/gsl-ucg/template
+++ b/srcpkgs/gsl-ucg/template
@@ -1,14 +1,14 @@
 # Template file for 'gsl-ucg'
 pkgname=gsl-ucg
 version=4.1.5
-revision=1
+revision=2
 wrksrc="gsl-${version}"
 build_wrksrc="src"
 build_style=gnu-makefile
 makedepends="pcre-devel"
 short_desc="Generator Scripting Language - Universal Code Generator"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/zeromq/gsl"
 distfiles="https://github.com/zeromq/gsl/archive/v${version}.tar.gz"
 checksum=c1c3d61a1d89b65d0d1161c803bcdd6364045cc20d7e0c1f67f0955cd9b326b0

From 799888db61aa50c2b097e5f80cbd690a03d8052d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:44:15 -0700
Subject: [PATCH 23/28] gsimplecal-gtk3: fix license, other lint

---
 srcpkgs/gsimplecal-gtk3/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template
index 57b595e0f4f5..52acc624d51c 100644
--- a/srcpkgs/gsimplecal-gtk3/template
+++ b/srcpkgs/gsimplecal-gtk3/template
@@ -1,19 +1,20 @@
 # Template file for 'gsimplecal-gtk3'
 pkgname=gsimplecal-gtk3
 version=2.1
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
-makedepends="gtk+3-devel"
 hostmakedepends="automake pkg-config"
-replaces="gsimplecal-gtk2>=0"
+makedepends="gtk+3-devel"
 short_desc="Simple and lightweight GTK calendar"
 maintainer="Jarbowski <jarbowski@gmail.com>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://dmedvinsky.github.io/gsimplecal/"
 distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
 checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
 
+replaces="gsimplecal-gtk2>=0"
+
 pre_configure() {
 	./autogen.sh
 }

From 779d90b86bbdca2236f8c12563af9549eaa61e23 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 11:04:55 -0700
Subject: [PATCH 24/28] gsmartcontrol: fix license

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

diff --git a/srcpkgs/gsmartcontrol/template b/srcpkgs/gsmartcontrol/template
index ac519e56c3cd..8685857898e6 100644
--- a/srcpkgs/gsmartcontrol/template
+++ b/srcpkgs/gsmartcontrol/template
@@ -8,7 +8,7 @@ makedepends="gtkmm-devel pcre-devel desktop-file-utils"
 depends="smartmontools hicolor-icon-theme"
 short_desc="GUI to smartmontools"
 maintainer="yopito <pierre.bourgin@free.fr>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://gsmartcontrol.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=b64f62cffa4430a90b6d06cd52ebadd5bcf39d548df581e67dfb275a673b12a9

From 1f3a813989bec524ae03c46674801fcfb167a279 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 11:20:58 -0700
Subject: [PATCH 25/28] gst123: fix license, other lint

---
 srcpkgs/gst123/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst123/template b/srcpkgs/gst123/template
index 95cf767befd2..f3a2d41316b2 100644
--- a/srcpkgs/gst123/template
+++ b/srcpkgs/gst123/template
@@ -1,15 +1,15 @@
 # Template file for 'gst123'
 pkgname=gst123
 version=0.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="ncurses-devel gtk+-devel libxml2-devel gst-plugins-base1-devel gst-plugins-good1"
 depends="gst-plugins-good1"
 short_desc="GStreamer based CLI player"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://space.twc.de/~stefan/gst123.php/"
-license="LGPL-2.1"
 distfiles="http://space.twc.de/~stefan/gst123/gst123-$version.tar.bz2"
 checksum=c7b4729773f66cc679e94df76bcc6a95a2222192730f906e527e72624f084a7d
 

From 754f7024620b940cdd45d7bf563e44ed57ee1c28 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:04:05 -0700
Subject: [PATCH 26/28] gtk-theme-config: fix license, vsed

---
 srcpkgs/gtk-theme-config/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk-theme-config/template b/srcpkgs/gtk-theme-config/template
index bb927821042f..6dd97132c14c 100644
--- a/srcpkgs/gtk-theme-config/template
+++ b/srcpkgs/gtk-theme-config/template
@@ -2,14 +2,14 @@
 pkgname=gtk-theme-config
 reverts=20140605_1
 version=1.0
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config vala-devel"
 makedepends="glib-devel vala-devel gtk+3-devel hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Utility to set GTK Theme Preferences"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://github.com/satya164/gtk-theme-config"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=174aac3ea43966168d120dbd9e0f23d7900d095ee1b0cf32472d59b0fdea8448
@@ -26,5 +26,5 @@ pre_build() {
 		_ldflags="${_ldflags} -X $_p"
 	done
 	# Add to VALACFLAGS
-	sed -i Makefile -e "s;^VALACFLAGS.*;& $_cflags $_ldflags;"
+	vsed -i Makefile -e "s;^VALACFLAGS.*;& $_cflags $_ldflags;"
 }

From 504b9296d1b2800f198472e1ccb17684a0d20443 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:06:21 -0700
Subject: [PATCH 27/28] gtypist: fix license, other lint

---
 srcpkgs/gtypist/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtypist/template b/srcpkgs/gtypist/template
index 723bc1664465..d4bf9dc41846 100644
--- a/srcpkgs/gtypist/template
+++ b/srcpkgs/gtypist/template
@@ -1,15 +1,16 @@
+# Template file for 'gtypist'
 pkgname=gtypist
 version=2.9.5
-revision=1
-short_desc="A universal typing tutor"
+revision=2
+build_style=gnu-configure
+hostmakedepends="automake"
+makedepends="ncurses-devel"
+short_desc="Universal typing tutor"
 maintainer="Phileas Vöcking <paspartout@fogglabs.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gtypist/"
 distfiles="$GNU_SITE/gtypist/gtypist-${version}.tar.xz"
 checksum="c13af40b12479f8219ffa6c66020618c0ce305ad305590fde02d2c20eb9cf977"
-build_style=gnu-configure
-makedepends="ncurses-devel"
-hostmakedepends="automake"
 
 pre_configure() {
 	autoreconf

From 0a5c1c6c8f37258abbb05247c19c8cd78c42d549 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:48:01 -0700
Subject: [PATCH 28/28] gv: fix license, other lint

---
 srcpkgs/gv/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gv/template b/srcpkgs/gv/template
index e15cfeb71f7b..60d34b5f472b 100644
--- a/srcpkgs/gv/template
+++ b/srcpkgs/gv/template
@@ -1,12 +1,8 @@
 # Template file for 'gv'
 pkgname=gv
 version=3.7.4
-revision=4
+revision=5
 build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.gnu.org/software/gv/"
-license="GPL-2"
-short_desc="Postscript and PDF viewer"
 configure_args=" --with-x --enable-backing-pixmap
  --enable-international --with-default-papersize=a4"
 hostmakedepends="pkg-config xorgproto"
@@ -14,6 +10,10 @@ makedepends="libX11-devel libXmu-devel libXpm-devel libXext-devel
  libXt-devel libICE-devel libXaw3d-devel zlib-devel bzip2-devel
  libXinerama-devel ghostscript"
 depends="ghostscript"
+short_desc="Postscript and PDF viewer"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="http://www.gnu.org/software/gv/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum="2162b3b3a95481d3855b3c4e28f974617eef67824523e56e20b56f12fe201a61"
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] Onmibus linting pass for SPDX warnings - most packages starting with G
  2021-04-13 20:05 [PR PATCH] Onmibus linting pass for SPDX warnings - most packages starting with G heliocat
@ 2021-04-14 19:22 ` heliocat
  2021-04-14 19:44 ` [PR PATCH] [Merged]: " Piraty
  1 sibling, 0 replies; 3+ messages in thread
From: heliocat @ 2021-04-14 19:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/heliocat/void-packages lint_g
https://github.com/void-linux/void-packages/pull/30218

Onmibus linting pass for SPDX warnings - most packages starting with G
<!-- 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
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



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

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

From 9ee6a3c4fac5dc1f4db9cb27de181ca8883ab722 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:49:43 -0700
Subject: [PATCH 01/28] geis: fix license

---
 srcpkgs/geis/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template
index e31cd8bc785c..ddad320d93a7 100644
--- a/srcpkgs/geis/template
+++ b/srcpkgs/geis/template
@@ -1,15 +1,15 @@
 # Template file for 'geis'
 pkgname=geis
 version=2.2.17
-revision=7
-hostmakedepends="pkg-config python3-devel"
-makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
+revision=8
 build_style="gnu-configure"
 configure_args="--disable-static"
+hostmakedepends="pkg-config python3-devel"
+makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
+short_desc="Gesture Engine Interface and Support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://launchpad.net/geis"
-short_desc="Gesture Engine Interface and Support"
 distfiles="https://launchpad.net/geis/trunk/$version/+download/geis-$version.tar.xz"
 checksum=8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb
 
@@ -27,7 +27,6 @@ geis-devel_package() {
 	}
 }
 geis-python3_package() {
-	pycompile_module="geis geisview"
 	short_desc+=" - Python3 bindings"
 	pkg_install() {
 		vmove usr/bin/pygeis

From 1830582147ef3c25d9ba79ef5226716323b82f00 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:51:50 -0700
Subject: [PATCH 02/28] genext2fs: fix license

---
 srcpkgs/genext2fs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/genext2fs/template b/srcpkgs/genext2fs/template
index 987cfaaa272e..284df8428720 100644
--- a/srcpkgs/genext2fs/template
+++ b/srcpkgs/genext2fs/template
@@ -1,12 +1,12 @@
 # Template file for 'genext2fs'
 pkgname=genext2fs
 version=1.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_have_working_snprintf=yes ac_cv_have_working_vsnprintf=yes"
 short_desc="Generates an ext2 filesystem as a normal (i.e. non-root) user"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://genext2fs.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc

From 8d9bcd497b583627579da305b3fbac87f0e45fc3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:58:47 -0700
Subject: [PATCH 03/28] geoip: fix license

---
 srcpkgs/geoip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template
index 2c08ba395a7d..dcdf58971869 100644
--- a/srcpkgs/geoip/template
+++ b/srcpkgs/geoip/template
@@ -1,7 +1,7 @@
 # Template file for 'geoip'
 pkgname=geoip
 version=1.6.12
-revision=2
+revision=3
 wrksrc="GeoIP-${version}"
 build_style=gnu-configure
 configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip"
@@ -9,8 +9,8 @@ hostmakedepends="automake libtool"
 makedepends="zlib-devel"
 short_desc="Non-DNS IP-to-country resolver C library and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://www.maxmind.com/app/c"
-license="GPL-2"
 distfiles="https://github.com/maxmind/geoip-api-c/releases/download/v$version/GeoIP-$version.tar.gz"
 checksum=1dfb748003c5e4b7fd56ba8c4cd786633d5d6f409547584f6910398389636f80
 

From cc4e48681397086933b1f159ca5910e3eb877886 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:01:47 -0700
Subject: [PATCH 04/28] gforth: fix license

---
 srcpkgs/gforth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gforth/template b/srcpkgs/gforth/template
index 71117b69f470..f0df03991086 100644
--- a/srcpkgs/gforth/template
+++ b/srcpkgs/gforth/template
@@ -1,17 +1,17 @@
 # Template file for 'gforth'
 pkgname=gforth
 version=0.7.3
-revision=2
+revision=3
 build_style=gnu-configure
-disable_parallel_build=yes
 hostmakedepends="m4"
 makedepends="libffi-devel"
 short_desc="GNU Forth, a fast and portable implementation of ANS Forth"
 maintainer="ZweiSpeedruns <zcm727@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gforth/"
 distfiles="${GNU_SITE}/gforth/gforth-${version}.tar.gz"
 checksum=2f62f2233bf022c23d01c920b1556aa13eab168e3236b13352ac5e9f18542bb0
+disable_parallel_build=yes
 
 nocross="Configure script is picky: https://api.travis-ci.org/jobs/158049419/log.txt?deansi=true"
 case "${XBPS_TARGET_MACHINE}" in

From 6c03ca6785fb0baa89884770f291792206a195e4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:05:16 -0700
Subject: [PATCH 05/28] gftp: fix license

---
 srcpkgs/gftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 2ce0a9e872f4..0820b29da2d3 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,13 +1,13 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.gftp.org"
 distfiles="https://sources.voidlinux.org/gftp-${version}/gftp-${version}.tar.bz2"
 checksum=5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd

From a15841b295ea97eb69156f352617ebfd820feea3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:21:27 -0700
Subject: [PATCH 06/28] git-crypt: fix license

---
 srcpkgs/git-crypt/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 0f81c8dc313c..f5c4c79b664d 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,16 +1,16 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=7
+revision=8
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="openssl-devel"
-hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"
+hostmakedepends="libxslt docbook-xsl"
+makedepends="openssl-devel"
 short_desc="Transparent file encryption in git"
 maintainer="Andy Cobaugh <andrewcobaugh@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.agwa.name/projects/git-crypt/"
 distfiles="https://github.com/AGWA/git-crypt/archive/${version}.tar.gz"
 checksum=777c0c7aadbbc758b69aff1339ca61697011ef7b92f1d1ee9518a8ee7702bb78
@@ -21,6 +21,4 @@ post_install() {
 	vdoc NEWS
 	vdoc doc/multiple_keys.md
 	vman man/man1/git-crypt.1
-	vlicense COPYING
 }
-

From 520b3b1d75f2babec7ad5a2947048b1a89c8a76a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:21:37 -0700
Subject: [PATCH 07/28] glpk: fix license

---
 srcpkgs/glpk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glpk/template b/srcpkgs/glpk/template
index b98f24f344a7..6724c10e5dd0 100644
--- a/srcpkgs/glpk/template
+++ b/srcpkgs/glpk/template
@@ -1,13 +1,13 @@
 # Template file for 'glpk'
 pkgname=glpk
 version=5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-gmp"
 makedepends="gmp-devel"
 short_desc="GNU Linear Programming Kit to solve LP, MIP and other problems"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/glpk/glpk.html"
 distfiles="${GNU_SITE}/glpk/${pkgname}-${version}.tar.gz"
 checksum=4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15

From b223d52c866d659d67f73b18e6831c0f38729613 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:27:27 -0700
Subject: [PATCH 08/28] glu: fix license

---
 srcpkgs/glu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glu/template b/srcpkgs/glu/template
index f6f079e03b5e..b655d49fe569 100644
--- a/srcpkgs/glu/template
+++ b/srcpkgs/glu/template
@@ -1,14 +1,14 @@
 # Template file for 'glu'
 pkgname=glu
 version=9.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel"
 short_desc="Mesa OpenGL utility library (GLU)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="SGI-B-2.0"
 homepage="http://cgit.freedesktop.org/mesa/glu/"
 distfiles="https://mesa.freedesktop.org/archive/glu/glu-${version}.tar.gz"
 checksum=f6f484cfcd51e489afe88031afdea1e173aa652697e4c19ddbcb8260579a10f7

From abd48b3dad6d5d7d5a4b656451dc9c461c38bdf7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:32:51 -0700
Subject: [PATCH 09/28] glyr: fix license

---
 srcpkgs/glyr/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/glyr/template b/srcpkgs/glyr/template
index eb59ece2e9cc..30dbe4e87f8e 100644
--- a/srcpkgs/glyr/template
+++ b/srcpkgs/glyr/template
@@ -1,20 +1,20 @@
 # Template file for 'glyr'
 pkgname=glyr
-version="1.0.10"
-revision=1
+version=1.0.10
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel glib-devel sqlite-devel"
-short_desc="A music metadata searchengine utility and library"
+short_desc="Music metadata searchengine utility and library"
 maintainer="Michal Koutenský <koutak.m@gmail.com>"
-license="LGPL-3"
+license="LGPL-3.0-or-later"
 homepage="https://github.com/sahib/glyr"
 distfiles="https://github.com/sahib/glyr/archive/${version}.tar.gz"
 checksum=77e8da60221c8d27612e4a36482069f26f8ed74a1b2768ebc373c8144ca806e8
 
 glyr-devel_package() {
 	depends="glyr>=${version}_${revision}"
-	short_desc="A music metadata searchengine utility and library - development files"
+	short_desc="Music metadata searchengine utility and library - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From 64281ba581ba0da2891edb918926f6b05bffad1b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:42:18 -0700
Subject: [PATCH 10/28] gmtp: fix license

---
 srcpkgs/gmtp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gmtp/template b/srcpkgs/gmtp/template
index 69de28c2c3d4..55516a916605 100644
--- a/srcpkgs/gmtp/template
+++ b/srcpkgs/gmtp/template
@@ -1,14 +1,14 @@
 # Template file for 'gmtp'
 pkgname=gmtp
 version=1.3.11
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config glib-devel"
 makedepends="libmtp-devel libflac-devel libid3tag-devel libvorbis-devel gtk+3-devel"
 depends="desktop-file-utils"
-short_desc="A simple MP3 player client for MTP based devices"
+short_desc="Simple MP3 player client for MTP based devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://gmtp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/gmtp/gmtp-${version}.tar.gz"
 checksum=5a830c9c448aa2caf7a844aaa9ba38c2ac0239547366c1e6874e0080bd5f0613

From cd8f8c5fb61e3ab664ea55772341f81f96f0dfba Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:43:46 -0700
Subject: [PATCH 11/28] gnome-epub-thumbnailer: fix license

---
 srcpkgs/gnome-epub-thumbnailer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-epub-thumbnailer/template b/srcpkgs/gnome-epub-thumbnailer/template
index c6e1c02b9d30..a9fae3dc6804 100644
--- a/srcpkgs/gnome-epub-thumbnailer/template
+++ b/srcpkgs/gnome-epub-thumbnailer/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-epub-thumbnailer'
 pkgname=gnome-epub-thumbnailer
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gdk-pixbuf-devel libarchive-devel libxml2-devel"
 short_desc="Thumbnailer for EPub and MOBI books"
 maintainer="Alif Rachmawadi <arch@subosito.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://git.gnome.org/browse/gnome-epub-thumbnailer"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
 checksum=b502420d9b02ea0b0fc7986ef5a091a12b2286be14fed9e47594fe9fa0c5898e

From 5ba360b05f2bb3aad84aa8d324c0adf11fb42242 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 00:56:39 -0700
Subject: [PATCH 12/28] gnugo: fix license

---
 srcpkgs/gnugo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnugo/template b/srcpkgs/gnugo/template
index 81c21903ea86..30b4f91184bc 100644
--- a/srcpkgs/gnugo/template
+++ b/srcpkgs/gnugo/template
@@ -1,14 +1,14 @@
 # Template file for 'gnugo'
 pkgname=gnugo
 version=3.8
-revision=1
-nocross=yes
+revision=2
 build_style=gnu-configure
 short_desc="Free program that plays the game Go"
 maintainer="Brandon Wilson <x@wilsonb.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gnugo/"
 distfiles="${GNU_SITE}/gnugo/${pkgname}-${version}.tar.gz"
 checksum=da68d7a65f44dcf6ce6e4e630b6f6dd9897249d34425920bfdd4e07ff1866a72
+nocross=yes
 
 CFLAGS="-fcommon"

From c60151f8f587d468251aba89cc2a63e4eaaeaaf3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 00:59:56 -0700
Subject: [PATCH 13/28] gnupod: fix license

---
 srcpkgs/gnupod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnupod/template b/srcpkgs/gnupod/template
index 91b093221354..09c35988a9d8 100644
--- a/srcpkgs/gnupod/template
+++ b/srcpkgs/gnupod/template
@@ -1,14 +1,14 @@
 # Template file for 'gnupod'
 pkgname=gnupod
 version=0.99.8
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="perl-Digest-SHA1 perl-XML-Parser perl-Unicode-String perl-MP3-Info perl-TimeDate"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Command line tools for managing data on iPods"
 maintainer="Evan Deaubl <evan@deaubl.name>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/gnupod/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tgz"
 checksum=bd566295a2e14352e6d05f5c816cab36b0e80d3ab36d29c4bbb45c581d3f3c31

From bba3370852d12000151f6e3d5d4959ab3968a642 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:45:54 -0700
Subject: [PATCH 14/28] gnurobbo: fix license, use vsed

---
 srcpkgs/gnurobbo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnurobbo/template b/srcpkgs/gnurobbo/template
index 49d4b52577f2..d8225df323d2 100644
--- a/srcpkgs/gnurobbo/template
+++ b/srcpkgs/gnurobbo/template
@@ -1,14 +1,14 @@
 # Template file for 'gnurobbo'
 pkgname=gnurobbo
 version=0.68
-revision=3
+revision=4
 build_wrksrc=gnurobbo
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Reimplementation of Janusz Pelc's Robbo for Atari XE/XL"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://gnurobbo.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gnurobbo/gnurobbo/gnurobbo%20${version}/gnurobbo-${version}-source.tar.gz"
 checksum=6c7e9e425655da02c2442d13b5fa8f542af62d2c8f253db2fb63470c5c0c3db8
@@ -16,7 +16,7 @@ checksum=6c7e9e425655da02c2442d13b5fa8f542af62d2c8f253db2fb63470c5c0c3db8
 CFLAGS="-fcommon"
 
 pre_build() {
-	sed -i Makefile \
+	vsed -i Makefile \
 		-e "s;\(CFLAGS\?+=\)-d;\1;" \
 		-e "s;CFLAGS+\?=;\0 ${CFLAGS} ;" \
 		-e "s;LDFLAGS+\?=;\0 ${LDFLAGS} ;" \

From bf6285f0cd70f0de27803bf3f3e27428e62a69a9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:48:32 -0700
Subject: [PATCH 15/28] gopm: fix license, fix homepage

---
 srcpkgs/gopm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index cf9e8258395d..ae3a0d2ca491 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,14 +1,14 @@
-# Template build file for 'gopm'
+# Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=14
+revision=15
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 wrksrc="${pkgname}-${_commit}"
 build_style=go
 go_import_path="github.com/gpmgo/gopm"
 short_desc="Go Package Manager"
 maintainer="John Regan <john@jrjrtech.com>"
-license="Apache"
-homepage="http://gopm.io/"
+license="Apache-2.0"
+homepage="https://github.com/gpmgo/gopm"
 distfiles="https://github.com/gpmgo/gopm/archive/${_commit}.tar.gz"
 checksum="67fd6c8940eab9adca178f880d217095ef54db8c608b0d000144d9ba7880c3f8"

From c944383d4b658b7ce7617f21fb3a9a24b2f5e4ae Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:56:11 -0700
Subject: [PATCH 16/28] gosh: fix license

---
 srcpkgs/gosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template
index 34388757f28e..dc364cfba67a 100644
--- a/srcpkgs/gosh/template
+++ b/srcpkgs/gosh/template
@@ -1,12 +1,12 @@
 # Template file for 'gosh'
 pkgname=gosh
 version=0.2.3
-revision=12
+revision=13
 build_style=go
 go_import_path="github.com/mkouhei/gosh"
 short_desc="Interactive shell for Golang"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/mkouhei/gosh"
 distfiles="https://github.com/mkouhei/gosh/archive/v${version}.tar.gz"
 checksum=0b601b467a57d809134a13c8e52c4986eb328931a4db3c237630cdcd9891a707

From 7e4423734b97b7ee846c1eefd2afe7b523f7720c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:56:16 -0700
Subject: [PATCH 17/28] govendor: fix license

---
 srcpkgs/govendor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/govendor/template b/srcpkgs/govendor/template
index 76b83b36abb7..e18a8fb0d11c 100644
--- a/srcpkgs/govendor/template
+++ b/srcpkgs/govendor/template
@@ -1,12 +1,12 @@
 # Template file for 'govendor'
 pkgname=govendor
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kardianos/govendor"
 short_desc="Go vendor tool that works with the standard vendor file"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://github.com/kardianos/govendor"
 distfiles="https://github.com/kardianos/govendor/archive/v${version}.tar.gz"
 checksum=d303abf194838792234a1451c3a1e87885d1b2cd21774867b592c1f7db00551e

From c718aef9dfaf83559099a6c7969ff86b9555b324 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:57:58 -0700
Subject: [PATCH 18/28] gperf: fix license

---
 srcpkgs/gperf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gperf/template b/srcpkgs/gperf/template
index 4fb373ec885b..023fe89d6c56 100644
--- a/srcpkgs/gperf/template
+++ b/srcpkgs/gperf/template
@@ -1,11 +1,11 @@
 # Template file for 'gperf'
 pkgname=gperf
 version=3.1
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Perfect hash function generator"
-homepage="https://www.gnu.org/software/gperf/"
-license="GPL-3"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/gperf/"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2

From 063b54cde3b5668bd842320d967e45026254e92c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 09:00:53 -0700
Subject: [PATCH 19/28] gpm: fix license

---
 srcpkgs/gpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gpm/template b/srcpkgs/gpm/template
index d95a6c1a6377..360f58668c53 100644
--- a/srcpkgs/gpm/template
+++ b/srcpkgs/gpm/template
@@ -1,13 +1,13 @@
 # Template file for 'gpm'
 pkgname=gpm
 version=1.20.7
-revision=9
+revision=10
 build_style=gnu-configure
 hostmakedepends="automake libtool flex texinfo"
 makedepends="ncurses-devel libfl-devel"
 short_desc="Mouse server for the console and xterm"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.nico.schottelius.org/software/gpm/"
 distfiles="http://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.lzma"
 checksum=a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c

From 0505f2e5588413ce2e430a1475d8ec1ce73634f8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 09:42:09 -0700
Subject: [PATCH 20/28] grail: fix license, other lint

---
 srcpkgs/grail/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/grail/template b/srcpkgs/grail/template
index 7d4a374512b3..3f4382a7f3f4 100644
--- a/srcpkgs/grail/template
+++ b/srcpkgs/grail/template
@@ -1,17 +1,17 @@
-# Template build file for 'grail'
+# Template file for 'grail'
 pkgname=grail
 version=3.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-x11"
+hostmakedepends="pkg-config"
+makedepends="frame-devel libXfixes-devel libXi-devel"
 short_desc="Gesture Recognition And Instantiation Library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3"
+license="LGPL-3.0-only"
 homepage="https://launchpad.net/grail"
 distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.bz2"
 checksum=5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3
-hostmakedepends="pkg-config"
-makedepends="frame-devel libXfixes-devel libXi-devel"
-configure_args="--with-x11"
 
 grail-devel_package() {
 	depends="grail>=${version}_${revision}"

From 4b955bb5c4bf25a6b2288c2d352a4f59e0d5762b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:11:23 -0700
Subject: [PATCH 21/28] gsimplecal-gtk2: fix license, other lint

---
 srcpkgs/gsimplecal-gtk2/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gsimplecal-gtk2/template b/srcpkgs/gsimplecal-gtk2/template
index 4712e1d854d3..73cf3bd39b88 100644
--- a/srcpkgs/gsimplecal-gtk2/template
+++ b/srcpkgs/gsimplecal-gtk2/template
@@ -1,20 +1,21 @@
 # Template file for 'gsimplecal-gtk2'
 pkgname=gsimplecal-gtk2
 version=2.1
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--enable-gtk2"
-makedepends="gtk+-devel"
 hostmakedepends="automake pkg-config"
-replaces="gsimplecal-gtk3>=0"
+makedepends="gtk+-devel"
 short_desc="Simple and lightweight GTK calendar"
 maintainer="Jarbowski <jarbowski@gmail.com>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://dmedvinsky.github.io/gsimplecal/"
 distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
 checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
 
+replaces="gsimplecal-gtk3>=0"
+
 pre_configure() {
 	./autogen.sh
 }

From 178c78eb155f13fa50a4aab6791ee8aaaa1baa11 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:21:46 -0700
Subject: [PATCH 22/28] gsl-ucg: fix license

---
 srcpkgs/gsl-ucg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsl-ucg/template b/srcpkgs/gsl-ucg/template
index 840a2be23e02..5ae1d27e5f8f 100644
--- a/srcpkgs/gsl-ucg/template
+++ b/srcpkgs/gsl-ucg/template
@@ -1,14 +1,14 @@
 # Template file for 'gsl-ucg'
 pkgname=gsl-ucg
 version=4.1.5
-revision=1
+revision=2
 wrksrc="gsl-${version}"
 build_wrksrc="src"
 build_style=gnu-makefile
 makedepends="pcre-devel"
 short_desc="Generator Scripting Language - Universal Code Generator"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/zeromq/gsl"
 distfiles="https://github.com/zeromq/gsl/archive/v${version}.tar.gz"
 checksum=c1c3d61a1d89b65d0d1161c803bcdd6364045cc20d7e0c1f67f0955cd9b326b0

From 799888db61aa50c2b097e5f80cbd690a03d8052d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:44:15 -0700
Subject: [PATCH 23/28] gsimplecal-gtk3: fix license, other lint

---
 srcpkgs/gsimplecal-gtk3/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template
index 57b595e0f4f5..52acc624d51c 100644
--- a/srcpkgs/gsimplecal-gtk3/template
+++ b/srcpkgs/gsimplecal-gtk3/template
@@ -1,19 +1,20 @@
 # Template file for 'gsimplecal-gtk3'
 pkgname=gsimplecal-gtk3
 version=2.1
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
-makedepends="gtk+3-devel"
 hostmakedepends="automake pkg-config"
-replaces="gsimplecal-gtk2>=0"
+makedepends="gtk+3-devel"
 short_desc="Simple and lightweight GTK calendar"
 maintainer="Jarbowski <jarbowski@gmail.com>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://dmedvinsky.github.io/gsimplecal/"
 distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
 checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
 
+replaces="gsimplecal-gtk2>=0"
+
 pre_configure() {
 	./autogen.sh
 }

From ac5b4e6bd60b1fde645e3f53753ec2944b196026 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 11:04:55 -0700
Subject: [PATCH 24/28] gsmartcontrol: fix license

---
 srcpkgs/gsmartcontrol/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsmartcontrol/template b/srcpkgs/gsmartcontrol/template
index ac519e56c3cd..3574f4a63770 100644
--- a/srcpkgs/gsmartcontrol/template
+++ b/srcpkgs/gsmartcontrol/template
@@ -1,14 +1,14 @@
 # Template file for 'gsmartcontrol'
 pkgname=gsmartcontrol
 version=1.1.3
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtkmm-devel pcre-devel desktop-file-utils"
 depends="smartmontools hicolor-icon-theme"
 short_desc="GUI to smartmontools"
 maintainer="yopito <pierre.bourgin@free.fr>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://gsmartcontrol.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=b64f62cffa4430a90b6d06cd52ebadd5bcf39d548df581e67dfb275a673b12a9

From c20c2d1505b43da2664a0ddc84c852c7dbbdc3ef Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 11:20:58 -0700
Subject: [PATCH 25/28] gst123: fix license, other lint

---
 srcpkgs/gst123/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst123/template b/srcpkgs/gst123/template
index 95cf767befd2..f3a2d41316b2 100644
--- a/srcpkgs/gst123/template
+++ b/srcpkgs/gst123/template
@@ -1,15 +1,15 @@
 # Template file for 'gst123'
 pkgname=gst123
 version=0.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="ncurses-devel gtk+-devel libxml2-devel gst-plugins-base1-devel gst-plugins-good1"
 depends="gst-plugins-good1"
 short_desc="GStreamer based CLI player"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://space.twc.de/~stefan/gst123.php/"
-license="LGPL-2.1"
 distfiles="http://space.twc.de/~stefan/gst123/gst123-$version.tar.bz2"
 checksum=c7b4729773f66cc679e94df76bcc6a95a2222192730f906e527e72624f084a7d
 

From bf05a90173e4c4d298eef73a5d8c855c36a1fa77 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:04:05 -0700
Subject: [PATCH 26/28] gtk-theme-config: fix license, vsed

---
 srcpkgs/gtk-theme-config/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk-theme-config/template b/srcpkgs/gtk-theme-config/template
index bb927821042f..6dd97132c14c 100644
--- a/srcpkgs/gtk-theme-config/template
+++ b/srcpkgs/gtk-theme-config/template
@@ -2,14 +2,14 @@
 pkgname=gtk-theme-config
 reverts=20140605_1
 version=1.0
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config vala-devel"
 makedepends="glib-devel vala-devel gtk+3-devel hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Utility to set GTK Theme Preferences"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://github.com/satya164/gtk-theme-config"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=174aac3ea43966168d120dbd9e0f23d7900d095ee1b0cf32472d59b0fdea8448
@@ -26,5 +26,5 @@ pre_build() {
 		_ldflags="${_ldflags} -X $_p"
 	done
 	# Add to VALACFLAGS
-	sed -i Makefile -e "s;^VALACFLAGS.*;& $_cflags $_ldflags;"
+	vsed -i Makefile -e "s;^VALACFLAGS.*;& $_cflags $_ldflags;"
 }

From e3d49c41f804d581259bc18f8c3f6ec7afdadaf1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:06:21 -0700
Subject: [PATCH 27/28] gtypist: fix license, other lint

---
 srcpkgs/gtypist/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtypist/template b/srcpkgs/gtypist/template
index 723bc1664465..d4bf9dc41846 100644
--- a/srcpkgs/gtypist/template
+++ b/srcpkgs/gtypist/template
@@ -1,15 +1,16 @@
+# Template file for 'gtypist'
 pkgname=gtypist
 version=2.9.5
-revision=1
-short_desc="A universal typing tutor"
+revision=2
+build_style=gnu-configure
+hostmakedepends="automake"
+makedepends="ncurses-devel"
+short_desc="Universal typing tutor"
 maintainer="Phileas Vöcking <paspartout@fogglabs.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gtypist/"
 distfiles="$GNU_SITE/gtypist/gtypist-${version}.tar.xz"
 checksum="c13af40b12479f8219ffa6c66020618c0ce305ad305590fde02d2c20eb9cf977"
-build_style=gnu-configure
-makedepends="ncurses-devel"
-hostmakedepends="automake"
 
 pre_configure() {
 	autoreconf

From e82a80edee53c2fe7d80c6ce1f1ff81df8b7f085 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:48:01 -0700
Subject: [PATCH 28/28] gv: fix license, other lint

---
 srcpkgs/gv/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gv/template b/srcpkgs/gv/template
index e15cfeb71f7b..60d34b5f472b 100644
--- a/srcpkgs/gv/template
+++ b/srcpkgs/gv/template
@@ -1,12 +1,8 @@
 # Template file for 'gv'
 pkgname=gv
 version=3.7.4
-revision=4
+revision=5
 build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.gnu.org/software/gv/"
-license="GPL-2"
-short_desc="Postscript and PDF viewer"
 configure_args=" --with-x --enable-backing-pixmap
  --enable-international --with-default-papersize=a4"
 hostmakedepends="pkg-config xorgproto"
@@ -14,6 +10,10 @@ makedepends="libX11-devel libXmu-devel libXpm-devel libXext-devel
  libXt-devel libICE-devel libXaw3d-devel zlib-devel bzip2-devel
  libXinerama-devel ghostscript"
 depends="ghostscript"
+short_desc="Postscript and PDF viewer"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="http://www.gnu.org/software/gv/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum="2162b3b3a95481d3855b3c4e28f974617eef67824523e56e20b56f12fe201a61"
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: Onmibus linting pass for SPDX warnings - most packages starting with G
  2021-04-13 20:05 [PR PATCH] Onmibus linting pass for SPDX warnings - most packages starting with G heliocat
  2021-04-14 19:22 ` [PR PATCH] [Updated] " heliocat
@ 2021-04-14 19:44 ` Piraty
  1 sibling, 0 replies; 3+ messages in thread
From: Piraty @ 2021-04-14 19:44 UTC (permalink / raw)
  To: ml

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

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

Onmibus linting pass for SPDX warnings - most packages starting with G
https://github.com/void-linux/void-packages/pull/30218

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
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-04-14 19:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-13 20:05 [PR PATCH] Onmibus linting pass for SPDX warnings - most packages starting with G heliocat
2021-04-14 19:22 ` [PR PATCH] [Updated] " heliocat
2021-04-14 19:44 ` [PR PATCH] [Merged]: " Piraty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).