Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
Date: Sun, 29 Dec 2019 19:18:10
Message-Id: 1577647069.da4ea6db373056dc9da5209ec60b2850842f06ce.floppym@gentoo
1 commit: da4ea6db373056dc9da5209ec60b2850842f06ce
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 29 19:17:49 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 29 19:17:49 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4ea6db
7
8 sys-boot/grub: update LICENSE
9
10 Closes: https://bugs.gentoo.org/662830
11 Package-Manager: Portage-2.3.82, Repoman-2.3.20_p9
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 sys-boot/grub/grub-2.02-r4.ebuild | 2 +-
15 sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
16 sys-boot/grub/grub-2.04_rc1.ebuild | 2 +-
17 sys-boot/grub/grub-9999.ebuild | 2 +-
18 4 files changed, 4 insertions(+), 4 deletions(-)
19
20 diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
21 index acd2c79e379..337ecc9a72d 100644
22 --- a/sys-boot/grub/grub-2.02-r4.ebuild
23 +++ b/sys-boot/grub/grub-2.02-r4.ebuild
24 @@ -56,7 +56,7 @@ DESCRIPTION="GNU GRUB boot loader"
25 HOMEPAGE="https://www.gnu.org/software/grub/"
26
27 # Includes licenses for dejavu and unifont
28 -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
29 +LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
30 SLOT="2/${PVR}"
31 IUSE="device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
32
33
34 diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
35 index e2119933d19..d3c1222ae04 100644
36 --- a/sys-boot/grub/grub-2.04-r1.ebuild
37 +++ b/sys-boot/grub/grub-2.04-r1.ebuild
38 @@ -51,7 +51,7 @@ DESCRIPTION="GNU GRUB boot loader"
39 HOMEPAGE="https://www.gnu.org/software/grub/"
40
41 # Includes licenses for dejavu and unifont
42 -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
43 +LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
44 SLOT="2/${PVR}"
45 IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
46
47
48 diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
49 index 545017ee85a..3eadfcfcfbe 100644
50 --- a/sys-boot/grub/grub-2.04_rc1.ebuild
51 +++ b/sys-boot/grub/grub-2.04_rc1.ebuild
52 @@ -50,7 +50,7 @@ DESCRIPTION="GNU GRUB boot loader"
53 HOMEPAGE="https://www.gnu.org/software/grub/"
54
55 # Includes licenses for dejavu and unifont
56 -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
57 +LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
58 SLOT="2/${PVR}"
59 IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
60
61
62 diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
63 index 6b165af8248..280a0bc3a90 100644
64 --- a/sys-boot/grub/grub-9999.ebuild
65 +++ b/sys-boot/grub/grub-9999.ebuild
66 @@ -50,7 +50,7 @@ DESCRIPTION="GNU GRUB boot loader"
67 HOMEPAGE="https://www.gnu.org/software/grub/"
68
69 # Includes licenses for dejavu and unifont
70 -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
71 +LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
72 SLOT="2/${PVR}"
73 IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"