gentoo resync : 17.07.2021

3 files changed, 2 insertions, 46 deletions

diff --git a/www-apps/zeppelin-bin/Manifest b/www-apps/zeppelin-bin/Manifest
index 5226916f6ac5..7e23b3bd8a7b 100644
--- a/www-apps/zeppelin-bin/Manifest
+++ b/www-apps/zeppelin-bin/Manifest
@@ -1,5 +1,4 @@
 AUX zeppelin.init.d 492 BLAKE2B f6a551375b34ffc8ab0c2f5fe259614a8dd7024e6578919943755121d796ffc815678133446ce65b0c7eadbe18bcd0441327e29fb4cd8226f949a769f1f7e1bd SHA512 a70788870d766256c3e515748d9680e19ea0a574b81c47e5a4456a81179701db551079e2a066e5dba69c3db5d10509250780b6e54f2b43f5fc8602252292ab1b
 DIST zeppelin-bin-0.8.2.tgz 998508624 BLAKE2B cccfa95426d8d0407d7a226f5d71c15ca55da8893a7fff9e3a612c63034ab1838f8f7d5a529bb393b825c6c3bd19e197f4e913c2c5b8dd04fb282affc43788ab SHA512 91a785153bc47b087f90fac0f83066fdede041d5193506b231af1b6855b150307873c92cea462c6dd48ef6d38caa37934591a08542199ac4b02d9493298fbd43
-EBUILD zeppelin-bin-0.8.2-r1.ebuild 852 BLAKE2B 74b788341a1205b37b50952d1d5302bb19a25ee2dda661da7364bda8824cf0c13fbe2847a63ed17868dc1c2fa2859a559c9b6224b6607be87503fb4b6966c916 SHA512 4e184fdc60b322239dff7ce9fd02fbe1ff6a8f05fdfd7d7c2d00e612814392dcbebc9cba11b08e1d64af9e3d21ebcea82156b4da8d135ca9c2240ccf046d1d1f
-EBUILD zeppelin-bin-0.8.2.ebuild 905 BLAKE2B 0bc8aeba198f6b4424bf7120a90278576a53ea71ac7eb60ec4184786bfe73d46523c44947b186622e9ccc1b0fd06979c4daabdaf497aecbf52e524af8e1b336f SHA512 07a10e5d231d06968f64cdbc4a0c362222b946ac885af5f09a95594e0e6040953f581316d63d39391b34e5950252d64dd17a564b676fa705a7bb946c8a05adeb
+EBUILD zeppelin-bin-0.8.2-r1.ebuild 850 BLAKE2B c47748659f5ccddfdefe8cb0f3e4a25ff783cbcff9f218159dd4807722c7dcdd733674c26e3f2a74883158d22c752330e3785dedbfc439cb0d21b479e8e28a73 SHA512 6042414563eae0b5a5ea2a28bc9c34af67498538a1b8e5f37a793f3bc5de5a93c3493b65dbc79af8efb14223310a6fb20e9dcf81a61b1e953b95576803261ee7
 MISC metadata.xml 339 BLAKE2B 1dcf764353ed060bc2bc430af6e22ab96fd2d703eea4718b3ffe794f936d344392b477bbbb30712808180172107a92d3ee16c236674f044c2275fd2111d16542 SHA512 e836e7f499e4d8b2cf9e9d2c4b2df437683186a92c8adda12f662224681edb76507bc3af84e5dd71cfe02320f3d4f3f481556bf2156ed052a2c1f758bf52180e
diff --git a/www-apps/zeppelin-bin/zeppelin-bin-0.8.2-r1.ebuild b/www-apps/zeppelin-bin/zeppelin-bin-0.8.2-r1.ebuild
index e1df14facd06..b98e468a55f9 100644
--- a/www-apps/zeppelin-bin/zeppelin-bin-0.8.2-r1.ebuild
+++ b/www-apps/zeppelin-bin/zeppelin-bin-0.8.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://zeppelin.apache.org"
 SRC_URI="mirror://apache/zeppelin/${MY_PN}-${PV}/${MY_P}.tgz -> ${P}.tgz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	acct-group/zeppelin
diff --git a/www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild b/www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
deleted file mode 100644
index 62d7b66262ba..000000000000
--- a/www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 user
-
-MY_PN="zeppelin"
-MY_P="${MY_PN}-${PV}-bin-all"
-
-DESCRIPTION="Web-based interactive data analytics notebook launcher"
-HOMEPAGE="https://zeppelin.apache.org"
-SRC_URI="mirror://apache/zeppelin/${MY_PN}-${PV}/${MY_P}.tgz -> ${P}.tgz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-INSTALL_DIR="/opt/${P}"
-
-pkg_setup() {
-	enewgroup zeppelin
-	enewuser zeppelin -1 /bin/sh /home/zeppelin zeppelin
-}
-
-src_install() {
-	keepdir /var/log/zeppelin
-	fowners -R zeppelin:zeppelin /var/log/zeppelin
-
-	newinitd "${FILESDIR}/zeppelin.init.d" zeppelin
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP * "${ED}/${INSTALL_DIR}" || die
-	dosym "${P}" /opt/zeppelin
-	fowners -R zeppelin:zeppelin "${INSTALL_DIR}"
-}