gentoo resync : 02.09.2020

5 files changed, 4 insertions, 293 deletions

diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index e2ed62418b32..89e9df51c873 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 zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
-DIST zookeeper-3.4.11.tar.gz 36668066 BLAKE2B 4bf963d41280bd6227b4e81721576bf1f973a765c7049e78c5fae4d9dbc7e4d034304208af0f68b894bd4624e1945c9e4492b3217ff7f0e05d9b822c1843d96d SHA512 1ed2df11dbff2fbbb70d992d02427c4f694ccb4fe493db10a087b04d934b132b970956099edbdf1c2c636d5eb248bca1528846fcb449ae8bee4b9a82f7936f9e
-DIST zookeeper-3.4.12.tar.gz 36667596 BLAKE2B e4aac98f86fc4fcc576ecfb55381fd37efe3fa56cebc1632abda59b6ba71fecca17ace29124ef9f59ca0de627ff463f9d6fc7ff7fbbe77c2bbf30ae25a9f99f8 SHA512 026c7feb4a660bf8d99b1b719fec2b7e4603c3c46f2b77bac372df15ed0ceb4d971aa9c954082d61d73929ef8dc38c31693604ae75244f746cafb4eb6e67320c
 DIST zookeeper-3.4.13.tar.gz 37191810 BLAKE2B 994eecf982a19bbf3ae648c5d140746f5836f0f5d8921ed005ebccdedf0098591005b9038eb75fc660b48ae12b09b8db9dd68d3ac3b4ac9f847de214996e1efd SHA512 3481bd19945d80848f81d9dc2896a682ae8b62269b8164ffbae532e55aa4219961403e0208c8e72cf784605eae436d70ddae2b26e0deba0f1f84c74188c32c0a
-EBUILD zookeeper-bin-3.4.10.ebuild 1933 BLAKE2B ac00e5f5e075cb3e77de407ae9863bc4f696711e54b92c45011fe2c51a992d8f156f8bacf20787b91126334c748bcc078ce327869e11c7f0b6afe6b8e73e3c8b SHA512 7dd0ece206a10f882e7fe9e0a6fee4f7a8079e84af017f6d9f12bd48ef08524fa5f672c18c469562812f4da9fdaab7a0c087ed977d473f6f33deac4f7a4e77c3
-EBUILD zookeeper-bin-3.4.11.ebuild 1933 BLAKE2B ac00e5f5e075cb3e77de407ae9863bc4f696711e54b92c45011fe2c51a992d8f156f8bacf20787b91126334c748bcc078ce327869e11c7f0b6afe6b8e73e3c8b SHA512 7dd0ece206a10f882e7fe9e0a6fee4f7a8079e84af017f6d9f12bd48ef08524fa5f672c18c469562812f4da9fdaab7a0c087ed977d473f6f33deac4f7a4e77c3
-EBUILD zookeeper-bin-3.4.12.ebuild 1933 BLAKE2B 5d326d7ea693b528e88a3e74b84e516b16ef60fc2ca1b92caa224170726b1092f8ac839b495a88d1880342b38958c6b18ebf58540884d62cd6ca44d65fd8b0cb SHA512 60b76cbc2b3e221f627737a56a0d3420d67c15f26f4b260f4278b678648d64bf51626867abff5ae2f5f7ca3d735943ac85cff03639c5daf353dc9c33314baf4e
-EBUILD zookeeper-bin-3.4.13.ebuild 2053 BLAKE2B 5aaa2b86d2762abd7558801ca16081ad65a02386bb91abb2b73caac17695028ccd3dac099194f38389c3321e11cc97281b782c9ccc0a99516195e3e7f694c28a SHA512 8335da5a5b9db28943af049dbbc25c615fe7d69684ea900ab9b4d49dc3d4823729b5f2a9c8b7df09cd7f2e0d125643693b475a8a7d382945d66ef474b3f30913
+EBUILD zookeeper-bin-3.4.13-r1.ebuild 1722 BLAKE2B 30ef5e55d7ca7fc1a98b905824ce0c015c8c1321c18d05e54157d10a026153fa444b0c4ce9615a0d96a3822ee2440059f88bab1abddba11af75b58962ceb370f SHA512 be88fae43276447a33e57986945da22b2f4f72140306b0878a9042ba107ec18107409c15eac9c065030ae9ec26f996b62d27392cb9d90147c8bd13829d49ac03
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild
deleted file mode 100644
index 8f6e4bd484fb..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils 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() {
-	# python
-	sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \
-		-e "s|../../../|${S}|g" \
-		-i contrib/zkpython/src/python/setup.py || die
-}
-
-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}
-
-	# python
-	cd "${S}"/contrib/zkpython/ || die
-	mv src/python/setup.py .
-	mv src/c/* .
-	python_foreach_impl distutils-r1_src_install
-	cd "${S}" || die
-
-	# 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.4.11.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild
deleted file mode 100644
index 8f6e4bd484fb..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils 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() {
-	# python
-	sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \
-		-e "s|../../../|${S}|g" \
-		-i contrib/zkpython/src/python/setup.py || die
-}
-
-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}
-
-	# python
-	cd "${S}"/contrib/zkpython/ || die
-	mv src/python/setup.py .
-	mv src/c/* .
-	python_foreach_impl distutils-r1_src_install
-	cd "${S}" || die
-
-	# 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.4.12.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild
deleted file mode 100644
index a68eac797592..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils 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() {
-	# python
-	sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \
-		-e "s|../../../|${S}|g" \
-		-i contrib/zkpython/src/python/setup.py || die
-}
-
-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}
-
-	# python
-	cd "${S}"/contrib/zkpython/ || die
-	mv src/python/setup.py .
-	mv src/c/* .
-	python_foreach_impl distutils-r1_src_install
-	cd "${S}" || die
-
-	# 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.4.13.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
index d911c9fc1da5..940d9e7fa92f 100644
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils java-utils-2 user
+inherit eutils java-utils-2 user
 
 MY_P="zookeeper"
 MY_PN=${MY_P}-${PV}
@@ -15,7 +14,7 @@ SRC_URI="mirror://apache/${MY_P}/${MY_PN}/${MY_PN}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="mirror binchecks"
 IUSE=""
 
@@ -33,11 +32,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# python
-	sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \
-		-e "s|../../../|${S}|g" \
-		-i contrib/zkpython/src/python/setup.py || die
-
 	# whyyyy u -Werror ?! so horribal!
 	sed -e 's/-Werror//g' -i src/c/Makefile.* || die "Failed to rectify the Makefile"
 }
@@ -55,13 +49,6 @@ src_compile() {
 src_install() {
 	local DATA_DIR=/var/lib/${MY_P}
 
-	# python
-	cd "${S}"/contrib/zkpython/ || die
-	mv src/python/setup.py .
-	mv src/c/* .
-	python_foreach_impl distutils-r1_src_install
-	cd "${S}" || die
-
 	# cleanup sources
 	rm -rf src/ || die
 	rm bin/*.cmd || die