1 |
commit: 9522709a3740c0c59967383265c82a2fd53c66af |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 3 10:22:45 2020 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 3 11:08:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9522709a |
7 |
|
8 |
app-doc/devmanual: Update live ebuild. |
9 |
|
10 |
This accounts for "upstream" changes in XSL stylesheet and Makefile. |
11 |
Drop unused patch. Rename the fallback USE flag to offline. |
12 |
|
13 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
14 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
15 |
|
16 |
app-doc/devmanual/devmanual-9999.ebuild | 14 ++---- |
17 |
app-doc/devmanual/files/devmanual-fallback.patch | 60 ------------------------ |
18 |
app-doc/devmanual/metadata.xml | 4 +- |
19 |
3 files changed, 7 insertions(+), 71 deletions(-) |
20 |
|
21 |
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild |
22 |
index 0cd5087804b..bb8f0ecfc78 100644 |
23 |
--- a/app-doc/devmanual/devmanual-9999.ebuild |
24 |
+++ b/app-doc/devmanual/devmanual-9999.ebuild |
25 |
@@ -18,7 +18,7 @@ fi |
26 |
|
27 |
LICENSE="CC-BY-SA-4.0" |
28 |
SLOT="0" |
29 |
-IUSE="+fallback" |
30 |
+IUSE="+offline" |
31 |
|
32 |
BDEPEND="dev-libs/libxml2 |
33 |
dev-libs/libxslt |
34 |
@@ -27,14 +27,9 @@ BDEPEND="dev-libs/libxml2 |
35 |
|
36 |
PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch ) |
37 |
|
38 |
-src_prepare() { |
39 |
- default |
40 |
- use fallback && eapply "${FILESDIR}"/${PN}-fallback.patch |
41 |
-} |
42 |
- |
43 |
src_compile() { |
44 |
- emake build |
45 |
- use fallback || emake documents.js |
46 |
+ emake build OFFLINE=$(usex offline 1 0) |
47 |
+ use offline || emake documents.js |
48 |
} |
49 |
|
50 |
src_install() { |
51 |
@@ -54,7 +49,7 @@ src_install() { |
52 |
|
53 |
local DOC_CONTENTS="In order to browse the Gentoo Development Guide in |
54 |
offline mode, point your browser to the following url: |
55 |
- ${EPREFIX}/usr/share/doc/devmanual/html/index.html" |
56 |
+ file://${EPREFIX}/usr/share/doc/${PN}/html/index.html" |
57 |
readme.gentoo_create_doc |
58 |
} |
59 |
|
60 |
@@ -66,6 +61,5 @@ pkg_postinst() { |
61 |
elog "the following package:" |
62 |
elog |
63 |
elog "app-doc/eclass-manpages" |
64 |
- elog |
65 |
fi |
66 |
} |
67 |
|
68 |
diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch |
69 |
deleted file mode 100644 |
70 |
index 76cefe2547e..00000000000 |
71 |
--- a/app-doc/devmanual/files/devmanual-fallback.patch |
72 |
+++ /dev/null |
73 |
@@ -1,60 +0,0 @@ |
74 |
-Fix assets for offline browsing. |
75 |
-https://bugs.gentoo.org/617724 |
76 |
- |
77 |
---- a/devbook.xsl |
78 |
-+++ b/devbook.xsl |
79 |
-@@ -451,8 +451,7 @@ |
80 |
- </xsl:variable> |
81 |
- <meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
82 |
- <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." /> |
83 |
-- <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" /> |
84 |
-- <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" /> |
85 |
-+ <link rel="stylesheet" href="{$relative_path_depth_recursion}fallback.css" type="text/css" /> |
86 |
- <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" /> |
87 |
- <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" /> |
88 |
- </head> |
89 |
-@@ -486,9 +485,6 @@ |
90 |
- </div> |
91 |
- <div class="logo"> |
92 |
- <a href="/" title="Back to the homepage" class="site-logo"> |
93 |
-- <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml"> |
94 |
-- <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo" /> |
95 |
-- </object> |
96 |
- </a> |
97 |
- <span class="site-label">Development Guide</span> |
98 |
- </div> |
99 |
-@@ -613,9 +609,6 @@ |
100 |
- </div> |
101 |
- </div> |
102 |
- </footer> |
103 |
-- <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script> |
104 |
-- <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script> |
105 |
-- <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script> |
106 |
- <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/> |
107 |
- <xsl:variable name="relative_path_depth_recursion"> |
108 |
- <xsl:call-template name="str:repeatString"> |
109 |
---- /dev/null |
110 |
-+++ b/fallback.css |
111 |
-@@ -0,0 +1,22 @@ |
112 |
-+body { |
113 |
-+ margin: 40px auto; |
114 |
-+ max-width: 650px; |
115 |
-+ line-height: 1.6; |
116 |
-+ font-size: 18px; |
117 |
-+ color: #454545; |
118 |
-+ padding: 0 10px; |
119 |
-+} |
120 |
-+ |
121 |
-+h1,h2,h3,h4,h5,h6 { |
122 |
-+ line-height: 1.2; |
123 |
-+} |
124 |
-+ |
125 |
-+.divider, |
126 |
-+.footerlinks, |
127 |
-+.input-group, |
128 |
-+.modal-dialog, |
129 |
-+.navbar-toggle, |
130 |
-+.site-title, |
131 |
-+.tyrian-navbar { |
132 |
-+ display: none; |
133 |
-+} |
134 |
|
135 |
diff --git a/app-doc/devmanual/metadata.xml b/app-doc/devmanual/metadata.xml |
136 |
index 6179f643632..9248012735b 100644 |
137 |
--- a/app-doc/devmanual/metadata.xml |
138 |
+++ b/app-doc/devmanual/metadata.xml |
139 |
@@ -13,6 +13,8 @@ |
140 |
</description> |
141 |
</maintainer> |
142 |
<use> |
143 |
- <flag name="fallback">Use alternative minimal stylesheet instead of tyrian theme.</flag> |
144 |
+ <flag name="offline"> |
145 |
+ Use alternative minimal stylesheet instead of Tyrian theme. |
146 |
+ </flag> |
147 |
</use> |
148 |
</pkgmetadata> |