Merge updates from master

3 files changed, 48 insertions, 2 deletions

diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index 946fb55ae69a..e6d8d047fd86 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -35,10 +35,12 @@ BDEPEND="
 		dev-lang/perl
 	)
 	doc? (
-		<dev-python/sphinx-4
+		dev-python/sphinx
 		sys-apps/texinfo
 	)
-	python? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	python? (
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
 "
 
 COMMON_DEPEND="
@@ -115,6 +117,9 @@ src_prepare() {
 
 	# Non-autoconf configure
 	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
 }
 
 src_configure() {
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 94915097c796..28c38fbe1af6 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,2 +1,3 @@
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST patch-5.13-rc1.patch 60248581 BLAKE2B c105c2518de0ad29258262913226d44598f19f50df9f4b5bd0ca3afbf132e9b7d582537c9a91fea1209e3e77ced9ba86c83745ec32bb4c9c940fd843bd2858ea SHA512 0ed817a3b25b9d28889c5754344537cd2266254dbfca87a98a5799594323d5b2cf04d233d0b48289dcf4518ebbabe687e49e7fe00553cbbd0cd2ac0e25fdf46b
+DIST patch-5.13-rc2.patch 60699877 BLAKE2B b29e45aa17aefe5adff81bc803890200d810848122240b731fa27d1bc0b08448d8579d6bd2328d11ca67b78346fa2342881e838b9cd657803ce6714a93f8e383 SHA512 2d54f9920d1d639a363989e37aba1e82687e7d6848bb53c4936678f50f178678235e9f45671d9373b1b5e15cbb6837640002038fd8b74d72d0e55d70b54321ba
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc2.ebuild b/sys-kernel/git-sources/git-sources-5.13_rc2.ebuild
new file mode 100644
index 000000000000..5279e1b05efd
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.13_rc2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.12"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}