1 |
commit: 35fb22a523f8a0019be5a3171a1a81f5041a915f |
2 |
Author: Austin English <austin.m.english <AT> sony <DOT> com> |
3 |
AuthorDate: Wed Aug 5 00:24:32 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 5 01:07:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35fb22a5 |
7 |
|
8 |
app-emulation/ganeti: disable rebuilding manpages |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
12 |
Signed-off-by: Austin English <austin.m.english <AT> sony.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/17003 |
14 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
15 |
|
16 |
.../ganeti/files/ganeti-2.15-disable-docs.patch | 44 ++++++++++++++++++++++ |
17 |
app-emulation/ganeti/ganeti-2.15.2-r11.ebuild | 1 + |
18 |
2 files changed, 45 insertions(+) |
19 |
|
20 |
diff --git a/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch b/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..adc2813d6a3 |
23 |
--- /dev/null |
24 |
+++ b/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch |
25 |
@@ -0,0 +1,44 @@ |
26 |
+--- a/Makefile.am 2020-08-04 18:21:12.395282115 +0000 |
27 |
++++ b/Makefile.am 2020-08-04 18:21:48.636729501 +0000 |
28 |
+@@ -1160,41 +1160,6 @@ |
29 |
+ # has to exist in order for the sphinx module to be loaded |
30 |
+ # successfully, but we certainly don't want the docs to be rebuilt if |
31 |
+ # it changes |
32 |
+-doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \ |
33 |
+- configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \ |
34 |
+- lib/build/shell_example_lexer.py lib/ht.py \ |
35 |
+- doc/css/style.css lib/rapi/connector.py lib/rapi/rlib2.py \ |
36 |
+- autotools/sphinx-wrapper | $(built_python_sources) |
37 |
+- @test -n "$(SPHINX)" || \ |
38 |
+- { echo 'sphinx-build' not found during configure; exit 1; } |
39 |
+-if !MANPAGES_IN_DOC |
40 |
+- if test -n '$(ENABLE_MANPAGES)'; then \ |
41 |
+- echo 'Man pages in documentation were disabled at configure time' >&2; \ |
42 |
+- exit 1; \ |
43 |
+- fi |
44 |
+-endif |
45 |
+-## Sphinx provides little control over what content should be included. Some |
46 |
+-## mechanisms exist, but they all have drawbacks or actual issues. Since we |
47 |
+-## build two different versions of the documentation--once without man pages and |
48 |
+-## once, if enabled, with them--some control is necessary. xmpp-wrapper provides |
49 |
+-## us with this, but requires running in a temporary directory. It moves the |
50 |
+-## correct files into place depending on environment variables. |
51 |
+- dir=$(dir $@) && \ |
52 |
+- @mkdir_p@ $$dir && \ |
53 |
+- PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) COPY_DOC=1 \ |
54 |
+- HTML_THEME=$(SPHINX_HTML_THEME) \ |
55 |
+- $(RUN_IN_TEMPDIR) autotools/sphinx-wrapper $(SPHINX) -q -W -b html \ |
56 |
+- -d . \ |
57 |
+- -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \ |
58 |
+- -D release="$(PACKAGE_VERSION)" \ |
59 |
+- -D graphviz_dot="$(DOT)" \ |
60 |
+- doc $(CURDIR)/$$dir && \ |
61 |
+- rm -f $$dir/.buildinfo $$dir/objects.inv |
62 |
+- touch $@ |
63 |
+- |
64 |
+-doc/html: doc/html/index.html |
65 |
+- |
66 |
+-doc/man-html: doc/man-html/index.html |
67 |
+ |
68 |
+ doc/install-quick.rst: INSTALL |
69 |
+ doc/news.rst: NEWS |
70 |
|
71 |
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild |
72 |
index 13b15c79546..0bd0b47f753 100644 |
73 |
--- a/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild |
74 |
+++ b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild |
75 |
@@ -20,6 +20,7 @@ SRC_URI=" |
76 |
KEYWORDS="~amd64 ~x86" |
77 |
PATCHES=( |
78 |
"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch |
79 |
+ "${FILESDIR}"/ganeti-2.15-disable-docs.patch |
80 |
"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch |
81 |
"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8 |
82 |
"${WORKDIR}"/debian/patches/relax-deps |