[gentoo-commits] dev/ultrabug:master commit in: sys-cluster/zookeeper/

[Alexys Jacob]

commit:     37336af62c6b9effc9657db5e898de52863c616f
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 15:45:19 2014 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 15:45:19 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=37336af6

add python client bindings to zookeeper

---
 sys-cluster/zookeeper/Manifest               |  2 +-
 sys-cluster/zookeeper/zookeeper-3.4.5.ebuild | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/zookeeper/Manifest b/sys-cluster/zookeeper/Manifest
index 9d88921..6d5059a 100644
--- a/sys-cluster/zookeeper/Manifest
+++ b/sys-cluster/zookeeper/Manifest
@@ -2,4 +2,4 @@ AUX log4j.properties 2191 SHA256 
bf9df5ca06d8ffd2c11b13f2ea0b78879afab7d05cb2d48
 AUX zookeeper.confd 390 SHA256 
12c202a8891a44ac7c19e619320339345f5b2ec0033736601dd334adcd78b472 SHA512 
c6b75ce741603e4c2df7dba93fb6207a5955e7bb231ca9098172c17753b8f87a0af2106d4676420d44e6099053f05086bc84c7966b6fe0f9da6e8a541fccf80e
 WHIRLPOOL 
662648c34c14ad9b58c05c8d1264d3c7fc5b8124f923cdcd09b4c3f2825ad84652e1816d0ed320d894a1cdbba9e64e577a41179a107c7cff14fb440147f2e760
 AUX zookeeper.initd 385 SHA256 
b654d3e19f72b72652523cecc46fdfecc0e209ee454bfe132fff114294bd453b SHA512 
2b18a2f4bae64c2e6c80168c6f02036d9bc6115aba2a94c219fbb20f3808a6c64c493dac552f189d54e7c8b4006dd1c0964dcb1f2cdb7a78222a17400b3de153
 WHIRLPOOL 
129df8d2a0bc946f78d99e843f5c616395a25e1dbc7b4b4a05c987ddfb946ba083f15dbb547752a21d4cc3888ff65d3e90699f8626a5f46be4c6eaac31a18216
 DIST zookeeper-3.4.5.tar.gz 16402010 SHA256 
e92b634e99db0414c6642f6014506cc22eefbea42cc912b57d7d0527fb7db132 SHA512 
525fbb2af52c06823b6bedaefeb718df6090a3775ead06f3ff1f54b1b3cb752286f568a91b3188444cbdfe26ad8b931e0663cb08b27f23b4e83e8a3cfb6e88a7
 WHIRLPOOL 
344ea06625f46ef216df93e29d653e8fb0100e83e977c50b59691e30803b0e2d632ba44a1e63f2d82689ddfadba3d6aafce37cd260559185416040bc80f903fa
-EBUILD zookeeper-3.4.5.ebuild 1637 SHA256 
39db3a921354579f63e005c4abb7cb581d4f331b8901cdd5c6d9de70d4c1914d SHA512 
5b7301d1c8636d73ae851ffc19b3183202e74a8324a7f6d8f3397d39d51e8fe818a319207e80d63ab012be710f5a80800bf6182745236b48834bb3a5815a9c6b
 WHIRLPOOL 
1247aceab99a9cac23ca15f55cd29333e7cfe4f009ddb3d598b2fcf58631e682d3f447eddfc37fab5d073b03bb15c795188f3a6958176a480d4113c7e12cee8c
+EBUILD zookeeper-3.4.5.ebuild 1986 SHA256 
2a8c3fdedcab95499f091fb3413d8e0b79556019b7b450109846d6625f67be5c SHA512 
918dfcc519b527915dcd6f6ae6eec9c40717e019bf8c8217864ac72873af8193753f06940920dbe6405123127a2b4369670495e49b01f0ecbfbe2c929b838a9a
 WHIRLPOOL 
9610a88b9c794306814638143e5bc43014c20bd4ffd79fc95d2ff730278f489da4b544f123e2b2d3793f30ef2d3436bbfb750f3cd86b21af5177fa8c449eca85

diff --git a/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild 
b/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
index 7375a2a..521872a 100644
--- a/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
+++ b/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
@@ -3,8 +3,9 @@
 # $Header: $
 
 EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
 
-inherit eutils java-utils-2 user autotools
+inherit autotools distutils-r1 eutils java-utils-2 user
 
 DESCRIPTION="ZooKeeper is a high-performance coordination service for 
distributed applications."
 HOMEPAGE="http://zookeeper.apache.org/";
@@ -27,6 +28,13 @@ pkg_setup() {
        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
@@ -40,10 +48,18 @@ src_compile() {
 src_install() {
        local DATA_DIR=/var/lib/${PN}
 
+       # C client
        cd "${S}"/src/c || die
        emake DESTDIR="${D}" install
        cd "${S}" || die
 
+       # python
+       cd ${S}/contrib/zkpython/ || die
+       mv src/python/setup.py .
+       mv src/c/* .
+       python_foreach_impl distutils-r1_src_install
+       cd -
+
        # cleanup sources
        rm -rf src/ || die
        rm bin/*.cmd || die
@@ -53,7 +69,7 @@ src_install() {
        cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
 
        dodir "${INSTALL_DIR}"
-       mv "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+       cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
 
        # data dir perms
        fowners zookeeper:zookeeper "${DATA_DIR}"