diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-05-29 17:25:05 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-05-29 17:25:05 +0000 |
| commit | b2b4b4d3d5608102009dea6cb13b9d3739c8b7ca (patch) | |
| tree | 5dd8f4e6a706a4ca675dcee6a46743c7ffbcba3f /sys-boot | |
| parent | remove old (diff) | |
| download | historical-b2b4b4d3d5608102009dea6cb13b9d3739c8b7ca.tar.gz historical-b2b4b4d3d5608102009dea6cb13b9d3739c8b7ca.tar.bz2 historical-b2b4b4d3d5608102009dea6cb13b9d3739c8b7ca.zip | |
Convert to EAPI=2 and do not run `set -e` with eautoreconf #369093 by Zachary Bedell.
Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 12 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 20 |
3 files changed, 20 insertions, 18 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 8bcf7b95f6d6..739fa3a26b46 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.154 2011/04/10 14:34:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.155 2011/05/29 17:25:05 vapier Exp $ + + 29 May 2011; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild: + Convert to EAPI=2 and do not run `set -e` with eautoreconf #369093 by Zachary + Bedell. 10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> grub-0.92-r1.ebuild, grub-0.94-r1.ebuild, grub-0.96-r1.ebuild, grub-0.96-r2.ebuild, diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 9495ddb46f37..b454ec8b8f7b 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389 @@ -41,13 +41,13 @@ EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58 EBUILD grub-1.98.ebuild 3039 RMD160 1208a2709adc8e38cfc8c7ce4c3057fbb3c7ba6c SHA1 9bf4f4af9ce15cc5a4813c5396e5b7045ce423f1 SHA256 7c6a9f04eceadfef0371752bd4a7263aae0c2fcea2c515756416d403ef702566 EBUILD grub-1.99_rc1.ebuild 3168 RMD160 fef601e56c45f2037e2b7ef28a5c148dd20770f7 SHA1 86f3e8294f880412f7ab7e4f611297ae8e024caa SHA256 4324b1360c890146fc7a3d2232a025ba6ef65084a7769e619184aa73e3053ce7 -EBUILD grub-9999.ebuild 3239 RMD160 3021cd1ce447f9aedb3dfe3649e2db6088e0658d SHA1 a4830bc5042e2a69f7723439556b353b5a8535ea SHA256 83e78d2e259a9f2d61643ddf7588aefbb1185db91f412af29d489f3877530017 -MISC ChangeLog 31753 RMD160 fbd2d40b762322889b2fb9ae4a5a58d71098a644 SHA1 ef9c482ca51ce221b465f7c08afcc81017fab46c SHA256 fe495ab5429f328c2fb6a19605841ff6bd5338f233df1d3e8c4fe29862e7301b +EBUILD grub-9999.ebuild 3170 RMD160 5ea30043cbff75eaba4bea805d1f5e4f027c0f7e SHA1 2d9ab026a1501ff6521bd85b01b554ee2a07133e SHA256 a0aff2aba3fbf1674b48cc9fc8827a93e3400ff6ac2dc8a34ff29c0ddd600031 +MISC ChangeLog 31915 RMD160 29d70c2724a38c1fa93fec0208acbe7260586d32 SHA1 19cff0222c9432e89afd332976450bc94e2df034 SHA256 b32893e538ef723e0e410eb77ce3fc622993bf437a3eadbb5ce4e068654c50ea MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2hwEsACgkQOeoy/oIi7ux4gACgvhGz0Z+XWE9WN0LzZ57Fz//G -dYwAn2a6tjzyp2v+uLBqmz4+UZr0+FFl -=IAK8 +iF4EAREIAAYFAk3igXgACgkQaC/OocHi7JZkPQD+NqeydI6VDMzDu569Pkjr7nX4 +UgD/nSaGv9BQdLpgCr8A/2IR8OLHzGKbPluCdex2r6pkW/zcPMoOpCdwH6zdgrf3 +=yfvu -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 76218eaf0036..40b4b5997ff7 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.32 2011/04/03 18:18:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.33 2011/05/29 17:25:05 vapier Exp $ # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch +EAPI="2" inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -37,24 +38,18 @@ DEPEND="${RDEPEND} export STRIP_MASK="*/grub/*/*.mod" QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest" -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - bzr_src_unpack - else - unpack ${A} - fi - cd "${S}" +src_prepare() { epatch_user # autogen.sh does more than just run autotools # need to eautomake due to weirdness #296013 if [[ ${PV} == "9999" ]] ; then - sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die + sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die (. ./autogen.sh) || die fi } -src_compile() { +src_configure() { use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS use static && append-ldflags -static @@ -69,7 +64,10 @@ src_compile() { $(use_enable debug mm-debug) \ $(use sdl && use_enable debug grub-emu-sdl) \ $(use_enable debug grub-emu-usb) - emake -j1 || die "making regular stuff" +} + +src_compile() { + emake -j1 || die } src_install() { |