diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-04-28 03:23:03 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-04-28 03:23:03 +0000 |
| commit | 8c8eaa89d7cba66e6c5f759ae6fbb8763b464d07 (patch) | |
| tree | 29885510afb707c9e52a6f8ee2d9d0dddd3e287b /sys-boot | |
| parent | keyword ~amd64-fbsd (diff) | |
| download | gentoo-2-8c8eaa89d7cba66e6c5f759ae6fbb8763b464d07.tar.gz gentoo-2-8c8eaa89d7cba66e6c5f759ae6fbb8763b464d07.tar.bz2 gentoo-2-8c8eaa89d7cba66e6c5f759ae6fbb8763b464d07.zip | |
Depend on static versions of bzip2, freetype, and zlib when USE=static.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.00_beta3-r2.ebuild | 15 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 15 |
3 files changed, 31 insertions, 5 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 1f64ad9a45d1..21e185d2a271 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.200 2012/04/26 00:10:14 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.201 2012/04/28 03:23:03 floppym Exp $ + + 28 Apr 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta3-r2.ebuild, + grub-9999.ebuild: + Depend on static versions of bzip2, freetype, and zlib when USE=static. *grub-2.00_beta3-r2 (26 Apr 2012) diff --git a/sys-boot/grub/grub-2.00_beta3-r2.ebuild b/sys-boot/grub/grub-2.00_beta3-r2.ebuild index b9711ad418f5..1283d35531b0 100644 --- a/sys-boot/grub/grub-2.00_beta3-r2.ebuild +++ b/sys-boot/grub/grub-2.00_beta3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta3-r2.ebuild,v 1.1 2012/04/26 00:08:27 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta3-r2.ebuild,v 1.2 2012/04/28 03:23:03 floppym Exp $ EAPI=4 @@ -60,12 +60,23 @@ RDEPEND=" device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype >=media-fonts/unifont-5 )" + truetype? ( + media-libs/freetype + >=media-fonts/unifont-5 + ) +" DEPEND="${RDEPEND} >=dev-lang/python-2.5.2 sys-devel/flex virtual/yacc sys-apps/texinfo + static? ( + truetype? ( + app-arch/bzip2[static-libs(+)] + media-libs/freetype[static-libs(+)] + sys-libs/zlib[static-libs(+)] + ) + ) " RDEPEND+=" grub_platforms_efi-32? ( sys-boot/efibootmgr ) diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 54915ffdf325..31bb3e76423d 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.61 2012/04/07 21:35:56 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.62 2012/04/28 03:23:03 floppym Exp $ EAPI=4 @@ -60,12 +60,23 @@ RDEPEND=" device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype >=media-fonts/unifont-5 )" + truetype? ( + media-libs/freetype + >=media-fonts/unifont-5 + ) +" DEPEND="${RDEPEND} >=dev-lang/python-2.5.2 sys-devel/flex virtual/yacc sys-apps/texinfo + static? ( + truetype? ( + app-arch/bzip2[static-libs(+)] + media-libs/freetype[static-libs(+)] + sys-libs/zlib[static-libs(+)] + ) + ) " RDEPEND+=" grub_platforms_efi-32? ( sys-boot/efibootmgr ) |