commit: 06385cb277f1910c00555c64c467368d909735e2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 15 09:01:12 2024 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Jan 15 09:01:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06385cb2
licenses: Drop BSD-2-with-views This is the standard FreeBSD license aka BSD-2 that has been approved by the FSF: https://directory.fsf.org/wiki/License:BSD-2-Clause-FreeBSD Update mapping in license-mapping.conf accordingly. It is unclear why SPDX has an extra identifier for this (which they list as non-free). Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> licenses/BSD-2-with-views | 28 ---------------------------- metadata/license-mapping.conf | 4 ++-- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/licenses/BSD-2-with-views b/licenses/BSD-2-with-views deleted file mode 100644 index ffb303569e2b..000000000000 --- a/licenses/BSD-2-with-views +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) <year>, <copyright holder> -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -The views and conclusions contained in the software and documentation are -those of the authors and should not be interpreted as representing official -policies, either expressed or implied, of the copyright holders or -contributors. diff --git a/metadata/license-mapping.conf b/metadata/license-mapping.conf index 4d0e36a1afe6..1aab79508e92 100644 --- a/metadata/license-mapping.conf +++ b/metadata/license-mapping.conf @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Mapping of SPDX-2.0 licenses to Gentoo repository licenses. @@ -37,9 +37,9 @@ Artistic-2.0 = Artistic-2 Beerware = BEER-WARE BSD-1-Clause = BSD-1 BSD-2-Clause = BSD-2 +BSD-2-Clause-Views = BSD-2 BSD-3-Clause = BSD BSD-4-Clause = BSD-4 -bsd-2-clause-views = BSD-2-with-views BSL-1.0 = Boost-1.0 BUSL-1.1 = BUSL-1.1 bzip2-1.0.5 = BZIP2
