gentoo resync : 30.06.2019

4 files changed, 75 insertions, 6 deletions

diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index f1da46e1cc12..dd8616b410d6 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1,4 +1,5 @@
+AUX devmanual-fallback.patch 2162 BLAKE2B b71262e6331be68acc6186c195faf7e1fe5fe030358c9aff3384c63f7a71553073e0dfba3425caca19f2fc5f7638c2ece4e3d06ecda29c40c019e55e9a120205 SHA512 6a345a2f61f28c996d3861821529c16bd3f3e9af725e00ec4fe22d214a5227beea13f67366331d64c0cbfb63cb409ce2f3abca05b483f654a28ed8cf21663451
 DIST devmanual-0_pre20141116.tar.gz 169936 BLAKE2B 9b01004750b9fce226fa6a965292d3ffaff0923f877da611743e39ee19077ea7fe0d21ff138853d3f79e4d4941026c30fcabf63c8903572ed7ba5d50d32c8dd5 SHA512 6af3f9a262bdb2ceb61ab195691dff4a850b22e8d1226e20ae3257c566b6cc913f756c8b90a40e8aa78b1242e78d24c4209a1d9cdb0706ae9b64c653544a028f
 EBUILD devmanual-0_pre20141116.ebuild 1762 BLAKE2B 83186e74a1172f7cef733e972bda7c3c88c91d094c9b260e004b16d4e60ca366dc257fc7e108388ef4d6c558e02d669ccdc424737fe03d7e4906c40488695522 SHA512 9420d56918fa471001ab39ffe0e99f8beee07d669e486d1691398c29266898cb5a2426c9d864680529d9a4cb9f13b3829c52827fc6f04f6e3dc4f1c0f26c08a6
-EBUILD devmanual-9999.ebuild 1762 BLAKE2B 1f0c4830358bdf2967c58404dc4d96eb1bc71cbe701f33c9e0d50ecba60191106364b6affaf8e8e6e2ef9c25e7faf782c4c88581fe8b78f750a62a667500157d SHA512 88082d5e4c5d74541b3dad020da2915766578ad35eda0a989b4904973e4de3692e18c9a95d00588556de70e278252a07f5c3b5fab1d2b5699f0eb05900d76178
-MISC metadata.xml 444 BLAKE2B e898461555bfab0233e7b0ed865f69366422aba872fbc94f915cbeb21181b7720ea891540bcd11e8e331a968b1bba8ece8b1fb09dd3220749b23c5b8d0c6e071 SHA512 e7902957c885afc8a9652aa172f9e49069b8ee9b963ddc57db762a9bce21b852f6bfb9dbe4ce34219c919a451fd3f82ad6d17bbaf56933a4e96d598d2daf37a8
+EBUILD devmanual-9999.ebuild 1865 BLAKE2B 34c7848ea709f61dd73e0df3a7f0df1eb478de8216c38b6a80366606152441027f1bc39d8b839603fb42ca4709635a1362e8c2689755e382bc89956b1e35343e SHA512 60908b9057d813ff2b996e1b1aa568eb8d27e53c43898119797dcc936bdc18b432b540170848863f60ab70a17e5311aeebaa12b4f61271344b433b5ebf223b2d
+MISC metadata.xml 550 BLAKE2B 4dbe114f2a848bbd10db5cd94e02f1965873afe99669fe3e129ffafe17d4bc70ad7e68428783d2288577c3889c05f8eb352d79d6629be824ec103cdb26a80bd3 SHA512 6acfc5436dcd473e987891ed565af102214244b68abc3f809affe0f04de6146fb3b29246d4e6175a007f5c683480a51aabd155ba5577894e4bd700e26a5c3cae
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index b71b47820054..8ad5f06a357e 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit readme.gentoo-r1
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://devmanual.gentoo.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/devmanual.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
 else
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
@@ -18,11 +18,16 @@ fi
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-IUSE=""
+IUSE="+fallback"
 
-DEPEND="dev-libs/libxslt
+BDEPEND="dev-libs/libxslt
 	media-gfx/imagemagick[truetype,svg,png]"
 
+src_prepare() {
+	default
+	use fallback && eapply "${FILESDIR}"/${PN}-fallback.patch
+}
+
 src_compile() {
 	# Imagemagick uses inkscape (if present) to delegate
 	# svg conversions.
diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch
new file mode 100644
index 000000000000..789451d13b2b
--- /dev/null
+++ b/app-doc/devmanual/files/devmanual-fallback.patch
@@ -0,0 +1,60 @@
+Fix assets for offline browsing.
+https://bugs.gentoo.org/617724
+
+--- a/devbook.xsl
++++ b/devbook.xsl
+@@ -439,11 +439,9 @@
+           <xsl:with-param name="append">../</xsl:with-param>
+         </xsl:call-template>
+       </xsl:variable>
+-      <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
++      <link rel="stylesheet" href="{$relative_path_depth_recursion}fallback.css" type="text/css" />
+       <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="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" />
+     </head>
+     <body>
+@@ -476,9 +474,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>
+@@ -566,8 +561,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>
+     </body>
+     </html>
+   </xsl:template>
+--- /dev/null
++++ b/fallback.css
+@@ -0,0 +1,20 @@
++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,
++.navbar-toggle,
++.site-title,
++.tyrian-navbar {
++    display: none;
++}
diff --git a/app-doc/devmanual/metadata.xml b/app-doc/devmanual/metadata.xml
index 182bdeb954f4..6179f6436327 100644
--- a/app-doc/devmanual/metadata.xml
+++ b/app-doc/devmanual/metadata.xml
@@ -12,4 +12,7 @@
 			devmanual@gentoo.org
 		</description>
 	</maintainer>
+	<use>
+		<flag name="fallback">Use alternative minimal stylesheet instead of tyrian theme.</flag>
+	</use>
 </pkgmetadata>