commit: 8eb3d389d4ef62e85a50f49afaedbef4055b8a7c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 19:30:10 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 19:31:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb3d389
sys-boot/grub: bump to 2.02~rc1
Package-Manager: Portage-2.3.3_p47_p599686, Repoman-2.3.1_p40_p599686
sys-boot/grub/Manifest | 3 ++-
.../{grub-9999.ebuild => grub-2.02_rc1.ebuild} | 26 ++++++++++++++--------
sys-boot/grub/grub-9999.ebuild | 26 ++++++++++++++--------
3 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1983a16..7b7d0b3 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -6,7 +6,8 @@ DIST grub-0.97.tar.gz 971783 SHA256
4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47
DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256
78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512
b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861
WHIRLPOOL
acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
DIST grub-2.02~beta2.tar.xz 5798740 SHA256
f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512
359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c
WHIRLPOOL
f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
DIST grub-2.02~beta3.tar.xz 6030784 SHA256
30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 SHA512
4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11
WHIRLPOOL
b1042c24060e35ea5a492b7258b147fde80c949c2e81dcff3a31750966b7d31cdb62e1492274843f313226d70b202a8edbf08d11c5e79e4173a4c373879e4aad
+DIST grub-2.02~rc1.tar.xz 6051964 SHA256
445239e9b96d1143c194c1d37851cf4196b83701c60172e49665e9d453d80278 SHA512
c55a91f43d3c065dc9303fc9ab164910432095a571e28082cbcae646b8b92212f85da22873af99a1a5d7c943c51e2f90837dd2c68abf87ff50bf2e5955877f39
WHIRLPOOL
7ae697d8de28f1e936e49662564900ce82402895a7d3d07c70879c68ed9765ac2e82a89a8d2da4cfb6ecf64cc04c61ff4b889283a2e8abad0c38d86d889a6317
DIST splash.xpm.gz 33856 SHA256
b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512
5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da
WHIRLPOOL
d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
DIST unifont-7.0.06.pcf.gz 1359006 SHA256
acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512
a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3
WHIRLPOOL
9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
DIST unifont-8.0.01.pcf.gz 1359487 SHA256
28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512
8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8
WHIRLPOOL
33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
-DIST unifont-9.0.02.pcf.gz 1360332 SHA256
c2f2a3d6a4e8420d4ed66778ca61836225ff68d6ef031aad6842f4d02914961f SHA512
f619d6a23217d28399b1cf842077891af6749eb611b1c6e3bb9fce94a918834c6a73d423dafe9b5d36661ac7fd2c0aa4ef3c483f449fed48f4d09ae55359073b
WHIRLPOOL
2323c2a3bea1eaeeb4c31d921114b9dc5f974a21f73465b7e6b2bb5e1f0b1a84767e1e638e36f6260395c9d3382d66cc631b7e75f72e7833eb168d5d07dcb363
+DIST unifont-9.0.06.pcf.gz 1360354 SHA256
6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512
dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
WHIRLPOOL
3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-2.02_rc1.ebuild
similarity index 93%
copy from sys-boot/grub/grub-9999.ebuild
copy to sys-boot/grub/grub-2.02_rc1.ebuild
index 8299681..5588e17 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-2.02_rc1.ebuild
@@ -1,11 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ WANT_LIBTOOL=none
inherit autotools python-any-r1
fi
@@ -18,9 +23,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
S=${WORKDIR}/${MY_P}
else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz";
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
KEYWORDS="~amd64 ~x86"
@@ -36,7 +39,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.02
+UNIFONT=unifont-9.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
@@ -134,7 +137,7 @@ src_prepare() {
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/'
docs/grub.texi || die
fi
- if [[ ${PV} == 9999 ]]; then
+ if [[ -n ${GRUB_AUTOGEN} ]]; then
python_setup
bash autogen.sh || die
autopoint() { :; }
@@ -202,7 +205,8 @@ grub_configure() {
ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf
|| die
fi
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
}
src_configure() {
@@ -225,8 +229,12 @@ src_configure() {
tc-export CC NM OBJCOPY RANLIB STRIP
tc-export BUILD_CC # Bug 485592
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed
)
grub_do grub_configure
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8299681..5588e17 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,11 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ WANT_LIBTOOL=none
inherit autotools python-any-r1
fi
@@ -18,9 +23,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
S=${WORKDIR}/${MY_P}
else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz";
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
KEYWORDS="~amd64 ~x86"
@@ -36,7 +39,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.02
+UNIFONT=unifont-9.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
@@ -134,7 +137,7 @@ src_prepare() {
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/'
docs/grub.texi || die
fi
- if [[ ${PV} == 9999 ]]; then
+ if [[ -n ${GRUB_AUTOGEN} ]]; then
python_setup
bash autogen.sh || die
autopoint() { :; }
@@ -202,7 +205,8 @@ grub_configure() {
ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf
|| die
fi
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
}
src_configure() {
@@ -225,8 +229,12 @@ src_configure() {
tc-export CC NM OBJCOPY RANLIB STRIP
tc-export BUILD_CC # Bug 485592
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed
)
grub_do grub_configure
}
