Warn people about the /boot/grub2 to /boot/grub move regardless of the version they are upgrading from.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 24 insertions, 27 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5db3bf0e1d28..29a45d237078 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.303 2014/01/27 02:50:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.304 2014/02/13 02:29:59 floppym Exp $
+
+  13 Feb 2014; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2.ebuild,
+  grub-9999-r1.ebuild:
+  Warn people about the /boot/grub2 to /boot/grub move regardless of the version
+  they are upgrading from.
 
   27 Jan 2014; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2.ebuild,
   grub-9999-r1.ebuild:
diff --git a/sys-boot/grub/grub-2.02_beta2.ebuild b/sys-boot/grub/grub-2.02_beta2.ebuild
index 62373f6cfb53..6315bb7dc665 100644
--- a/sys-boot/grub/grub-2.02_beta2.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v 1.2 2014/01/27 02:50:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v 1.3 2014/02/13 02:29:59 floppym Exp $
 
 EAPI=5
 
@@ -284,9 +284,14 @@ src_install() {
 pkg_postinst() {
 	mount-boot_mount_boot_partition
 
-	if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
-		mkdir -p "${ROOT%/}/boot/grub"
-		ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
+	if [[ -e "${ROOT%/}/boot/grub2/grub.cfg"  ]]; then
+		ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
+		ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
+
+		if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
+			mkdir -p "${ROOT%/}/boot/grub"
+			ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
+		fi
 	fi
 
 	mount-boot_pkg_postinst
@@ -306,14 +311,5 @@ pkg_postinst() {
 		if ! has_version dev-libs/libisoburn; then
 			elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
 		fi
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; then
-				ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
-				ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-				break
-			fi
-		done
 	fi
 }
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index ac84104c10e0..11213c0606f5 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.11 2014/01/27 02:50:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.12 2014/02/13 02:29:59 floppym Exp $
 
 EAPI=5
 
@@ -284,9 +284,14 @@ src_install() {
 pkg_postinst() {
 	mount-boot_mount_boot_partition
 
-	if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
-		mkdir -p "${ROOT%/}/boot/grub"
-		ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
+	if [[ -e "${ROOT%/}/boot/grub2/grub.cfg"  ]]; then
+		ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
+		ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
+
+		if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
+			mkdir -p "${ROOT%/}/boot/grub"
+			ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
+		fi
 	fi
 
 	mount-boot_pkg_postinst
@@ -306,14 +311,5 @@ pkg_postinst() {
 		if ! has_version dev-libs/libisoburn; then
 			elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
 		fi
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; then
-				ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
-				ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-				break
-			fi
-		done
 	fi
 }