| 1 |
commit: 49c7c98657b29a3ea8865e4280b150c20b40c249 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 21:20:53 2020 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 27 21:21:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c7c986 |
| 7 |
|
| 8 |
app-doc/devmanual: Update the live ebuild. |
| 9 |
|
| 10 |
This accounts for several changes in the devmanual repository. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
| 13 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 14 |
|
| 15 |
app-doc/devmanual/devmanual-9999.ebuild | 24 ++++----- |
| 16 |
app-doc/devmanual/files/devmanual-eclasses.patch | 20 +++++++ |
| 17 |
app-doc/devmanual/files/devmanual-fallback.patch | 69 +++++++++++++++++++++--- |
| 18 |
3 files changed, 94 insertions(+), 19 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild |
| 21 |
index 8ad5f06a357..0cd5087804b 100644 |
| 22 |
--- a/app-doc/devmanual/devmanual-9999.ebuild |
| 23 |
+++ b/app-doc/devmanual/devmanual-9999.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2019 Gentoo Authors |
| 26 |
+# Copyright 1999-2020 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
@@ -16,12 +16,16 @@ else |
| 31 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos" |
| 32 |
fi |
| 33 |
|
| 34 |
-LICENSE="CC-BY-SA-3.0" |
| 35 |
+LICENSE="CC-BY-SA-4.0" |
| 36 |
SLOT="0" |
| 37 |
IUSE="+fallback" |
| 38 |
|
| 39 |
-BDEPEND="dev-libs/libxslt |
| 40 |
- media-gfx/imagemagick[truetype,svg,png]" |
| 41 |
+BDEPEND="dev-libs/libxml2 |
| 42 |
+ dev-libs/libxslt |
| 43 |
+ gnome-base/librsvg |
| 44 |
+ media-fonts/open-sans" |
| 45 |
+ |
| 46 |
+PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch ) |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
default |
| 50 |
@@ -29,22 +33,18 @@ src_prepare() { |
| 51 |
} |
| 52 |
|
| 53 |
src_compile() { |
| 54 |
- # Imagemagick uses inkscape (if present) to delegate |
| 55 |
- # svg conversions. |
| 56 |
- # Inkscape uses g_get_user_config_dir () which in turn |
| 57 |
- # uses XDG_CONFIG_HOME to get the config directory for this |
| 58 |
- # user. See bug 463380 |
| 59 |
- export XDG_CONFIG_HOME="${T}/inkscape_home" |
| 60 |
- emake |
| 61 |
+ emake build |
| 62 |
+ use fallback || emake documents.js |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
# clean out XML/XSL before installing |
| 67 |
find . \( \ |
| 68 |
-iname '*.xml' -o \ |
| 69 |
+ -iname '*.dtd' -o \ |
| 70 |
-iname '*.xsl' -o \ |
| 71 |
-iname '*.svg' \) -delete || die |
| 72 |
- rm -r README.md xsl LICENSE Makefile || die |
| 73 |
+ rm -r bin xsl .git* LICENSE Makefile README.md || die |
| 74 |
|
| 75 |
local HTML_DOCS=( . ) |
| 76 |
einstalldocs |
| 77 |
|
| 78 |
diff --git a/app-doc/devmanual/files/devmanual-eclasses.patch b/app-doc/devmanual/files/devmanual-eclasses.patch |
| 79 |
new file mode 100644 |
| 80 |
index 00000000000..88b2322c25b |
| 81 |
--- /dev/null |
| 82 |
+++ b/app-doc/devmanual/files/devmanual-eclasses.patch |
| 83 |
@@ -0,0 +1,20 @@ |
| 84 |
+The offline version doesn't generate eclass manpages. |
| 85 |
+Add a dummy file, otherwise internal links would be broken. |
| 86 |
+ |
| 87 |
+--- /dev/null |
| 88 |
++++ b/eclass-reference/text.xml |
| 89 |
+@@ -0,0 +1,14 @@ |
| 90 |
++<?xml version="1.0"?> |
| 91 |
++<guide self="eclass-reference/"> |
| 92 |
++<chapter> |
| 93 |
++<title>Eclass Reference</title> |
| 94 |
++<body> |
| 95 |
++ |
| 96 |
++<note> |
| 97 |
++The offline version of the devmanual does not include the documentation for the |
| 98 |
++eclasses. If you need it, emerge <c>app-doc/eclass-manpages</c>. |
| 99 |
++</note> |
| 100 |
++ |
| 101 |
++</body> |
| 102 |
++</chapter> |
| 103 |
++</guide> |
| 104 |
|
| 105 |
diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch |
| 106 |
index 789451d13b2..9e86cca39c8 100644 |
| 107 |
--- a/app-doc/devmanual/files/devmanual-fallback.patch |
| 108 |
+++ b/app-doc/devmanual/files/devmanual-fallback.patch |
| 109 |
@@ -3,20 +3,18 @@ https://bugs.gentoo.org/617724 |
| 110 |
|
| 111 |
--- a/devbook.xsl |
| 112 |
+++ b/devbook.xsl |
| 113 |
-@@ -439,11 +439,9 @@ |
| 114 |
- <xsl:with-param name="append">../</xsl:with-param> |
| 115 |
- </xsl:call-template> |
| 116 |
+@@ -451,9 +451,7 @@ |
| 117 |
</xsl:variable> |
| 118 |
-- <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" /> |
| 119 |
-+ <link rel="stylesheet" href="{$relative_path_depth_recursion}fallback.css" type="text/css" /> |
| 120 |
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
| 121 |
<meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." /> |
| 122 |
- <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" /> |
| 123 |
- <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" /> |
| 124 |
+- <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" /> |
| 125 |
++ <link rel="stylesheet" href="{$relative_path_depth_recursion}fallback.css" type="text/css" /> |
| 126 |
<link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" /> |
| 127 |
</head> |
| 128 |
<body> |
| 129 |
-@@ -476,9 +474,6 @@ |
| 130 |
+@@ -486,9 +484,6 @@ |
| 131 |
</div> |
| 132 |
<div class="logo"> |
| 133 |
<a href="/" title="Back to the homepage" class="site-logo"> |
| 134 |
@@ -26,15 +24,72 @@ https://bugs.gentoo.org/617724 |
| 135 |
</a> |
| 136 |
<span class="site-label">Development Guide</span> |
| 137 |
</div> |
| 138 |
-@@ -566,8 +561,6 @@ |
| 139 |
+@@ -530,45 +525,7 @@ |
| 140 |
+ </div> |
| 141 |
+ </div> |
| 142 |
+ </nav> |
| 143 |
+- <nav class="navbar navbar-grey navbar-stick" id="devmanual-actions" role="navigation"> |
| 144 |
+- <div class="container"> |
| 145 |
+- <div class="row"> |
| 146 |
+- <div class="navbar-header"> |
| 147 |
+- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#gw-toolbar"> |
| 148 |
+- <span class="sr-only">Toggle navigation</span> |
| 149 |
+- <span class="icon-bar"></span> |
| 150 |
+- <span class="icon-bar"></span> |
| 151 |
+- <span class="icon-bar"></span> |
| 152 |
+- </button> |
| 153 |
+- </div> |
| 154 |
+- <div class="collapse navbar-collapse" id="gw-toolbar"> |
| 155 |
+- <div class="input-group"> |
| 156 |
+- <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/> |
| 157 |
+- <div class="input-group-btn"> |
| 158 |
+- <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/> |
| 159 |
+- </div> |
| 160 |
+- </div> |
| 161 |
+- </div> |
| 162 |
+- </div> |
| 163 |
+- </div> |
| 164 |
+- </nav> |
| 165 |
+ </header> |
| 166 |
+- <div id="searchResults" class="modal fade" role="dialog"> |
| 167 |
+- <div class="modal-dialog"> |
| 168 |
+- <div class="modal-content"> |
| 169 |
+- <div class="modal-header"> |
| 170 |
+- <button type="button" class="close" data-dismiss="modal">x</button> |
| 171 |
+- <h4 class="modal-title">Search Results</h4> |
| 172 |
+- </div> |
| 173 |
+- <div class="modal-body"> |
| 174 |
+- <p>No results found.</p> |
| 175 |
+- </div> |
| 176 |
+- <div class="modal-footer"> |
| 177 |
+- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> |
| 178 |
+- </div> |
| 179 |
+- </div> |
| 180 |
+- </div> |
| 181 |
+- </div> |
| 182 |
+ <div class="container"> |
| 183 |
+ <div class="row"> |
| 184 |
+ <div class="col-md010"> |
| 185 |
+@@ -613,19 +570,7 @@ |
| 186 |
</div> |
| 187 |
</div> |
| 188 |
</footer> |
| 189 |
- <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script> |
| 190 |
- <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script> |
| 191 |
+- <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script> |
| 192 |
+- <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/> |
| 193 |
+- <xsl:variable name="relative_path_depth_recursion"> |
| 194 |
+- <xsl:call-template name="str:repeatString"> |
| 195 |
+- <xsl:with-param name="count" select="$relative_path_depth"/> |
| 196 |
+- <xsl:with-param name="append">../</xsl:with-param> |
| 197 |
+- </xsl:call-template> |
| 198 |
+- </xsl:variable> |
| 199 |
+- <script><xsl:text>var documentsSrc = "</xsl:text><xsl:value-of select="$relative_path_depth_recursion"/><xsl:text>documents.js"</xsl:text></script> |
| 200 |
+- <script src="{$relative_path_depth_recursion}search.js"></script> |
| 201 |
</body> |
| 202 |
</html> |
| 203 |
</xsl:template> |
| 204 |
+ |
| 205 |
--- /dev/null |
| 206 |
+++ b/fallback.css |
| 207 |
@@ -0,0 +1,20 @@ |
Archives