public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: licenses/, net-libs/libmicrohttpd/
@ 2023-05-13  3:31 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2023-05-13  3:31 UTC (permalink / raw
  To: gentoo-commits

commit:     fcfd98e57900829d87cc7af89eca0b755ad27f9c
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Thu May 11 12:39:23 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 03:30:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcfd98e5

net-libs/libmicrohttpd: fixed license

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/30986
Signed-off-by: Sam James <sam <AT> gentoo.org>

 licenses/GPL-2+-with-eCos-exception-2              | 12 ++++++++++++
 net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild |  2 +-
 net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/licenses/GPL-2+-with-eCos-exception-2 b/licenses/GPL-2+-with-eCos-exception-2
new file mode 100644
index 000000000000..e5cceeaf5f24
--- /dev/null
+++ b/licenses/GPL-2+-with-eCos-exception-2
@@ -0,0 +1,12 @@
+GNU General Public License, version 2 or any later version.
+See GPL-2 or GPL-3 for the full text of these licenses.
+
+As a special exception, if other files instantiate templates or use macros or
+inline functions from this file, or you compile this file and link it with
+other works to produce a work based on this file, this file does not by itself
+cause the resulting work to be covered by the GNU General Public License.
+However the source code for this file must still be made available in
+accordance with section (3) of the GNU General Public License v2.
+
+This exception does not invalidate any other reasons why a work based on this
+file might be covered by the GNU General Public License.

diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
index 1bb9ef7f324f..62bf8e01dbaf 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 
-LICENSE="LGPL-2.1+"
+LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )"
 SLOT="0/12"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+epoll ssl static-libs test +thread-names"

diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
index bf4d507938ba..9cda5c5d4ffa 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 
-LICENSE="LGPL-2.1+"
+LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+epoll ssl static-libs test +thread-names"


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2023-05-13  3:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-13  3:31 [gentoo-commits] repo/gentoo:master commit in: licenses/, net-libs/libmicrohttpd/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox