gentoo resync : 12.07.2021

6 files changed, 74 insertions, 2 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 8ac712d182a5..e4213a71d8aa 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 6687193b60da..3f1bf307ce95 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -52,9 +52,9 @@ DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 58bbb3243de076ed1d25dfd7bd75717c50ad1
 DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 4962e7d574b38592a874a1b3fa8610bb2d0afc8713d995d67a790c025bb086cb619cbbaec76482ec096b4c55b9f1df383f5bd4806a231bc88e70ac3efbac24b5 SHA512 08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f
 DIST ceph-15.2.13.tar.gz 148542333 BLAKE2B 2e9668bcb0fd283ec4ab51b0c6142fc9a3b6310eb5d34e07da5e6b73b55dd7976db5ab9c78a93684ddc2f51873b1a17c4d31c5f5647b2d43a2826ee5362f7e5d SHA512 bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da
 DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae SHA512 8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6
-EBUILD ceph-14.2.21-r1.ebuild 10411 BLAKE2B f57bf6a7d1d0f19f3d2ca22cd1da35c527e0a8c504d18e4a9495f5d37d4e6a4a751dc4d24df6dbc5e0f323ba203f54e8db043231fd418f325d1539c4ab273ccf SHA512 c6fe6f3fe697538687504c8581697821e6ab17ca7d0cd7371eab0de46925428fbf160d805605e3b4cdee7f3058bd1ae34ccc26621cb0958f5d6fb239a2b7b295
+EBUILD ceph-14.2.21-r2.ebuild 10431 BLAKE2B da08ec46959c57da162051019010c20bd718e1def03a99f7a74dfae5a8305b63d720b5da00fd26c0527683d13e703d223c09d86fad88c251934b28a20d444efb SHA512 38ca1c08982148a210c9aeb308407cc118c67e315aee6d20f2255f01f48656dfa622d610337dcbd5b83d27cfba60649c1d8aa07beed84d9ffe8fb74c644a4d8c
 EBUILD ceph-14.2.22.ebuild 10379 BLAKE2B 970b467d01d8b294f5c886e843e0f85c19dccf6bfe17726f7e6a34ec2e34557b90a96305d2b62e45a9e3264e5eb9335b1f29cc37a52fb116387b85aa62d685f6 SHA512 f64bf074c77fc603b4ade5c2ac341218c932f4058eadbaeff29bbf6f10facf60b09698bf0a6fa2de6d7feb6271dbe2ff9ad41e2e60b8b0d57ab2a9517f346775
-EBUILD ceph-15.2.12-r1.ebuild 10760 BLAKE2B e0507e63c215d3626544f56fc97fc75c0a6c9671a66a5ed40c628a23d73289415314ffb3758f05692f52694140d38ed89ee559969d0182bef2fb8d2a5c9f1984 SHA512 c33b21dbf3640a6db042d310ea65be069d05314d29f21124bd64e060f276a5667870835d6f9280abafedff6a5cee6f66a7447137433e4ec97609f38859fbdafb
+EBUILD ceph-15.2.12-r2.ebuild 10780 BLAKE2B c3ceaef839451ad3c05d8d3ffa389a3e8a2a65563a0276c3b5b6f9e81a02590a77561d5a1ee7ac6842ad1295d3f2908fe3c4aede5edb50f15eaec2ebe2dbeae2 SHA512 f2d503964a06f6ebab1e080ae574744c455ba34323ab04de7d98ff7f6b33b8d0439b179412fd3410ab2602443f2c5757621238a4006edc73aaddb001b9b81c8b
 EBUILD ceph-15.2.13-r2.ebuild 10676 BLAKE2B df69ca97ef59cd7934aab08fa4e754e69ccf0a000e06523bd444681fde18171adc71acd4b99d5935174542cc0c3eb12ae39e557a078bc296e482047092514b1d SHA512 474f065867fbdf66832e4d910d90447406dcb0483727ce42e8e5ae13b8222294e05838fa18990998b3cb693a27e0fc2de4a06402120535088a12c374ede8f814
 EBUILD ceph-16.2.4-r2.ebuild 11991 BLAKE2B 62c9ee82927b0ae110e8bad74e76a39cf3ccbf1e4d5d247784d4962fa619fceec2c463885c574fedb5ec75d4f369a0152afd007550d60fe8833dd1faa0c71d26 SHA512 09d8ce0d5aa9ae0b11b6c2918ef06807a9065b8d4341df7c0ff9b5f87ef1896589d2d1437eb70a4ed0cf5f0a29c01d998318797a358a96b5b56fe5caa8dbbeeb
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-14.2.21-r1.ebuild b/sys-cluster/ceph/ceph-14.2.21-r2.ebuild
index 36597b47ed0a..aa787f1388b9 100644
--- a/sys-cluster/ceph/ceph-14.2.21-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.21-r2.ebuild
@@ -36,6 +36,7 @@ IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 DEPEND="
 	acct-group/ceph
 	acct-user/ceph
+	virtual/libcrypt:=
 	virtual/libudev:=
 	app-arch/bzip2:=
 	app-arch/lz4:=
diff --git a/sys-cluster/ceph/ceph-15.2.12-r1.ebuild b/sys-cluster/ceph/ceph-15.2.12-r2.ebuild
index acb36e7d6617..75c961e4526c 100644
--- a/sys-cluster/ceph/ceph-15.2.12-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.12-r2.ebuild
@@ -36,6 +36,7 @@ IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 DEPEND="
 	acct-group/ceph
 	acct-user/ceph
+	virtual/libcrypt:=
 	virtual/libudev:=
 	app-arch/bzip2:=
 	app-arch/lz4:=
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index ae0c1282a8d6..2c5bd25092bf 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -4,7 +4,9 @@ AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f
 DIST apache-zookeeper-3.5.9-bin.tar.gz 9623007 BLAKE2B cb8a599a86f57cb0eb91d58925d363271749e0ca93b0d40be5852f859848bf557f4bc6016707cb99ad75e95204b7b8e0417acdff5ebc8328e3a12c5fe7faf285 SHA512 0e5a64713abc6f36d961dd61a06f681868171a9d9228366e512a01324806d263e05508029c94d8e18307811867cdc39d848e736c252bf56c461273ef74c66a45
 DIST apache-zookeeper-3.6.2-bin.tar.gz 12515974 BLAKE2B 6770397b818558464843638bb9beebc1e23fc737ed88b28966494f69a28adb9624d9ea67225f8b528babd78a6ce7650218933b80db520ea08e31231e1bbe478c SHA512 caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199
 DIST zookeeper-3.4.13.tar.gz 37191810 BLAKE2B 994eecf982a19bbf3ae648c5d140746f5836f0f5d8921ed005ebccdedf0098591005b9038eb75fc660b48ae12b09b8db9dd68d3ac3b4ac9f847de214996e1efd SHA512 3481bd19945d80848f81d9dc2896a682ae8b62269b8164ffbae532e55aa4219961403e0208c8e72cf784605eae436d70ddae2b26e0deba0f1f84c74188c32c0a
+DIST zookeeper-bin-3.7.0.tar.gz 12387614 BLAKE2B 5b5467b4c7e206704177d41289c3c52fb0487f990fcc460d2749215551ab08eee672b6b52b8d43796c52660a46d3bed837fe26f042c30506b537457f54a95bd7 SHA512 64e2701c019ed46f45f4d53b2c5eaeaf7cf48c342bbafa032a0819d527fc77caebfada6bdad34e5171e6d838f40b16c95b62ce378b53dfc827af2d60cec0b17c
 EBUILD zookeeper-bin-3.4.13-r1.ebuild 1715 BLAKE2B 8ce26ac2d66e2e9591b57a344bf4ae0448d6bf6178c0552255f1137fa4d1038385c1880f31485c928a09719ec9b37a8f9950aa57ebbf60d3c8095d13b48254d4 SHA512 cedb27ee795393d4cdfc342fb549cd603cbb1585ef6ea74a3d2c334d6dd0213d39d9e680408e895b2d0e403724029a3e60e1cd194d008b53f43f95a13898974a
 EBUILD zookeeper-bin-3.5.9.ebuild 1477 BLAKE2B f6cc7898f223a134e7ec0f64f63ab1487e255c8be6690e583f89ad19e04c9f795dc17d24599684cd7f5a2a91575a90fdef57f4e5c2b5b34c9cac4dbd84748c91 SHA512 de17264957bbc15d231a14d88c82538d1ae0fcc490c9feb72534fb1d04517e9e66235266b8ec09f6d87b1e7b813799dd33b0fa80930d339a8f3710bb31c3d536
 EBUILD zookeeper-bin-3.6.2.ebuild 1477 BLAKE2B f6cc7898f223a134e7ec0f64f63ab1487e255c8be6690e583f89ad19e04c9f795dc17d24599684cd7f5a2a91575a90fdef57f4e5c2b5b34c9cac4dbd84748c91 SHA512 de17264957bbc15d231a14d88c82538d1ae0fcc490c9feb72534fb1d04517e9e66235266b8ec09f6d87b1e7b813799dd33b0fa80930d339a8f3710bb31c3d536
+EBUILD zookeeper-bin-3.7.0.ebuild 1492 BLAKE2B f76741fe53ab3cc99240af760f451a304ec5b1c6a666d28c0d5d3228ca78afd6fb8be4e778f1ff26064af4304fe14bde94f492f330fa8aebd6cc9016e41f834f SHA512 6d7cf7057665bb2076e48777f3c22df094886d113ffd6d7845c8a16eaae43b728524075c36129efc314b830ae42e8b2ec2b92b8589ff09d7325379b261ddf33e
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
new file mode 100644
index 000000000000..758806fe6c01
--- /dev/null
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-utils-2
+
+MY_PN="zookeeper"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A high-performance coordination service for distributed applications"
+HOMEPAGE="https://zookeeper.apache.org/"
+SRC_URI="https://downloads.apache.org/${MY_PN}/${MY_P}/apache-${MY_P}-bin.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/apache-${MY_P}-bin"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror binchecks"
+
+BDEPEND="
+	acct-group/zookeeper
+	acct-user/zookeeper
+"
+RDEPEND="
+	${BDEPEND}
+	>=virtual/jre-1.8
+"
+
+INSTALL_DIR=/opt/"${PN}"
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+src_prepare() {
+	default
+	rm "${S}"/docs/skin/instruction_arrow.png || die
+}
+
+src_install() {
+	local DATA_DIR=/var/lib/"${MY_P}"
+
+	# cleanup sources
+	rm bin/*.cmd || die
+
+	keepdir "${DATA_DIR}"
+	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die
+	cp "${FILESDIR}"/log4j.properties conf/ || die
+
+	dodir "${INSTALL_DIR}"
+	cp -a "${S}"/* "${ED}${INSTALL_DIR}" || die
+
+	# data dir perms
+	fowners zookeeper:zookeeper "${DATA_DIR}"
+
+	# log dir
+	keepdir /var/log/zookeeper
+	fowners zookeeper:zookeeper /var/log/zookeeper
+
+	# init script
+	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
+	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
+
+	# env file
+	cat > 99"${PN}" <<-EOF
+		PATH="${INSTALL_DIR}"/bin
+		CONFIG_PROTECT="${INSTALL_DIR}"/conf
+	EOF
+	doenvd 99"${PN}"
+}