From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 484411382C5 for ; Mon, 26 Mar 2018 16:07:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2E6CE083B; Mon, 26 Mar 2018 16:07:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0188E083B for ; Mon, 26 Mar 2018 16:07:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59937335C63 for ; Mon, 26 Mar 2018 16:07:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F63326B for ; Mon, 26 Mar 2018 16:07:27 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1522080423.680db13073fd89ce3cb02bbc2817423a72525ab3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage-mgorny/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage-mgorny/portage-mgorny-9999.ebuild X-VCS-Directories: sys-apps/portage-mgorny/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 680db13073fd89ce3cb02bbc2817423a72525ab3 X-VCS-Branch: master Date: Mon, 26 Mar 2018 16:07:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f3834ec8-214a-43de-876e-62e912eaf800 X-Archives-Hash: f8b57e93d5f1143abbf5ba9ba9c7e8b7 commit: 680db13073fd89ce3cb02bbc2817423a72525ab3 Author: Michał Górny gentoo org> AuthorDate: Mon Mar 26 16:05:13 2018 +0000 Commit: Michał Górny gentoo 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."