gentoo resync : 30.06.2019

11 files changed, 108 insertions, 138 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index f41477d0c8b1..1bdb82e2c99d 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
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>
diff --git a/app-doc/geant-docs/Manifest b/app-doc/geant-docs/Manifest
index c156d6cf8724..0039321a31b8 100644
--- a/app-doc/geant-docs/Manifest
+++ b/app-doc/geant-docs/Manifest
@@ -1,26 +1,11 @@
-DIST BookForAppliDev-4.10.0.pdf 4576743 BLAKE2B e254063d5f5b7d41f43b1cf94706d6267695947f6e493eaebbefdb2d4bfb78597eabfa918b6dd7a8d6ce55fef3c3ffb3e8e4b087710d0fd603fb474c34bd3cc3 SHA512 8b2385d625bf2eeed3ec9056c1c409348d5dcff44da3438640ef8e7e178b73f540c2112b019eef4568e6cb6a0866000c36170004e0648580edf58899c2d730cf
 DIST BookForAppliDev-4.10.03.pdf 3428164 BLAKE2B e553618bc666983a906827f5b8d5795b800c1baba47435fb830ae441f06e525d8db63aff20546210292215834da67c6a113e79f83ff61fbe2fb77b91383ae5e8 SHA512 20572135306945724f28a8f00088d9f4e5c6e1dfa012666152a6ec78856adbab019a0aa1dfb03034cf2686d8244b8dab7553c9bc12847c55364e7b80928a5e50
-DIST BookForAppliDev-4.10.1.pdf 4636744 BLAKE2B 7d45b6fc2ea9b1a5716c455fe6d200d3974a43bba09b73ec5012f7cea2f6b45de97c6f1baabff990297ed932b4977bebc78d2f5754349811de9737cc2cc76856 SHA512 560d9c7ae2b72c261bfe705ce51c278ff1be460bac997ceb7ebae168d377d9499a1022fb7a8c0e715b11833527acaa5ee1508874ccfd5da65e1615b63d16c6e0
-DIST BookForAppliDev-4.10.2.pdf 3384490 BLAKE2B 6b3716db6c725a80b1afd2848f582b3069c52f4520665a5e233a6c73b407902042cef49e73ba228d88df19647f9f62a6b41a9a8452b37aef61d49733347caaf9 SHA512 0d1677984c50713740f5f261ce217ef1e072119b29a131fae37d5955eff06d7211445b2bbd19958e945f4ec813289775d817747e72cfa772694ac3f4d0b87fab
-DIST BookForAppliDev-4.9.6.pdf 3022878 BLAKE2B 2f5579a787d2b7bd0c3f99d2a6fc5fd88a01717616ef9fc19846cff5e46d9009c63bf605e99f684dbb613d61022798cd96d34810a7f66a691c3c7600144b9095 SHA512 b653c29a3bcdee7709566268410a32d3f226ecc7e22a6857f4eb1f816d203e9de826b7fe09e74d317ee2864e830b701d01ef66251a1883de16ea21631093db7b
-DIST BookForToolDev-4.10.0.pdf 6148005 BLAKE2B b8ec5162d40bb5b6834508a0e6ab762beaa5832e08711afd8191449f0911a555622228b78341962ca327d36d02714f0080500f72cc1bc9358b1cde0fc7e38745 SHA512 2b211b3d70771bc6cbfa4885497ef754a6d738e217291ec4e6da7b095d7e1e6a46ed809d0dd42b24b205669725ac67c498c1fb1a4ac9bb4fdaf00bc2a378b8bc
+DIST BookForAppliDev-4.10.05.pdf 3724808 BLAKE2B 7e50455cd3c49d1cf9bc2d60626af208f09000b20213d22d57c96c6d109f82f3a2e05fb55b798d5676cf092da74f1a8a6c52eb081ce7badbb8cb41118b4181d8 SHA512 32a4c1e5b93a79696e579d09d5c9c1e2123bf3f7fc99b2b96a0feb6c6b141d47d3241b24dabcb7725a2966d8d293765c7b8a03ba866021c4474ecb67f7719873
 DIST BookForToolDev-4.10.03.pdf 6805988 BLAKE2B 4bb091131c35bf7814d297d011e6ebb90bd2cd265b97d4ace406c9ec773f5c2a784b0b9a7e6bde16d43aee600c648e1ec7c71f8dba4984d69dc9ceb75ff58490 SHA512 46fea826f018f1e5e32534d8b27d7ec4c99e264d4d75c36fe0cb855efc081801467f4747ef30dfb0bf8ff62c54f5e172f2eb8c0dd4e56918b46166ed9ca39c77
-DIST BookForToolDev-4.10.1.pdf 5792624 BLAKE2B 88dd63f2acb38cca39089bc97414e15cb5e3f2318e8e5d7398c473c896725e771168ce2455c0c85419672afafa3cdf13c50218bc2c238102ba70de9f576f95c6 SHA512 2872b9369e49497819b50150e734d6d70694d77786dba7ca01393462c76f6320787ff48bcc463821db3a3c5479075a19ce41a02189d2440064ca3329803f42d4
-DIST BookForToolDev-4.10.2.pdf 5281452 BLAKE2B c05a2f2c326320fb613e32e6dc0b6f4436f98a05e42c90343d49400ebc7f6335ee9112036ce2de171e2decf8a03e7ce66e5a0183b798349f03ea0dd8974c1531 SHA512 e7f86aa2f7f6fe21f169a6229f7b93af0282705cae203cc2297a9797fbc664b3d5e82721f271706db6392c1ade3ff62651212b626392773c96dfb21667dc36cb
-DIST BookForToolDev-4.9.6.pdf 5270128 BLAKE2B e3779998fded84e26ae15cc10d19472512e9a86c8277df9a11f34b04c7e69d4c9c5042f457f31e3e06dcae26f46a796df673aa5ab1ae96550e377c55f1bc4e85 SHA512 ba2f6a9f0ef7093527cfc8e1c98d1299f7784eb58cb2c1aff0910ac3277aefa3ba5fe8d6be1ff040695623f7e2fff56e82fafcc6f583d13cc98ca513bd5528b5
-DIST BookInstalGuide-4.10.0.pdf 3057028 BLAKE2B 58aed34a5158843c1c695f46efa443f3327fe7281e556358d4906acd9ea9080b27b7605ccabb360d1e045f94faed8aede07ff5f2e42367a1e194b39af84fc48c SHA512 abd76299ce4bdc0d61103282d41e4325ee4d290f286bfd368570add4b7d7a4263b47ccc4309f4ef28b0c268bf88f8c0eb2c6cee1e1f5da1a92d324a110b8a716
+DIST BookForToolDev-4.10.05.pdf 7380134 BLAKE2B c75ea70339eaf3a57b6baf2070eaff3ce0d91668f8201b380442b1bee00da5de22694a9a35996b1b2ced17a17f07a8498a95c2364711dfe994ac81352dbb7fd3 SHA512 7c716248ee3e72ca7159fd7913fdd8f3fa2428dc3d2b4c2082e324c93405d4d666a55eed30df22e058a0c68c25abd72c7bf24d1fc781e63a20708f43101c1973
 DIST BookInstalGuide-4.10.03.pdf 977915 BLAKE2B 7a7605d7b469ce68e25ffd409918d83cfe98c1fca0b324227be449a6e2b8073bb364572becd93acce0aa0ed2f038ec2fd0c07b8f268a87e047e9e6b9ccf50630 SHA512 2bdd26e2933b4efb09e99fde420bbfcc66e664893fa44bdb6ac3df6d21efeb92511ad68ce84489b18f7d3bbb4204c3e2a4066c198c49163ed4f18ade14d3345f
-DIST BookInstalGuide-4.10.1.pdf 3061881 BLAKE2B 2f56ab691ae2ed986632c09b83c8876e19c367f46d0b979ca1518f5788e7923fa5e0155641093df02e4f6451f9d95c14b1af6800414a7373a7b447d3911dfd09 SHA512 0280498bf0040d2f60fe9de3eff3395e9fd0dd8e2d18b605e6848779146198fa1def58e1cd660d577e4a40fe0a6f7b1ad618a4459ae48ce01b9782cdefb83642
-DIST BookInstalGuide-4.10.2.pdf 972556 BLAKE2B 5cb5e942d7797d7e23362a2261cf92f7e5444c8c00537966c6fabb20a2d073ba530c75c305f9b19f2815f1a1c296ae0948147eebf2af6bb6190bd15c3a344fbb SHA512 23175e1e31bfec8ce19226592515b8cfbdf82f3dd5e36f72b875a2f12e4d9ce298896b7b22f02da516d8bd20241f59adda8ec775de19beea16fb55ff9e5d7e61
-DIST BookInstalGuide-4.9.6.pdf 177888 BLAKE2B d8abe9edac49a901aa553da131f5b282b390075528ad3dfebc00ddfec3661469c689eebd586ee6ae5111c6d695b233aaacd5c63b9692b2eae949e983a71e10d5 SHA512 de35770ead31a1013fb9ec0eb817d681def4fef82dbbd5493ece2cf9129db44e6cd116dc2c610da62da92857aa8926d063f570e3b181796544cb2f92bba12df4
-DIST PhysicsReferenceManual-4.10.0.pdf 5776452 BLAKE2B 742ea4b9bda4fcdc21f292bd1aee7ffef716128e3181d52ec19712270a6297089e5bbf6186c1ce15d467652bcf3718ce930a499f60087a8e037cd33887ae0349 SHA512 568325b0d673c7015b019c10ca51361ec8fd98999660ba9fde2f69514c85fd0e897514ee9b97ab25462298b23670d79d9336ad839186e7f1b135bab819662794
+DIST BookInstalGuide-4.10.05.pdf 329532 BLAKE2B e367ae17b11105a5324899e6fc1e4117c4586e4d617cf3aa8c97ebe2820ee9ee339a30f96174b41b14344d30dde6a84ca9639901facec5e85526349cf3623328 SHA512 cf60fcb34f245605ffea364c30cccd69e756e53801c23c51e01daa1f02da5fbda319210e4bf9154786b423248d3a579abd403f0c2ff9911ae9d3b7d91d314d26
 DIST PhysicsReferenceManual-4.10.03.pdf 4721187 BLAKE2B 81a15732a2448300bae69fc531d3923f7749da311212c6e1128d156330787c0c79fa6ba16bf8f9545a995a281bb2c137e6b2712cb25a1aa15321273062061f1e SHA512 d55f119abf572c11ea62346c04e1277e3f85bf737619e48bd70eba34f69480156450e222a32274268b0849aece5d6f483cad21aef7746da13b946148f2c340c2
-DIST PhysicsReferenceManual-4.10.1.pdf 5857216 BLAKE2B e3706e699feb2ffa80eaf21710d6e8846b3d6ee5ee6697b6bc44923df409cb7133724cf6e48f78369e11821d13b11dad2a4cf038af217e7d93dcee926b6d51b3 SHA512 56f1ec07ea3833cbff4eb431450a67c905bf541d7a82e38231adc2edd6a0da5ca7d8050f0e34c5c0f9480f7b0a5a00090299a5318162fb9f95efdb345fc46061
-DIST PhysicsReferenceManual-4.10.2.pdf 4711503 BLAKE2B ed1bcf09ef25895e10ff3b0af54830e2b73f9eb368e3283b7c46743ea47ffb5024324afbf885ee39c9adb2ab38ea1073b8a084ef1cd250de896b9d1ca1c57bc6 SHA512 d1a2607c4aac6ceae92a1cfe96215e1b6287e77bbaac74326e5fee79b2587481ca1bc0bc8d0d5d45b93bf2866b306e4283d7d813292cf3dc1e269afcc8f0e165
-DIST PhysicsReferenceManual-4.9.6.pdf 4430198 BLAKE2B 1518a945491ee9da91a5b3e4cbb6845e08c83935aff936399125eb8969c4c459d636afaa838c4783ea78483ec63528dc987d59093d89c54a93d31339146b10d0 SHA512 90e7ae7410b5276f9be2eeb340deb062288ebc7f6a3bb425086fec07576e075fc0480bf3f233239e8ca13cbe462cb7d4254301ee57bd0368b2479c603957561b
-EBUILD geant-docs-4.10.0.ebuild 963 BLAKE2B 4de38c1678dcc6e5f9466af441cc6ddd00bc7840b5a5c5979c5a6b10b76eddc7ed616bebf5240e207fa728354504965f1f6b44602e9e9e949afc266406187648 SHA512 f723aef52672ca9ac40e6e0006a5e740a66f0c36388f11976003cdc24e4d406cb967dabffa9e7368d0e117fbfd9956c29a9a76caf15935bb9b396222e5147474
+DIST PhysicsReferenceManual-4.10.05.pdf 19527078 BLAKE2B 1ac3dde2f9d039ac5f7bdffe4027e4117a9db71e4916f9dddedf6fde0390e33cf1a99f4f0d11708ed2dc2a3fb25cab3d15935d0f83a6a69c58ebf65dc53beb9e SHA512 cf1a5abb91d2c24502f3a37d4413d99c0555239c5e777505f8c8f17b81d90c2236766252ec563422d9b551787098e267a0b1595fd34588dfe0fd04945681881f
 EBUILD geant-docs-4.10.03.ebuild 968 BLAKE2B 785d448cd61b05b8a2f87c701317b305d41ac18cc6d34d71c049243679d08190339e29d1abe402237c5cc334e7f91669180bd474e9f5cd72497ca1e3bef89e3c SHA512 0914280703a7feff4e5c7d3a3f928481f6c1af3c5c641d4286177ef950807dbdadbcfbe984e7e7e7b5493d2e25430e17d5f47fa6dfa06724ab0e6c4dc131b2ad
-EBUILD geant-docs-4.10.1.ebuild 963 BLAKE2B d3b3600f8ee8a3a747e575766fe54571d23143e0f83e083d055b152b01ff2e3ca252671b59a7edf5631507e87991ee0425995dd7fc3c4c74c54ff4471a30ef93 SHA512 4b9e6a142e3c4fe65cad0aa75eacbaa86d4b9426b9c09b7722950a73ed171cf36a035829ccb273f57ee06b0d4215e5731373fba42c54008ded5ac2bd39a2f4ba
-EBUILD geant-docs-4.10.2.ebuild 963 BLAKE2B 95598c26717a47573d7a79a036b80f4adfabef9cab8a55a4bec2c5e3fa774ebf4acce15ffbf2b7e74d5edd6f0d6e862008f34e52002ea96b61ba89a9a96bf6d0 SHA512 239eb90c413797c4307f82a8ece7cc8d50ccb4be5d64313753f2fb3fe0337bf78c5ecb995df6b2dea0ba080b37cd73bd5a345b2d34f997de2ac5f325aed78e3c
-EBUILD geant-docs-4.9.6.ebuild 963 BLAKE2B 4de38c1678dcc6e5f9466af441cc6ddd00bc7840b5a5c5979c5a6b10b76eddc7ed616bebf5240e207fa728354504965f1f6b44602e9e9e949afc266406187648 SHA512 f723aef52672ca9ac40e6e0006a5e740a66f0c36388f11976003cdc24e4d406cb967dabffa9e7368d0e117fbfd9956c29a9a76caf15935bb9b396222e5147474
+EBUILD geant-docs-4.10.05.ebuild 967 BLAKE2B 8dce5d9e63e976498a0b8e2a2a746905e162cdf432ea1d0f9b5438ca5c01a007c54a898a70bfca63b54c4eb98a4d20840d4273dea39092b319c223ffc8da4208 SHA512 c3f67e8f03ab776df1085d07cf71dbf40483d3695c92b2a106c9b2c4cb6367bf20e34c9cbee80f46851bd2697d2e76db0cdfe3df5d85155afb64e687b3ac8dcd
 MISC metadata.xml 413 BLAKE2B d79a9c73ffacad88262fa1aea585c18f95ec78c409efce7aba9c2780114a8fd9dac0978846b6e6862ceb106d0f41c5c79ebc47c961929ad683bfb090e366c010 SHA512 0c0d2a72a6947edb0a97a0d91d6c7dbfbde06eceac1deeb073906dbdfeb8ac43f5f2c6d1222ee8773c361ae34b48d77093e7734a0bd784fd408b2828793176e2
diff --git a/app-doc/geant-docs/geant-docs-4.10.0.ebuild b/app-doc/geant-docs/geant-docs-4.10.0.ebuild
deleted file mode 100644
index 49b9867de1cb..000000000000
--- a/app-doc/geant-docs/geant-docs-4.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
-HOMEPAGE="https://geant4.web.cern.ch/geant4/support/userdocuments.shtml"
-SRC_DOC="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides"
-SRC_URI="
-	${SRC_DOC}/InstallationGuide/fo/BookInstalGuide.pdf -> BookInstalGuide-${PV}.pdf
-	${SRC_DOC}/ForApplicationDeveloper/fo/BookForAppliDev.pdf -> BookForAppliDev-${PV}.pdf
-	${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolDev.pdf -> BookForToolDev-${PV}.pdf
-	${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf
-"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${DISTDIR}"
-
-src_install() {
-	local d
-	for d in *pdf; do newdoc ${d} ${d/-${PV}}; done
-	echo GEANT_DOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" >> 99geant-doc
-	doenvd 99geant-doc
-}
diff --git a/app-doc/geant-docs/geant-docs-4.10.05.ebuild b/app-doc/geant-docs/geant-docs-4.10.05.ebuild
new file mode 100644
index 000000000000..11d491f9b3bb
--- /dev/null
+++ b/app-doc/geant-docs/geant-docs-4.10.05.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
+HOMEPAGE="https://geant4.web.cern.ch/support/user_documentation"
+SRC_DOC="http://cern.ch/geant4-userdoc/UsersGuides"
+SRC_URI="
+	${SRC_DOC}/InstallationGuide/fo/Geant4InstallationGuide.pdf -> BookInstalGuide-${PV}.pdf
+	${SRC_DOC}/ForApplicationDeveloper/fo/BookForApplicationDevelopers.pdf -> BookForAppliDev-${PV}.pdf
+	${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolkitDevelopers.pdf -> BookForToolDev-${PV}.pdf
+	${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf
+"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${DISTDIR}"
+
+src_install() {
+	local d
+	for d in *pdf; do newdoc ${d} ${d/-${PV}}; done
+	echo GEANT_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" >> 99geant-doc || die
+	doenvd 99geant-doc
+}
diff --git a/app-doc/geant-docs/geant-docs-4.10.1.ebuild b/app-doc/geant-docs/geant-docs-4.10.1.ebuild
deleted file mode 100644
index 5cbdc9a61fcb..000000000000
--- a/app-doc/geant-docs/geant-docs-4.10.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
-HOMEPAGE="https://geant4.web.cern.ch/geant4/support/userdocuments.shtml"
-SRC_DOC="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides"
-SRC_URI="
-	${SRC_DOC}/InstallationGuide/fo/BookInstalGuide.pdf -> BookInstalGuide-${PV}.pdf
-	${SRC_DOC}/ForApplicationDeveloper/fo/BookForAppliDev.pdf -> BookForAppliDev-${PV}.pdf
-	${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolDev.pdf -> BookForToolDev-${PV}.pdf
-	${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf
-"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${DISTDIR}"
-
-src_install() {
-	local d
-	for d in *pdf; do newdoc ${d} ${d/-${PV}}; done
-	echo GEANT_DOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" >> 99geant-doc
-	doenvd 99geant-doc
-}
diff --git a/app-doc/geant-docs/geant-docs-4.10.2.ebuild b/app-doc/geant-docs/geant-docs-4.10.2.ebuild
deleted file mode 100644
index e74e7bde74ce..000000000000
--- a/app-doc/geant-docs/geant-docs-4.10.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
-HOMEPAGE="https://geant4.web.cern.ch/geant4/support/userdocuments.shtml"
-SRC_DOC="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides"
-SRC_URI="
-	${SRC_DOC}/InstallationGuide/fo/BookInstalGuide.pdf -> BookInstalGuide-${PV}.pdf
-	${SRC_DOC}/ForApplicationDeveloper/fo/BookForAppliDev.pdf -> BookForAppliDev-${PV}.pdf
-	${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolDev.pdf -> BookForToolDev-${PV}.pdf
-	${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf
-"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${DISTDIR}"
-
-src_install() {
-	local d
-	for d in *pdf; do newdoc ${d} ${d/-${PV}}; done
-	echo GEANT_DOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" >> 99geant-doc
-	doenvd 99geant-doc
-}
diff --git a/app-doc/geant-docs/geant-docs-4.9.6.ebuild b/app-doc/geant-docs/geant-docs-4.9.6.ebuild
deleted file mode 100644
index 49b9867de1cb..000000000000
--- a/app-doc/geant-docs/geant-docs-4.9.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
-HOMEPAGE="https://geant4.web.cern.ch/geant4/support/userdocuments.shtml"
-SRC_DOC="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides"
-SRC_URI="
-	${SRC_DOC}/InstallationGuide/fo/BookInstalGuide.pdf -> BookInstalGuide-${PV}.pdf
-	${SRC_DOC}/ForApplicationDeveloper/fo/BookForAppliDev.pdf -> BookForAppliDev-${PV}.pdf
-	${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolDev.pdf -> BookForToolDev-${PV}.pdf
-	${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf
-"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${DISTDIR}"
-
-src_install() {
-	local d
-	for d in *pdf; do newdoc ${d} ${d/-${PV}}; done
-	echo GEANT_DOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" >> 99geant-doc
-	doenvd 99geant-doc
-}