[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage-mgorny/

["Michał Górny" <mgorny@gentoo.org>]

commit:     0ac26eba0b299f99bb15140576f68c85c8342e96
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 15:59:35 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 16:07:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac26eba

sys-apps/portage-mgorny: Require /etc/make.conf migration

 sys-apps/portage-mgorny/portage-mgorny-9999.ebuild | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
index 5b8cc188f76..832411c48c2 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
@@ -55,6 +55,20 @@ PDEPEND="
 # NOTE: FEATURES=installsources requires debugedit and rsync
 
 pkg_pretend() {
+	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
+		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
+		eerror "/etc/portage/make.conf location before upgrading."
+		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
+			eerror
+			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
+		else
+			ewarn
+			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
+			ewarn "care not to accientally overwrite one with the other."
+		fi
+		die "${EROOT%/}/etc/make.conf present"
+	fi
+
 	if has_version sys-apps/portage; then
 		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
 		ewarn "please note that Portage will abort upon having to unmerge itself."