[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/

[Brian Dolbec]

commit:     8aa011a8c1de830fe232c5df295db22c5934fda0
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 17:21:21 2020 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 18:56:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa011a8

dev-util/buildbot: Version bump to 2.8.4

Update 9999 sphinx dep.
Docs build fails in 9999 due to sphinxcontrib.jinga error,
maintaining current package.use.mask.

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 dev-util/buildbot/Manifest                         |  1 +
 ...{buildbot-9999.ebuild => buildbot-2.8.4.ebuild} | 26 +++++++++++++---------
 dev-util/buildbot/buildbot-9999.ebuild             |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 1ce0b508b66..459e87fc240 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
 DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
+DIST buildbot-2.8.4.tar.gz 3134447 BLAKE2B 67052a060c9951e584a5e94f36b92262b9a1956c22efbce7ac17d83f93edde3d9443b00a7bc3afc5918006d68cc023ea0ae913e7bbf0e7cede0d9345992f83ae SHA512 45a6e6116ab5fec18b9b3a6d54886bcf86d3a821a79fd151f9311c8c3646c61051a194250395e203f02b9aa0161e12a9ca54b623897c74eee6133df752f1742c

diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-2.8.4.ebuild
similarity index 92%
copy from dev-util/buildbot/buildbot-9999.ebuild
copy to dev-util/buildbot/buildbot-2.8.4.ebuild
index aab7babe0e9..1912aad93d9 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-2.8.4.ebuild
@@ -5,11 +5,8 @@ EAPI="7"
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-inherit git-r3
 inherit readme.gentoo-r1 systemd distutils-r1
 
 MY_PV="${PV/_p/.post}"
@@ -17,11 +14,13 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
 HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
 
 IUSE="crypt doc docker examples irc test"
 RESTRICT="!test? ( test )"
@@ -59,6 +58,7 @@ DEPEND="${RDEPEND}
 		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
 		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
 		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 		dev-python/pyenchant[${PYTHON_USEDEP}]
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
@@ -74,15 +74,19 @@ DEPEND="${RDEPEND}
 		dev-python/lz4[${PYTHON_USEDEP}]
 		dev-python/treq[${PYTHON_USEDEP}]
 		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		dev-util/buildbot-pkg[${PYTHON_USEDEP}]
-		dev-util/buildbot-worker[${PYTHON_USEDEP}]
-		dev-util/buildbot-www[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 	)"
 
-S=${S}/master
+S=${WORKDIR}/${MY_P}
 
 distutils_enable_tests setup.py
 
+PATCHES=(
+		"${FILESDIR}/pypugjs-2.8.0.patch"
+)
+
 pkg_setup() {
 	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
 		to support starting buildbot through Gentoo's init system. To use this,
@@ -93,11 +97,12 @@ pkg_setup() {
 src_compile() {
 	distutils-r1_src_compile
 
+	# missing files, so skip building
 	if use doc; then
 		einfo "Generation of documentation"
 		pushd docs > /dev/null
 		#'man' target is currently broken
-		emake html
+		emake html || die "Docs generation failed"
 		popd > /dev/null
 	fi
 }
@@ -109,7 +114,6 @@ src_install() {
 
 	if use doc; then
 		HTML_DOCS=( docs/_build/html/ )
-		# TODO: install man pages
 	fi
 
 	if use examples; then

diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index aab7babe0e9..5929de5695c 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -55,10 +55,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
 		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
 		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 		dev-python/pyenchant[${PYTHON_USEDEP}]
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx-jinja[${PYTHON_USEDEP}]