From 537d70a30424d39a3b658ce5e5779e10de63fed3 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 26 Sep 2024 12:14:33 +0200
Subject: [PATCH] srcpkgs/*: update licenses in my pkgs
---
srcpkgs/cargo-auditable-bootstrap/template | 2 +-
srcpkgs/cargo-auditable/template | 2 +-
srcpkgs/fd/template | 2 +-
srcpkgs/git-cliff/template | 2 +-
srcpkgs/hyperrogue/template | 2 +-
srcpkgs/neovim/template | 2 +-
srcpkgs/ntpd-rs/template | 2 +-
srcpkgs/rust-audit-info/template | 2 +-
srcpkgs/rustup/template | 2 +-
srcpkgs/sheldon/template | 2 +-
srcpkgs/topgrade/template | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index 9810f562c99..5b9e7d02c52 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -10,7 +10,7 @@ make_check_args="-- --skip test_wasm"
make_cmd=cargo
short_desc="Bootstrap package for cargo-auditable"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="MIT,Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://github.com/rust-secure-code/cargo-auditable"
changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-auditable/master/cargo-auditable/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/cargo-auditable/template b/srcpkgs/cargo-auditable/template
index a91e3fd71c7..fd19a23f850 100644
--- a/srcpkgs/cargo-auditable/template
+++ b/srcpkgs/cargo-auditable/template
@@ -9,7 +9,7 @@ make_check_args="-- --skip test_wasm"
hostmakedepends="cargo-auditable-bootstrap"
short_desc="Tool for embedding dependency information in rust binaries"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="MIT,Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://github.com/rust-secure-code/cargo-auditable"
changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-auditable/master/cargo-auditable/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/fd/template b/srcpkgs/fd/template
index daf17fb9300..0ed188e8e46 100644
--- a/srcpkgs/fd/template
+++ b/srcpkgs/fd/template
@@ -6,7 +6,7 @@ build_style=cargo
build_helper=qemu
short_desc="Simple, fast and user-friendly alternative to find"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="Apache-2.0, MIT"
+license="Apache-2.0 OR MIT"
homepage="https://github.com/sharkdp/fd"
changelog="https://raw.githubusercontent.com/sharkdp/fd/master/CHANGELOG.md"
distfiles="https://github.com/sharkdp/fd/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 2349cd9818f..c8c5997459a 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config"
makedepends="libgit2-1.8-devel libzstd-devel"
short_desc="Changelog generator based on conventional commits"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="Apache-2.0, MIT"
+license="Apache-2.0 OR MIT"
homepage="https://github.com/orhun/git-cliff"
changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
index b52ed892592..3d84ea17a00 100644
--- a/srcpkgs/hyperrogue/template
+++ b/srcpkgs/hyperrogue/template
@@ -8,7 +8,7 @@ makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
depends="dejavu-fonts-ttf"
short_desc="SDL rogue-like in a non-euclidean world"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="GPL-2.0-or-later, CC-BY-SA-4.0, CC-BY-SA-3.0, CC-BY-3.0, Public Domain"
+license="GPL-2.0-or-later"
homepage="https://www.roguetemple.com/z/hyper/"
changelog="https://raw.githubusercontent.com/zenorogue/hyperrogue/master/changelog.txt"
distfiles="https://github.com/zenorogue/hyperrogue/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 6ca580d1375..634f03ace2d 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -18,7 +18,7 @@ makedepends="libuv-devel libvterm-devel msgpack-devel
lua51-lpeg $(vopt_if luajit LuaJIT-devel lua51-devel)"
short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="Apache-2.0, Vim"
+license="Apache-2.0 AND Vim"
homepage="https://neovim.io"
changelog="https://github.com/neovim/neovim/releases"
distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz
diff --git a/srcpkgs/ntpd-rs/template b/srcpkgs/ntpd-rs/template
index 77e8330567d..5c3a92d6212 100644
--- a/srcpkgs/ntpd-rs/template
+++ b/srcpkgs/ntpd-rs/template
@@ -12,7 +12,7 @@ make_install_args="--path ntpd"
depends="libcap-progs"
short_desc="Full-featured implementation of the Network Time Protocol"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="Apache-2.0, MIT"
+license="Apache-2.0 OR MIT"
homepage="https://github.com/pendulum-project/ntpd-rs"
changelog="https://raw.githubusercontent.com/pendulum-project/ntpd-rs/main/CHANGELOG.md"
distfiles="https://github.com/pendulum-project/ntpd-rs/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/rust-audit-info/template b/srcpkgs/rust-audit-info/template
index fe6818516c2..0a3683b2433 100644
--- a/srcpkgs/rust-audit-info/template
+++ b/srcpkgs/rust-audit-info/template
@@ -6,7 +6,7 @@ build_wrksrc=rust-audit-info
build_style=cargo
short_desc="CLI tool for extracting cargo-auditable dependency trees"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://github.com/rust-secure-code/cargo-auditable"
distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/${pkgname}/v${version}.tar.gz"
checksum=d9d53352b5f2dc34a93b1ae6408cdd50085f40e24d832af6938e0c3b7c906ff5
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index a2c053e904c..978787fcaa1 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config"
makedepends="openssl-devel zlib-devel libcurl-devel"
short_desc="Rust toolchain installer"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="Apache-2.0, MIT"
+license="Apache-2.0 OR MIT"
homepage="https://www.rustup.rs"
changelog="https://raw.githubusercontent.com/rust-lang/rustup/master/CHANGELOG.md"
distfiles="https://github.com/rust-lang/rustup/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/sheldon/template b/srcpkgs/sheldon/template
index 98ccabe4562..9512f96dfa6 100644
--- a/srcpkgs/sheldon/template
+++ b/srcpkgs/sheldon/template
@@ -9,7 +9,7 @@ makedepends="libcurl-devel libgit2-1.8-devel openssl-devel"
checkdepends="git"
short_desc="Fast, configurable shell plugin manager"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="Apache-2.0, MIT"
+license="Apache-2.0 OR MIT"
homepage="https://sheldon.cli.rs/"
changelog="https://raw.githubusercontent.com/rossmacarthur/sheldon/trunk/RELEASES.md"
distfiles="https://github.com/rossmacarthur/sheldon/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 81512a3c4fa..dfd526a2ce2 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -6,7 +6,7 @@ build_style=cargo
build_helper=qemu
short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
-license="GPL-3.0-only"
+license="GPL-3.0-or-later"
homepage="https://github.com/topgrade-rs/topgrade"
distfiles="https://github.com/topgrade-rs/topgrade/archive/refs/tags/v${version}.tar.gz"
checksum=53c6521041a6ffddf1ccb13f404f131919a2ef48deb3974fc71dc3be08db6cd0