[gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/files/, app-doc/devmanual/

[gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/files/, app-doc/devmanual/

[Ulrich Müller]

commit:     9522709a3740c0c59967383265c82a2fd53c66af
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  3 10:22:45 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 11:08:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9522709a

app-doc/devmanual: Update live ebuild.

This accounts for "upstream" changes in XSL stylesheet and Makefile.
Drop unused patch. Rename the fallback USE flag to offline.

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-doc/devmanual/devmanual-9999.ebuild          | 14 ++----
 app-doc/devmanual/files/devmanual-fallback.patch | 60 ------------------------
 app-doc/devmanual/metadata.xml                   |  4 +-
 3 files changed, 7 insertions(+), 71 deletions(-)

diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 0cd5087804b..bb8f0ecfc78 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-IUSE="+fallback"
+IUSE="+offline"
 
 BDEPEND="dev-libs/libxml2
 	dev-libs/libxslt
@@ -27,14 +27,9 @@ BDEPEND="dev-libs/libxml2
 
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 
-src_prepare() {
-	default
-	use fallback && eapply "${FILESDIR}"/${PN}-fallback.patch
-}
-
 src_compile() {
-	emake build
-	use fallback || emake documents.js
+	emake build OFFLINE=$(usex offline 1 0)
+	use offline || emake documents.js
 }
 
 src_install() {
@@ -54,7 +49,7 @@ src_install() {
 
 	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
 		offline mode, point your browser to the following url:
-		${EPREFIX}/usr/share/doc/devmanual/html/index.html"
+		file://${EPREFIX}/usr/share/doc/${PN}/html/index.html"
 	readme.gentoo_create_doc
 }
 
@@ -66,6 +61,5 @@ pkg_postinst() {
 		elog "the following package:"
 		elog
 		elog "app-doc/eclass-manpages"
-		elog
 	fi
 }

diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch
deleted file mode 100644
index 76cefe2547e..00000000000
--- a/app-doc/devmanual/files/devmanual-fallback.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix assets for offline browsing.
-https://bugs.gentoo.org/617724
-
---- a/devbook.xsl
-+++ b/devbook.xsl
-@@ -451,8 +451,7 @@
-       </xsl:variable>
-       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-       <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." />
--      <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" />
--      <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" />
-+      <link rel="stylesheet" href="{$relative_path_depth_recursion}fallback.css" type="text/css" />
-       <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
-       <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" />
-     </head>
-@@ -486,9 +485,6 @@
-               </div>
-               <div class="logo">
-                 <a href="/" title="Back to the homepage" class="site-logo">
--                  <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml">
--                    <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo" />
--                  </object>
-                 </a>
-                 <span class="site-label">Development Guide</span>
-               </div>
-@@ -613,9 +609,6 @@
-           </div>
-         </div>
-       </footer>
--      <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
--      <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
--      <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
-       <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-       <xsl:variable name="relative_path_depth_recursion">
-           <xsl:call-template name="str:repeatString">
---- /dev/null
-+++ b/fallback.css
-@@ -0,0 +1,22 @@
-+body {
-+    margin: 40px auto;
-+    max-width: 650px;
-+    line-height: 1.6;
-+    font-size: 18px;
-+    color: #454545;
-+    padding: 0 10px;
-+}
-+
-+h1,h2,h3,h4,h5,h6 {
-+    line-height: 1.2;
-+}
-+
-+.divider,
-+.footerlinks,
-+.input-group,
-+.modal-dialog,
-+.navbar-toggle,
-+.site-title,
-+.tyrian-navbar {
-+    display: none;
-+}

diff --git a/app-doc/devmanual/metadata.xml b/app-doc/devmanual/metadata.xml
index 6179f643632..9248012735b 100644
--- a/app-doc/devmanual/metadata.xml
+++ b/app-doc/devmanual/metadata.xml
@@ -13,6 +13,8 @@
 		</description>
 	</maintainer>
 	<use>
-		<flag name="fallback">Use alternative minimal stylesheet instead of tyrian theme.</flag>
+		<flag name="offline">
+			Use alternative minimal stylesheet instead of Tyrian theme.
+		</flag>
 	</use>
 </pkgmetadata>