gentoo resync : 09.06.2018

5 files changed, 4 insertions, 97 deletions

diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index 54eead6536c3..1dacf8721f73 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,11 +1,8 @@
 AUX amc.init 562 BLAKE2B f4aed655b924f345905aa8d3f149799ad299086cca1555e4902e09b376a47e2da8a34445446b00f7508cf4b6ef1d7eb83df93ae6af7c89d9b6e23d027ea5ce45 SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094
-AUX amc.init.3 422 BLAKE2B d7ad7a2a2e610da62542728da59d581f3bd69fdd5a7bf077f42cf2057e6c6bed05c298c73aee7ae9dee8ef93c3d684fc467619d202f2dd7a371b566b4e8cdf7c SHA512 71109e0779408e0cad3b4073a680ff40500daab6f2efe9af7d69286939437de0bc2b6e3a406ac65355f11b56d84077a04d98a2a6e06aac1147e1e516fe4e5181
+AUX amc.init.4 401 BLAKE2B a649832bdbc6dc33de0f87ac0037b1c38212b97abdec16d25d714db6c183fcaed0eb8374d7fecccaf8c8cdeff2c125007b4a924e208721e9d6a8e83befb93dc6 SHA512 00cca21719821efff950d272bfe1c35bbedaf5597507d2b19ecdf6f6c2e7ac7c1c1bdd42474177551e55b9751060ec396add7f4cc94f693537c105f5cbe1bac6
 AUX amc.init2 583 BLAKE2B 0745a48ecfdc060ac9995c0634761d9b16d7d190df9d6a3d8fd7ec415fda486157e22f6f7ff03b2d4a3afe93632a67e7ad07214831007101bd9ebc71557f6003 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317
 DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 BLAKE2B cd823dd1c546fe69948ef3f77fa8bf0a68a8d95ed3ee778272b84c39b1b1bc4e5afef803931ce859fd957421f4816358590a3c1e0845fdc524a0f029b52ce828 SHA512 8077f8c51aab39ca701eb1ada633a3a378e02fed39ef2e565fed57fa57cf12da6c69a2b3d93e179110c29043a0a5a114512d30752eab6356e1b819ae490d23bb
-DIST aerospike-amc-community-4.0.17.tar.gz 7868123 BLAKE2B 86ada2e5af69b9306dc10b5386d21bd4459fff8a05672f289511f1b4efc27b1bd114cdd7bf9e5d6656fa3911ca111c8eabaa178a564f2ff9e6ab64c4a88a0145 SHA512 3dce8e8d435f70685498083d50818c1655faa61125391424c0ff99ea50618df4f9f3c3ddc7be5c64aba7118e75c5c3f24f7c5bfe834ba7fb504fa7d72bd00db3
 DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B 69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf SHA512 821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
 EBUILD aerospike-amc-community-3.6.13-r1.ebuild 1404 BLAKE2B 8b278cd44569c009fb9801ebded251e7dbbb074056a94ff07f9634660150171219e73af4638990bb660676a1e6d127015eef515b46026e97ba30a6eaed360baf SHA512 b359adddaf57972b90436bf09edac8081ee5113636f427f69e94e57eae15da8ad1a93c0e1c97ee2ddd590a98ff22290a360fe2ff54da292a16d4ed009fbbf77d
-EBUILD aerospike-amc-community-3.6.13.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
-EBUILD aerospike-amc-community-4.0.17.ebuild 539 BLAKE2B f1b3f5551986370c16c24fae02ecc0c733fe52057bb0e47d770267a7103313421c54e2292381e04475cb4c2dbd2e538ee34546249f051b06f2e5abc6317b2089 SHA512 ae0703242bc3706586d021d58738cab5ab7babf9427e63d0a421fda4f5c25b75d103d9f40489f219058710919425c6ab3e2ce1c07277893e372dcac0a047a0d0
-EBUILD aerospike-amc-community-4.0.19.ebuild 539 BLAKE2B f1b3f5551986370c16c24fae02ecc0c733fe52057bb0e47d770267a7103313421c54e2292381e04475cb4c2dbd2e538ee34546249f051b06f2e5abc6317b2089 SHA512 ae0703242bc3706586d021d58738cab5ab7babf9427e63d0a421fda4f5c25b75d103d9f40489f219058710919425c6ab3e2ce1c07277893e372dcac0a047a0d0
+EBUILD aerospike-amc-community-4.0.19-r1.ebuild 539 BLAKE2B f68e4bdeed829f5340c2ce1dd15773da038a1755e7682aa4cc02236e7654ff956f87582be75bcea950c1aafd9f8b26848039990354ac780a9574425ae93b3a55 SHA512 89c275ed1d9706a4cd9bf068f0ab6d7931f6a7b346248b5ced94163e98434461b2c22226c0c83a75cec4f5f13a0efec63ab3a09c8537d513fe6bc1dcdd4681f4
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
deleted file mode 100644
index 5e04b68567fe..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
index ee583da80e5f..d1d21c1ab7be 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
@@ -20,5 +20,5 @@ S=$WORKDIR
 src_install() {
 	cp -r "$S/"* "$D"
 	rm "${D}/etc/init.d/*"
-	newinitd "${FILESDIR}/amc.init.3" amc
+	newinitd "${FILESDIR}/amc.init.4" amc
 }
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
deleted file mode 100644
index ee583da80e5f..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S=$WORKDIR
-
-src_install() {
-	cp -r "$S/"* "$D"
-	rm "${D}/etc/init.d/*"
-	newinitd "${FILESDIR}/amc.init.3" amc
-}
diff --git a/app-admin/aerospike-amc-community/files/amc.init.3 b/app-admin/aerospike-amc-community/files/amc.init.4
index 6fd8097b18f1..87405a83c709 100644
--- a/app-admin/aerospike-amc-community/files/amc.init.3
+++ b/app-admin/aerospike-amc-community/files/amc.init.4
@@ -11,11 +11,8 @@ pidfile=${run_dir}/${SVCNAME}.pid
 user=${user:-root}
 group=${group:-root}
 start_stop_daemon_args="--user ${user} --group ${group}"
+command_args="--daemon"
 
 depend() {
 	use net
 }
-
-start_post() {
-	ewaitfile 60 "${pidfile}"
-}