summaryrefslogtreecommitdiff
path: root/sys-boot
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/Manifest5
-rw-r--r--sys-boot/grub/grub-1.99.ebuild2
-rw-r--r--sys-boot/grub/grub-1.99_rc2.ebuild115
-rw-r--r--sys-boot/grub/grub-9999-r2931.ebuild110
4 files changed, 2 insertions, 230 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index d523ee5..235069a 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,7 +1,4 @@
AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f
AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
DIST grub-1.99.tar.gz 4652619 RMD160 63293381ac2ed2479ac65896d4744b866e6d216c SHA1 6d0536da38224e7caf94cf2531a5f921ac057b9b SHA256 b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff
-DIST grub-1.99~rc2.tar.gz 4297065 RMD160 aadf6d9eb554c7201bcd1a1b72bbe49ec88fdfcd SHA1 1cd0b6a805266eddfb903223b0accd2edf58e563 SHA256 ea8f243c95851d58d34ac04910929395790e9b9383d6deb2bb6750435bc3e7bd
-EBUILD grub-1.99.ebuild 2585 RMD160 e4a67d94f4a4237ff8206154031c3ca0df39d12e SHA1 788d42adfe1e30c15490fa13f990705d6ea14ff2 SHA256 a7b7f5deb99b3f660ba97ac65e84de689aebc273d7ad352aff95245d44e43b0e
-EBUILD grub-1.99_rc2.ebuild 3111 RMD160 bad47d5d9278f11ba82838e1d83b86775ea7ecaa SHA1 0abe5845e48c449b7a672f86dd40a4b25155beab SHA256 f662f9fced59aa161ea3429310f29c27db3d019bf0ea3c139c3ca117c5b20da2
-EBUILD grub-9999-r2931.ebuild 3013 RMD160 c53ad65c9a817ac8a788e74c06621c63f2427905 SHA1 256854d5b3c7e99c755192eaa4cf86ffc090f423 SHA256 22d991f55851d7e3084f749258003e91d89beb65a905ad9bf06a66b1dfd5e846
+EBUILD grub-1.99.ebuild 2589 RMD160 95269dabd78641a27711832628f860e351d4183c SHA1 3643f9e4cef700529ac1a90039c6d2edb0295ab8 SHA256 21d366b4d7ed590c0bcb719c425e83c52ded0d1d8815d01c50f370c0791f9b34
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index 7c7b40d..d3c3d94 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
use multislot && SLOT="2" || SLOT="0"
-KEYWORDS=""
+KEYWORDS="~x86"
IUSE="custom-cflags debug truetype multislot static"
RDEPEND=">=sys-libs/ncurses-5.2-r5
diff --git a/sys-boot/grub/grub-1.99_rc2.ebuild b/sys-boot/grub/grub-1.99_rc2.ebuild
deleted file mode 100644
index 4e8f078..0000000
--- a/sys-boot/grub/grub-1.99_rc2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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-1.99_rc1.ebuild,v 1.3 2011/04/10 14:34:42 ulm Exp $
-
-# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
- inherit autotools bzr
- SRC_URI=""
-else
- MY_P=${P/_/\~}
- SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.gz
- mirror://gentoo/${MY_P}.tar.gz"
- S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="GNU GRUB 2 boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-use multislot && SLOT="2" || SLOT="0"
-KEYWORDS=""
-IUSE="custom-cflags debug truetype multislot static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
- dev-libs/lzo
- truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
- >=sys-devel/autogen-5.10
- >=dev-lang/python-2.5.2"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
-
-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}"
- 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
- (. ./autogen.sh) || die
- fi
-}
-
-src_compile() {
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use static && append-ldflags -static
-
- econf \
- --disable-werror \
- --sbindir=/sbin \
- --bindir=/bin \
- --libdir=/$(get_libdir) \
- --disable-efiemu \
- $(use_enable truetype grub-mkfont) \
- $(use_enable debug mm-debug) \
- $(use_enable debug grub-emu) \
- $(use_enable debug grub-emu-usb) \
- $(use_enable debug grub-fstest)
- emake -j1 || die "making regular stuff"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
- cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
- GRUB_DISTRIBUTOR="Gentoo"
- EOF
- if use multislot ; then
- sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
- mv "${D}"/sbin/grub{,2}-install || die
- mv "${D}"/sbin/grub{,2}-set-default || die
- mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
- mv "${D}"/usr/share/info/grub{,2}.info || die
- fi
-}
-
-setup_boot_dir() {
- local boot_dir=$1
- local dir=${boot_dir}/grub
-
- if [[ ! -e ${dir}/grub.cfg ]] ; then
- einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
- grub-mkconfig -o "${dir}/grub.cfg"
- fi
-
- #local install=grub-install
- #use multislot && install="grub2-install --grub-setup=/bin/true"
- #einfo "Running: ${install} "
- #${install}
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if use multislot ; then
- elog "You have installed grub2 with USE=multislot, so to coexist"
- elog "with grub1, the grub2 install binary is named grub2-install."
- fi
- setup_boot_dir "${ROOT}"boot
-
- # needs to be after we call setup_boot_dir
- mount-boot_pkg_postinst
-}
diff --git a/sys-boot/grub/grub-9999-r2931.ebuild b/sys-boot/grub/grub-9999-r2931.ebuild
deleted file mode 100644
index 6f34bbf..0000000
--- a/sys-boot/grub/grub-9999-r2931.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2010 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.26 2010/10/07 04:22:11 vapier Exp $
-
-# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub"
- EBZR_REVISION="2931"
- inherit autotools bzr
- SRC_URI=""
-else
- SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
- mirror://gentoo/${P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GRUB 2 boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-use multislot && SLOT="2" || SLOT="0"
-KEYWORDS=""
-IUSE="custom-cflags debug truetype multislot static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
- dev-libs/lzo
- truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
- >=sys-devel/autogen-5.10
- >=dev-lang/python-2.5.2"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
-PROVIDE="virtual/bootloader"
-
-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}"
- 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
- (. ./autogen.sh) || die
- fi
-}
-
-src_compile() {
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use static && append-ldflags -static
-
- econf \
- --disable-werror \
- --sbindir=/sbin \
- --bindir=/bin \
- --libdir=/$(get_libdir) \
- --disable-efiemu \
- $(use_enable truetype grub-mkfont) \
- $(use_enable debug mm-debug) \
- $(use_enable debug grub-emu) \
- $(use_enable debug grub-emu-usb) \
- $(use_enable debug grub-fstest)
- emake -j1 || die "making regular stuff"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
- cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
- GRUB_DISTRIBUTOR="Gentoo"
- EOF
- if use multislot ; then
- sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
- mv "${D}"/sbin/grub{,2}-install || die
- mv "${D}"/sbin/grub{,2}-set-default || die
- mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
- mv "${D}"/usr/share/info/grub{,2}.info || die
- fi
-}
-
-setup_boot_dir() {
- local boot_dir=$1
- local dir=${boot_dir}/grub
-
- if [[ ! -e ${dir}/grub.cfg ]] ; then
- einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
- grub-mkconfig -o "${dir}/grub.cfg"
- fi
-
- #local install=grub-install
- #use multislot && install="grub2-install --grub-setup=/bin/true"
- #einfo "Running: ${install} "
- #${install}
-}
-
-pkg_postinst() {
- if use multislot ; then
- elog "You have installed grub2 with USE=multislot, so to coexist"
- elog "with grub1, the grub2 install binary is named grub2-install."
- fi
- setup_boot_dir "${ROOT}"boot
-}