From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 39E8013828B for ; Sat, 28 May 2016 04:17:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB07321C038; Sat, 28 May 2016 04:17:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34FCF21C038 for ; Sat, 28 May 2016 04:17:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92C17340BCD for ; Sat, 28 May 2016 04:17:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F488980 for ; Sat, 28 May 2016 04:17:16 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1464409024.2a57d2bdaae984b8170098e7364d49b3374d79a5.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage/portage-2.3.0_rc1-r1.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 2a57d2bdaae984b8170098e7364d49b3374d79a5 X-VCS-Branch: master Date: Sat, 28 May 2016 04:17:16 +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: 337cd809-5ff4-42bd-b2d8-43521ef92b78 X-Archives-Hash: 7ac72dbef1cb9c1e44a1b62c4caf09ea commit: 2a57d2bdaae984b8170098e7364d49b3374d79a5 Author: Benda Xu gentoo org> AuthorDate: Sat May 28 04:15:28 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Sat May 28 04:17:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a57d2bd sys-apps/portage: use gentoo main tree on RAP. prefix-rpath using prefix-portage is not affected. Package-Manager: portage-2.2.28 sys-apps/portage/portage-2.3.0_rc1-r1.ebuild | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild index 7db2ef3..253f431 100644 --- a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild +++ b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild @@ -127,10 +127,7 @@ python_prepare_all() { -i cnf/make.globals || die "sed failed" einfo "Adjusting repos.conf ..." - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \ + sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ -i cnf/repos.conf || die "sed failed" einfo "Adding FEATURES=force-prefix to make.globals ..."