From 1fd1cf2f332c953856842d3f358f9aea915ec720 Mon Sep 17 00:00:00 2001
From: Leon Marz <main@lmarz.org>
Date: Fri, 10 Feb 2023 17:06:11 +0100
Subject: [PATCH] main/i*: update licenses

---
 main/icon-naming-utils/APKBUILD | 4 ++--
 main/icu/APKBUILD               | 4 ++--
 main/imake/APKBUILD             | 5 +++--
 main/indent/APKBUILD            | 4 ++--
 main/installkernel/APKBUILD     | 4 ++--
 main/intltool/APKBUILD          | 4 ++--
 main/iperf3/APKBUILD            | 4 ++--
 main/iproute2-qos/APKBUILD      | 4 ++--
 main/iucode-tool/APKBUILD       | 4 ++--
 main/ivykis/APKBUILD            | 4 ++--
 10 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/main/icon-naming-utils/APKBUILD b/main/icon-naming-utils/APKBUILD
index fe66d8cab01a..0495770bbe0c 100644
--- a/main/icon-naming-utils/APKBUILD
+++ b/main/icon-naming-utils/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=icon-naming-utils
 pkgver=0.8.90
-pkgrel=3
+pkgrel=4
 pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
 url="http://tango.freedesktop.org/"
 arch="noarch"
 options="!check"  # No test suite.
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 depends="perl-xml-simple"
 source="http://tango.freedesktop.org/releases/icon-naming-utils-$pkgver.tar.bz2"
 
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index a2203fe80000..7d51943d765e 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -3,11 +3,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=icu
 pkgver=72.1
-pkgrel=1
+pkgrel=2
 pkgdesc="International Components for Unicode library"
 url="https://icu.unicode.org/"
 arch="all"
-license="MIT ICU Unicode-TOU"
+license="ICU"
 depends_dev="$pkgname=$pkgver-r$pkgrel"
 makedepends="python3 py3-yaml"
 checkdepends="diffutils"
diff --git a/main/imake/APKBUILD b/main/imake/APKBUILD
index a65ddd6285e1..8df81f29ab9a 100644
--- a/main/imake/APKBUILD
+++ b/main/imake/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imake
 pkgver=1.0.9
-pkgrel=0
+pkgrel=1
 pkgdesc="X Windows make utility"
 url="https://www.x.org"
 arch="all"
-license="MIT-enna"
+license="custom"
 options="!check"  # No test suite.
 makedepends="util-macros xorgproto"
 subpackages="$pkgname-doc"
@@ -18,6 +18,7 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 sha512sums="
diff --git a/main/indent/APKBUILD b/main/indent/APKBUILD
index c495000873e9..c4601aa012b2 100644
--- a/main/indent/APKBUILD
+++ b/main/indent/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer:
 pkgname=indent
 pkgver=2.2.12
-pkgrel=2
+pkgrel=3
 pkgdesc="An indenting utility"
 url="https://www.gnu.org/software/indent/"
 arch="all"
-license="GPL-3.0-or-later BSD"
+license="GPL-3.0-or-later"
 makedepends="gettext-dev"
 options="!check" #texinfo
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/main/installkernel/APKBUILD b/main/installkernel/APKBUILD
index 6db7dec048b8..68d6fb8743d1 100644
--- a/main/installkernel/APKBUILD
+++ b/main/installkernel/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=installkernel
 pkgver=3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Alpine Linux Kernel install script"
 url="https://git.alpinelinux.org/cgit/aports/tree/main/installkernel"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
 options="!check" # no test suite
 source="installkernel"
 
diff --git a/main/intltool/APKBUILD b/main/intltool/APKBUILD
index 3bbe96459c28..c9d6d6bf68b9 100644
--- a/main/intltool/APKBUILD
+++ b/main/intltool/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=intltool
 pkgver=0.51.0
-pkgrel=5
+pkgrel=6
 pkgdesc="The internationalization tool collection"
 url="http://freedesktop.org/wiki/Software/intltool"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 depends="perl perl-xml-parser gettext file"
 subpackages="$pkgname-doc"
 source="https://edge.launchpad.net/intltool/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
diff --git a/main/iperf3/APKBUILD b/main/iperf3/APKBUILD
index 34616660d3cb..9bfd9fdf2646 100644
--- a/main/iperf3/APKBUILD
+++ b/main/iperf3/APKBUILD
@@ -3,11 +3,11 @@
 pkgname=iperf3
 _pkgname=iperf
 pkgver=3.12
-pkgrel=0
+pkgrel=1
 pkgdesc="A tool to measure IP bandwidth using UDP or TCP"
 url="https://github.com/esnet/iperf"
 arch="all"
-license="BSD-3-Clause"
+license="BSD-3-Clause-LBNL"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/esnet/$_pkgname/archive/$pkgver.tar.gz
 	$pkgname.initd
diff --git a/main/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
index 3ff43ed50783..a25f94080a2f 100644
--- a/main/iproute2-qos/APKBUILD
+++ b/main/iproute2-qos/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Iilluzion <iilluzion@gmail.com>
 pkgname=iproute2-qos
 pkgver=0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Scripts to set up quality of service with iproute2"
 url="https://git.alpinelinux.org/cgit/aports"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends="iproute2"
 source="qos.initd qos.eth0.sample qos.ifb0.sample setup-qos"
 
diff --git a/main/iucode-tool/APKBUILD b/main/iucode-tool/APKBUILD
index 51137f09218d..44b61232d920 100644
--- a/main/iucode-tool/APKBUILD
+++ b/main/iucode-tool/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iucode-tool
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="manipulate microcode update collections for Intel i686 and X86-64"
 url="https://gitlab.com/iucode-tool/iucode-tool"
 arch="x86 x86_64"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 makedepends="autoconf automake libtool argp-standalone"
 subpackages="$pkgname-doc"
 source="https://gitlab.com/iucode-tool/iucode-tool/-/archive/v$pkgver/iucode-tool-v$pkgver.tar.gz"
diff --git a/main/ivykis/APKBUILD b/main/ivykis/APKBUILD
index 77894bdbd02e..6be83d2fc553 100644
--- a/main/ivykis/APKBUILD
+++ b/main/ivykis/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ivykis
 pkgver=0.42.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for asynchronous I/O readiness notification"
 url="https://libivykis.sourceforge.net/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 makedepends="automake autoconf libtool"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://downloads.sourceforge.net/project/libivykis/$pkgver/ivykis-$pkgver.tar.gz"
-- 
GitLab