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

["Fabian Groffen" <grobian@gentoo.org>]

commit:     bff822005b671778d4f3a45ad3d9983512a86377
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 07:41:53 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 07:41:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bff82200

sys-apps/portage: version bump to 2.3.7

Package-Manager: Portage-2.3.7-prefix, Repoman-2.3.3

 sys-apps/portage/Manifest                                     |  2 +-
 .../portage/{portage-2.3.5.ebuild => portage-2.3.7.ebuild}    | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1615291209..9b4865e225 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 SHA256 e4bb6c08a65252cfb3faf777ff9bb6aab162174766202f811154c0bbe301b45e SHA512 ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42 WHIRLPOOL d2d3feab14c4b0dc706db9336e08637897d963d0cbd7e1995431701c8c1914f6f42f57917470a2c89cdc8596d2ed8183c80f3814eba7512b5216611595da38a1
-DIST prefix-portage-2.3.5.tar.bz2 1163747 SHA256 d0a0d3c3b09f8abd10ea7569f87d5dbb57623baba1972258461c4afd16fc98af SHA512 0ae5a043b41c57e24dee60cb2ac8ab0896e562e815544685a75b106c8f22f3c0540077755f6f9f462130d13ef2995e54dfd63a8c9b529c6646c5dcf7fda3575d WHIRLPOOL 89e939c6c35e9056dbff78e663a07317500b9b7efe1ba32f585ba1f9752f97b78363bab2b301dae21bebcd5c859f625d38b12b056b885776bf8c51ece6d84595
 DIST prefix-portage-2.3.6.tar.bz2 1214157 SHA256 3a2b4494a7fc97dae8c2c50a02004ae47281d01338a878e99a756b9b62194417 SHA512 065d0d6eee144473ffb3b16e1df43f54a9e5295e11c5dac4e0a5ceb416d36d7b7fac2e4194777f0b352a181bc24d80fac10ea53c11356fee34ed98a8bd6a2fea WHIRLPOOL 45c19dde4a0f6fa5750515707d81f31b446e36dd90d66daf44e8baebcd6b337cb16a85fc962c4181532c419552af223388ef77262ca407979dfb16f797446f40
+DIST prefix-portage-2.3.7.tar.bz2 1228627 SHA256 3d6c0818520d6e39df0c0a94b7fc206e1c82e596f88146c729245a8489968ceb SHA512 bff82ccac9cbb249f196c656311ba0d29cd93ee803bc2f3744e028cf85c0b622cabacdee9bc634cf06bb92afc342f0790e19e2cc6ff87d6593228f6b79b7c332 WHIRLPOOL d6f236a618cd8c2e2817e4d1a9d3dac5072cd012cf8756bd144d652b63e09fca6134ab84780911674563aa977458532eda6a04b024e413b1e732e75984581563

diff --git a/sys-apps/portage/portage-2.3.5.ebuild b/sys-apps/portage/portage-2.3.7.ebuild
similarity index 95%
rename from sys-apps/portage/portage-2.3.5.ebuild
rename to sys-apps/portage/portage-2.3.7.ebuild
index 231f912693..af55c0f34b 100644
--- a/sys-apps/portage/portage-2.3.5.ebuild
+++ b/sys-apps/portage/portage-2.3.7.ebuild
@@ -90,7 +90,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 
 	epatch "${FILESDIR}"/${PN}-2.2.28-ebuildshell-r1.patch # 155161
-	epatch "${FILESDIR}"/${PN}-2.3.4-mj-safe-econf.patch
 	use prefix-chaining &&
 		epatch "${FILESDIR}"/${PN}-2.3.5-prefix-chaining.patch
 
@@ -114,19 +113,13 @@ python_prepare_all() {
 
 	if [[ -n ${EPREFIX} ]] ; then
 		# PREFIX LOCAL: only hack const_autotool
-		local extrapath="/usr/bin:/bin"
+		local extrapath="/usr/sbin:/usr/bin:/sbin:/bin"
 		# ok, we can't rely on PORTAGE_ROOT_USER being there yet, as people
 		# tend not to update that often, as long as we are a separate ebuild
 		# we can assume when unset, it's time for some older trick
 		if [[ -z ${PORTAGE_ROOT_USER} ]] ; then
 			PORTAGE_ROOT_USER=$(python -c 'from portage.const import rootuser; print rootuser')
 		fi
-		# lazy check, but works for now
-		if [[ ${PORTAGE_ROOT_USER} == "root" ]] ; then
-			# we need this for e.g. mtree on FreeBSD (and Darwin) which is in
-			# /usr/sbin
-			extrapath="/usr/sbin:/usr/bin:/sbin:/bin"
-		fi
 		local defaultpath="${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
 		# We need to probe for bash in the Prefix, because it may not
 		# exist, in which case we fall back to the currently in use
@@ -151,7 +144,7 @@ python_prepare_all() {
 			-e "s|@sysconfdir@|${EPREFIX}/etc|" \
 			-i '{}' + || \
 			die "Failed to patch sources"
-		# We don't need the below, since setup.py deal with this (and
+		# We don't need the below, since setup.py deals with this (and
 		# more) so we don't have to make this correct
 		#	-e "s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \