diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-12-04 00:46:37 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-12-04 00:46:37 +0000 |
| commit | 3b2ef3dab2dfaf757f018f2a7b95a850d7dea8ec (patch) | |
| tree | bb4de6c016850a328192b2c1e20f2946b66577bb /sys-boot | |
| parent | Remove older RC (diff) | |
| download | gentoo-2-3b2ef3dab2dfaf757f018f2a7b95a850d7dea8ec.tar.gz gentoo-2-3b2ef3dab2dfaf757f018f2a7b95a850d7dea8ec.tar.bz2 gentoo-2-3b2ef3dab2dfaf757f018f2a7b95a850d7dea8ec.zip | |
Require python2 and drop autogen dep.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999-r1.ebuild | 14 |
2 files changed, 12 insertions, 7 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/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 |