From a3105a49ef1908bc17180973b007f895fb7e7603 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 28 Nov 2020 22:53:55 +0000
Subject: move : sys-boot/grub-config-redcore => sys-boot/grubcfg
---
sys-boot/grub-config-redcore/files/grub | 63 ----------------------
.../grub-config-redcore-1337-r3.ebuild | 34 ------------
sys-boot/grub/grub-2.04-r314.ebuild | 2 +-
sys-boot/grubcfg/files/grub | 63 ++++++++++++++++++++++
sys-boot/grubcfg/grubcfg-1337.ebuild | 34 ++++++++++++
5 files changed, 98 insertions(+), 98 deletions(-)
delete mode 100644 sys-boot/grub-config-redcore/files/grub
delete mode 100644 sys-boot/grub-config-redcore/grub-config-redcore-1337-r3.ebuild
create mode 100644 sys-boot/grubcfg/files/grub
create mode 100644 sys-boot/grubcfg/grubcfg-1337.ebuild
diff --git a/sys-boot/grub-config-redcore/files/grub b/sys-boot/grub-config-redcore/files/grub
deleted file mode 100644
index b88083b2..00000000
--- a/sys-boot/grub-config-redcore/files/grub
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
-# To populate all changes in this file you need to regenerate your
-# grub configuration file afterwards:
-# 'grub2-mkconfig -o /boot/grub/grub.cfg'
-#
-# See the grub info page for documentation on possible variables and
-# their associated values.
-
-GRUB_DISTRIBUTOR="Redcore"
-
-# Default menu entry
-#GRUB_DEFAULT=0
-
-# Boot the default entry this many seconds after the menu is displayed
-GRUB_TIMEOUT="5"
-#GRUB_TIMEOUT_STYLE=menu
-
-# Append parameters to the linux kernel command line for non-recovery entries
-GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=1 splash"
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal.
-# Note that you can use only modes which your graphic card supports via VBE.
-# You can see them in real GRUB with the command `vbeinfo'.
-GRUB_GFXMODE="1366x768,1024x768,auto"
-
-# Set to 'text' to force the Linux kernel to boot in normal text
-# mode, 'keep' to preserve the graphics mode set using
-# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
-# graphics mode, or a sequence of these separated by commas or
-# semicolons to try several modes in sequence.
-GRUB_GFXPAYLOAD_LINUX="keep"
-
-# Path to theme spec txt file.
-# The starfield is by default provided with use truetype.
-# NOTE: when enabling custom theme, ensure you have required font/etc.
-GRUB_THEME="/usr/share/grub/themes/redcore/theme.txt"
-
-# Background image used on graphical terminal.
-# Can be in various bitmap formats.
-GRUB_BACKGROUND="/usr/share/grub/themes/redcore/terminal_bg.png"
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY=true
-
-# Uncomment to disable generation of the submenu and put all choices on
-# the top-level menu.
-# Besides the visual affect of no sub menu, this makes navigation of the
-# menu easier for a user who can't see the screen.
-#GRUB_DISABLE_SUBMENU=y
-
-# Uncomment to play a tone when the main menu is displayed.
-# This is useful, for example, to allow users who can't see the screen
-# to know when they can make a choice on the menu.
-#GRUB_INIT_TUNE="60 800 1"
diff --git a/sys-boot/grub-config-redcore/grub-config-redcore-1337-r3.ebuild b/sys-boot/grub-config-redcore/grub-config-redcore-1337-r3.ebuild
deleted file mode 100644
index 490e1933..00000000
--- a/sys-boot/grub-config-redcore/grub-config-redcore-1337-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Redcore Linux GRUB configuration files"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${FILESDIR}"
-
-src_install() {
- dodir "etc/default" || die
- insinto "etc/default" || die
- newins grub grub.example || die
-}
-
-pkg_preinst() {
- if [[ -f ""${ROOT}"etc/default/grub" ]]; then
- mv ""${ROOT}"etc/default/grub" ""${ROOT}"etc/default/grub.bak"
- fi
-}
-
-pkg_postinst() {
- if [[ -f ""${ROOT}"etc/default/grub.bak" ]]; then
- mv ""${ROOT}"etc/default/grub.bak" ""${ROOT}"etc/default/grub"
- fi
-}
diff --git a/sys-boot/grub/grub-2.04-r314.ebuild b/sys-boot/grub/grub-2.04-r314.ebuild
index 4a02d0d7..f0c4b5f1 100644
--- a/sys-boot/grub/grub-2.04-r314.ebuild
+++ b/sys-boot/grub/grub-2.04-r314.ebuild
@@ -96,7 +96,7 @@ BDEPEND="
DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
- sys-boot/grub-config-redcore
+ sys-boot/grubcfg
sdl? ( media-libs/libsdl )
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
mount? ( sys-fs/fuse:0 )
diff --git a/sys-boot/grubcfg/files/grub b/sys-boot/grubcfg/files/grub
new file mode 100644
index 00000000..b88083b2
--- /dev/null
+++ b/sys-boot/grubcfg/files/grub
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+# 'grub2-mkconfig -o /boot/grub/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values.
+
+GRUB_DISTRIBUTOR="Redcore"
+
+# Default menu entry
+#GRUB_DEFAULT=0
+
+# Boot the default entry this many seconds after the menu is displayed
+GRUB_TIMEOUT="5"
+#GRUB_TIMEOUT_STYLE=menu
+
+# Append parameters to the linux kernel command line for non-recovery entries
+GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=1 splash"
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+GRUB_GFXMODE="1366x768,1024x768,auto"
+
+# Set to 'text' to force the Linux kernel to boot in normal text
+# mode, 'keep' to preserve the graphics mode set using
+# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
+# graphics mode, or a sequence of these separated by commas or
+# semicolons to try several modes in sequence.
+GRUB_GFXPAYLOAD_LINUX="keep"
+
+# Path to theme spec txt file.
+# The starfield is by default provided with use truetype.
+# NOTE: when enabling custom theme, ensure you have required font/etc.
+GRUB_THEME="/usr/share/grub/themes/redcore/theme.txt"
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+GRUB_BACKGROUND="/usr/share/grub/themes/redcore/terminal_bg.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"
diff --git a/sys-boot/grubcfg/grubcfg-1337.ebuild b/sys-boot/grubcfg/grubcfg-1337.ebuild
new file mode 100644
index 00000000..490e1933
--- /dev/null
+++ b/sys-boot/grubcfg/grubcfg-1337.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Redcore Linux GRUB configuration files"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${FILESDIR}"
+
+src_install() {
+ dodir "etc/default" || die
+ insinto "etc/default" || die
+ newins grub grub.example || die
+}
+
+pkg_preinst() {
+ if [[ -f ""${ROOT}"etc/default/grub" ]]; then
+ mv ""${ROOT}"etc/default/grub" ""${ROOT}"etc/default/grub.bak"
+ fi
+}
+
+pkg_postinst() {
+ if [[ -f ""${ROOT}"etc/default/grub.bak" ]]; then
+ mv ""${ROOT}"etc/default/grub.bak" ""${ROOT}"etc/default/grub"
+ fi
+}
--
cgit v1.2.3