gentoo resync : 16.09.2020

3 files changed, 18 insertions, 16 deletions

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index af7a1abb6bef..ea18ff727f1b 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -2,11 +2,11 @@ DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B e9f67fb42b6c4e6c2092e713e801db
 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
 DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c SHA512 e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
 DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
-DIST openafs-1.8.2-doc.tar.bz2 3801937 BLAKE2B 321af6f0b97cfe195b18a7fb55208981158f23671dec35c0462167d3ebddd245e3aabefbc13f3caddbd6d4556c448f137acfd70be768dbeb843bedf2acfe8e2b SHA512 99bf052f7128e920766efaafc930fa33b7d3615f7c61c1182fd93159fd477d88da05f88fd9f39896c44d80a3687142367613adc2d7bd73d069dc5820b4cf8653
-DIST openafs-1.8.2-src.tar.bz2 15109003 BLAKE2B 13a786bcc2053d70a161e32911eef9c774492b28f93d33747f51fd55e4374d1dba52c83733d6cce8fdb4496a222800acaf4f95d8e7b4790259476c29486fd601 SHA512 8115098fc60e12f63e9177a7487c08bf60ac738ceaa84644e4c57345928f2764a9e06653f235456e8667a779bbce7647521574751d1bd6b64827b12f63f91b92
+DIST openafs-1.8.6-doc.tar.bz2 3769160 BLAKE2B c5fe08fbb2cdab48dd691a7e228cc590644e05b22c87afef24a5fb35aa12e379d8d49d4b920cb84dd23b4e1f1a04512078f3018808531cdc7180778885bdc466 SHA512 7525325a5ef6e1ceada7075f489a03e1d250d3cbd8b8e83a25c8e40d506d50cbf10c2b28b682f2f9663a8cd450cb70891a04e6dbc296347945ee2454b138d971
+DIST openafs-1.8.6-src.tar.bz2 14874336 BLAKE2B a83f5bfe543b3797fa6d80ebc96cacb1a15f58cf5495d1c693593bc6d24a9f08678693080b3920a97afebe937689dd0ad08bbca95c996af0d2c83935974d3613 SHA512 0800c3825d4e0384b43cb801fc898e9255a0fa0d0baf1f231fbf383317919cc30f68526eeec803d2dc21fc7a6b55155ea4cb23197604c70e89ecf4d520b85ec1
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
-DIST openafs-patches-20190106.tar.xz 29712 BLAKE2B 6377ffc6afa147f47e57e94c7c18c17c42f70c3c8d578ca7e53a4577918be0e6e6d3fbe427c5c460df8a5abb3e4f707beb27fda5e919b95285c4ce02484cd89d SHA512 bc35e422ffb3b231a3ba80f5408ebbec7b1220b8be56bf4a84024a2554060ca1c0e2ea97af989bcafade3629d40520df3d69f58a90f526f0d60523f8d3f96d16
+DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6 SHA512 ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820
 EBUILD openafs-1.6.22.1.ebuild 6969 BLAKE2B 38d0afcf387995157317252cfad1ea5d831e89779c02a2635b600be0f0dc279357cc989b6982d5fab3b3e51acb7cf5d86eb97d0c07b9d5340e843861ecede6ee SHA512 96acce6ba9b8d4847ddaaaf459516f1b159bc27b9f9faa3c00909926d9a8aad3158864a2ccc74f83357419d31ccd8a94df994dd7f65f54e4513f532c47e02869
 EBUILD openafs-1.6.22.2.ebuild 6971 BLAKE2B 2cb82e548ec3c46082c4ebb2aa6c85387e0c8d6914fa772b23e02a94d94ac4cf41ff74749a6e94de235e980630991b629ed0b72639eb7e8e76501146fbc154b1 SHA512 eab046105a4744c1a3b21b29e436f028138333a182ee1d759e9d351fcd23fe9d218c21161131f4f381448a1f2c477cfec992efffa451e9178e00b856ae8a0d1e
-EBUILD openafs-1.8.2-r2.ebuild 10883 BLAKE2B 945d42bbba340a7fe66dcdc82d1c14bc8ad2ad3b9399de16d57527c0c886aba6415a2ce8294c8ad1176d64f690582d967911ab4ee35c9c8959b4b39ca966249e SHA512 21237560f4a4abc3191294fcf5873fddc67ccef612f2fb0dd109ef7d111771385dfacd8fe9ac6807b2476ca645a613106a8abe41d9911eb1fd1a470b4c053343
-MISC metadata.xml 1430 BLAKE2B cb3538d4816c5ebae039e2aba5bf3b2acf21a499c8f18f504862922507830f6534d6c0e0434052c62ae1e34676479ac8dd794a3e8f82504328589c8e86bd7455 SHA512 f57967dcc50858e63db43af63128b4a6d5a6db78019178a5a44a0a9ef770de4d274f26ad00f7e5abebfa900795cdfecd6a9019202419a426606ea1419eb4d948
+EBUILD openafs-1.8.6.ebuild 10942 BLAKE2B 91c35347837a66a2e5df21b7e5993b492a137060d78c964e112085466164fd567767f600d008c2faecec7f7372980ea980a362ebb1af24b89b06e6f4e3de67c1 SHA512 fcdfb50c478746c24d2640170f0d1e098d44a4cd874cf0d4ccf3e111c149d2efc104cbe4720d0b89bb6a6b884d9845d7d3813526a7c964c7142e2228a8052951
+MISC metadata.xml 1433 BLAKE2B 649cbf6ca873658e3f4829223f60cf646dcd601eb1f0aadefe24a0ecf561367988c4e63b37550693b56fd74adbffe8ce27db526ec1f175536a7d2d5f184204c5 SHA512 a4f1ecf4833e0f8491ee7b2a0ae6f1baa8a19125971c8bc19f44ff4bb3d229c08870699207269be797af31dde53417577779e43f3a723ec621d04571b6a75df5
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index 32ca71d15eb8..59c61d4d6093 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -9,7 +9,7 @@
 	<name>Andrew Savchenko</name>
 </maintainer>
 <use>
-	<flag name="api">Build API documentation using <pkg>app-doc/doxygen</pkg>.
+	<flag name="apidoc">Build API documentation using <pkg>app-doc/doxygen</pkg>.
 	May take a *long* time to build.</flag>
 	<flag name="bitmap-later">Enable fast startup of file server by not
 	reading bitmap till needed.</flag>
diff --git a/net-fs/openafs/openafs-1.8.2-r2.ebuild b/net-fs/openafs/openafs-1.8.6.ebuild
index d88f7cf693a4..dcf7a9a179c0 100644
--- a/net-fs/openafs/openafs-1.8.2-r2.ebuild
+++ b/net-fs/openafs/openafs-1.8.6.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit autotools linux-mod flag-o-matic pam systemd toolchain-funcs
+inherit autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
-PVER=20190106
-KERNEL_LIMIT=4.21
+PVER=20200913
+KERNEL_LIMIT=5.10
 
 DESCRIPTION="The OpenAFS distributed file system"
 HOMEPAGE="https://www.openafs.org/"
@@ -24,15 +24,15 @@ LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="api bitmap-later debug doc fuse kauth kerberos +modules +namei
+IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
 
 BDEPEND="
 	dev-lang/perl
 	sys-devel/flex
 	virtual/yacc
-	api? (
-		app-doc/doxygen
+	apidoc? (
+		app-doc/doxygen[dot]
 		media-gfx/graphviz
 	)
 	doc? (
@@ -153,7 +153,7 @@ src_configure() {
 		$(use_enable pthreaded-ubik) \
 		$(use_enable supergroups) \
 		$(use_enable ubik-read-while-write) \
-		$(use_with api dot) \
+		$(use_with apidoc dot) \
 		$(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets) \
 		$(use_with kerberos krb5) \
 		$(use_with kerberos gssapi) \
@@ -170,7 +170,7 @@ src_compile() {
 		emake -C doc/xml/QuickStartUnix auqbg000.pdf
 		emake -C doc/xml/UserGuide auusg000.pdf
 	fi
-	use api && doxygen doc/doxygen/Doxyfile
+	use apidoc && doxygen doc/doxygen/Doxyfile
 }
 
 src_install() {
@@ -243,7 +243,7 @@ src_install() {
 		newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf
 		newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf
 	fi
-	use api && DOCS+=( doc/doxygen/output/html )
+	use apidoc && DOCS+=( doc/doxygen/output/html )
 	einstalldocs
 
 	# Gentoo related scripts
@@ -251,7 +251,7 @@ src_install() {
 	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
 	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
 	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	dotmpfiles "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
 	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
 	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
 	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
@@ -290,6 +290,8 @@ pkg_postinst() {
 		use kernel_linux && linux-mod_pkg_postinst
 	fi
 
+	tmpfiles_process openafs-client.conf
+
 	elog "This installation should work out of the box (at least the"
 	elog "client part doing global afs-cell browsing, unless you had"
 	elog "a previous and different configuration).  If you want to"