diff options
| author |   Robert Förster <Dessa@gmake.de> | 2011-08-12 19:01:07 +0200 |
|---|---|---|
| committer |   Tomas Chvatal <tchvatal@suse.cz> | 2011-08-12 21:43:27 +0200 |
| commit | 525932c915541c8549464313dd289dd6ed417b6f (patch) | |
| tree | a5ee5b8e81d3eb9b08067913ca1c8b5ea8598346 | |
| parent | [sys-boot/grub] update qa masks. (diff) | |
| download | scarabeus-525932c915541c8549464313dd289dd6ed417b6f.tar.gz scarabeus-525932c915541c8549464313dd289dd6ed417b6f.tar.bz2 scarabeus-525932c915541c8549464313dd289dd6ed417b6f.zip | |
sync with g-x86
| -rw-r--r-- | sys-boot/grub/Manifest | 4 | ||||
| -rw-r--r-- | sys-boot/grub/grub-1.99.ebuild | 8 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index a276543..c7c8065 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,5 +1,5 @@ AUX grub.default 1130 RMD160 6df056d7bcbaf75783921c5c45bcf3544d284f58 SHA1 c62cb61c4d96ca9780ea559d1d38fce91197c701 SHA256 8e2cc8c02135a13d4401971ce9955039cc0dc7ceb045e3eff8ba673fceef6bb9 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b -EBUILD grub-1.99.ebuild 6732 RMD160 35e38015bd2be6ddc0f8c8b01d77099b64a1761c SHA1 1e10ba0919b936c5011a477e3be3e34f9772b85a SHA256 c137e3963c321675e9520739a10c56a077e937a50901e3900b975a01fbcca86d -EBUILD grub-9999.ebuild 6732 RMD160 41b36e2a51b03a99b9a30979228acd0e84f53fe2 SHA1 23d8078aaea0ff720368a4882f461b9f34c3d600 SHA256 15a280c61740f03ad6a6c3f8607af3fa8216b0bb7a5790336a1176b42cf6beb5 +EBUILD grub-1.99.ebuild 6906 RMD160 1f9632b5c2d46a61aaefdc60a768841229f965e7 SHA1 9db3588a488a43ecec9acd788bb9580209bfe374 SHA256 88713c49f4897308edae474da5217aba759fbc4114516229ea512639eeccd6a0 +EBUILD grub-9999.ebuild 6906 RMD160 d0fb2433e03d28a270223dbbe1c5e54f050bc19a SHA1 8877fcf161c099f22f6b5b7888fab94a8a1e7c74 SHA256 dc4dd171389556267f925bacb4f24a0031e20ad1e10aa305d392881645f65d3b MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SHA1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab90c81b2e369177a8d7c1bfe2dd2868419872c097f64 diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild index 7e0892d..44eec65 100644 --- a/sys-boot/grub/grub-1.99.ebuild +++ b/sys-boot/grub/grub-1.99.ebuild @@ -158,11 +158,15 @@ src_prepare() { # autogen.sh does more than just run autotools if [[ ${PV} == "9999" ]] ; then - sed -i -e '/^autoreconf/ d' autogen.sh || die + sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die (. ./autogen.sh) || die - eautoreconf fi + # install into the right dir for eselect #372735 + sed -i \ + -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \ + util/bash-completion.d/Makefile.in || die + # get enabled platforms GRUB_ENABLED_PLATFORMS="" for i in ${GRUB_PLATFORMS}; do diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index fcf22f0..2430b13 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -158,11 +158,15 @@ src_prepare() { # autogen.sh does more than just run autotools if [[ ${PV} == "9999" ]] ; then - sed -i -e '/^autoreconf/ d' autogen.sh || die + sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die (. ./autogen.sh) || die - eautoreconf fi + # install into the right dir for eselect #372735 + sed -i \ + -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \ + util/bash-completion.d/Makefile.in || die + # get enabled platforms GRUB_ENABLED_PLATFORMS="" for i in ${GRUB_PLATFORMS}; do |