From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 27 Oct 2016 09:13:56 +0000 (+0200)
Subject: sys-libs/libomp: Add missing licenses, #598106
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cb65bb54bf92658016c2ec4657fa2faf3eb13e26;p=gentoo.git

sys-libs/libomp: Add missing licenses, #598106
---

diff --git a/sys-libs/libomp/libomp-3.7.0.ebuild b/sys-libs/libomp/libomp-3.7.0.ebuild
index f3ea5052ffbe..f067d24294bf 100644
--- a/sys-libs/libomp/libomp-3.7.0.ebuild
+++ b/sys-libs/libomp/libomp-3.7.0.ebuild
@@ -13,7 +13,11 @@ DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="http://openmp.llvm.org"
 SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
 
-LICENSE="UoI-NCSA"
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0/3.7"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sys-libs/libomp/libomp-3.7.1.ebuild b/sys-libs/libomp/libomp-3.7.1.ebuild
index b121661c7d03..0cd5101e2435 100644
--- a/sys-libs/libomp/libomp-3.7.1.ebuild
+++ b/sys-libs/libomp/libomp-3.7.1.ebuild
@@ -13,7 +13,11 @@ DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="http://openmp.llvm.org"
 SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
 
-LICENSE="UoI-NCSA"
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0/3.7"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sys-libs/libomp/libomp-3.8.0.ebuild b/sys-libs/libomp/libomp-3.8.0.ebuild
index a35930ccf9ba..69d0c71faaf1 100644
--- a/sys-libs/libomp/libomp-3.8.0.ebuild
+++ b/sys-libs/libomp/libomp-3.8.0.ebuild
@@ -13,7 +13,11 @@ DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="http://openmp.llvm.org"
 SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
 
-LICENSE="UoI-NCSA"
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0/3.8"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sys-libs/libomp/libomp-3.8.1.ebuild b/sys-libs/libomp/libomp-3.8.1.ebuild
index a35930ccf9ba..69d0c71faaf1 100644
--- a/sys-libs/libomp/libomp-3.8.1.ebuild
+++ b/sys-libs/libomp/libomp-3.8.1.ebuild
@@ -13,7 +13,11 @@ DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="http://openmp.llvm.org"
 SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
 
-LICENSE="UoI-NCSA"
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0/3.8"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sys-libs/libomp/libomp-3.9.0.ebuild b/sys-libs/libomp/libomp-3.9.0.ebuild
index dad69636c3e5..6626fab9b01a 100644
--- a/sys-libs/libomp/libomp-3.9.0.ebuild
+++ b/sys-libs/libomp/libomp-3.9.0.ebuild
@@ -13,7 +13,11 @@ DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="http://openmp.llvm.org"
 SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
 
-LICENSE="UoI-NCSA"
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0/3.9"
 KEYWORDS="~amd64 ~x86"
 IUSE="hwloc ompt"
diff --git a/sys-libs/libomp/libomp-9999.ebuild b/sys-libs/libomp/libomp-9999.ebuild
index 32c0683b71d1..a61c877c62d5 100644
--- a/sys-libs/libomp/libomp-9999.ebuild
+++ b/sys-libs/libomp/libomp-9999.ebuild
@@ -15,7 +15,11 @@ SRC_URI=""
 EGIT_REPO_URI="http://llvm.org/git/openmp.git
 	https://github.com/llvm-mirror/openmp.git"
 
-LICENSE="UoI-NCSA"
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS=""
 IUSE="hwloc ompt test"