[gentoo-commits] dev/ultrabug:master commit in: dev-db/aerospike-server-community/files/, app-admin/aerospike-amc-community/, ...

[gentoo-commits] dev/ultrabug:master commit in: dev-db/aerospike-server-community/files/, app-admin/aerospike-amc-community/, ...

[Alexys Jacob]

commit:     740792ee29d12fd0e830a0a3f36ccd8d1b083826
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 15 16:16:41 2015 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Apr 15 16:16:41 2015 +0000
URL:        https://gitweb.gentoo.org/dev/ultrabug.git/commit/?id=740792ee

remove bundled python libs, fix dependencies

 app-admin/aerospike-amc-community/Manifest                    |  4 ++--
 .../aerospike-amc-community-3.5.4.ebuild                      | 11 +++++++++--
 app-admin/aerospike-amc-community/files/amc.init              |  6 +-----
 dev-db/aerospike-server-community/Manifest                    |  2 +-
 dev-db/aerospike-server-community/files/aerospike.init        |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index 678de7d..c5776c3 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,3 +1,3 @@
-AUX amc.init 755 SHA256 57e36710051ac150c8bd880fdc1265dce7041f71bf14337d3d1f89e836f5309d SHA512 d049915eb1818ca831ddf4a73cbc2d10ed46ff9d43bd9bbf33788f75fb0c838229d8034c0904dc4088fa194533fd3b29af990ab2f44ef27aeae935a8b1666440 WHIRLPOOL 0044155f7a039a6615a262e41bef3593278aca8fc444e51ddf98c53a99066fdbe4ecb97b91f53eef6cdc266e9d2829dd997e5f94e3513b6fe5625735a48e95db
+AUX amc.init 675 SHA256 b96749bc87ff974de98c1e981189b319ec4a1e4b326426900c893662ff40f10d SHA512 8aff4f155bbdb8e8b5d60014d41ea7001fc562242c3011d9e44305ab4cb6089f19ec9c82fabdbaf13bfc991407431a35dfc112f04ab76d959b37da07edfbbd83 WHIRLPOOL 6604ef709911d1bdfbd084f082af87f899611aa796d19a71ce86d114041b0f474954cd01e1fe49416931527d214a1514ffa60a96a048725c97980f35b6822c7f
 DIST aerospike-amc-community-3.5.4.all.x86_64.deb 1414546 SHA256 0e055873632a278b5974b5db12c32a3912f2166ae1f0a7ed58271f9f4c19afc9 SHA512 aa092c43c5242129c7fb1a7f5c2fe09a98540d714f033a58cebcebaae34eab68f3e7b461cd049c2307a499e828c9252348cf832ce95355236e53c1e87628e4b8 WHIRLPOOL 0abd84dfc4fe841ea4c1053217088d499e32f440fc913d3fb4b3f8e00c78d2be590760b719e53989127a8739fb031e23c537a9ea5995732436014677f96dd10c
-EBUILD aerospike-amc-community-3.5.4.ebuild 1245 SHA256 a4576fee39ee81e8f1cde04bbf07f19152cffe613ccdef7d8a5d9299cdd50050 SHA512 8c75e687b1762b41e915ba0dd2327050ba0ea1f0d8f4aca76954bd275d8972b83e97950007e9b7ed52a0ab4116624c93a2d0a63fcb94774d7bedcd26feb594fe WHIRLPOOL 4161979548e96f3c22335e083975338588c3aa710475131b265974937d6a24b6d5393a690ed2c92f1c852b0fd55efde7e7e12bac679d02b6f48fded6e30832a6
+EBUILD aerospike-amc-community-3.5.4.ebuild 1416 SHA256 f438dc785637e046988c7dc62ce49b0bfa5db3a7a6273b34ee51d3d6d4a0fe2d SHA512 c81acdde91d49b50c3de7678a19d817655b965487c2aebbbdbf292adbe633323154cbdf2ea1c6b68a8317a555e7f439d85bb66ac3b11a18780eab7dce9bcffdf WHIRLPOOL 80ac916c732cfaa9f9957b4eeb19742e0d9e965c992616597035ac9c419883bed6344487e42be0c6479c733294a868ffbf82cd39a99a9b1ee76db8d7adeea307

diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.5.4.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.5.4.ebuild
index f491106..9d9a4d5 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.5.4.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.5.4.ebuild
@@ -14,7 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="app-crypt/gcr"
+RDEPEND="app-crypt/gcr
+	dev-python/eventlet
+	dev-python/flask
+	dev-python/greenlet
+	dev-python/setproctitle
+	www-servers/gunicorn"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -32,6 +37,9 @@ src_install() {
 	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
@@ -53,7 +61,6 @@ src_install() {
 	doins -r opt/amc/*
 
 	keepdir /var/log/amc
-	fperms +x /opt/amc/bin/gunicorn
 
 	newinitd "${FILESDIR}"/amc.init amc
 }

diff --git a/app-admin/aerospike-amc-community/files/amc.init b/app-admin/aerospike-amc-community/files/amc.init
index fbcc2ec..2fb535c 100755
--- a/app-admin/aerospike-amc-community/files/amc.init
+++ b/app-admin/aerospike-amc-community/files/amc.init
@@ -6,7 +6,7 @@
 config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
 run_dir=${run_dir:-/run}
 
-command="/opt/amc/bin/gunicorn"
+command="/usr/bin/gunicorn"
 command_args="--daemon --config ${config_file} flaskapp:app"
 command_background="true"
 pidfile=${run_dir}/${SVCNAME}.pid
@@ -19,10 +19,6 @@ depend() {
 	use net
 }
 
-start_pre() {
-	checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
-}
-
 start_post() {
 	ewaitfile 60 "${pidfile}"
 }

diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest
index e6a8c99..5999573 100644
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@@ -1,5 +1,5 @@
 AUX aerospike.conf 1265 SHA256 546cc602656e4889eb9ad201874d54356fdd3058e821a70bb803637a1c1575e2 SHA512 5d2b2a368bb31e8230d2f88073befbf5f1aa33aecc628b669e5714cfde71e83d53143b28c0ee95b52f13e84027283413927abd97470a97e36946cc05605b15ed WHIRLPOOL c67e134dde02d2c04e2fa9f118a84b448d9a8d2ff01d952283b7f14fad590cc0d10c23d0f6432849b37f313e2b52e6d4a9d6bbcb2824bba4c81f0c0aa0a73f9c
-AUX aerospike.init 1307 SHA256 cc89cd2ebdfb2d5a028b054af75d446d2636131ddabac6ec500b008fd2ae449b SHA512 765d315d64f77c3efaadba0b2734029cb727c9520cdb603c2c24b1dbc701a4c67f741977537a2ea0e5a18a2cba4d8b6ff65d919707ab6436608a231d2f05ed78 WHIRLPOOL 35ae7e66501f26f44e9650c34f5c017a1ab8838b1d17fc9b5a0a866ad9d760a1c62f26abbed0dd5b447675fbfc3c512f856510a018e9f7395c5a8c9b7354a0f8
+AUX aerospike.init 1307 SHA256 76840025b5ad07a891fb1fc4cbd41af1ae66d75e60d7417f0d9ff13cb983556d SHA512 6dc8365a24408e1a3b5e39ec10dac552eca1d7e63a9d1e0333f31bb8b5a35d9304ce4f8ba25264ae7f7b491fc9e5aa801a0d2f2ee35cbfee06e04727dbff5735 WHIRLPOOL 4b91e4709bb26a371bc3e61e00d8006418f0a9ec3b6ee5fbfcbf1908da097a624b80dfcc80682f928e9a6400f7e40e89d09ab974d658668e9d3f426398031382
 AUX aerospike.logrotate 191 SHA256 2984ecf6a19f08cea0ee4fdad725922f29b3b878df7478b6619f6b885263abb6 SHA512 4c014730ad2f829197f1a76912a1327586b36e5d4018a48ea1bbb7970698a5de94e98dbcd720b71656f7986fafa6fae5b9273b0f835d0cb33f3fcab5e57cbf70 WHIRLPOOL 9bd399d5c525280ad915d5725de6628d2fe46d163f62a611f601cd81edacb9686281cef66da38c20e315def6c3c78a1a61f5fb54cf3b87504db126e397369f73
 AUX aerospike_mesh.conf 1476 SHA256 27cd3b9304c5af4855ca1edea949b471e209d1402a27a15044b59f7329624572 SHA512 a7d5e52738a3153b649cc81d8a9b635b70fe21335802f5c2f348fe71f3b7087ea85aaf926c4ad3ce71514fa1b479f98bc27aadb95995a5bbb8808219bcbe28c4 WHIRLPOOL 27209abe9aae485e8a540dd6b4563d38c43d8e9a19f2c97e41ca7c995349b7c8f1abcef08e0a92f38431d4fe919838eb6442990201bd3506cc5126e37b92f2d1
 AUX aerospike_ssd.conf 1341 SHA256 11dbbffdea382e30d606c4564a577e0657f3ff87f37156f5169806d52acdb711 SHA512 0382842d4e7b20caaa4c39d999da0cd2b67c24bdd9fad6e5d2d393758b6f788decf0039ae9a262a4db7e89b358cbb9954efd082a15549d12e3e244b2c51675c9 WHIRLPOOL 2aa9230d6d1b477aad21b81f6760a915d15bbd51499512a618a1a0dd24342eb9ed0d46cbe0318885a6c446433bd009641adad5fa5e2fdf34e15138ffcabb1f84

diff --git a/dev-db/aerospike-server-community/files/aerospike.init b/dev-db/aerospike-server-community/files/aerospike.init
index 1188424..2baaca7 100755
--- a/dev-db/aerospike-server-community/files/aerospike.init
+++ b/dev-db/aerospike-server-community/files/aerospike.init
@@ -42,7 +42,7 @@ set_shmmax() {
 }
 
 start_pre() {
-	checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
+	checkpath -d -m 0755 -o "${user}":"${group}" "${run_dir}"
 	set_shmall
 	set_shmmax
 	ulimit -n 100000