sys-apps/portage: Version bump

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Manifest-Sign-Key: 0xC05330B3211CA2D4
Signed-off-by: Thomas Sachau <tommy@gentoo.org>

2 files changed, 23 insertions, 19 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6728f60a5..927436014 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-EBUILD portage-2.3.103-r1.ebuild 8768 BLAKE2B 0b7453cea3babe0c9a194ed09cf774d971cfb2fc2a5638fad18295efd0e1c8dc6f9af47dcaf9a2a5f173e670c990025cba6ba9826f822eded49b9248c2df52ad SHA512 ecbe93b4e6f91df99f86c5349663b2719bcad4a7ac16a259f7ed4fa7dac08d666e444f2085d547ed42d664a4f33423de5420b756d67b89cdb601f9aaa84b60a7
+EBUILD portage-3.0.13.ebuild 8862 BLAKE2B 52241e311b5f848aeb1adb83422d20b0eda278b24985ab97ba6de67a577a140f1c113c140d00a78232dfd9e439b32b81aec55ef112aac74267b7cc4981580770 SHA512 c62efef1c0547dd6377840c9539fa476e975e1a66c0f13f8d41541591ddd7d474ff4edbd4a8989a573df4f89d20b0e46f08d2b3d6f9a7886a3652a5d256e2eeb
 EBUILD portage-3.0.4.ebuild 8764 BLAKE2B 25c438cdbc500eccf27f8613fcbd16107f05e23be37413b9badb660e7455bace25a503c5e6299375505f0fd804e75e0ff3e4738b57beacf2950d4cf8a27c53d6 SHA512 569d2b903931e1704542468c46718e206ca5a524e48d9531eb302e4c0ab4580490ddee5292d3e8da77fcddf3ae8ef3b6c4e4149a15e83ba129a6422212263d6e
 EBUILD portage-3.0.8.ebuild 8784 BLAKE2B 0678de7a5633682e184b021a68fba45369ea9a74c2b889f0480594d196e7531ed1e75443dd7c9d68e5c312c10b6ebaf5bf6bc5d13ab2958b87d3336702956a4c SHA512 9187fedf56d88c62d4ea8f5569aa5674ab7fabf16eed707c293011e07d89a127fd1ec74182e5c8e50be7bb9335ff8debe74566fa02ca841021fa85c7e5f8161b
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
 -----BEGIN PGP SIGNATURE-----
 
-iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl+b8dFfFIAAAAAALgAo
+iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmABwvlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
-kGdBAwP/cUhHw/288GZ41wUxtJne4AFPVG1tg05RKDvKIIECXoH7oKmbxZOj1k2m
-47YpqzA5dtPB2WUVnEy70ZgmnsdyEKutRkjxSPtvCstMQu14Pa2Jab3buHuD0y90
-TNglXZJ+vJsWMoGB2pjATG+z0XWs9YSKBBu4fTJ9v/TG34OSDnA=
-=qAbt
+kGdfEwP+KRpWTFY2I6BNjbPIGdgg62bWgBdO7CzfTBpLvd9rmIua+r6NSLdP7l2B
+fmwRrTLabmBIIxCyPUtJMaKAC+x9ezIwvFoTbhW8ogh7QJtPpqf7ewHGrWG6AYX4
+yZFw05LC+y+3m8wZZPhX4mSnieYIdNIojrBWA2/XLpfL0i6VNZU=
+=jZ8p
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.3.103-r1.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
index 223a1fd7e..c6be34a63 100644
--- a/sys-apps/portage/portage-2.3.103-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.13.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-r3 linux-info multilib systemd prefix
+inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 EGIT_BRANCH="multilib"
-EGIT_COMMIT="661e707be59a3e3c2973b81ac1cbe376248ed0d9"
+EGIT_COMMIT="688a2012b8e4d5d66406e7d3ee2eb140569a4b20"
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( dev-vcs/git )"
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -36,15 +38,17 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # app-portage/gemato goes without PYTHON_USEDEP since we're calling
 # the executable.
 RDEPEND="
+	acct-user/portage
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
 	!build? (
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		rsync-verify? (
-			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
@@ -203,7 +207,7 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
 
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
@@ -212,24 +216,24 @@ python_install_all() {
 	dodir /usr/sbin
 	for target in ${sbin_relocations}; do
 		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
 	done
 }
 
 pkg_preinst() {
 	python_setup
 	local sitedir=$(python_get_sitedir)
-	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
 	env -u DISTDIR \
 		-u PORTAGE_OVERRIDE_EPREFIX \
 		-u PORTAGE_REPOSITORIES \
 		-u PORTDIR \
 		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
@@ -237,8 +241,8 @@ pkg_preinst() {
 	# portage:portage to root:root which happens after src_install.
 	keepdir /var/log/portage/elog
 	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
 	fi
 
 	if has_version "<${CATEGORY}/${PN}-2.3.77"; then