[gentoo-commits] repo/gentoo:master commit in: licenses/, profiles/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     19eba49d3f1b67443b5dd95cdeab9c4910d0569c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 16:41:14 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 16:41:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19eba49d

Revert "licenses: Temporarily re-add OFL"

This reverts commit 3de5dc18e3fbc1b0415bdbfab5d3d4af3d874977.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 licenses/OFL            | 99 -------------------------------------------------
 profiles/license_groups |  4 +-
 2 files changed, 2 insertions(+), 101 deletions(-)

diff --git a/licenses/OFL b/licenses/OFL
deleted file mode 100644
index 2a36aea25d89..000000000000
--- a/licenses/OFL
+++ /dev/null
@@ -1,99 +0,0 @@
-This Font Software is Copyright (c) 2003-2005, SIL International (http://scripts.sil.org/).
-All Rights Reserved.
-
-"Gentium" is a Reserved Font Name for this Font Software.
-"SIL" is a Reserved Font Name for this Font Software.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.0.
-No modification of the license is permitted, only verbatim copy is allowed.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of cooperative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide an open
-framework in which fonts may be shared and improved in partnership with
-others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and sold with any software provided that the font
-names of derivative works are changed. The fonts and derivatives,
-however, cannot be released under any other type of license.
-
-DEFINITIONS
-"Font Software" refers to any and all of the following:
-	- font files
-	- data files
-	- source code
-	- build scripts
-	- documentation
-
-"Reserved Font Name" refers to the Font Software name as seen by
-users and any other names as specified after the copyright statement.
-
-"Standard Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder.
-
-"Modified Version" refers to any derivative font software made by
-adding to, deleting, or substituting -- in part or in whole --
-any of the components of the Standard Version, by changing formats
-or by porting the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Standard or Modified Versions, may be sold by itself.
-
-2) Standard or Modified Versions of the Font Software may be bundled,
-redistributed and sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s), in part or in whole, unless explicit written permission is
-granted by the Copyright Holder. This restriction applies to all 
-references stored in the Font Software, such as the font menu name and
-other font description fields, which are used to differentiate the
-font from others.
-
-4) The name(s) of the Copyright Holder or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed using this license, and may not be distributed
-under any other license.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

diff --git a/profiles/license_groups b/profiles/license_groups
index 4922fdefd324..67aad742e76b 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -43,7 +43,7 @@ FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED-FREE @MISC-FREE
 
 # FSF-approved licenses for "free documentation" and "works of
 # practical use besides software and documentation" (including fonts)
-FSF-APPROVED-OTHER Arphic CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ Free-Art-1.2 Free-Art-1.3 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ IPAfont OFL OFL-1.0 OFL-1.1 OPL
+FSF-APPROVED-OTHER Arphic CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ Free-Art-1.2 Free-Art-1.3 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ IPAfont OFL-1.0 OFL-1.1 OPL
 
 # Misc licenses for free documents and other works (including fonts)
 # that follow the definition at https://freedomdefined.org/ but are NOT
@@ -84,7 +84,7 @@ OSI-APPROVED @OSI-APPROVED-FREE @OSI-APPROVED-NONFREE
 EULA 2dboy-EULA AMD-GPU-PRO-EULA android AnyDesk-TOS Aseprite-EULA baudline bestcrypt CAPYBARA-EULA Coherent-Graphics Dell-EULA ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi microsoft-edge Microsoft-vscode Mojang MTA-0.5 NVIDIA-CUDA NVIDIA-SDK Ookla OPERA-2018 PAPERS-PLEASE PassMark-EULA PICO-8 Primate-Plunge PUEL-11 Q3AEULA-20000111 QUAKE4 RAR sfpg SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
 
 # Deprecated license labels, used by repoman and pkgcheck
-DEPRECATED OFL
+#DEPRECATED (currently none)
 
 # Local Variables:
 # mode: conf-space