commit: 40e2e58044a0354b4386daea5774d167ed1e18ef
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 11:18:20 2014 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 11:18:20 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=40e2e580
make sure we dont overwrite couchbase config and data on reinstall
---
dev-db/couchbase-server-community/Manifest | 2 +-
.../couchbase-server-community/couchbase-server-community-2.2.0.ebuild | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-db/couchbase-server-community/Manifest
b/dev-db/couchbase-server-community/Manifest
index 9df839e..68c00c6 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 1500 SHA256
140e9fa05388dfa03f91977569489d5ae54623682fa5748508449ebce305c196 SHA512
44e7c1bc461a9f92ef30b3d245624e98b702fdde9e96ab4f27091b11899e5ae503fed327bbead91155015769a5f18bc0f1e6c0245bf89dad4e07e2b8431e2b1a
WHIRLPOOL
9d96adb7ca16d538113ee53cd2888ec291f83ffe0cc3be09e077a787aa31250e2b830e7cfef2f7c8f3c47cedf440ada7a7185b6b2dc6b4f1dfd9e21cbe47f6bc
+EBUILD couchbase-server-community-2.2.0.ebuild 1572 SHA256
b98d5747248195677cace727e73ce55659837206fc49a479c01761f52aad4423 SHA512
b6a2ba265289f0083d6d27f7ad0e84ca28c3a534894e295b1803d013e1ba04fd95a907ffd19a77fa07f16d951487fc64d173be7affb2880ce3aaf39582c55724
WHIRLPOOL
67ea81a68c48d8a7f9e2e5808fa3e37c5ac4d5f857c2f94ccca55df4908919b613444553fa06be605443b9e1a71e30ca14f135896c0f0d539dd9aa4fb6eb1e48
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 3ba6c24..ff295f0 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/"
+export CONFIG_PROTECT="${CONFIG_PROTECT} /opt/couchbase/var/lib/couchbase/"
S=${WORKDIR}
@@ -45,6 +45,7 @@ src_install() {
# 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/
