From 4bf27313d39ee0f7dbff576718cb855500d74fd9 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Thu, 5 Jul 2018 15:53:50 +0200
Subject: sys-boot/systemrescuecd-x86-grub: Fix path of ISO image.

Also bump EAPI to 7.

Non-maintainer commit. Acked by mgorny.

Package-Manager: Portage-2.3.41, Repoman-2.3.9
---
 .../files/systemrescuecd.grub                      | 10 +++----
 .../systemrescuecd-x86-grub-0.1-r1.ebuild          | 31 +++++++++++++++++++++
 .../systemrescuecd-x86-grub-0.1.ebuild             | 32 ----------------------
 3 files changed, 36 insertions(+), 37 deletions(-)
 create mode 100644 sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
 delete mode 100644 sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild

(limited to 'sys-boot/systemrescuecd-x86-grub')

diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
index e9695c4b4821..269b1eb76adb 100644
--- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
+++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 . /usr/share/grub/grub-mkconfig_lib
@@ -32,28 +32,28 @@ if [ -f "${srcd}" ]; then
 submenu "${longname}" --class submenu {
 	menuentry "${longname} (32bit standard${bootops}" --class rescue {
 ${grub_string}
-		set isofile=${srcd}
+		set isofile=${path}
 		loopback loop \${isofile}
 		linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
 		initrd (loop)/isolinux/initram.igz
 	}
 	menuentry "${longname} (64bit standard${bootops}" --class rescue {
 ${grub_string}
-		set isofile=${srcd}
+		set isofile=${path}
 		loopback loop \${isofile}
 		linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
 		initrd (loop)/isolinux/initram.igz
 	}
 	menuentry "${longname} (32bit alternative${bootops}" --class rescue {
 ${grub_string}
-		set isofile=${srcd}
+		set isofile=${path}
 		loopback loop \${isofile}
 		linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
 		initrd (loop)/isolinux/initram.igz
 	}
 	menuentry "${longname} (64bit alternative${bootops}" --class rescue {
 ${grub_string}
-		set isofile=${srcd}
+		set isofile=${path}
 		loopback loop \${isofile}
 		linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
 		initrd (loop)/isolinux/initram.igz
diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
new file mode 100644
index 000000000000..80a820419133
--- /dev/null
+++ b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86"
+HOMEPAGE="http://www.sysresccd.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}
+
+RDEPEND="app-admin/systemrescuecd-x86
+	sys-boot/grub"
+
+src_install() {
+	exeinto /etc/grub.d
+	newexe "${FILESDIR}"/systemrescuecd.grub 39_systemrescuecd
+
+	insinto /etc/default
+	newins "${FILESDIR}"/systemrescuecd.default systemrescuecd
+}
+
+pkg_postinst() {
+	elog "To add the menu entries for systemrescuecd to grub, you should now run"
+	elog "	grub-mkconfig -o /boot/grub/grub.cfg"
+	elog "You can set custom bootoptions in /etc/default/systemrescuecd"
+}
diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild
deleted file mode 100644
index 3a5d11ae858b..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86"
-HOMEPAGE="http://www.sysresccd.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}
-
-RDEPEND="app-admin/systemrescuecd-x86
-	sys-boot/grub"
-
-src_install() {
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/systemrescuecd.grub 39_systemrescuecd
-
-	insinto /etc/default
-	newins "${FILESDIR}"/systemrescuecd.default systemrescuecd
-}
-
-pkg_postinst() {
-	elog "To add the menu entries for systemrescuecd to grub, you should now run"
-	elog "	grub-mkconfig -o /boot/grub/grub.cfg"
-	elog "You can set custom bootoptions in /etc/default/systemrescuecd"
-}
-- 
cgit v1.2.3-65-gdbad