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

[Michał Górny]

commit:     680db13073fd89ce3cb02bbc2817423a72525ab3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 16:05:13 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=680db130

sys-apps/portage-mgorny: Require /etc/portage/package.keywords migr

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

diff --git a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild 
b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
index 832411c48c2..492a6ca37c2 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
@@ -69,6 +69,22 @@ pkg_pretend() {
                die "${EROOT%/}/etc/make.conf present"
        fi
 
+       if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
+               eerror "You seem to be using /etc/portage/package.keywords. 
Please migrate"
+               eerror "to the new /etc/portage/package.accept_keywords 
location before"
+               eerror "upgrading."
+               eerror
+               if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
+                       eerror "  mv ${EROOT%/}/etc/portage/package.keywords 
${EROOT%/}/etc/portage/package.accept_keywords/99old"
+               else
+                       if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords 
]]; then
+                               eerror "  cat 
${EROOT%/}/etc/portage/package.accept_keywords >> 
${EROOT%/}/etc/portage/package.keywords"
+                       fi
+                       eerror "  mv ${EROOT%/}/etc/portage/package.keywords 
${EROOT%/}/etc/portage/package.accept_keywords"
+               fi
+               die "${EROOT%/}/etc/portage/package.keywords 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."