gentoo auto-resync : 27:05:2023 - 21:13:06

6 files changed, 66 insertions, 33 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 62c9825adddd..81f3e093355b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 2b5e1d2421a0..8afb28713a9a 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,5 +3,5 @@ AUX dbus-1.15.0-daemon-optional.patch 2442 BLAKE2B 9fb08fc24f8a6ee1feba274b60c33
 AUX dbus-1.15.0-enable-elogind.patch 3045 BLAKE2B 450a63270867b1c570af595492e90a8040195b6145e4f9463b186ebcec2f7128ee0b1d55d695fa81efda5391455dac69d67c4717e888ceab550763558f8eb929 SHA512 e24af56f6f7eb71d3c17a040e84a294a4cadd972bbc41010fdb79d6d541ec8cc271b25921d1c997550150b2e0c0dc5bb0c4df0ba300b22526de1fa1fb91c483f
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.15.4.tar.xz 1404576 BLAKE2B 6007be414497ef95f1e6a7e937c6a0a9b590c163b6b3a1c3e61b6726b988192728aa85a328d89472f34613d48ca1bb6844e86bee997acb4f377a228b2072fbce SHA512 53a5b7161940c5d4432b902c3c0ac1f1965978e3791a640d1a71f2d819474b727497f7a13c95d7c5850baef659062f1434296a3f5e56701383cc573dfbf187ee
-EBUILD dbus-1.15.4-r1.ebuild 8246 BLAKE2B 8ad2fabcf45be5a850caec6a59737c29acf6b498bf2d360b7ae56ef72356c87b0ec9ae3e3b162c0ea0d528f465426faeb6c1efd19e2c4d677bd1eb418f1aa4d5 SHA512 1a671d98e6385a2ce309c8aeade0fd75236dccf5fd864d0aabf3df8db083e0d711c6410a3baab4deb3fe9a2f77e49f2aaafe52b02b80faacc1a8eb318862e82b
+EBUILD dbus-1.15.4-r1.ebuild 8247 BLAKE2B 9a1bd68580813cbb9ee918e107ca8ee36b7608bf48b4e8077f908eec114196b68afc4b3aedbed503e04ff261c164bc7c7d769f779756e30896c93d6111cd882e SHA512 637746e9e795a0db3415629db10d2863773ab1082e1a679a4193b55caefaca487ea28bf672fb93593f5995cf451cc7882efd17766a5d70376bbfd62d30542a08
 MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.15.4-r1.ebuild b/sys-apps/dbus/dbus-1.15.4-r1.ebuild
index 958d0ae0e369..8d4a6511d292 100644
--- a/sys-apps/dbus/dbus-1.15.4-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.15.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Be careful with packaging odd-version-number branches.
 # See https://www.freedesktop.org/wiki/Software/dbus/#download.
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 TMPFILES_OPTIONAL=1
 
 # From 1.15.0 release notes:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4808e65a50e4..8bd5997fcffa 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,6 +8,6 @@ DIST portage-3.0.47.tar.bz2 1148789 BLAKE2B 268589c37a6bdc36377f3e407b16bebfb987
 EBUILD portage-3.0.44-r1.ebuild 9185 BLAKE2B d1477b9433d5d369f10b4332293c0686be65cf0a3c343612749e437b8db10e9609167e430dd051fbb8fdbf0c74ca2e8b67fd84868d0e7aeebcd678aaf9c4e70d SHA512 58f4dd151193fd9fb626855a1e05804f4ffe8ddc88f3431db59dde337fb7e07fd319d4583f15108aaa853d1b8ae13d4586af5ab203c2703dc6ff15d5837a7086
 EBUILD portage-3.0.45.3-r2.ebuild 9034 BLAKE2B 14f9d103cb065925f1487975448bc3bc2da871676a6216782f8fbda37823a063ffa74601630f316e66a3acf611381ae2e2610138faf6df977b648035d4234643 SHA512 de460773918dade93a80b3bf3253fbe02530024534a4a673c803d0440ebe24e7bc2af5322193864577180af831895096d8ea6cf12477c3b0dab6f0280833e65f
 EBUILD portage-3.0.46.ebuild 9034 BLAKE2B 14f9d103cb065925f1487975448bc3bc2da871676a6216782f8fbda37823a063ffa74601630f316e66a3acf611381ae2e2610138faf6df977b648035d4234643 SHA512 de460773918dade93a80b3bf3253fbe02530024534a4a673c803d0440ebe24e7bc2af5322193864577180af831895096d8ea6cf12477c3b0dab6f0280833e65f
-EBUILD portage-3.0.47.ebuild 9034 BLAKE2B 14f9d103cb065925f1487975448bc3bc2da871676a6216782f8fbda37823a063ffa74601630f316e66a3acf611381ae2e2610138faf6df977b648035d4234643 SHA512 de460773918dade93a80b3bf3253fbe02530024534a4a673c803d0440ebe24e7bc2af5322193864577180af831895096d8ea6cf12477c3b0dab6f0280833e65f
-EBUILD portage-9999.ebuild 8272 BLAKE2B dc90f7ea92b5039cb4f7baf04edef4d6d327e9101223b4561ea3a82a4ba1fb3c001720f562a6d283f29af85112ca2ba8e920eba41daebe380c2c4a6eb8c912b8 SHA512 00f2c4569d4b18ee2a7e38d8c3aec859e9f80250292348fca8f3dc98b98cad20f95f576e640a08804d5db4f842921691731195e3ec5d58037d83f88b9fbc7488
+EBUILD portage-3.0.47.ebuild 9200 BLAKE2B a3cd513f441aef9205bc0761ee782b82d6721181243d6bef4dab5bbafa47a54a4e470d8eb805a2c31f3ee40b0a8b426578a46cb7bf406bdeb1485b7d20a10f79 SHA512 6b2f57982d6bb6e6ccab936f9cf995817bb8ab93c67f81615ca74151bea13d832a29998ee70cff7a7ac3859c2c5648cfc75ed89af8f807665bc05bc09dd45407
+EBUILD portage-9999.ebuild 9200 BLAKE2B a3cd513f441aef9205bc0761ee782b82d6721181243d6bef4dab5bbafa47a54a4e470d8eb805a2c31f3ee40b0a8b426578a46cb7bf406bdeb1485b7d20a10f79 SHA512 6b2f57982d6bb6e6ccab936f9cf995817bb8ab93c67f81615ca74151bea13d832a29998ee70cff7a7ac3859c2c5648cfc75ed89af8f807665bc05bc09dd45407
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.47.ebuild b/sys-apps/portage/portage-3.0.47.ebuild
index 77a95c1762c4..351719796ca4 100644
--- a/sys-apps/portage/portage-3.0.47.ebuild
+++ b/sys-apps/portage/portage-3.0.47.ebuild
@@ -12,28 +12,39 @@ inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/portage.git
+		https://github.com/gentoo/portage.git
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	app-arch/xz-utils
 	test? ( dev-vcs/git )
 "
 DEPEND="
-	!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	apidoc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
 	)
+	doc? (
+		app-text/xmlto
+		~app-text/docbook-xml-dtd-4.4
+	)
 "
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
@@ -70,6 +81,8 @@ RDEPEND="
 	!<app-portage/repoman-2.3.10
 	!~app-portage/repoman-3.0.0
 "
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -77,8 +90,8 @@ PDEPEND="
 		>=sys-apps/file-5.44-r3
 	)
 "
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
+
+distutils_enable_tests setup.py
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -91,12 +104,11 @@ pkg_pretend() {
 }
 
 python_prepare_all() {
-	local PATCHES=(
-	)
-
 	distutils-r1_python_prepare_all
 
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+	if [[ ${PV} != 9999 ]] ; then
+		sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+	fi
 
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
@@ -184,10 +196,6 @@ python_compile_all() {
 	fi
 }
 
-python_test() {
-	esetup.py test
-}
-
 python_install() {
 	# Install sbin scripts to bindir for python-exec linking
 	# they will be relocated in pkg_preinst()
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 93b8cfe952f4..351719796ca4 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -8,15 +8,23 @@ PYTHON_COMPAT=( pypy3 python3_{10..11} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
-inherit distutils-r1 git-r3 linux-info toolchain-funcs tmpfiles prefix
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git
-	https://github.com/gentoo/portage.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/portage.git
+		https://github.com/gentoo/portage.git
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
 
 LICENSE="GPL-2"
-KEYWORDS=""
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
@@ -25,15 +33,19 @@ BDEPEND="
 	test? ( dev-vcs/git )
 "
 DEPEND="
-	!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	apidoc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)"
+	)
+	doc? (
+		app-text/xmlto
+		~app-text/docbook-xml-dtd-4.4
+	)
+"
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
@@ -67,7 +79,10 @@ RDEPEND="
 	!<app-admin/logrotate-3.8.0
 	!<app-portage/gentoolkit-0.4.6
 	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
+	!~app-portage/repoman-3.0.0
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -75,8 +90,8 @@ PDEPEND="
 		>=sys-apps/file-5.44-r3
 	)
 "
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
+
+distutils_enable_tests setup.py
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -91,6 +106,10 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	if [[ ${PV} != 9999 ]] ; then
+		sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+	fi
+
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
@@ -177,10 +196,6 @@ python_compile_all() {
 	fi
 }
 
-python_test() {
-	esetup.py test
-}
-
 python_install() {
 	# Install sbin scripts to bindir for python-exec linking
 	# they will be relocated in pkg_preinst()
@@ -256,6 +271,16 @@ pkg_preinst() {
 	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
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
 }
 
 pkg_postinst() {