gentoo resync : 02.09.2020

7 files changed, 103 insertions, 4 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index fbd0ede46137..758d22183213 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index a3aab002432a..680c99b3b7cc 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -3,5 +3,7 @@ AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370d
 AUX cvmfs-2.7.2-gcc-version.patch 2482 BLAKE2B cf184820140669a15f4051e8d0f9a41ae8625bb7beebeabd1a2021be0b5ffa4ed915c92a980229f1692f5f2e4145a08356a89ec8f2e3cc8963f04af157c090df SHA512 c59d2b33d41467d31d6095df20e7a576a02f39fc0ff1a2938afaa30929cc3b4178cf99d1eca3326551eba982adda0b5eed7f2a11348b23a43aa2e921b983e89a
 AUX cvmfs-2.7.2-xattr.patch 717 BLAKE2B 48d595b0219b62a3ac45e46d51e3910d6124edc89669ae8996a49e95331bf9d32b4f1eec8c6df76f6906594c3da4a89665b6457d3aef9dea96d2af3959c5780e SHA512 9be285da46f52d59ef28f666bee2b0b372d76cbb786f225a533239ac7683fdef6092aaa7d62458a89bc647598e12611f025060c37c0539071feac71b262e57a0
 DIST cvmfs-2.7.2.tar.gz 43121950 BLAKE2B 3f9b23709f7fd7d21f0c141388df9b3f59c0c9ed8c4b27ae4071cff919e6d04eec1c80fe26a70b421d554969d35cb18f1a700be67f046a1a5d53d73a9e64bbe2 SHA512 35f4d949b4f2d002e6ef07e61cd443e55b30031a396f9850fc8d511b2ea3fd37f12e340828878cce151876f7391459f5bb13f0fe325070567f2876eb50185149
+DIST cvmfs-2.7.3.tar.gz 43123803 BLAKE2B 39d11f9dd69e36897c501bd4b24c01a13fc351d1251cd9a7965fe46ddf0c8128c3c976bb747d477d5d5231aeef09cad38337bb28c343c1d7bfbd915af02119cb SHA512 94940a09a713c14f776914b74bbec8794637b98b42ffcbab36e3455c0ea83219ae6f0eebaf41a62d1abf05134aada0abfd521dec793b2fec015458b80f387bfd
 EBUILD cvmfs-2.7.2-r1.ebuild 2517 BLAKE2B 608d5bde89d45917afe51e8a26a4cceb4b07feee14a52c664698ce226950660266e70b57e53b0853572ca885047b36885c90996b0e6e1607b2d4dbefad508ecb SHA512 cc9a6ad42acfe31d4b58b6a045af71f58b4824f4e513c288ee5f4467827874045df8ab08ca38ad86f373bc6a34f0be33d91181ab2c51a9932a92108b26d9f4f8
+EBUILD cvmfs-2.7.3.ebuild 2195 BLAKE2B dd8a8604023e603596dec028d4c6b49e0ff71e4d1e93653d1c5a1c0c720dc913e3ca9a4fcec1605c7a621b12d714645e67e07e9c70c2cbccefa29e77c7a1df78 SHA512 c5be08f1f6d35fe1c363146a60144c7c65b6d0f7c548dd874ddea1fccb773eb37e33ac325add6d1c082c05e4dbf856247d7bb1c522a170b0dc9c7338776079d4
 MISC metadata.xml 1445 BLAKE2B 05a946a662c2f55cf57a50a88e698769e9e930f197880afaa8a81b51d2a6bb36c7e83061635992729c187e07463fc2914a214d7bf66279cd892835bebe971c73 SHA512 ee20a97ff26790a2cecfa28f0be7afdac3eda4a0aaade4cea4cb5d6c500d7634a2bb086dc0271189c50707deabc3c8882abfa25e959770976bf1196476b6aae9
diff --git a/net-fs/cvmfs/cvmfs-2.7.3.ebuild b/net-fs/cvmfs/cvmfs-2.7.3.ebuild
new file mode 100644
index 000000000000..c9a633a1fa72
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.7.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc server"
+
+CDEPEND="
+	acct-group/cvmfs
+	acct-user/cvmfs
+	app-arch/libarchive
+	dev-cpp/gtest
+	dev-cpp/sparsehash
+	dev-db/sqlite:3=
+	dev-libs/leveldb:0=
+	dev-libs/openssl:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/pacparser:0=
+	net-misc/curl:0[adns]
+	sys-apps/attr
+	sys-fs/fuse:0=
+	sys-fs/fuse:3=
+	sys-libs/libcap:0=
+	sys-libs/zlib:0=
+"
+
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+pkg_setup() {
+	if use server; then
+		CONFIG_CHECK="~OVERLAY_FS"
+		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.7.2-builtins.patch"
+	cmake_src_prepare
+	# gentoo stuff
+	rm bootstrap.sh || die
+	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
+	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+		CMakeLists.txt || die
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILTIN_EXTERNALS=OFF
+		-DBUILD_CVMFS=ON
+		-DBUILD_LIBCVMFS=OFF # static library used only for development
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+		-DBUILD_RECEIVER=OFF # for distributed publishers only
+		-DBUILD_SERVER=$(usex server)
+		-DINSTALL_BASH_COMPLETION=OFF
+		-DINSTALL_MOUNT_SCRIPTS=ON
+		-DINSTALL_PUBLIC_KEYS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs
+	dodoc doc/*.md
+}
+
+pkg_config() {
+	einfo "Setting up CernVM-FS client"
+	cvmfs_config setup
+	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
+	einfo "and restart the autofs service"
+}
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 6cc264e13d06..a9c197ebcb3c 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -4,6 +4,6 @@ DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bd
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
 EBUILD libnfs-2.0.0.ebuild 1104 BLAKE2B 48e778f6746267304ab5b9bda20a841004a7ba7a2bc14887e4665e9ac7e1bc78fa3ee05f05603b049aa68695516632788886420c79497aed1f845f5c91bffa66 SHA512 9f849f4e864eb262fd87d8d2645df6f07bb24806f540905b192eab4b1954143f8d8e18d78e6ade56261833696d972e184cfad4f0e773d4fd1a6733d91c8613e9
 EBUILD libnfs-3.0.0.ebuild 1255 BLAKE2B 6b87b80f4e85f556f4a01573f5b539b95da72e7d98b36bc2913d5caa3428db586c12e8683169fb1d775e5f53cedd6866f686937bd83461a67e04345764d71dce SHA512 9b281707a6f99af238072c602c9e59e9e2f81178e7a77d643cd45e0deb0bb2c7fd2fbcac4723a645a051ea74fbf0ed007ae10528c539865684aef94ecdd08b6d
-EBUILD libnfs-4.0.0.ebuild 1199 BLAKE2B c68144b3feb2c37b452e89b8c44ad27e27f134864192b70065b5d37fde1981deb9b2ba41b897f254faf23d94dcfa3803eaf08c26969ab97f5347533de1883df1 SHA512 ddba507a145b2b2b4efc7c26619de6a0a78a28b0069f79acf9eb087df53a2338ee8a179cb7e5491f3250766fc7527a80e2e7d8f05cbc111c8499f2f28ce9a7c6
+EBUILD libnfs-4.0.0.ebuild 1198 BLAKE2B acf448b1025b6cfb779ceb681148a1587e0ad1e74c94f8be76f1a92062abac63249d37e6b14c3a98e2cdc2c278975864ab56f087faa317036ce0d8c42506ab74 SHA512 a120b64a3a1ea47f4a3fce99ad0a3f99d1d082a24da893fda1213f25229de6f2e64c587f27614b432cf1add0742ba1c16ce7347e412ffbd5b9aaf49ee7249a5a
 EBUILD libnfs-9999.ebuild 1203 BLAKE2B c2f6f95e87478e5f33574dccdac1c9261ea6bb1942199deca4179ed1238e681a3e92595f2b049438841ac432f8bf5464bbf659de29c5953f9f0f67a69ace4aaa SHA512 2162d6b5a34347117bfe99f3697bd804621c7b9afbcead44687767b360481122bb49799d444df882557e2619b3fc6d13ff1e25680f28975030cc17e9cdbf693b
 MISC metadata.xml 416 BLAKE2B dd298d1b48b996a31ccef799be0e581239d99bed3f79f05aba02693821e869cbb73425af4ba1d581d641ca52a7b636dba591e68cbcb7c647cfd6840745c16721 SHA512 69475dd9d86a2335ee1780e6a330ff6096ccf99d14fea094b8bab5a59aa1deb2841b7c0e1bf5c00fcec38756c219af9b7ff255f1986a54756c28128b9e447ce5
diff --git a/net-fs/libnfs/libnfs-4.0.0.ebuild b/net-fs/libnfs/libnfs-4.0.0.ebuild
index feebd48c4430..09467353e965 100644
--- a/net-fs/libnfs/libnfs-4.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-4.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 x86"
 	S="${WORKDIR}/${PN}-${P}"
 fi
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 507506b28b7a..940ae50f1e8e 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -24,5 +24,5 @@ DIST nfs-utils-2.4.3.tar.bz2 921710 BLAKE2B 9386a99561370e09ffe871ec38a4fc993e99
 DIST nfs-utils-2.5.1.tar.bz2 931848 BLAKE2B 84c93ef5707bd97e9e1107dcca0530a3c137cb5ad04c7533bb8aee595a53fdc72359252d009fde95b9833a61f1695db1d6b1726081e5e8efd6c528e831f9834c SHA512 36c11668a9d2a382206db3d73a3d03000cdd2be9836fcbbbd327eb38515ac0b451520f6ffdc69bc05b2b81c60ecb88d50a20a50f123b8092a5b63e1c1054a2eb
 EBUILD nfs-utils-2.4.1-r4.ebuild 6205 BLAKE2B 6a8c7bb4e2796bbf00c8aef69243cafd7a428aae5b1c0c1e4d82418593b14272efd37e8d7561ef0a671de217e27147f73c6287a207016185054c88ae31df3f86 SHA512 68a109f63eefc855a42569867db9876bd0c49ac222bc30c1791b5e7ce88752144315553e309c613c8953dfbc8f3c58c69f067312c936574a491355349ec61f14
 EBUILD nfs-utils-2.4.3.ebuild 5788 BLAKE2B fb3b87163a7337d3d8e08b87f874168a0ead5f40bfff0614366201221783e647ab8aa2dbd0e50bf5be6a948cf8b44955ae93c91a290d0d334b243854e0af8170 SHA512 f3d6b7c868ef735455f49ff495244396528bbd35134e85d42743054fe8eb8fb7fc8cd7afcf5d9a5781dfecf79832f6eb8cd5034c3fb9ec1d350b872c40760f67
-EBUILD nfs-utils-2.5.1.ebuild 5792 BLAKE2B 08d90c2a7ac289caae73561b604782bd6c6c56f9348cf90ce9ca986b0f7b390b96b37efae69205fe85368a9f3f58fce60e3f2cbc679bf05342b850b663c7630c SHA512 afd163e16cedfb1c3399cffe5217ffad1ab839f506cba631ead75ea6915d00ffc0f257efc3d43ff735e26da25ee7d0348dad166f11f4fe6f0dce653fc7e88ecd
+EBUILD nfs-utils-2.5.1.ebuild 5790 BLAKE2B d841adeb6aaa58e7cb58206fc61a155b5b0e79d3275b721ef25aac979bc6fafd85591cc3f474eac8df55b2bb01ae4034f7641015c3b71bceb2db5a8a644de4ca SHA512 cd76ec65257ce6f8c58d95e53e4c22caca9de893d19548b1e44e62ab68b57f76c8444ee9b0bd5942e752040af4d8e4ac8325eb04d95a05ad70570c3dde1ba650
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
index 6cf269492a69..aaba5b268293 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"