diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-12-04 00:46:39 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-12-04 00:46:39 +0000 |
| commit | 53f9ba13a911fae4c6d96f31542e2fe2832bfc15 (patch) | |
| tree | 245f9e5766b7849fac47a79b5bb588517a93ae3e /sys-boot/grub | |
| parent | Remove older RC (diff) | |
| download | historical-53f9ba13a911fae4c6d96f31542e2fe2832bfc15.tar.gz historical-53f9ba13a911fae4c6d96f31542e2fe2832bfc15.tar.bz2 historical-53f9ba13a911fae4c6d96f31542e2fe2832bfc15.zip | |
Require python2 and drop autogen dep.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 10 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999-r1.ebuild | 14 |
3 files changed, 17 insertions, 12 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 065702ee8ecb..0850d1176691 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.292 2013/10/26 14:41:41 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.293 2013/12/04 00:46:37 floppym Exp $ + + 04 Dec 2013; Mike Gilbert <floppym@gentoo.org> grub-9999-r1.ebuild: + Require python2 and drop autogen dep. 26 Oct 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00_p5107-r2.ebuild, grub-9999-r1.ebuild: diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 380faf8b03e9..22bf56c071ff 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -68,13 +68,13 @@ EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c5 EBUILD grub-2.00-r4.ebuild 6772 SHA256 567b9c19af55d0687a084eab551197c6bb2b36bc800375f6fc3522b611effb19 SHA512 0a09c35b7e534a772451eb3a3ef8a6333d89abc9b6e3cae4548e4e289fe8104e1282fe7e1ca699a5d2650fb83ae75f06ee732ec13b2d6e509c3311591e654427 WHIRLPOOL ab8e4b5566283f6f07b31022e646863f44b37a8d8bb210bc7db7843220b25cf235599fc458225792afabec5e449e3d72dd005ee75d904b8e62b857e6bf680253 EBUILD grub-2.00_p5107-r2.ebuild 8031 SHA256 61d9f753e1517eb71b586718f926e2476a333bdb932ed3e98e79152968451408 SHA512 b5342feaf1e08b12f402158a3e9440c05d0b9b61b3732faad4fe4dd24b3288e54b46ac1e6aadab4aaa374e13f0bc3d3065a41c7f56e52c8aa28da0effca0d9e4 WHIRLPOOL ebe46428076776d7a91233a121cbcbdad98c1f9b0b8954d30b5e6f8b68e8b47e5bbfd9ba827b55b02727fe6057946decb6b48c4cb5266800769a23fa65bd85ac EBUILD grub-2.00_p5107.ebuild 6567 SHA256 fecc66f9d1f45a940530ddaf1fc9fcb1c05c2346b1ee8170c3a897d7be5c5fd9 SHA512 7ce9b814878dceb204dbe5a7103517ab451bce414e2075420e234392369b5edd82e499907becdabff456ad3c5ca53ede74dfa7132ed1b33904f44c52fc471cd0 WHIRLPOOL 103d3db1fb21055d69289717bf6acef361cc4fec4e862413f90d047987889d8b248b5c15288977aab2f3df686990dd14f3e6a3cf90da0d3eb0a066f2b773a593 -EBUILD grub-9999-r1.ebuild 8027 SHA256 8ccac3a0cea123b94a7b0d82c9bb4c9f90cc9b0f7b2f6ce2d5482ad68e5b8ed1 SHA512 19f038140da6c970b1afb86e4293f10fd802fdffedd7ae3fa6567796302c286a35c17dfc90fe6097876bdca4ec4a3f23bb62b6de27170cc3b6c20a7da43d9896 WHIRLPOOL 067ed4e75039dce27f1fc980afd9b368f88a1eca68cf657ad7dcc9bd412a897be8995f81ee477f119e2b86e58e1ef9fbb6cdcc095eb6ca18e73b6b7552e18a96 -MISC ChangeLog 54937 SHA256 3eb69920179f6222147a1df58f1b99fbec93de304abe41ca8dfb0ecd8f8d26f4 SHA512 d57eeccc495e03a03b5dd6980c853d6a999e6aa75457308fedd85610cde5adfce3bda6a3bfc5c89903104ebc1ca23dcdecac068ae917d5e20007aceefd4d3814 WHIRLPOOL 92d4e4616c51a9c7543d4c512bb31f1d44b03164b494aa8b080b9a24349e522f8a67c792ea28e44794b47afa29717c56fb5f19d4a03cc4d9990ca485aa296f0c +EBUILD grub-9999-r1.ebuild 8054 SHA256 268968b92d63d1bda87dfd704b64b7f06fbac0d1deb351856d5171fd223859cb SHA512 172c7f72df99dd2c608da04c6cf1902979586bff0ed8fedf85b6da65dbfc112712a4d38bd0b9e255c6f4566cd35e601d3c26660bc8733a05bb81b9b386e97b65 WHIRLPOOL d675847a81f9bda3c931b37083d7b642eb7689f22e3b859a15fce89d01ff519af12a27ec772a319a4e13426c2c0268d65eabe3f9c90b699f380b454cfa540ee8 +MISC ChangeLog 55048 SHA256 766a842562ee390a4d52a77d48679d30e45e2b8eb087bfa69d3015c80d8feca4 SHA512 eb09a0d3e88ab057b8dc43518d44f5614dd1f5b0da61d17d6472411200cc4a65c9cdbbb2b3189a811c1f228ce21305ae22de65a00e54bb93ef905ad5196ccf28 WHIRLPOOL dde3cbd363f2e60f197b3fd9d8336e8a9bd19cfd75a88dc2dc2950f743cdd951c751a4510b21b6e24546397fb6b6f56cf287e319463b3c225f786366a8e05e00 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iF4EAREIAAYFAlJr1KoACgkQC77qH+pIQ6S3sQD9GoAodT4RIQ4b3uXP65BD4jjy -uXN+et7gZfABGvuIyD4BAMl6eu3qxk3t4y25lzs99O+nI5Yslo0Z1U37jq/ancjj -=xTC+ +iF4EAREIAAYFAlKee24ACgkQC77qH+pIQ6Ts3wD9EF5gTDHIcYaL5hq6JSo6DON3 +3W6YaKfVcCzMv6C83woA/1wAOgtHWyfyoiS7AtXFWOdADpG01mrYIO2VS8HqtSPw +=lvhY -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild index 1196d6738534..c2c70265e32a 100644 --- a/sys-boot/grub/grub-9999-r1.ebuild +++ b/sys-boot/grub/grub-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.3 2013/10/26 14:41:41 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.4 2013/12/04 00:46:37 floppym Exp $ EAPI=5 @@ -9,6 +9,11 @@ if [[ ${PV} == 9999 ]]; then GRUB_AUTOGEN=1 fi +if [[ -n ${GRUB_AUTOGEN} ]]; then + PYTHON_COMPAT=( python{2_6,2_7} ) + inherit python-any-r1 +fi + inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator if [[ ${PV} != 9999 ]]; then @@ -78,8 +83,8 @@ RDEPEND=" ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) " DEPEND="${RDEPEND} + ${PYTHON_DEPS} app-misc/pax-utils - >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man @@ -106,10 +111,6 @@ RDEPEND+=" !multislot? ( !sys-boot/grub:0 ) " -if [[ -n ${GRUB_AUTOGEN} ]]; then - DEPEND+=" >=sys-devel/autogen-5.10" -fi - STRIP_MASK="*/grub/*/*.{mod,img}" RESTRICT="test" @@ -160,6 +161,7 @@ src_prepare() { fi epatch_user if [[ -n ${GRUB_AUTOGEN} ]]; then + python_setup bash autogen.sh || die fi if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then |