[patch] glep-0076: Difference from version 1.3 to version 2

glep-0076.rst.diff (text/plain), 3.98 KB, created by Ulrich Müller on 2024-04-09 16:48:24 UTC

diff --git a/glep-0076.rst b/glep-0076.rst
index 338e094..7f7e425 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -8,10 +8,11 @@ Author: Richard Freeman <[e-mail]>,
         Michał Górny <[e-mail]>
 Type: Informational
 Status: Active
-Version: 1.3
+Version: 2
 Created: 2013-04-23
-Last-Modified: 2023-04-01
-Post-History: 2018-06-10, 2018-06-19, 2018-08-31, 2018-09-26, 2023-03-02
+Last-Modified: 2024-04-09
+Post-History: 2018-06-10, 2018-06-19, 2018-08-31, 2018-09-26, 2023-03-02,
+              2024-04-04
 Content-Type: text/x-rst
 ---
 
@@ -94,9 +95,9 @@ infrastructure or to any official Gentoo project (independently
 of hosting) must comply with this policy.  Unofficial Gentoo projects
 are also recommended to use this policy.
 
-Questions regarding this policy should be directed to the Trustees
+Questions regarding this policy should be directed to the Council
 or the ``gentoo-project`` mailing list.  Any concerns over possible
-copyright violations should be directed to the Trustees if they cannot
+copyright violations should be directed to the Council if they cannot
 be worked out with the appropriate maintainer.
 
 
@@ -118,10 +119,7 @@ c) A license approved as GPL compatible by the Free Software
    Foundation [#GPL-COMPAT]_.
 
 Exceptions for other free software licenses will be granted by the
-Gentoo Foundation on a case by case basis.
-
-For easy reference, the license for each project should be documented
-on the wiki page at [#PROJECTS]_.
+Gentoo Council on a case by case basis.
 
 
 Certificate of Origin
@@ -213,7 +211,7 @@ associated project/package providing as much information as possible.
 Files that are not brought into compliance within 60 days or upon a
 request for removal by a aggrieved copyright holder will be removed.
 Any concerns not addressed by a maintainer can be appealed to the
-Trustees.
+Council.
 
 
 Simplified Attribution
@@ -253,6 +251,12 @@ the DCO model and an FLA model [#FLA]_ as it is used by different open
 source projects.  Contributors would be able to freely choose whether
 they sign the FLA document or not.
 
+After Gentoo Linux has become an associated project of Software in the
+Public Interest (SPI) [#SPI]_, the Gentoo Council will be responsible
+for granting of license exceptions and resolution of copyright issues,
+instead of the Gentoo Foundation Trustees.  The Council may confer
+with SPI for issues that it cannot resolve itself.
+
 
 Licensing of Projects
 ---------------------
@@ -274,9 +278,9 @@ license.)
 
 By default, GPL-incompatible licenses (e.g., the CDDL) are not
 allowed, because their use would hinder interchange of code between
-Gentoo projects.  However, the Foundation can grant exceptions to
-this, as long as the license in question is a free software or open
-source license.
+Gentoo projects.  However, the Council can grant exceptions to this,
+as long as the license in question is a free software or open source
+license.
 
 
 Changes to the Certificate of Origin
@@ -367,9 +371,6 @@ References
 .. [#GPL-COMPAT] GPL-compatible free software licenses,
    https://www.gnu.org/licenses/license-list.en.html#GPLCompatibleLicenses
 
-.. [#PROJECTS] Licensing of Gentoo projects,
-   https://wiki.gentoo.org/wiki/Project:Licenses/Licensing_of_Gentoo_projects
-
 .. [#OSDL-DCO] Open Source Development Labs, Inc.,
    Developer's Certificate of Origin 1.1,
    https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
@@ -382,6 +383,9 @@ References
    https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=d4563201f33a022fc0353033d9dfeb1606a88330#n410
    https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d4563201f33a022fc0353033d9dfeb1606a88330
 
+.. [#SPI] Software in the Public Interest,
+   https://www.spi-inc.org/
+
 .. [#CC-SOFTWARE] Can I apply a Creative Commons license to software?
    https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software