From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7907315808E for ; Wed, 27 Apr 2022 12:27:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AA11E0882; Wed, 27 Apr 2022 12:27:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA121E0882 for ; Wed, 27 Apr 2022 12:27:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7E55341632 for ; Wed, 27 Apr 2022 12:27:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3891455 for ; Wed, 27 Apr 2022 12:27:13 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1651062425.09d5faa6448a900f5a840727cdca7a7ddc8ad690.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sphinx/sphinx-4.4.0-r1.ebuild dev-python/sphinx/sphinx-4.4.0.ebuild dev-python/sphinx/sphinx-4.5.0-r1.ebuild dev-python/sphinx/sphinx-4.5.0.ebuild X-VCS-Directories: dev-python/sphinx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 09d5faa6448a900f5a840727cdca7a7ddc8ad690 X-VCS-Branch: master Date: Wed, 27 Apr 2022 12:27:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6774b04f-ae4d-43a5-bad1-7297f2c7fd35 X-Archives-Hash: af8596a801e80c2a131a7b8903165519 commit: 09d5faa6448a900f5a840727cdca7a7ddc8ad690 Author: Michał Górny gentoo org> AuthorDate: Wed Apr 27 10:32:04 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Apr 27 12:27:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d5faa6 dev-python/sphinx: Add a blocker to unmerge namespace-sphinxcontrib Add a blocker on dev-python/namespace-sphinxcontrib to force unmerging it. dev-python/sphinx is a common dependency of various dev-python/sphinxcontrib-* packages, so it should be the best place to put the blocker. Signed-off-by: Michał Górny gentoo.org> dev-python/sphinx/{sphinx-4.4.0.ebuild => sphinx-4.4.0-r1.ebuild} | 7 +++++-- dev-python/sphinx/{sphinx-4.5.0.ebuild => sphinx-4.5.0-r1.ebuild} | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dev-python/sphinx/sphinx-4.4.0.ebuild b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild similarity index 98% rename from dev-python/sphinx/sphinx-4.4.0.ebuild rename to dev-python/sphinx/sphinx-4.4.0-r1.ebuild index 0bc1915d9cac..43a0b572068c 100644 --- a/dev-python/sphinx/sphinx-4.4.0.ebuild +++ b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild @@ -43,7 +43,9 @@ RDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng - )" + ) + !dev-python/namespace-sphinxcontrib +" BDEPEND=" doc? ( dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}] @@ -56,7 +58,8 @@ BDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng - )" + ) +" PATCHES=( "${FILESDIR}/${PN}-3.2.1-doc-link.patch" diff --git a/dev-python/sphinx/sphinx-4.5.0.ebuild b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild similarity index 98% rename from dev-python/sphinx/sphinx-4.5.0.ebuild rename to dev-python/sphinx/sphinx-4.5.0-r1.ebuild index 2229e8a7a853..727d541b4499 100644 --- a/dev-python/sphinx/sphinx-4.5.0.ebuild +++ b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild @@ -43,7 +43,9 @@ RDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng - )" + ) + !dev-python/namespace-sphinxcontrib +" BDEPEND=" doc? ( dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}] @@ -56,7 +58,8 @@ BDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng - )" + ) +" PATCHES=( "${FILESDIR}/${PN}-3.2.1-doc-link.patch"