gentoo resync : 17.07.2021

5 files changed, 2 insertions, 216 deletions

diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index 2c5bd25092bf..b52b47ef50aa 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -1,12 +1,6 @@
 AUX log4j.properties 2191 BLAKE2B 64ca568213fcc1168a10b8ca5914361f2d4543e8d5a2e22bf81ee807df2c4f7ca269a1f8d355ee8e889aa50c250e24f65c3900a32f06233e6c3dbc9b460c48b2 SHA512 a465aef274e3f325730c150fdebe3ca27f9debe723af6680b187daf83d6da663fa8a51bb9813ec8cba3b4d59c9e28848032083a44686b08fd2c246a461ada0c6
 AUX zookeeper.confd 398 BLAKE2B d49c6c7358ce2f6911d359142e0f6abe2662c0e5c2bcf1ac114cd272d44efcfad05d31d58ef368a470e6f844df999068b68a7c1e8392138fc07887333e7bd41f SHA512 76ad4796faa2d267ae30d85e573de2dbad00c566764cf6757d71c00c68b10c99383dd87d2352f521c872ce22edde85bb2d3896bb6258f57ce3fc6b423a16296f
 AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f639843b105d6ce9b4ebd9555db13f5ac1447c154881b3c95fbd4738d496f6008d9e52de1cc3e74eb SHA512 34a4011ecb5d8739e57dbc9222b528a0b323c6aa0aa45391621e724106571a632908782e3a4e14e953be72fa0e525b4c7cab0440af37bbef26a100fd1d92da81
-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
+EBUILD zookeeper-bin-3.7.0.ebuild 1490 BLAKE2B 03572804661466c353c36c37eba0847148dc8a7bd5643c100c59183c054b25800803524d66e36e818e9316b8bc82425ebcd62d0a157383746458df279674e828 SHA512 e90e8b9acd7e360b310576fdb538289e536783e42e1b7f5c1c6b972008d792edcdc3e802b09724e2b92cc6eb160022ff4675f68ffb5e215e0ef3437c91dc50f7
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
deleted file mode 100644
index d6622479c88c..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="zookeeper"
-MY_PN=${MY_P}-${PV}
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/${MY_P}/${MY_PN}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_prepare() {
-	# whyyyy u -Werror ?! so horribal!
-	sed -e 's/-Werror//g' -i src/c/Makefile.* || die "Failed to rectify the Makefile"
-}
-
-src_configure() {
-	cd "${S}"/src/c || die
-	econf
-}
-
-src_compile() {
-	cd "${S}"/src/c || die
-	emake
-}
-
-src_install() {
-	local DATA_DIR=/var/lib/${MY_P}
-
-	# cleanup sources
-	rm -rf src/ || die
-	rm bin/*.cmd || die
-
-	keepdir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# 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}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild
deleted file mode 100644
index da7b8c2abcdc..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="apache-zookeeper"
-MY_PN=${MY_P}-${PV}-bin
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-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 "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# 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}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild
deleted file mode 100644
index da7b8c2abcdc..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="apache-zookeeper"
-MY_PN=${MY_P}-${PV}-bin
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-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 "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# 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}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
index 758806fe6c01..b5c177878c77 100644
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/apache-${MY_P}-bin"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="mirror binchecks"
 
 BDEPEND="