commit:     199e4bde07788a60b18c0cd10dde492955d0ba6c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 16:48:32 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 16:54:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=199e4bde

sys-kernel/linux-firmware: Simplify LICENSE

Drop no-source-code from LICENSE and add a note to the
linux-fw-redistributable license file instead. This means that the user
must only add a single license exception for the package when using the
default configuration ("+redistributable" in IUSE).

Closes: https://bugs.gentoo.org/891381
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sys-kernel/linux-firmware/linux-firmware-20220209.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20220310.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20220411.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20220509.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20220610.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20220708.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20220815.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20220913-r2.ebuild | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20221012-r1.ebuild | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20221012.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20221109.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20221214.ebuild    | 5 ++---
 sys-kernel/linux-firmware/linux-firmware-20230117.ebuild    | 3 +--
 sys-kernel/linux-firmware/linux-firmware-99999999.ebuild    | 5 ++---
 14 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/sys-kernel/linux-firmware/linux-firmware-20220209.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20220209.ebuild
index 38cb90b53b9b..88fd355c6055 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220209.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220209.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20220310.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20220310.ebuild
index 38cb90b53b9b..88fd355c6055 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220310.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220310.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20220411.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20220411.ebuild
index 38cb90b53b9b..88fd355c6055 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220411.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220411.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20220509.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20220509.ebuild
index 59f7f02ea282..261b658f7b55 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220509.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220509.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20220610.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20220610.ebuild
index 59f7f02ea282..261b658f7b55 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220610.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220610.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20220708.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20220708.ebuild
index f4b705f99cb1..0d60053aa30e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220708.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220708.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20220815.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20220815.ebuild
index f4b705f99cb1..0d60053aa30e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220815.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220815.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20220913-r2.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20220913-r2.ebuild
index 57a14cdbbc9c..e26f7a6024b8 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220913-r2.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220913-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20221012-r1.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20221012-r1.ebuild
index 83806f04167f..6eb5ade58607 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20221012-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20221012-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="compress initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20221012.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20221012.ebuild
index 57a14cdbbc9c..e26f7a6024b8 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20221012.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20221012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20221109.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20221109.ebuild
index e67209103f73..86b7c08499ea 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20221109.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20221109.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="compress initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20221214.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20221214.ebuild
index e67209103f73..86b7c08499ea 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20221214.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20221214.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="compress initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-20230117.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20230117.ebuild
index c81235b9c549..6eb5ade58607 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20230117.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20230117.ebuild
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="compress initramfs +redistributable savedconfig unknown-license"

diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 83806f04167f..6eb5ade58607 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,7 @@ DESCRIPTION="Linux firmware files"
 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git";
 
 LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-       redistributable? (
-               linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT 
no-source-code ) )
+       redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
        unknown-license? ( all-rights-reserved )"
 SLOT="0"
 IUSE="compress initramfs +redistributable savedconfig unknown-license"

Reply via email to