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: Thu, 22 Jun 2017 18:32:34
Message-Id: 1498156272.dc39d7b692b39fa398f71b71a6f37b331ccc138f.floppym@gentoo
1 commit: dc39d7b692b39fa398f71b71a6f37b331ccc138f
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 22 18:31:12 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 22 18:31:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc39d7b6
7
8 sys-boot/grub: remove old
9
10 Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77
11
12 sys-boot/grub/Manifest | 9 -
13 sys-boot/grub/grub-2.02_beta2-r9.ebuild | 323 --------------------------------
14 sys-boot/grub/grub-2.02_beta3-r1.ebuild | 291 ----------------------------
15 sys-boot/grub/grub-2.02_rc1.ebuild | 284 ----------------------------
16 sys-boot/grub/grub-2.02_rc2.ebuild | 298 -----------------------------
17 5 files changed, 1205 deletions(-)
18
19 diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
20 index 029dcd6b340..32b751da264 100644
21 --- a/sys-boot/grub/Manifest
22 +++ b/sys-boot/grub/Manifest
23 @@ -1,15 +1,6 @@
24 -DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
25 -DIST dejavu-sans-ttf-2.35.zip 415463 SHA256 c629bce270e75b6234d5285a739cd186bebc27319993f4b1ea6beb3631810799 SHA512 23c24218da70b3a93fa8c72e8db972b2b881bf3f76056a9315e29162743a8edaf5b699e0a527de121ca5f9efe07243eaf15811db355dba8cca1b92bdd1210732 WHIRLPOOL e3436818e11dab0330bff1a129d1e6fbf670b06a362b353f7bd00388cf46790bde202f1f7dd67b03ad7f9ae7d76098a5a72bc5321f359c2138c4d42c0cebc2aa
26 DIST dejavu-sans-ttf-2.37.zip 417746 SHA256 5c6e497a2f36552cb5ffb112c413a6af39c0f3c47653662b90b4fa6499822fd7 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae WHIRLPOOL 6f19280e76ea3efe265db09236e94bdd00268c5d8742c191100b8eb19faa532289fb03d838e33aa3c501d8a3243db248648af8929d5d5dba1bfd2ea2c10358cd
27 DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
28 DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
29 DIST grub-2.02.tar.xz 6113260 SHA256 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 WHIRLPOOL a7f5d786064642f926faa444b9db1555ccfbb460655f81a0ca408bc5ad2acfb89fe596f81d161078944ce1b2dc00e82e8fb056f050bf026fc07f6417af7b9776
30 -DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
31 -DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
32 -DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 SHA512 4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 WHIRLPOOL b1042c24060e35ea5a492b7258b147fde80c949c2e81dcff3a31750966b7d31cdb62e1492274843f313226d70b202a8edbf08d11c5e79e4173a4c373879e4aad
33 -DIST grub-2.02~rc1.tar.xz 6051964 SHA256 445239e9b96d1143c194c1d37851cf4196b83701c60172e49665e9d453d80278 SHA512 c55a91f43d3c065dc9303fc9ab164910432095a571e28082cbcae646b8b92212f85da22873af99a1a5d7c943c51e2f90837dd2c68abf87ff50bf2e5955877f39 WHIRLPOOL 7ae697d8de28f1e936e49662564900ce82402895a7d3d07c70879c68ed9765ac2e82a89a8d2da4cfb6ecf64cc04c61ff4b889283a2e8abad0c38d86d889a6317
34 -DIST grub-2.02~rc2.tar.xz 6055836 SHA256 053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246 SHA512 00c79c1642ea5d5688a4b59f71315ed72e467f8964e198f0b78f7b95378a07a69087914033bb799e3b1946e0ba116e153c1141ad6a1ea49143203eda3f16b228 WHIRLPOOL 1ab5279113becb33ec2b3339ec584a0ea2021e1edd15a23cca6398eb3499c58846eb4d5b15dae7e08ec69d13146bb50eaf4f7f986084a47c416e43951a52d62b
35 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
36 -DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
37 -DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
38 DIST unifont-9.0.06.pcf.gz 1360354 SHA256 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 WHIRLPOOL 3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b
39
40 diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
41 deleted file mode 100644
42 index 22a4044fc58..00000000000
43 --- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
44 +++ /dev/null
45 @@ -1,323 +0,0 @@
46 -# Copyright 1999-2017 Gentoo Foundation
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=5
50 -
51 -AUTOTOOLS_AUTORECONF=1
52 -GRUB_AUTOGEN=1
53 -
54 -if [[ -n ${GRUB_AUTOGEN} ]]; then
55 - PYTHON_COMPAT=( python{2_7,3_3,3_4} )
56 - inherit python-any-r1
57 -fi
58 -
59 -inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
60 -
61 -if [[ ${PV} != 9999 ]]; then
62 - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
63 - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
64 - MY_P=${P/_/'~'}
65 - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
66 - https://dev.gentoo.org/~floppym/dist/${P}-gentoo-r3.tar.xz"
67 - S=${WORKDIR}/${MY_P}
68 - else
69 - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
70 - https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
71 - S=${WORKDIR}/${P%_*}
72 - fi
73 - KEYWORDS="amd64 x86"
74 -else
75 - inherit git-r3
76 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
77 - http://git.savannah.gnu.org/r/grub.git"
78 -fi
79 -
80 -DEJAVU=dejavu-sans-ttf-2.34
81 -UNIFONT=unifont-7.0.06
82 -SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
83 - themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
84 -
85 -DESCRIPTION="GNU GRUB boot loader"
86 -HOMEPAGE="https://www.gnu.org/software/grub/"
87 -
88 -# Includes licenses for dejavu and unifont
89 -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
90 -SLOT="2/${PVR}"
91 -IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
92 -
93 -GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
94 -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
95 -
96 -REQUIRED_USE="
97 - grub_platforms_coreboot? ( fonts )
98 - grub_platforms_qemu? ( fonts )
99 - grub_platforms_ieee1275? ( fonts )
100 - grub_platforms_loongson? ( fonts )
101 -"
102 -
103 -# os-prober: Used on runtime to detect other OSes
104 -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
105 -RDEPEND="
106 - app-arch/xz-utils
107 - >=sys-libs/ncurses-5.2-r5:0=
108 - debug? (
109 - sdl? ( media-libs/libsdl )
110 - )
111 - device-mapper? ( >=sys-fs/lvm2-2.02.45 )
112 - libzfs? ( sys-fs/zfs )
113 - mount? ( sys-fs/fuse )
114 - truetype? ( media-libs/freetype:2= )
115 - ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
116 - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
117 -"
118 -DEPEND="${RDEPEND}
119 - ${PYTHON_DEPS}
120 - app-misc/pax-utils
121 - sys-devel/flex
122 - sys-devel/bison
123 - sys-apps/help2man
124 - sys-apps/texinfo
125 - fonts? ( media-libs/freetype:2 )
126 - grub_platforms_xen? ( app-emulation/xen-tools:= )
127 - static? (
128 - app-arch/xz-utils[static-libs(+)]
129 - truetype? (
130 - app-arch/bzip2[static-libs(+)]
131 - media-libs/freetype[static-libs(+)]
132 - sys-libs/zlib[static-libs(+)]
133 - )
134 - )
135 - test? (
136 - dev-libs/libisoburn
137 - app-emulation/qemu
138 - )
139 - themes? (
140 - app-arch/unzip
141 - media-libs/freetype:2
142 - )
143 -"
144 -RDEPEND+="
145 - kernel_linux? (
146 - grub_platforms_efi-32? ( sys-boot/efibootmgr )
147 - grub_platforms_efi-64? ( sys-boot/efibootmgr )
148 - )
149 - !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
150 - nls? ( sys-devel/gettext )
151 -"
152 -
153 -DEPEND+=" !!=media-libs/freetype-2.5.4"
154 -
155 -STRIP_MASK="*/grub/*/*.{mod,img}"
156 -RESTRICT="!test? ( test )"
157 -
158 -QA_EXECSTACK="
159 - usr/bin/grub*-emu*
160 - usr/lib*/grub/*/*.mod
161 - usr/lib*/grub/*/*.module
162 - usr/lib*/grub/*/kernel.exec
163 - usr/lib*/grub/*/kernel.img
164 -"
165 -
166 -QA_WX_LOAD="
167 - usr/lib*/grub/*/kernel.exec
168 - usr/lib*/grub/*/kernel.img
169 - usr/lib*/grub/*/*.image
170 -"
171 -
172 -QA_PRESTRIPPED="
173 - usr/lib.*/grub/.*/kernel.img
174 -"
175 -
176 -src_unpack() {
177 - if [[ ${PV} == 9999 ]]; then
178 - git-r3_src_unpack
179 - fi
180 - default_src_unpack
181 -}
182 -
183 -src_prepare() {
184 - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
185 -
186 - epatch "${FILESDIR}"/CVE-2015-8370.patch
187 - epatch "${FILESDIR}"/${P}-lvm2-raid1.patch
188 - epatch "${FILESDIR}"/${P}-KERNEL_GLOBS.patch
189 -
190 - sed -i -e /autoreconf/d autogen.sh || die
191 -
192 - if use multislot; then
193 - # fix texinfo file name, bug 416035
194 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
195 - fi
196 -
197 - epatch_user
198 -
199 - if [[ -n ${GRUB_AUTOGEN} ]]; then
200 - python_setup
201 - bash autogen.sh || die
202 - fi
203 -
204 - if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
205 - autopoint() { return 0; }
206 - eautoreconf
207 - fi
208 -}
209 -
210 -setup_fonts() {
211 - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
212 - if use themes; then
213 - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
214 - fi
215 -}
216 -
217 -grub_configure() {
218 - local platform
219 -
220 - case ${MULTIBUILD_VARIANT} in
221 - efi-32)
222 - platform=efi
223 - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
224 - local CTARGET=${CTARGET:-i386}
225 - fi ;;
226 - efi-64)
227 - platform=efi
228 - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
229 - local CTARGET=${CTARGET:-x86_64}
230 - local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
231 - local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
232 - export TARGET_CFLAGS TARGET_CPPFLAGS
233 - fi ;;
234 - guessed) ;;
235 - *) platform=${MULTIBUILD_VARIANT} ;;
236 - esac
237 -
238 - local myeconfargs=(
239 - --disable-werror
240 - --program-prefix=
241 - --libdir="${EPREFIX}"/usr/lib
242 - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
243 - $(use_enable debug mm-debug)
244 - $(use_enable debug grub-emu-usb)
245 - $(use_enable device-mapper)
246 - $(use_enable mount grub-mount)
247 - $(use_enable nls)
248 - $(use_enable themes grub-themes)
249 - $(use_enable truetype grub-mkfont)
250 - $(use_enable libzfs)
251 - $(use sdl && use_enable debug grub-emu-sdl)
252 - ${platform:+--with-platform=}${platform}
253 -
254 - # Let configure detect this where supported
255 - $(usex efiemu '' '--disable-efiemu')
256 - )
257 -
258 - if use multislot; then
259 - myeconfargs+=( --program-transform-name="s,grub,grub2," )
260 - fi
261 -
262 - mkdir -p "${BUILD_DIR}" || die
263 - run_in_build_dir setup_fonts
264 -
265 - autotools-utils_src_configure
266 -}
267 -
268 -src_configure() {
269 - # Bug 508758.
270 - replace-flags -O3 -O2
271 -
272 - # We don't want to leak flags onto boot code.
273 - export HOST_CCASFLAGS=${CCASFLAGS}
274 - export HOST_CFLAGS=${CFLAGS}
275 - export HOST_CPPFLAGS=${CPPFLAGS}
276 - export HOST_LDFLAGS=${LDFLAGS}
277 - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
278 -
279 - use static && HOST_LDFLAGS+=" -static"
280 -
281 - tc-ld-disable-gold #439082 #466536 #526348
282 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
283 - unset LDFLAGS
284 -
285 - tc-export CC NM OBJCOPY RANLIB STRIP
286 - tc-export BUILD_CC # Bug 485592
287 -
288 - # Portage will take care of cleaning up GRUB_PLATFORMS
289 - MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
290 - multibuild_parallel_foreach_variant grub_configure
291 -}
292 -
293 -src_compile() {
294 - # Sandbox bug 404013.
295 - use libzfs && addpredict /etc/dfs:/dev/zfs
296 -
297 - multibuild_foreach_variant autotools-utils_src_compile
298 -
299 - use doc && multibuild_for_best_variant \
300 - autotools-utils_src_compile -C docs html
301 -}
302 -
303 -src_test() {
304 - # The qemu dependency is a bit complex.
305 - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
306 - multibuild_foreach_variant autotools-utils_src_test
307 -}
308 -
309 -src_install() {
310 - multibuild_foreach_variant autotools-utils_src_install \
311 - bashcompletiondir="$(get_bashcompdir)"
312 -
313 - local grub=grub
314 - if use multislot; then
315 - grub=grub2
316 - mv "${ED%/}"/usr/share/info/grub{,2}.info || die
317 - mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die
318 - fi
319 -
320 - bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe}
321 -
322 - use doc && multibuild_for_best_variant run_in_build_dir \
323 - emake -C docs DESTDIR="${D}" install-html
324 -
325 - insinto /etc/default
326 - newins "${FILESDIR}"/grub.default-3 grub
327 -}
328 -
329 -pkg_postinst() {
330 - mount-boot_mount_boot_partition
331 -
332 - if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
333 - ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
334 - ewarn "Please run $(usex multislot grub2 grub)-install and $(usex multislot grub2 grub)-mkconfig -o /boot/grub/grub.cfg."
335 -
336 - if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
337 - mkdir -p "${ROOT%/}/boot/grub"
338 - ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
339 - fi
340 - fi
341 -
342 - mount-boot_pkg_postinst
343 -
344 - elog "For information on how to configure GRUB2 please refer to the guide:"
345 - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
346 -
347 - if has_version 'sys-boot/grub:0'; then
348 - elog "A migration guide for GRUB Legacy users is available:"
349 - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"
350 - fi
351 -
352 - if [[ -z ${REPLACING_VERSIONS} ]]; then
353 - elog
354 - elog "You may consider installing the following optional packages:"
355 - optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
356 - optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
357 - optfeature "Enable RAID device detection" sys-fs/mdadm
358 - else
359 - local v
360 - for v in ${REPLACING_VERSIONS}; do
361 - if ! version_is_at_least 2.02_beta2-r8 ${v}; then
362 - ewarn "Please re-run $(usex multislot grub2 grub)-install to address a security flaw when using"
363 - ewarn "username/password authentication in grub."
364 - ewarn "See bug 568326 for more information."
365 - fi
366 - done
367 - fi
368 -}
369
370 diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
371 deleted file mode 100644
372 index e9079dbea6e..00000000000
373 --- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
374 +++ /dev/null
375 @@ -1,291 +0,0 @@
376 -# Copyright 1999-2017 Gentoo Foundation
377 -# Distributed under the terms of the GNU General Public License v2
378 -
379 -EAPI=6
380 -
381 -if [[ ${PV} == 9999 ]]; then
382 - PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
383 - inherit python-any-r1
384 -fi
385 -
386 -inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
387 -
388 -if [[ ${PV} != 9999 ]]; then
389 - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
390 - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
391 - MY_P=${P/_/'~'}
392 - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
393 - S=${WORKDIR}/${MY_P}
394 - else
395 - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
396 - mirror://gentoo/${P}.tar.xz
397 - https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
398 - S=${WORKDIR}/${P%_*}
399 - fi
400 - KEYWORDS="amd64 x86"
401 -else
402 - inherit git-r3
403 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
404 - http://git.savannah.gnu.org/r/grub.git"
405 -fi
406 -
407 -PATCHES=(
408 - "${FILESDIR}"/gfxpayload.patch
409 - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
410 - "${FILESDIR}"/2.02_beta3-10_linux-UUID.patch
411 - "${FILESDIR}"/2.02_beta3-sysmacros.patch
412 - "${FILESDIR}"/2.02_beta3-gcc6-ld-no-pie.patch
413 -)
414 -
415 -DEJAVU=dejavu-sans-ttf-2.35
416 -UNIFONT=unifont-8.0.01
417 -SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
418 - themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
419 -
420 -DESCRIPTION="GNU GRUB boot loader"
421 -HOMEPAGE="https://www.gnu.org/software/grub/"
422 -
423 -# Includes licenses for dejavu and unifont
424 -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
425 -SLOT="2/${PVR}"
426 -IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
427 -
428 -GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
429 -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
430 -
431 -REQUIRED_USE="
432 - grub_platforms_coreboot? ( fonts )
433 - grub_platforms_qemu? ( fonts )
434 - grub_platforms_ieee1275? ( fonts )
435 - grub_platforms_loongson? ( fonts )
436 -"
437 -
438 -# os-prober: Used on runtime to detect other OSes
439 -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
440 -RDEPEND="
441 - app-arch/xz-utils
442 - >=sys-libs/ncurses-5.2-r5:0=
443 - debug? (
444 - sdl? ( media-libs/libsdl )
445 - )
446 - device-mapper? ( >=sys-fs/lvm2-2.02.45 )
447 - libzfs? ( sys-fs/zfs )
448 - mount? ( sys-fs/fuse )
449 - truetype? ( media-libs/freetype:2= )
450 - ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
451 - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
452 -"
453 -DEPEND="${RDEPEND}
454 - ${PYTHON_DEPS}
455 - app-misc/pax-utils
456 - sys-devel/flex
457 - sys-devel/bison
458 - sys-apps/help2man
459 - sys-apps/texinfo
460 - fonts? ( media-libs/freetype:2 )
461 - grub_platforms_xen? ( app-emulation/xen-tools:= )
462 - grub_platforms_xen-32? ( app-emulation/xen-tools:= )
463 - static? (
464 - app-arch/xz-utils[static-libs(+)]
465 - truetype? (
466 - app-arch/bzip2[static-libs(+)]
467 - media-libs/freetype[static-libs(+)]
468 - sys-libs/zlib[static-libs(+)]
469 - )
470 - )
471 - test? (
472 - dev-libs/libisoburn
473 - app-emulation/qemu
474 - )
475 - themes? (
476 - app-arch/unzip
477 - media-libs/freetype:2
478 - )
479 -"
480 -RDEPEND+="
481 - kernel_linux? (
482 - grub_platforms_efi-32? ( sys-boot/efibootmgr )
483 - grub_platforms_efi-64? ( sys-boot/efibootmgr )
484 - )
485 - !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
486 - nls? ( sys-devel/gettext )
487 -"
488 -
489 -DEPEND+=" !!=media-libs/freetype-2.5.4"
490 -
491 -STRIP_MASK="*/grub/*/*.{mod,img}"
492 -RESTRICT="!test? ( test )"
493 -
494 -QA_EXECSTACK="
495 - usr/bin/grub*-emu*
496 - usr/lib*/grub/*/*.mod
497 - usr/lib*/grub/*/*.module
498 - usr/lib*/grub/*/kernel.exec
499 - usr/lib*/grub/*/kernel.img
500 -"
501 -
502 -QA_WX_LOAD="usr/lib/grub/*"
503 -
504 -QA_PRESTRIPPED="
505 - usr/lib.*/grub/.*/kernel.img
506 -"
507 -
508 -src_unpack() {
509 - if [[ ${PV} == 9999 ]]; then
510 - git-r3_src_unpack
511 - fi
512 - default
513 -}
514 -
515 -src_prepare() {
516 - default
517 -
518 - sed -i -e /autoreconf/d autogen.sh || die
519 -
520 - if use multislot; then
521 - # fix texinfo file name, bug 416035
522 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
523 - fi
524 -
525 - autopoint() { :; }
526 - eautoreconf
527 -}
528 -
529 -grub_do() {
530 - multibuild_foreach_variant run_in_build_dir "$@"
531 -}
532 -
533 -grub_do_once() {
534 - multibuild_for_best_variant run_in_build_dir "$@"
535 -}
536 -
537 -grub_configure() {
538 - local platform
539 -
540 - case ${MULTIBUILD_VARIANT} in
541 - efi*) platform=efi ;;
542 - xen*) platform=xen ;;
543 - guessed) ;;
544 - *) platform=${MULTIBUILD_VARIANT} ;;
545 - esac
546 -
547 - case ${MULTIBUILD_VARIANT} in
548 - *-32)
549 - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
550 - local CTARGET=i386
551 - fi ;;
552 - *-64)
553 - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
554 - local CTARGET=x86_64
555 - local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
556 - local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
557 - fi ;;
558 - esac
559 -
560 - local myeconfargs=(
561 - --disable-werror
562 - --program-prefix=
563 - --libdir="${EPREFIX}"/usr/lib
564 - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
565 - $(use_enable debug mm-debug)
566 - $(use_enable device-mapper)
567 - $(use_enable mount grub-mount)
568 - $(use_enable nls)
569 - $(use_enable themes grub-themes)
570 - $(use_enable truetype grub-mkfont)
571 - $(use_enable libzfs)
572 - $(use sdl && use_enable debug grub-emu-sdl)
573 - ${platform:+--with-platform=}${platform}
574 -
575 - # Let configure detect this where supported
576 - $(usex efiemu '' '--disable-efiemu')
577 - )
578 -
579 - if use multislot; then
580 - myeconfargs+=( --program-transform-name="s,grub,grub2," )
581 - fi
582 -
583 - # Set up font symlinks
584 - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
585 - if use themes; then
586 - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
587 - fi
588 -
589 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
590 -}
591 -
592 -src_configure() {
593 - # Bug 508758.
594 - replace-flags -O3 -O2
595 -
596 - # We don't want to leak flags onto boot code.
597 - export HOST_CCASFLAGS=${CCASFLAGS}
598 - export HOST_CFLAGS=${CFLAGS}
599 - export HOST_CPPFLAGS=${CPPFLAGS}
600 - export HOST_LDFLAGS=${LDFLAGS}
601 - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
602 -
603 - use static && HOST_LDFLAGS+=" -static"
604 -
605 - tc-ld-disable-gold #439082 #466536 #526348
606 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
607 - unset LDFLAGS
608 -
609 - tc-export CC NM OBJCOPY RANLIB STRIP
610 - tc-export BUILD_CC # Bug 485592
611 -
612 - # Portage will take care of cleaning up GRUB_PLATFORMS
613 - MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
614 - grub_do grub_configure
615 -}
616 -
617 -src_compile() {
618 - # Sandbox bug 404013.
619 - use libzfs && addpredict /etc/dfs:/dev/zfs
620 -
621 - grub_do emake
622 - use doc && grub_do_once emake -C docs html
623 -}
624 -
625 -src_test() {
626 - # The qemu dependency is a bit complex.
627 - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
628 - grub_do emake check
629 -}
630 -
631 -src_install() {
632 - grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
633 - use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
634 -
635 - einstalldocs
636 -
637 - dodoc "${FILESDIR}/grub.cfg.example"
638 -
639 - if use multislot; then
640 - mv "${ED%/}"/usr/share/info/grub{,2}.info || die
641 - fi
642 -
643 - insinto /etc/default
644 - newins "${FILESDIR}"/grub.default-3 grub
645 -}
646 -
647 -pkg_postinst() {
648 - elog "For information on how to configure GRUB2 please refer to the guide:"
649 - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
650 - elog
651 - elog "For manual configuration, see /usr/share/doc/${PF}/grub.cfg.example"
652 -
653 - if has_version 'sys-boot/grub:0'; then
654 - elog
655 - elog "A migration guide for GRUB Legacy users is available:"
656 - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"
657 - fi
658 -
659 - if [[ -z ${REPLACING_VERSIONS} ]]; then
660 - elog
661 - elog "You may consider installing the following optional packages:"
662 - optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
663 - optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
664 - optfeature "Enable RAID device detection" sys-fs/mdadm
665 - fi
666 -}
667
668 diff --git a/sys-boot/grub/grub-2.02_rc1.ebuild b/sys-boot/grub/grub-2.02_rc1.ebuild
669 deleted file mode 100644
670 index ef61e338186..00000000000
671 --- a/sys-boot/grub/grub-2.02_rc1.ebuild
672 +++ /dev/null
673 @@ -1,284 +0,0 @@
674 -# Copyright 1999-2017 Gentoo Foundation
675 -# Distributed under the terms of the GNU General Public License v2
676 -
677 -EAPI=6
678 -
679 -if [[ ${PV} == 9999 ]]; then
680 - GRUB_AUTOGEN=1
681 -fi
682 -
683 -if [[ -n ${GRUB_AUTOGEN} ]]; then
684 - PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
685 - WANT_LIBTOOL=none
686 - inherit autotools python-any-r1
687 -fi
688 -
689 -inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
690 -
691 -if [[ ${PV} != 9999 ]]; then
692 - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
693 - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
694 - MY_P=${P/_/'~'}
695 - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
696 - S=${WORKDIR}/${MY_P}
697 - else
698 - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
699 - S=${WORKDIR}/${P%_*}
700 - fi
701 - KEYWORDS="~amd64 ~arm64 ~x86"
702 -else
703 - inherit git-r3
704 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
705 - http://git.savannah.gnu.org/r/grub.git"
706 -fi
707 -
708 -PATCHES=(
709 - "${FILESDIR}"/gfxpayload.patch
710 - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
711 -)
712 -
713 -DEJAVU=dejavu-sans-ttf-2.37
714 -UNIFONT=unifont-9.0.06
715 -SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
716 - themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
717 -
718 -DESCRIPTION="GNU GRUB boot loader"
719 -HOMEPAGE="https://www.gnu.org/software/grub/"
720 -
721 -# Includes licenses for dejavu and unifont
722 -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
723 -SLOT="2/${PVR}"
724 -IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
725 -
726 -GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
727 -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
728 -
729 -REQUIRED_USE="
730 - grub_platforms_coreboot? ( fonts )
731 - grub_platforms_qemu? ( fonts )
732 - grub_platforms_ieee1275? ( fonts )
733 - grub_platforms_loongson? ( fonts )
734 -"
735 -
736 -# os-prober: Used on runtime to detect other OSes
737 -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
738 -RDEPEND="
739 - app-arch/xz-utils
740 - >=sys-libs/ncurses-5.2-r5:0=
741 - debug? (
742 - sdl? ( media-libs/libsdl )
743 - )
744 - device-mapper? ( >=sys-fs/lvm2-2.02.45 )
745 - libzfs? ( sys-fs/zfs )
746 - mount? ( sys-fs/fuse )
747 - truetype? ( media-libs/freetype:2= )
748 - ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
749 - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
750 -"
751 -DEPEND="${RDEPEND}
752 - ${PYTHON_DEPS}
753 - app-misc/pax-utils
754 - sys-devel/flex
755 - sys-devel/bison
756 - sys-apps/help2man
757 - sys-apps/texinfo
758 - fonts? ( media-libs/freetype:2 )
759 - grub_platforms_xen? ( app-emulation/xen-tools:= )
760 - grub_platforms_xen-32? ( app-emulation/xen-tools:= )
761 - static? (
762 - app-arch/xz-utils[static-libs(+)]
763 - truetype? (
764 - app-arch/bzip2[static-libs(+)]
765 - media-libs/freetype[static-libs(+)]
766 - sys-libs/zlib[static-libs(+)]
767 - )
768 - )
769 - test? (
770 - dev-libs/libisoburn
771 - app-emulation/qemu
772 - )
773 - themes? (
774 - app-arch/unzip
775 - media-libs/freetype:2
776 - )
777 -"
778 -RDEPEND+="
779 - kernel_linux? (
780 - grub_platforms_efi-32? ( sys-boot/efibootmgr )
781 - grub_platforms_efi-64? ( sys-boot/efibootmgr )
782 - )
783 - !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
784 - nls? ( sys-devel/gettext )
785 -"
786 -
787 -DEPEND+=" !!=media-libs/freetype-2.5.4"
788 -
789 -RESTRICT="strip !test? ( test )"
790 -
791 -QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
792 -QA_WX_LOAD="usr/lib/grub/*"
793 -QA_MULTILIB_PATHS="usr/lib/grub/.*"
794 -
795 -src_unpack() {
796 - if [[ ${PV} == 9999 ]]; then
797 - git-r3_src_unpack
798 - fi
799 - default
800 -}
801 -
802 -src_prepare() {
803 - default
804 -
805 - sed -i -e /autoreconf/d autogen.sh || die
806 -
807 - if use multislot; then
808 - # fix texinfo file name, bug 416035
809 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
810 - fi
811 -
812 - if [[ -n ${GRUB_AUTOGEN} ]]; then
813 - python_setup
814 - bash autogen.sh || die
815 - autopoint() { :; }
816 - eautoreconf
817 - fi
818 -}
819 -
820 -grub_do() {
821 - multibuild_foreach_variant run_in_build_dir "$@"
822 -}
823 -
824 -grub_do_once() {
825 - multibuild_for_best_variant run_in_build_dir "$@"
826 -}
827 -
828 -grub_configure() {
829 - local platform
830 -
831 - case ${MULTIBUILD_VARIANT} in
832 - efi*) platform=efi ;;
833 - xen*) platform=xen ;;
834 - guessed) ;;
835 - *) platform=${MULTIBUILD_VARIANT} ;;
836 - esac
837 -
838 - case ${MULTIBUILD_VARIANT} in
839 - *-32)
840 - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
841 - local CTARGET=i386
842 - fi ;;
843 - *-64)
844 - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
845 - local CTARGET=x86_64
846 - local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
847 - local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
848 - fi ;;
849 - esac
850 -
851 - local myeconfargs=(
852 - --disable-werror
853 - --program-prefix=
854 - --libdir="${EPREFIX}"/usr/lib
855 - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
856 - $(use_enable debug mm-debug)
857 - $(use_enable device-mapper)
858 - $(use_enable mount grub-mount)
859 - $(use_enable nls)
860 - $(use_enable themes grub-themes)
861 - $(use_enable truetype grub-mkfont)
862 - $(use_enable libzfs)
863 - $(use sdl && use_enable debug grub-emu-sdl)
864 - ${platform:+--with-platform=}${platform}
865 -
866 - # Let configure detect this where supported
867 - $(usex efiemu '' '--disable-efiemu')
868 - )
869 -
870 - if use multislot; then
871 - myeconfargs+=( --program-transform-name="s,grub,grub2," )
872 - fi
873 -
874 - # Set up font symlinks
875 - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
876 - if use themes; then
877 - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
878 - fi
879 -
880 - local ECONF_SOURCE="${S}"
881 - econf "${myeconfargs[@]}"
882 -}
883 -
884 -src_configure() {
885 - # Bug 508758.
886 - replace-flags -O3 -O2
887 -
888 - # We don't want to leak flags onto boot code.
889 - export HOST_CCASFLAGS=${CCASFLAGS}
890 - export HOST_CFLAGS=${CFLAGS}
891 - export HOST_CPPFLAGS=${CPPFLAGS}
892 - export HOST_LDFLAGS=${LDFLAGS}
893 - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
894 -
895 - use static && HOST_LDFLAGS+=" -static"
896 -
897 - tc-ld-disable-gold #439082 #466536 #526348
898 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
899 - unset LDFLAGS
900 -
901 - tc-export CC NM OBJCOPY RANLIB STRIP
902 - tc-export BUILD_CC # Bug 485592
903 -
904 - MULTIBUILD_VARIANTS=()
905 - local p
906 - for p in "${GRUB_ALL_PLATFORMS[@]}"; do
907 - use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
908 - done
909 - [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
910 - grub_do grub_configure
911 -}
912 -
913 -src_compile() {
914 - # Sandbox bug 404013.
915 - use libzfs && addpredict /etc/dfs:/dev/zfs
916 -
917 - grub_do emake
918 - use doc && grub_do_once emake -C docs html
919 -}
920 -
921 -src_test() {
922 - # The qemu dependency is a bit complex.
923 - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
924 - grub_do emake check
925 -}
926 -
927 -src_install() {
928 - grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
929 - use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
930 -
931 - einstalldocs
932 -
933 - if use multislot; then
934 - mv "${ED%/}"/usr/share/info/grub{,2}.info || die
935 - fi
936 -
937 - insinto /etc/default
938 - newins "${FILESDIR}"/grub.default-3 grub
939 -}
940 -
941 -pkg_postinst() {
942 - elog "For information on how to configure GRUB2 please refer to the guide:"
943 - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
944 -
945 - if has_version 'sys-boot/grub:0'; then
946 - elog "A migration guide for GRUB Legacy users is available:"
947 - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"
948 - fi
949 -
950 - if [[ -z ${REPLACING_VERSIONS} ]]; then
951 - elog
952 - elog "You may consider installing the following optional packages:"
953 - optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
954 - optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
955 - optfeature "Enable RAID device detection" sys-fs/mdadm
956 - fi
957 -}
958
959 diff --git a/sys-boot/grub/grub-2.02_rc2.ebuild b/sys-boot/grub/grub-2.02_rc2.ebuild
960 deleted file mode 100644
961 index cc6db989c6e..00000000000
962 --- a/sys-boot/grub/grub-2.02_rc2.ebuild
963 +++ /dev/null
964 @@ -1,298 +0,0 @@
965 -# Copyright 1999-2017 Gentoo Foundation
966 -# Distributed under the terms of the GNU General Public License v2
967 -
968 -EAPI=6
969 -
970 -if [[ ${PV} == 9999 ]]; then
971 - GRUB_AUTOGEN=1
972 -fi
973 -
974 -if [[ -n ${GRUB_AUTOGEN} ]]; then
975 - PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
976 - WANT_LIBTOOL=none
977 - inherit autotools python-any-r1
978 -fi
979 -
980 -inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
981 -
982 -if [[ ${PV} != 9999 ]]; then
983 - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
984 - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
985 - MY_P=${P/_/'~'}
986 - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
987 - S=${WORKDIR}/${MY_P}
988 - else
989 - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
990 - S=${WORKDIR}/${P%_*}
991 - fi
992 - KEYWORDS="~amd64 ~arm64 ~x86"
993 -else
994 - inherit git-r3
995 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
996 - http://git.savannah.gnu.org/r/grub.git"
997 -fi
998 -
999 -PATCHES=(
1000 - "${FILESDIR}"/gfxpayload.patch
1001 - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
1002 -)
1003 -
1004 -DEJAVU=dejavu-sans-ttf-2.37
1005 -UNIFONT=unifont-9.0.06
1006 -SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
1007 - themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
1008 -
1009 -DESCRIPTION="GNU GRUB boot loader"
1010 -HOMEPAGE="https://www.gnu.org/software/grub/"
1011 -
1012 -# Includes licenses for dejavu and unifont
1013 -LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
1014 -SLOT="2/${PVR}"
1015 -IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
1016 -
1017 -GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
1018 -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
1019 -
1020 -REQUIRED_USE="
1021 - grub_platforms_coreboot? ( fonts )
1022 - grub_platforms_qemu? ( fonts )
1023 - grub_platforms_ieee1275? ( fonts )
1024 - grub_platforms_loongson? ( fonts )
1025 -"
1026 -
1027 -# os-prober: Used on runtime to detect other OSes
1028 -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
1029 -RDEPEND="
1030 - app-arch/xz-utils
1031 - >=sys-libs/ncurses-5.2-r5:0=
1032 - debug? (
1033 - sdl? ( media-libs/libsdl )
1034 - )
1035 - device-mapper? ( >=sys-fs/lvm2-2.02.45 )
1036 - libzfs? ( sys-fs/zfs )
1037 - mount? ( sys-fs/fuse )
1038 - truetype? ( media-libs/freetype:2= )
1039 - ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
1040 - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
1041 -"
1042 -DEPEND="${RDEPEND}
1043 - ${PYTHON_DEPS}
1044 - app-misc/pax-utils
1045 - sys-devel/flex
1046 - sys-devel/bison
1047 - sys-apps/help2man
1048 - sys-apps/texinfo
1049 - fonts? ( media-libs/freetype:2 )
1050 - grub_platforms_xen? ( app-emulation/xen-tools:= )
1051 - grub_platforms_xen-32? ( app-emulation/xen-tools:= )
1052 - static? (
1053 - app-arch/xz-utils[static-libs(+)]
1054 - truetype? (
1055 - app-arch/bzip2[static-libs(+)]
1056 - media-libs/freetype[static-libs(+)]
1057 - sys-libs/zlib[static-libs(+)]
1058 - )
1059 - )
1060 - test? (
1061 - app-admin/genromfs
1062 - app-arch/cpio
1063 - app-arch/lzop
1064 - app-emulation/qemu
1065 - dev-libs/libisoburn
1066 - sys-apps/miscfiles
1067 - sys-block/parted
1068 - sys-fs/squashfs-tools
1069 - )
1070 - themes? (
1071 - app-arch/unzip
1072 - media-libs/freetype:2
1073 - )
1074 -"
1075 -RDEPEND+="
1076 - kernel_linux? (
1077 - grub_platforms_efi-32? ( sys-boot/efibootmgr )
1078 - grub_platforms_efi-64? ( sys-boot/efibootmgr )
1079 - )
1080 - !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
1081 - nls? ( sys-devel/gettext )
1082 -"
1083 -
1084 -DEPEND+=" !!=media-libs/freetype-2.5.4"
1085 -
1086 -RESTRICT="strip !test? ( test )"
1087 -
1088 -QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
1089 -QA_WX_LOAD="usr/lib/grub/*"
1090 -QA_MULTILIB_PATHS="usr/lib/grub/.*"
1091 -
1092 -src_unpack() {
1093 - if [[ ${PV} == 9999 ]]; then
1094 - git-r3_src_unpack
1095 - fi
1096 - default
1097 -}
1098 -
1099 -src_prepare() {
1100 - default
1101 -
1102 - sed -i -e /autoreconf/d autogen.sh || die
1103 -
1104 - if use multislot; then
1105 - # fix texinfo file name, bug 416035
1106 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
1107 - fi
1108 -
1109 - # Nothing in Gentoo packages 'american-english' in the exact path
1110 - # wanted for the test, but all that is needed is a compressible text
1111 - # file, and we do have 'words' from miscfiles in the same path.
1112 - sed -i \
1113 - -e '/CFILESSRC.*=/s,american-english,words,' \
1114 - tests/util/grub-fs-tester.in \
1115 - || die
1116 -
1117 - if [[ -n ${GRUB_AUTOGEN} ]]; then
1118 - python_setup
1119 - bash autogen.sh || die
1120 - autopoint() { :; }
1121 - eautoreconf
1122 - fi
1123 -}
1124 -
1125 -grub_do() {
1126 - multibuild_foreach_variant run_in_build_dir "$@"
1127 -}
1128 -
1129 -grub_do_once() {
1130 - multibuild_for_best_variant run_in_build_dir "$@"
1131 -}
1132 -
1133 -grub_configure() {
1134 - local platform
1135 -
1136 - case ${MULTIBUILD_VARIANT} in
1137 - efi*) platform=efi ;;
1138 - xen*) platform=xen ;;
1139 - guessed) ;;
1140 - *) platform=${MULTIBUILD_VARIANT} ;;
1141 - esac
1142 -
1143 - case ${MULTIBUILD_VARIANT} in
1144 - *-32)
1145 - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
1146 - local CTARGET=i386
1147 - fi ;;
1148 - *-64)
1149 - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
1150 - local CTARGET=x86_64
1151 - local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
1152 - local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
1153 - fi ;;
1154 - esac
1155 -
1156 - local myeconfargs=(
1157 - --disable-werror
1158 - --program-prefix=
1159 - --libdir="${EPREFIX}"/usr/lib
1160 - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
1161 - $(use_enable debug mm-debug)
1162 - $(use_enable device-mapper)
1163 - $(use_enable mount grub-mount)
1164 - $(use_enable nls)
1165 - $(use_enable themes grub-themes)
1166 - $(use_enable truetype grub-mkfont)
1167 - $(use_enable libzfs)
1168 - $(use sdl && use_enable debug grub-emu-sdl)
1169 - ${platform:+--with-platform=}${platform}
1170 -
1171 - # Let configure detect this where supported
1172 - $(usex efiemu '' '--disable-efiemu')
1173 - )
1174 -
1175 - if use multislot; then
1176 - myeconfargs+=( --program-transform-name="s,grub,grub2," )
1177 - fi
1178 -
1179 - # Set up font symlinks
1180 - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
1181 - if use themes; then
1182 - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
1183 - fi
1184 -
1185 - local ECONF_SOURCE="${S}"
1186 - econf "${myeconfargs[@]}"
1187 -}
1188 -
1189 -src_configure() {
1190 - # Bug 508758.
1191 - replace-flags -O3 -O2
1192 -
1193 - # We don't want to leak flags onto boot code.
1194 - export HOST_CCASFLAGS=${CCASFLAGS}
1195 - export HOST_CFLAGS=${CFLAGS}
1196 - export HOST_CPPFLAGS=${CPPFLAGS}
1197 - export HOST_LDFLAGS=${LDFLAGS}
1198 - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
1199 -
1200 - use static && HOST_LDFLAGS+=" -static"
1201 -
1202 - tc-ld-disable-gold #439082 #466536 #526348
1203 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
1204 - unset LDFLAGS
1205 -
1206 - tc-export CC NM OBJCOPY RANLIB STRIP
1207 - tc-export BUILD_CC # Bug 485592
1208 -
1209 - MULTIBUILD_VARIANTS=()
1210 - local p
1211 - for p in "${GRUB_ALL_PLATFORMS[@]}"; do
1212 - use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
1213 - done
1214 - [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
1215 - grub_do grub_configure
1216 -}
1217 -
1218 -src_compile() {
1219 - # Sandbox bug 404013.
1220 - use libzfs && addpredict /etc/dfs:/dev/zfs
1221 -
1222 - grub_do emake
1223 - use doc && grub_do_once emake -C docs html
1224 -}
1225 -
1226 -src_test() {
1227 - # The qemu dependency is a bit complex.
1228 - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
1229 - grub_do emake check
1230 -}
1231 -
1232 -src_install() {
1233 - grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
1234 - use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
1235 -
1236 - einstalldocs
1237 -
1238 - if use multislot; then
1239 - mv "${ED%/}"/usr/share/info/grub{,2}.info || die
1240 - fi
1241 -
1242 - insinto /etc/default
1243 - newins "${FILESDIR}"/grub.default-3 grub
1244 -}
1245 -
1246 -pkg_postinst() {
1247 - elog "For information on how to configure GRUB2 please refer to the guide:"
1248 - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
1249 -
1250 - if has_version 'sys-boot/grub:0'; then
1251 - elog "A migration guide for GRUB Legacy users is available:"
1252 - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"
1253 - fi
1254 -
1255 - if [[ -z ${REPLACING_VERSIONS} ]]; then
1256 - elog
1257 - elog "You may consider installing the following optional packages:"
1258 - optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
1259 - optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
1260 - optfeature "Enable RAID device detection" sys-fs/mdadm
1261 - fi
1262 -}