[gentoo-commits] dev/ultrabug:master commit in: dev-db/couchbase-server-community/

[Alexys Jacob]

commit:     22ecba165c58f24cc8c25e460a322bbb3f6b2d27
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 11:31:07 2014 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 11:31:07 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=22ecba16

couchbase ebuild cosmetics

---
 dev-db/couchbase-server-community/Manifest                            | 2 +-
 .../couchbase-server-community-2.2.0.ebuild                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/couchbase-server-community/Manifest 
b/dev-db/couchbase-server-community/Manifest
index 68c00c6..f2c1730 100644
--- a/dev-db/couchbase-server-community/Manifest
+++ b/dev-db/couchbase-server-community/Manifest
@@ -1,4 +1,4 @@
 AUX couchbase-server 1416 SHA256 
54da50401e1a51c83f43f25cb8c1964fcd8683ec7e327687be1a85ce68766877 SHA512 
94d97674fb4c050d56a714a6bf0f62811ba4217bac765550fc9890d041c8e5b7a934fbded303bee28563c85971ca6ecac3f2bc7192c59ac12df67308341af127
 WHIRLPOOL 
ccb74197e03003c1bab9ecfb69f5c81c9eaa9d8712b1de3450c8cbe4af5b06afff2af33a91bd1ad9fbd47c0aeb9bdea8df6a3d9a6769c39752078a160cddbd1c
 DIST couchbase-server-community_2.2.0_x86.deb 135143596 SHA256 
8d00532af7f60963e8a3b8002731ddf2245eb1942381337377502bebe4e8b0b6 SHA512 
3b15fc496c225bd67f1592fb66e3febad6c04e929499db18a4ddc3e87eee6986836aeee6964e114f710f346102e8ed8aa93dad7b5136684dd1ea6e3a8e64ba5e
 WHIRLPOOL 
5b61bf14a01e9eb72e93f85c7e2882627c39c560c006823dbc0c4b22657d4456198633b16cd6e0da4aab02a49ffd3a7343666d4b796069d6052f93001978fbbe
 DIST couchbase-server-community_2.2.0_x86_64.deb 137295996 SHA256 
051b0905e13241de19fbd9efb1e22a421f33429a1db3e4b5e3ae8756b9e4d6a2 SHA512 
1001177631312f7dd75aa270e8eb32cfd076e9c6de42968619513f3adf640d1973120e3dded1e47b98cb47e25886111a9d1de29c6f405ffbbdae4e31d7225c67
 WHIRLPOOL 
caab764b78b6b8386267d91e1bd8cbc82741384e221f25e169cd11c498f8ed4c596b03d9873915d1d174d82e4d80110952d54e5bf3183b31aad58e699784d3c9
-EBUILD couchbase-server-community-2.2.0.ebuild 1572 SHA256 
b98d5747248195677cace727e73ce55659837206fc49a479c01761f52aad4423 SHA512 
b6a2ba265289f0083d6d27f7ad0e84ca28c3a534894e295b1803d013e1ba04fd95a907ffd19a77fa07f16d951487fc64d173be7affb2880ce3aaf39582c55724
 WHIRLPOOL 
67ea81a68c48d8a7f9e2e5808fa3e37c5ac4d5f857c2f94ccca55df4908919b613444553fa06be605443b9e1a71e30ca14f135896c0f0d539dd9aa4fb6eb1e48
+EBUILD couchbase-server-community-2.2.0.ebuild 1564 SHA256 
b619e36a46121f03f798bf4dba2626fca76c58f9ca50d3c3d430a070fad2a087 SHA512 
01b33eb26e5610006fb6c39afbe62225b0c076edae3b8c23194ad1cb90132036a78d8b8c45976d8c8c4e7b3ab66eb3710a41d20d1feed315b02e3f0609da2c54
 WHIRLPOOL 
9430e8281f46a7b8db85dd43d6a8079d1ac0e10a1bfed2838395c2b09ee07e6ce522ba909ceb87cd019d0439ebcf344e7c2d58daf0de149fe16b314fd997e9db

diff --git 
a/dev-db/couchbase-server-community/couchbase-server-community-2.2.0.ebuild 
b/dev-db/couchbase-server-community/couchbase-server-community-2.2.0.ebuild
index ff295f0..a90f555 100644
--- a/dev-db/couchbase-server-community/couchbase-server-community-2.2.0.ebuild
+++ b/dev-db/couchbase-server-community/couchbase-server-community-2.2.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=sys-libs/ncurses-5[tinfo]
                ~media-video/rtmpdump-2.3"
 DEPEND="${RDEPEND}"
 
-export CONFIG_PROTECT="${CONFIG_PROTECT} /opt/couchbase/var/lib/couchbase/"
+export CONFIG_PROTECT="${CONFIG_PROTECT} /opt/${PN}/var/lib/${PN}/"
 
 S=${WORKDIR}
 
@@ -42,10 +42,10 @@ src_unpack() {
 src_install() {
        # basic cleanup
        rm -rf opt/couchbase/etc/{couchbase_init.d,couchbase_init.d.tmpl,init.d}
+       find opt/couchbase/var/lib/couchbase/ -type f -delete || die
 
        # bin install / copy
        dodir /opt/couchbase
-       find opt/couchbase/var/lib/couchbase/ -type f -delete || die
        tar xfm opt/couchbase/lib/python/pysqlite2.tar -C 
opt/couchbase/lib/python || die
        cp -a opt/couchbase/* "${D}"/opt/couchbase/