[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ - 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:	Wed, 26 Jun 2019 18:37:56
Message-Id:	`1561574247.88796cf18e3cf94ca3c23f694eaffd90cf217a19.floppym@gentoo`

1

commit:     88796cf18e3cf94ca3c23f694eaffd90cf217a19

2

Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

3

AuthorDate: Wed Jun 26 18:37:27 2019 +0000

4

Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

5

CommitDate: Wed Jun 26 18:37:27 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88796cf1

7

8

sys-boot/grub: drop debug USE flag, fix sdl dependency

9

10

Closes: https://bugs.gentoo.org/682830

11

Package-Manager: Portage-2.3.67_p12, Repoman-2.3.14_p7

12

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

13

14

 sys-boot/grub/grub-2.02-r4.ebuild  | 9 +++------

15

 sys-boot/grub/grub-2.04_rc1.ebuild | 9 +++------

16

 sys-boot/grub/grub-9999.ebuild     | 9 +++------

17

 3 files changed, 9 insertions(+), 18 deletions(-)

18

19

diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild

20

index e7fdf86942f..2215a61ff45 100644

21

--- a/sys-boot/grub/grub-2.02-r4.ebuild

22

+++ b/sys-boot/grub/grub-2.02-r4.ebuild

23

@@ -58,7 +58,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"

24

 # Includes licenses for dejavu and unifont

25

 LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"

26

 SLOT="2/${PVR}"

27

-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"

28

+IUSE="device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"

29

30

 GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )

31

 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"

32

@@ -75,9 +75,7 @@ REQUIRED_USE="

33

 COMMON_DEPEND="

34

 	app-arch/xz-utils

35

 	>=sys-libs/ncurses-5.2-r5:0=

36

-	debug? (

37

-		sdl? ( media-libs/libsdl )

38

-	)

39

+	sdl? ( media-libs/libsdl )

40

 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )

41

 	libzfs? ( sys-fs/zfs )

42

 	mount? ( sys-fs/fuse:0 )

43

@@ -211,14 +209,13 @@ grub_configure() {

44

 		--program-prefix=

45

 		--libdir="${EPREFIX}"/usr/lib

46

 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html

47

-		$(use_enable debug mm-debug)

48

 		$(use_enable device-mapper)

49

 		$(use_enable mount grub-mount)

50

 		$(use_enable nls)

51

 		$(use_enable themes grub-themes)

52

 		$(use_enable truetype grub-mkfont)

53

 		$(use_enable libzfs)

54

-		$(use sdl && use_enable debug grub-emu-sdl)

55

+		$(use_enable sdl grub-emu-sdl)

56

 		${platform:+--with-platform=}${platform}

57

58

 		# Let configure detect this where supported

59

60

diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild

61

index 38c9444f69a..5970936ad66 100644

62

--- a/sys-boot/grub/grub-2.04_rc1.ebuild

63

+++ b/sys-boot/grub/grub-2.04_rc1.ebuild

64

@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"

65

 # Includes licenses for dejavu and unifont

66

 LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"

67

 SLOT="2/${PVR}"

68

-IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"

69

+IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"

70

71

 GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )

72

 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"

73

@@ -95,9 +95,7 @@ BDEPEND="

74

 COMMON_DEPEND="

75

 	app-arch/xz-utils

76

 	>=sys-libs/ncurses-5.2-r5:0=

77

-	debug? (

78

-		sdl? ( media-libs/libsdl )

79

-	)

80

+	sdl? ( media-libs/libsdl )

81

 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )

82

 	libzfs? ( sys-fs/zfs )

83

 	mount? ( sys-fs/fuse:0 )

84

@@ -211,14 +209,13 @@ grub_configure() {

85

 		--program-prefix=

86

 		--libdir="${EPREFIX}"/usr/lib

87

 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html

88

-		$(use_enable debug mm-debug)

89

 		$(use_enable device-mapper)

90

 		$(use_enable mount grub-mount)

91

 		$(use_enable nls)

92

 		$(use_enable themes grub-themes)

93

 		$(use_enable truetype grub-mkfont)

94

 		$(use_enable libzfs)

95

-		$(use sdl && use_enable debug grub-emu-sdl)

96

+		$(use_enable sdl grub-emu-sdl)

97

 		${platform:+--with-platform=}${platform}

98

99

 		# Let configure detect this where supported

100

101

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild

102

index 38c9444f69a..5970936ad66 100644

103

--- a/sys-boot/grub/grub-9999.ebuild

104

+++ b/sys-boot/grub/grub-9999.ebuild

105

@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"

106

 # Includes licenses for dejavu and unifont

107

 LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"

108

 SLOT="2/${PVR}"

109

-IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"

110

+IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"

111

112

 GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )

113

 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"

114

@@ -95,9 +95,7 @@ BDEPEND="

115

 COMMON_DEPEND="

116

 	app-arch/xz-utils

117

 	>=sys-libs/ncurses-5.2-r5:0=

118

-	debug? (

119

-		sdl? ( media-libs/libsdl )

120

-	)

121

+	sdl? ( media-libs/libsdl )

122

 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )

123

 	libzfs? ( sys-fs/zfs )

124

 	mount? ( sys-fs/fuse:0 )

125

@@ -211,14 +209,13 @@ grub_configure() {

126

 		--program-prefix=

127

 		--libdir="${EPREFIX}"/usr/lib

128

 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html

129

-		$(use_enable debug mm-debug)

130

 		$(use_enable device-mapper)

131

 		$(use_enable mount grub-mount)

132

 		$(use_enable nls)

133

 		$(use_enable themes grub-themes)

134

 		$(use_enable truetype grub-mkfont)

135

 		$(use_enable libzfs)

136

-		$(use sdl && use_enable debug grub-emu-sdl)

137

+		$(use_enable sdl grub-emu-sdl)

138

 		${platform:+--with-platform=}${platform}

139

140

 		# Let configure detect this where supported

1	commit: 88796cf18e3cf94ca3c23f694eaffd90cf217a19
2	Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3	AuthorDate: Wed Jun 26 18:37:27 2019 +0000
4	Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5	CommitDate: Wed Jun 26 18:37:27 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88796cf1
7
8	sys-boot/grub: drop debug USE flag, fix sdl dependency
9
10	Closes: https://bugs.gentoo.org/682830
11	Package-Manager: Portage-2.3.67_p12, Repoman-2.3.14_p7
12	Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14	sys-boot/grub/grub-2.02-r4.ebuild \| 9 +++------
15	sys-boot/grub/grub-2.04_rc1.ebuild \| 9 +++------
16	sys-boot/grub/grub-9999.ebuild \| 9 +++------
17	3 files changed, 9 insertions(+), 18 deletions(-)
18
19	diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
20	index e7fdf86942f..2215a61ff45 100644
21	--- a/sys-boot/grub/grub-2.02-r4.ebuild
22	+++ b/sys-boot/grub/grub-2.02-r4.ebuild
23	@@ -58,7 +58,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
24	# Includes licenses for dejavu and unifont
25	LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
26	SLOT="2/${PVR}"
27	-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
28	+IUSE="device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
29
30	GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
31	IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
32	@@ -75,9 +75,7 @@ REQUIRED_USE="
33	COMMON_DEPEND="
34	app-arch/xz-utils
35	>=sys-libs/ncurses-5.2-r5:0=
36	- debug? (
37	- sdl? ( media-libs/libsdl )
38	- )
39	+ sdl? ( media-libs/libsdl )
40	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
41	libzfs? ( sys-fs/zfs )
42	mount? ( sys-fs/fuse:0 )
43	@@ -211,14 +209,13 @@ grub_configure() {
44	--program-prefix=
45	--libdir="${EPREFIX}"/usr/lib
46	--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
47	- $(use_enable debug mm-debug)
48	$(use_enable device-mapper)
49	$(use_enable mount grub-mount)
50	$(use_enable nls)
51	$(use_enable themes grub-themes)
52	$(use_enable truetype grub-mkfont)
53	$(use_enable libzfs)
54	- $(use sdl && use_enable debug grub-emu-sdl)
55	+ $(use_enable sdl grub-emu-sdl)
56	${platform:+--with-platform=}${platform}
57
58	# Let configure detect this where supported
59
60	diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
61	index 38c9444f69a..5970936ad66 100644
62	--- a/sys-boot/grub/grub-2.04_rc1.ebuild
63	+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
64	@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
65	# Includes licenses for dejavu and unifont
66	LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
67	SLOT="2/${PVR}"
68	-IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
69	+IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
70
71	GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
72	IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
73	@@ -95,9 +95,7 @@ BDEPEND="
74	COMMON_DEPEND="
75	app-arch/xz-utils
76	>=sys-libs/ncurses-5.2-r5:0=
77	- debug? (
78	- sdl? ( media-libs/libsdl )
79	- )
80	+ sdl? ( media-libs/libsdl )
81	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
82	libzfs? ( sys-fs/zfs )
83	mount? ( sys-fs/fuse:0 )
84	@@ -211,14 +209,13 @@ grub_configure() {
85	--program-prefix=
86	--libdir="${EPREFIX}"/usr/lib
87	--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
88	- $(use_enable debug mm-debug)
89	$(use_enable device-mapper)
90	$(use_enable mount grub-mount)
91	$(use_enable nls)
92	$(use_enable themes grub-themes)
93	$(use_enable truetype grub-mkfont)
94	$(use_enable libzfs)
95	- $(use sdl && use_enable debug grub-emu-sdl)
96	+ $(use_enable sdl grub-emu-sdl)
97	${platform:+--with-platform=}${platform}
98
99	# Let configure detect this where supported
100
101	diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
102	index 38c9444f69a..5970936ad66 100644
103	--- a/sys-boot/grub/grub-9999.ebuild
104	+++ b/sys-boot/grub/grub-9999.ebuild
105	@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
106	# Includes licenses for dejavu and unifont
107	LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
108	SLOT="2/${PVR}"
109	-IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
110	+IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
111
112	GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
113	IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
114	@@ -95,9 +95,7 @@ BDEPEND="
115	COMMON_DEPEND="
116	app-arch/xz-utils
117	>=sys-libs/ncurses-5.2-r5:0=
118	- debug? (
119	- sdl? ( media-libs/libsdl )
120	- )
121	+ sdl? ( media-libs/libsdl )
122	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
123	libzfs? ( sys-fs/zfs )
124	mount? ( sys-fs/fuse:0 )
125	@@ -211,14 +209,13 @@ grub_configure() {
126	--program-prefix=
127	--libdir="${EPREFIX}"/usr/lib
128	--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
129	- $(use_enable debug mm-debug)
130	$(use_enable device-mapper)
131	$(use_enable mount grub-mount)
132	$(use_enable nls)
133	$(use_enable themes grub-themes)
134	$(use_enable truetype grub-mkfont)
135	$(use_enable libzfs)
136	- $(use sdl && use_enable debug grub-emu-sdl)
137	+ $(use_enable sdl grub-emu-sdl)
138	${platform:+--with-platform=}${platform}
139
140	# Let configure detect this where supported

Gentoo Archives: gentoo-commits