Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-boot
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-09-16 18:07:53 +0000
committerMike Gilbert <floppym@gentoo.org>2014-09-16 18:07:53 +0000
commitb11b80e5ef5b5752b6d215cd6f2b3e5913ed839b (patch)
treeaf31630cdbf9ec1e0f1a0a036d2389d85e7b2242 /sys-boot
parentAdd kde-workspace 4.11.12 SRC_URI, remove obsolete. (diff)
downloadhistorical-b11b80e5ef5b5752b6d215cd6f2b3e5913ed839b.tar.gz
historical-b11b80e5ef5b5752b6d215cd6f2b3e5913ed839b.tar.bz2
historical-b11b80e5ef5b5752b6d215cd6f2b3e5913ed839b.zip
Always download/symlink unifont, bug 522956.
Package-Manager: portage-2.2.12/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/Manifest12
-rw-r--r--sys-boot/grub/grub-2.02_beta2-r2.ebuild18
-rw-r--r--sys-boot/grub/grub-9999-r1.ebuild18
4 files changed, 27 insertions, 27 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 92697981fbe0..2e17c78f65ed 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.317 2014/09/10 20:50:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.318 2014/09/16 18:07:47 floppym Exp $
+
+ 16 Sep 2014; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2-r2.ebuild,
+ grub-9999-r1.ebuild:
+ Always download/symlink unifont, bug 522956.
*grub-2.02_beta2-r2 (10 Sep 2014)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index abb2a086bcbe..729ed336ecfc 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -26,15 +26,15 @@ DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528b
EBUILD grub-0.97-r12.ebuild 9233 SHA256 d5486666e1f8339a8308489607c9108cd34e8ebc696a956e2ff8dafad1c71815 SHA512 332a89395331ef04654345f960f2939340ce9b47ae6ac755e54f4ecc85f6243060890e7553b515468aaffd8346bbb5a0b7fbd26d23911b847f12c557854e96f1 WHIRLPOOL 1a20c9df999954ce431ca50eaaa5651721c939229b3a55d820445620218ffa64d43ba6251e88b1df6f54163f6914265596698db513a47d3c415ccaa01b51e61d
EBUILD grub-0.97-r13.ebuild 9384 SHA256 c694ab37f477548da2b98c9beb2c5432ddd799e40fcbf82273cd2da3fdb072e1 SHA512 615e4d11ba91c7bc2fcb926bfc791d1aa3151a06dd336f9597ccc5b22a4b6a1bbffde5f7622ec6cc4c04216c63d99becfc9cf38bcf8fed476773bd3b7930fad2 WHIRLPOOL 91d94e1f90393bb5137b791bfa2d73b418938091d81ec44b783d749ea08ee3a615a5ca4d07a841c66429f6ff7d480ae2ad4f0626576ddaab459f111106160761
EBUILD grub-2.00_p5107-r2.ebuild 8180 SHA256 1db3f6266e63332ef89d9c32895189fee3307a5ca2f687620df43c5a9d52547a SHA512 f95264d8eff99a1dd8420d64539aef4b7eb464edc8119076af7c175fac418d0e554ee7bb0ae4edb57c3a1a5b82f32da51db6b7ffc4a9a62dc7541d3694b65faa WHIRLPOOL d1dd247120f6de17aaea2899760fd7daf3eb242a3945f6ae2c03eae71c33e3c6bb780639a030d9ba46f4b9b8f23d383fc6559306e40a82be293466ce6d6270a5
-EBUILD grub-2.02_beta2-r2.ebuild 8372 SHA256 69c4df3a1b7cba26f4330c667de9e31b1b1d725339751c0720c6c8e275aac159 SHA512 63703cb741a76794bc9925cfac987541300fea74a7e9f5afa5c54fc0ddc512200fd0b6e65f96913799c1690ed0cdb2b77b9901c06c3801f5918c314cfa96be19 WHIRLPOOL 69f56d61b22ea429edaf113fc5de2a874e15fdcf58ba159d9e898efe3e9cacd8d0dd6450c10895f7c1e0fabadef00b617db637ada5311449965d09b5442c909d
+EBUILD grub-2.02_beta2-r2.ebuild 8370 SHA256 604219f2a81021d5e40f24fc97f1132d5b8d62925f7e2ac2771b997a03e1f941 SHA512 35c78c35ecac5587b6337ccc3eb338f8a33a735b2e65ea902e0c7adf23feb62e4fd6c0ead5c21552496254260da5046d3a037b2a6f9e2abf5f216c82d48c7c27 WHIRLPOOL 51c82d28ba805d5b074b85b9212ffeb3ec0a36a96a76e4779ce439666d5af1459bf745e9a5dddc73758b9e336cbc35e274f15304dcb9e0c55d653a83cf827ebe
EBUILD grub-2.02_beta2.ebuild 8304 SHA256 7c41c4abbb6daef697960d00f9f44f2779095b4918ac975c97799c0fd38b958f SHA512 07ee0e1605e12899d5544db3e3672d4c91f7dcc6b65556d27c32ab1edf9a39a183a6b7be6eeb4ad1f5c4be84dee3a0e18af90867241069c253e4be7185163f54 WHIRLPOOL dc310d7dbea7e310da6f7ee3b1f0563014cba9102f325603cf7d3f7ce6047a93fa4f50777e3b86097c04a372c659eb12ab06ded3293585b0c87c74872c31b5fc
-EBUILD grub-9999-r1.ebuild 8308 SHA256 e6a8a3c6f0a9540802f65b43e63c20648cea25c5cc1261534d254c31f5d97193 SHA512 51939a575a06e299e860621c3d5bc23c059b27fdff0336fef8a005afe813435af6ca50a07ee71aa02dee09a158bb437bb7690bc9bc4c794d5431045db601052c WHIRLPOOL b59e25ce068dfce03d8fb4c413e890af414209f4d44045fe29d255e0c7d52299527db2468cb1e187a8678b4774279ad407c1decced069fa22a441fbfd9a9bd6d
-MISC ChangeLog 60815 SHA256 18e0209922da176eba2d74a9dc675c55b7791e4638aff6ef08416c1367f9893d SHA512 df77572ba1872fe177a513702b76b0dfe243521058a0572925529a9225067fa6cf9d8440ee9c146ed52ce09ea3e6720564716bd9aa171699e3afe7c0362181dd WHIRLPOOL fdb64d18c0f793474414f86fe97829a1ef5767dfe7ff1b4d29f5a8cda11f9e65739ff852dc1527aa565279a1718710440ffa413e7206913dd10da5c460c4d42e
+EBUILD grub-9999-r1.ebuild 8306 SHA256 6606fb1f324649428d4d25562718f211d8938a07c46ad89d6016934fec545716 SHA512 dc2c6ff2f85ddb1a2e91eca66ca726e51d981b9ac1b7cf869d966260fd3d1fb8600d7f19ce69e3874c37c37c060cf8b4781e40a3206a50ad6845254ec1d255be WHIRLPOOL 44fd6978a3539bdafa26252ec0788c7d55392f7ba439a9ba0b23c09b8145cefeae8bc1b5bc9fd722bf9c9f46a6b6b34cf4df611229b350dd7550e45f4bdaf48c
+MISC ChangeLog 60962 SHA256 cfd16fc7272d3c553bfa134f9879d7e19f872652bb7348f9838944fcac125592 SHA512 77f461b6add69d5c1a609c24539945845e91042b490be26d90e80d82e9f7ac5a812be2b221cd472bcec2673f4c97be1fa6f339be743fc78f4d36aec21016b695 WHIRLPOOL accbbb6014d46dc7e5fac974ed5a4ebc2bcb51396d529b75580db9ba4bd051ee88200d7169ec28931b3f6de3be7d151e299cc2ab611a933a24f2f947e61d476e
MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlQQuaIACgkQC77qH+pIQ6ShQQD/XFqb6P50jHST6WdVuEl9PEGI
-toukXhtFVBj1i9QGXgEA/R+VF37WzSwXl+Vc35ssj+9T9VBHtQQpQF8zMVdTAqJT
-=XxG+
+iF4EAREIAAYFAlQYfHgACgkQC77qH+pIQ6TlNgD/X8Zafh5S1eZw7qdsqbywuyJ1
+ZdslZ/IVzHWXVwf1szEA/1iKmHZRODmv2E17n/dmCzGGSNv3nGfd0ZLNimZDWrQ4
+=oyKs
-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.02_beta2-r2.ebuild b/sys-boot/grub/grub-2.02_beta2-r2.ebuild
index af88035e4618..f1e7f6e579a3 100644
--- a/sys-boot/grub/grub-2.02_beta2-r2.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild,v 1.1 2014/09/10 20:50:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild,v 1.2 2014/09/16 18:07:47 floppym Exp $
EAPI=5
@@ -36,10 +36,8 @@ fi
DEJAVU=dejavu-sans-ttf-2.34
UNIFONT=unifont-7.0.01
-SRC_URI+=" truetype? (
- mirror://sourceforge/dejavu/${DEJAVU}.zip
- mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
-)"
+SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
+ truetype? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="http://www.gnu.org/software/grub/"
@@ -182,8 +180,10 @@ src_prepare() {
}
setup_fonts() {
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use truetype; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
}
grub_configure() {
@@ -230,10 +230,8 @@ grub_configure() {
myeconfargs+=( --program-transform-name="s,grub,grub2," )
fi
- if use truetype; then
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
- fi
+ mkdir -p "${BUILD_DIR}" || die
+ run_in_build_dir setup_fonts
autotools-utils_src_configure
}
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 8015b3c41ec7..2d19427a8964 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.19 2014/09/10 01:20:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.20 2014/09/16 18:07:47 floppym Exp $
EAPI=5
@@ -38,10 +38,8 @@ fi
DEJAVU=dejavu-sans-ttf-2.34
UNIFONT=unifont-7.0.01
-SRC_URI+=" truetype? (
- mirror://sourceforge/dejavu/${DEJAVU}.zip
- mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
-)"
+SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
+ truetype? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="http://www.gnu.org/software/grub/"
@@ -179,8 +177,10 @@ src_prepare() {
}
setup_fonts() {
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use truetype; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
}
grub_configure() {
@@ -227,10 +227,8 @@ grub_configure() {
myeconfargs+=( --program-transform-name="s,grub,grub2," )
fi
- if use truetype; then
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
- fi
+ mkdir -p "${BUILD_DIR}" || die
+ run_in_build_dir setup_fonts
autotools-utils_src_configure
}