gentoo resync : 25.08.2020

3 files changed, 64 insertions, 16 deletions

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index fa168ffe880d..8c76d3191f7c 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -11,6 +11,7 @@ AUX ganeti-2.12-qemu-enable-kvm.patch 569 BLAKE2B be0e80b3cbadee22a4f1d19161d19e
 AUX ganeti-2.12-start-stop-daemon-args.patch 1310 BLAKE2B 086e10664e461dbab1476a956027787c10161f19b65784ee8bacb1c2a8e128cd8604597441027d3bb34ed4bc925ddef1f2742c2ec2a3178157fb7f9ba1482894 SHA512 dad3fdbecc1efcb01cd22ba277122f07c7193eb11ad5e45d5e6c82ccace5cf13f1d666241412a484ffbf5581d652329b8fd267ab0fdca4ae79966f3c40cd579e
 AUX ganeti-2.13-process_unittest.patch 1027 BLAKE2B ad736721ab1d2d465b1071144cc741589b716acededd79d724e8b9f3f12bd2c747e132884dbecbbfaf897501fd75850870ec09edd93d8a137381a578f99b6797 SHA512 305b7fc43e8b0e9ce3d830be68d6f309b4b7cea54505b1bc615f83255a52d75cc6010ceafc1a44b5e4ce359936f8294bdfeb8fe7f616a81f15a1174851f69f34
 AUX ganeti-2.15-daemon-util.patch 1449 BLAKE2B e2c17a6c57025b91bf48f130f7ba0bfbbad7396188aa5da79ebcca97d8664a1b0605b4624b7aeaa60f21816a371396162b4b35a019a7733969d3a9478d0ab309 SHA512 026d7e5c0b3278f005ceea0d338ea023dd1f07ce109bcf2953defb14394cf83234ec08730eed454d4eac3880adb6b1d68f28b2f04f755c961ca6b67a4a66ad5a
+AUX ganeti-2.15-disable-docs.patch 1872 BLAKE2B 59df4281aaef54bdfed07cf031f12e958a176a94232652c0c5109518afbf689d0639e1dcf9fc983a0550b2146727f20f495cb70a906776cb46874eeda75e915f SHA512 dfbca93cc367789da33b78a9e780d976abb29dbf4138e9a30556cb4e3985d88023ea572f4f718c32c8b40f0ad5237b5dcabd663c336fdab0e39dd9f1fbc000ec
 AUX ganeti-2.15-dont-invert-return-values-for-man-warnings.patch 413 BLAKE2B 6b37e766fc014c4b19812e729c07fa991c6a259e6d848fafc1e67b3491985d7ffb64523c411918d0ad088f2f6618e199c300f79fdc9950e4e600ba04fe9caa7e SHA512 639e76c841542459a105a6406b58f89a90a96e5a2b16eaf116f548a39e511c4fd4d4dc495fdc466e821a2ee2c1026d67922d9478255ff907bb1a9219dace973a
 AUX ganeti-2.15-kvmd-run-as-daemon-user.patch 1267 BLAKE2B ec993c7eefca32eea45151de9ccc03e4a3b19c7e9279be8c142243c7ee544132e8d4c4edf4e269b492b9c27e254655e636c10863bdcbf092d5481e9c7e80293a SHA512 f4b8e76698f92ab0e90e8c809fed575a07edae8f8af62e492cdde34cdd60c0f0a0b0ad74e63ab968f38ac7fb24b5f786a14184bfad2e0519805de09a095764fd
 AUX ganeti-2.15-noded-must-run-as-root.patch 1652 BLAKE2B ed019d793ede24eef2edf3e525bd1c859edfd71cb814b75b84565547e63df64bd21999f4c9a181209b98539b5c6c3aaad92a93b8ad10ace103480795a95758db SHA512 6c055cd56088762e143fdcc1903943f2bcd565b46d9669b8905128b9885db27819f65d0c80dfd2ff05776bb8e38f23fc055597343e5a7eeb41821653e08a0f3a
@@ -38,7 +39,7 @@ DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfd
 DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be
 DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e
 DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af
-EBUILD ganeti-2.15.2-r10.ebuild 12375 BLAKE2B a08ec6e74df047d59339b56920ca84ac6bc018d20420482a11fad142d4b7383798a78bd07aceae4a5793d49cab01c7fced528323e48ca87fb71002d3ca09e19e SHA512 5e24ab704ce3a12e9d4d7ade712251d843c79b2bd8a8ebb7dc9788d885745cb034195caec920698e62d17995dda6670114d059bb5d3cd80c21f1a5e008e9490a
+EBUILD ganeti-2.15.2-r11.ebuild 12432 BLAKE2B 32c9eebcfa58ea6da37414e009b21e3b4d268824ab8ed43e2cf3600609e3475907ce494e5be0c86eff43e92bc364d1af875efc67d81abb73b5058c40f4570324 SHA512 5a572a56512fb8d47fa5b411168e0ac2b299ec1da6efd8445c342738dabf19209d9a6408a0a8fba901aac84ef00b29e2fed37106fd5d04326ac3fda6d6432c46
 EBUILD ganeti-2.16.0_rc1.ebuild 10619 BLAKE2B 6f3a4aca5ac36c41671ce34a489e79fd6382055683722e34aee736c2baf9fa3ec4cb60e90eab9c2d9a7fed57391c84a793bfdd855a664238876a58931166e141 SHA512 a11bf679646bcd6081efb028fc1333e3e98c6551cefeff4d9336f585990050533ef57ba2ca5cb7ef3aa0f966afa0c9e532b999c169df30b453cedb03bd638801
 EBUILD ganeti-2.17.0_beta1.ebuild 10646 BLAKE2B 75c7e1d72d0a778dbaa0c5703c7a41ea7df3f3b1b20f4744d62e130be022d030953c1b3636f3f8d9e58a71d4c6ac4863f2cc4ed493db0e66eab95b5cb529e5a0 SHA512 77da930bdf819620f06c3e722b02a0afa4bfb4beed918a88f9f330d11605c9b8fdbb413f8af9f791a6c7e1c1071720f89966d52b958fe790209efe4582cf773f
 MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch b/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch
new file mode 100644
index 000000000000..adc2813d6a30
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch
@@ -0,0 +1,44 @@
+--- a/Makefile.am	2020-08-04 18:21:12.395282115 +0000
++++ b/Makefile.am       2020-08-04 18:21:48.636729501 +0000
+@@ -1160,41 +1160,6 @@
+ # has to exist in order for the sphinx module to be loaded
+ # successfully, but we certainly don't want the docs to be rebuilt if
+ # it changes
+-doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \
+-	configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
+-	lib/build/shell_example_lexer.py lib/ht.py \
+-	doc/css/style.css lib/rapi/connector.py lib/rapi/rlib2.py \
+-	autotools/sphinx-wrapper | $(built_python_sources)
+-	@test -n "$(SPHINX)" || \
+-	    { echo 'sphinx-build' not found during configure; exit 1; }
+-if !MANPAGES_IN_DOC
+-	if test -n '$(ENABLE_MANPAGES)'; then \
+-	  echo 'Man pages in documentation were disabled at configure time' >&2; \
+-	  exit 1; \
+-	fi
+-endif
+-## Sphinx provides little control over what content should be included. Some
+-## mechanisms exist, but they all have drawbacks or actual issues. Since we
+-## build two different versions of the documentation--once without man pages and
+-## once, if enabled, with them--some control is necessary. xmpp-wrapper provides
+-## us with this, but requires running in a temporary directory. It moves the
+-## correct files into place depending on environment variables.
+-	dir=$(dir $@) && \
+-	@mkdir_p@ $$dir && \
+-	PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) COPY_DOC=1 \
+-        HTML_THEME=$(SPHINX_HTML_THEME) \
+-	$(RUN_IN_TEMPDIR) autotools/sphinx-wrapper $(SPHINX) -q -W -b html \
+-	    -d . \
+-	    -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
+-	    -D release="$(PACKAGE_VERSION)" \
+-	    -D graphviz_dot="$(DOT)" \
+-	    doc $(CURDIR)/$$dir && \
+-	rm -f $$dir/.buildinfo $$dir/objects.inv
+-	touch $@
+-
+-doc/html: doc/html/index.html
+-
+-doc/man-html: doc/man-html/index.html
+ 
+ doc/install-quick.rst: INSTALL
+ doc/news.rst: NEWS
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
index 4427da82567e..0bd0b47f753a 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
@@ -20,6 +20,7 @@ SRC_URI="
 KEYWORDS="~amd64 ~x86"
 PATCHES=(
 	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
+	"${FILESDIR}"/ganeti-2.15-disable-docs.patch
 	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
 	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
 	"${WORKDIR}"/debian/patches/relax-deps
@@ -77,7 +78,6 @@ DEPEND="
 		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
 		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
 		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
-		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
 		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
 	')
 	|| (
@@ -158,10 +158,6 @@ RDEPEND="${DEPEND}
 	!app-emulation/ganeti-htools"
 DEPEND+="
 	sys-devel/m4
-	app-text/pandoc
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-	')
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
@@ -259,28 +255,30 @@ src_prepare() {
 	# 24618882737fd7c189adf99f4acc767d48f572c3
 	sed -i \
 		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
+		cabal/ganeti.template.cabal || die
 	# Neuter -Werror
 	sed -i \
 		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
+		Makefile.am || die
 
 	# not sure why these tests are failing
 	# should remove this on next version bump if possible
 	for testfile in test/py/import-export_unittest.bash; do
-		printf '#!/bin/bash\ntrue\n' > "${testfile}"
+		printf '#!/bin/bash\ntrue\n' > "${testfile}" || die
 	done
 
 	# take the sledgehammer approach to bug #526270
-	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' || die
 
 	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \
-		> "${T}/ganeti.initd"
+		> "${T}/ganeti.initd" || die
 
 	eapply_user
 
-	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
-	rm autotools/missing
+	if [[ ${PV} =~ [9]{4,} ]]; then
+		./autogen.sh || die
+	fi
+	rm autotools/missing || die
 	eautoreconf
 }
 
@@ -314,7 +312,12 @@ src_configure() {
 		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
 		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
 		--enable-socat-escape \
-		--enable-socat-compress
+		--enable-socat-compress \
+		SPHINX= \
+		PANDOC=
+
+	touch man/*.gen || die
+	touch man/*.in || die
 }
 
 src_install() {
@@ -329,9 +332,9 @@ src_install() {
 	fi
 
 	# ganeti installs it's own docs in a generic location
-	rm -rf "${D}"/{usr/share/doc/${PN},run}
+	rm -rf "${D}"/{usr/share/doc/${PN},run} || die
 
-	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion || die
 	newbashcomp doc/examples/bash_completion gnt-instance
 	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
 		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \