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

["Thomas Sachau" <tommy@gentoo.org>]

commit:     0603d13f8cdcd67edc687b0454eabf311ea7620e
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 14:19:48 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 14:19:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=0603d13f

Sync portage

Package-Manager: portage-2.3.7
Manifest-Sign-Key: 0xC05330B3211CA2D4

 sys-apps/portage/Manifest                          | 12 ++---
 ...ge-2.3.7-r1.ebuild => portage-2.3.19-r1.ebuild} | 59 ++++++++--------------
 2 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 35056361e..b99f700ca 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 AUX portage-ccache.conf 60 SHA256 5175a18d3b81bd0aa499e0da6a2f44b920cf26f650e8dadea8dc2dc6551f8a39 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c WHIRLPOOL f79ec05596e022d2d73cc18656e398cbca9c55c7ff65c51634f7ccd1a46af1845ef66649267773b93a2bcff9e1de621785231a1a18d42fff97026ff12594a3bc
+EBUILD portage-2.3.19-r1.ebuild 8679 SHA256 aa47dff8267d42498b048f8ab0db28aae05e9597e76eb2684b649dabbe698b8a SHA512 d126e506f32bf1328b01cdd35ecea66b4fd60a22c08cd7d1264d0f9b01535e7981a4b363a3bb4dfe52b979c6f55af2e7670290813b89bc1e5f3a5278dc62622b WHIRLPOOL 633ef2bc54c67beb8e59e66b1a76caeb7490fb96aa31922a78e74901c66945065c1c1d6b5e1ad1c36e7736d4740debadacb9d904bb31c181844eb0bd62e0d358
 EBUILD portage-2.3.6-r1.ebuild 8865 SHA256 c4c300df276931854a9b35178cfa3ad517bc70cef438289b36b66d75ed4ff765 SHA512 50991bc94f2934454f5254dce47460a57d4e933a78e26cb2db9374856efff135c7d0564a52297f0416d922a22bb011ef6cc0623d17fa8b1ad9a880395c8e2f6c WHIRLPOOL de1a86c97dec170bc36f3afe548b1515ed3f84c8b79bba16edf288133391d9c1e76df388ab073921775968edc02f66852b7d70b7a339ca11c79cc3d31eabc0de
-EBUILD portage-2.3.7-r1.ebuild 8865 SHA256 eda572bf020e8911795c7e51656f4dabb9553065abc9710bb6fd435b288b8ad7 SHA512 05388033a012ddcd0357406d2aa1d550e68d729decc0fb8142efd394be61aca6f46a5eb8f676a1968b8da7654d977f6ca97973990132ee125c45de1bf3e3598d WHIRLPOOL 65e0442f061f42a8e0271cfce930deaf423996b430ab115a3f812c5cc85380c7632115feeae5f5d874e17608bfe20f3b55405772d31a02ee023b1b07e4199fed
 MISC metadata.xml 1147 SHA256 c4832ae64ab0915c65eadca15e4540680d109c21d572464f69e218d14fe6bd8b SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c WHIRLPOOL bf901ca7474f9b8358c458edad904f9c0c853187c6dc8ea0bc0c327bded60940c6f8b20f0231d78d86aa7dc5235b23d70c69f7153cca9e375fa271c7c93707b9
 -----BEGIN PGP SIGNATURE-----
 
-iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWlIXygAKCRAbuSpxNYmQ
-Z5L8A/0fS0jXc2VB6HZeJaHroZVu708ahhwFnT2qZSAXA/o5nX+1nbvZ9KRlM/BQ
-beeIBsDBNxnk970EGF4i337MiFKG/oJhELcf8qe2SQXP1F0ckZVEjIVkQgPzgM7s
-YMh/F+ketJcrt77D+vTTESt1+VgNmO1uQx2183M6149q/mjL+w==
-=E3Qm
+iLMEAQEIAB0WIQQUEEce6kYbCwkDe/sbuSpxNYmQZwUCWlIsfwAKCRAbuSpxNYmQ
+ZxvuBACCyd9oC/2cE42enQVc8v0VSuu2275SxX4fNtZ7hMH2O7cq/D+nkQToMHFj
+IyjVtYYRfb6uPwf9XfbnP4scBqqcoJeDs2Pm2cPLKWGUHsdeHUL5CSaosiYF8MRq
+/Gb8Ms2bH05SHAU//2YDJqrPXqZUdW5PSifjuqTYZqp27UOI3g==
+=1+PK
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.3.7-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
similarity index 89%
rename from sys-apps/portage/portage-2.3.7-r1.ebuild
rename to sys-apps/portage/portage-2.3.19-r1.ebuild
index e8d70e28f..77284a3be 100644
--- a/sys-apps/portage/portage-2.3.7-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -10,11 +10,11 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-2 multilib
+inherit distutils-r1 git-2 multilib tmpfiles
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="16fcf4998f4b55f1697e4358c7b232e3cab56a11"
+EGIT_COMMIT="2186b6acaa669b0bf64312d0e5294050f8aaefd0"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
@@ -44,6 +44,8 @@ RDEPEND="
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
 	)
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
@@ -119,11 +121,14 @@ 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://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
 			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
 
 		einfo "Adding FEATURES=force-prefix to make.globals ..."
 		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
@@ -174,14 +179,22 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
 
 	# install docs
 	if [[ ${targets[@]} ]]; then
 		esetup.py "${targets[@]}"
 	fi
 
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
 	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
@@ -222,36 +235,6 @@ pkg_preinst() {
 	fi
 }
 
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
 pkg_postinst() {
 	if ${SYNC_DEPTH_UPGRADE}; then
 		ewarn "Please note that this release no longer respects sync-depth for"