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 28208138332 for ; Mon, 26 Mar 2018 16:07:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5BD2E08DF; Mon, 26 Mar 2018 16:07:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BE896E08D1 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 4776E335C60 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 2CFAD268 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.0ac26eba0b299f99bb15140576f68c85c8342e96.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: 0ac26eba0b299f99bb15140576f68c85c8342e96 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: 165b3de0-529e-41ac-a2ea-27dd30cce500 X-Archives-Hash: bf9ff2fac004e9bdefe3173bf87eed1f commit: 0ac26eba0b299f99bb15140576f68c85c8342e96 Author: Michał Górny gentoo org> AuthorDate: Mon Mar 26 15:59:35 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=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."