public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Haelwenn Monnier" <contact@hacktivis.me>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: licenses/, app-emulation/proton-ge-custom-bin/
Date: Tue,  2 Aug 2022 10:55:18 +0000 (UTC)	[thread overview]
Message-ID: <1659437618.2fe70d5c311e61e7249ef997b51878f61ac55d1a.lanodan@gentoo> (raw)

commit:     2fe70d5c311e61e7249ef997b51878f61ac55d1a
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Tue Aug  2 10:44:03 2022 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue Aug  2 10:53:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2fe70d5c

app-emulation/proton-ge-custom-bin: Fix LICENSE

This is just the BSD-3-Clause aka "BSD" in Gentoo.

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 .../proton-ge-custom-bin-7.27.ebuild               |  2 +-
 licenses/proton                                    | 27 ----------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.27.ebuild b/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.27.ebuild
index 569b83a87..6a91640c6 100644
--- a/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.27.ebuild
+++ b/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.27.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A fancy custom distribution of Valves Proton with various patches"
 HOMEPAGE="https://github.com/GloriousEggroll/proton-ge-custom"
 SRC_URI="https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton${PV/./-}/GE-Proton${PV/./-}.tar.gz"
 S="${WORKDIR}/GE-Proton${PV/./-}"
-LICENSE="|| ( 0BSD LGPL-2+ ZLIB MIT MPL-2.0 OFL-1.1 proton )"
+LICENSE="0BSD LGPL-2+ ZLIB MIT MPL-2.0 OFL-1.1 BSD"
 SLOT="${PV}"
 KEYWORDS="~amd64"
 RESTRICT="mirror strip"

diff --git a/licenses/proton b/licenses/proton
deleted file mode 100644
index 6118cfbf8..000000000
--- a/licenses/proton
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2018-2022, Valve Corporation
-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.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.


WARNING: multiple messages have this Message-ID (diff)
From: "Haelwenn Monnier" <contact@hacktivis.me>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-emulation/proton-ge-custom-bin/, licenses/
Date: Tue,  2 Aug 2022 10:54:18 +0000 (UTC)	[thread overview]
Message-ID: <1659437618.2fe70d5c311e61e7249ef997b51878f61ac55d1a.lanodan@gentoo> (raw)
Message-ID: <20220802105418.RalBUN70_BNANE-OIGp-ND6b7JijSOihZsJismwlbB4@z> (raw)

commit:     2fe70d5c311e61e7249ef997b51878f61ac55d1a
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Tue Aug  2 10:44:03 2022 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue Aug  2 10:53:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2fe70d5c

app-emulation/proton-ge-custom-bin: Fix LICENSE

This is just the BSD-3-Clause aka "BSD" in Gentoo.

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 .../proton-ge-custom-bin-7.27.ebuild               |  2 +-
 licenses/proton                                    | 27 ----------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.27.ebuild b/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.27.ebuild
index 569b83a87..6a91640c6 100644
--- a/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.27.ebuild
+++ b/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.27.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A fancy custom distribution of Valves Proton with various patches"
 HOMEPAGE="https://github.com/GloriousEggroll/proton-ge-custom"
 SRC_URI="https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton${PV/./-}/GE-Proton${PV/./-}.tar.gz"
 S="${WORKDIR}/GE-Proton${PV/./-}"
-LICENSE="|| ( 0BSD LGPL-2+ ZLIB MIT MPL-2.0 OFL-1.1 proton )"
+LICENSE="0BSD LGPL-2+ ZLIB MIT MPL-2.0 OFL-1.1 BSD"
 SLOT="${PV}"
 KEYWORDS="~amd64"
 RESTRICT="mirror strip"

diff --git a/licenses/proton b/licenses/proton
deleted file mode 100644
index 6118cfbf8..000000000
--- a/licenses/proton
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2018-2022, Valve Corporation
-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.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.


             reply	other threads:[~2022-08-02 10:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-02 10:55 Haelwenn Monnier [this message]
2022-08-02 10:54 ` [gentoo-commits] repo/proj/guru:dev commit in: app-emulation/proton-ge-custom-bin/, licenses/ Haelwenn Monnier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1659437618.2fe70d5c311e61e7249ef997b51878f61ac55d1a.lanodan@gentoo \
    --to=contact@hacktivis.me \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox