Gentoo Archives: gentoo-commits

From: Alexys Jacob <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/ultrabug:master commit in: dev-libs/libcouchbase/
Date: Wed, 01 Apr 2015 16:37:50
Message-Id: 1427905992.8ff9d74d630b36900e29ac821c4245e2d554a836.ultrabug@gentoo
1 commit: 8ff9d74d630b36900e29ac821c4245e2d554a836
2 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 1 16:33:12 2015 +0000
4 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 1 16:33:12 2015 +0000
6 URL: https://gitweb.gentoo.org/dev/ultrabug.git/commit/?id=8ff9d74d
7
8 version bump, libcouchbase
9
10 dev-libs/libcouchbase/Manifest | 4 ++--
11 ...base-2.2.0.ebuild => libcouchbase-2.4.8.ebuild} | 28 +++++++---------------
12 2 files changed, 10 insertions(+), 22 deletions(-)
13
14 diff --git a/dev-libs/libcouchbase/Manifest b/dev-libs/libcouchbase/Manifest
15 index dfcf574..f9e5fe6 100644
16 --- a/dev-libs/libcouchbase/Manifest
17 +++ b/dev-libs/libcouchbase/Manifest
18 @@ -1,2 +1,2 @@
19 -DIST libcouchbase-2.2.0.tar.gz 830548 SHA256 d4ac43e7539316249b2d42b93f67e4b8a83b5be75f791d3c58cb88fbb4b67c67 SHA512 a9a654f66d7a95d6592b657900d25bb4dd116ba202da9eebad0de1731b3eaf62658b1c44ca24b5d9949d554f6f09291254e360d552f300f9ddf74706fe2b07dc WHIRLPOOL 8dbbe007a05ac63b6f1f0618626ebe68002f2c9e6addfecd48d2e230310be5a8d779b53f2d4c2c1011e569a5e76eb187c1741dc7a62f8ffce202b4295eb018c7
20 -EBUILD libcouchbase-2.2.0.ebuild 898 SHA256 74bcbe8e2efbe1f72007aaaf4d669c249a6dd6d24c6f1b7bad4356b4887496ad SHA512 0c01a5efaf30aff5e6b8c0639203be1696ff9738ccb1368ea8a26996c306c5a91dc17037033a2a9be95d369cd6386c408518a5879ed7804fc85794e6d84952c2 WHIRLPOOL 7b66c0a2e3effc685b0750af8ac9960d6c0640072d37bb698b569bcb52828d97b3c63ae7b7cf82a50e6fafc4715faf115dd22d3d07a6501214ebad07721c80d3
21 +DIST libcouchbase-2.4.8.tar.gz 995938 SHA256 10a5ff50608364b02201f79d5713f628f11de485ab212f54b4306f432b1cef21 SHA512 6d681a76a2aaf2abbcf5e5e493ff04397507999cd14fa0c5740d7efd1eac8ca58e4a5c610e346c208370b10e0523ee2402b8d16250c82c39160da581bb569ae1 WHIRLPOOL ac6e3a9621dd6fb9bd9a5924f2e90defbc265a1be1de903dd5d2f2b0e2c809ce86bf2a9a351e7dff61c902e443b69fc5dcc95b53ecad5d3a2237a5749094c36f
22 +EBUILD libcouchbase-2.4.8.ebuild 702 SHA256 812b86a1d412b03a7d9b3d68e563812761421296aa15e146245a25ae497a8609 SHA512 5839d77a83dd77b605c4d30e768f6aa7255da3900be7100a0085dec7f3f7b1f7e847f9dec2f84df2ecf26a96265afa87eae3df7473128d2706a15c065300ef3b WHIRLPOOL 82421384da6d237c62b8abe96a18b116dfd2a1ba2fe162ac991f533539eb50c7a3011bb21b775933cf23c2bc20702ecdf47cf87d7823ebe8fcad59cc434d274d
23
24 diff --git a/dev-libs/libcouchbase/libcouchbase-2.2.0.ebuild b/dev-libs/libcouchbase/libcouchbase-2.4.8.ebuild
25 similarity index 52%
26 rename from dev-libs/libcouchbase/libcouchbase-2.2.0.ebuild
27 rename to dev-libs/libcouchbase/libcouchbase-2.4.8.ebuild
28 index 1e07302..df13a23 100644
29 --- a/dev-libs/libcouchbase/libcouchbase-2.2.0.ebuild
30 +++ b/dev-libs/libcouchbase/libcouchbase-2.4.8.ebuild
31 @@ -4,9 +4,7 @@
32
33 EAPI=5
34
35 -AUTOTOOLS_AUTORECONF=yes
36 -
37 -inherit autotools-utils
38 +inherit cmake-utils
39
40 DESCRIPTION="Couchbase C Client Library"
41 HOMEPAGE="http://www.couchbase.com/communities/c-client-library"
42 @@ -15,28 +13,18 @@ SRC_URI="http://packages.couchbase.com/clients/c/${P}.tar.gz"
43 LICENSE="Apache-2.0"
44 SLOT="0"
45 KEYWORDS="~amd64 ~x86"
46 -IUSE="doc static-libs tools"
47 +IUSE="doc ssl static-libs"
48
49 -# tests fails to build
50 +# tests fails to build ?
51 RESTRICT="test"
52
53 -RDEPEND=">=dev-libs/libevent-1.4.13"
54 +RDEPEND=">=dev-util/cmake-2.8.9
55 + >=dev-libs/libevent-1.4.13
56 + ssl? ( >=dev-libs/openssl-1.0.1g:= )"
57 DEPEND="${RDEPEND}"
58
59 -# building in a separate dir fails
60 -AUTOTOOLS_IN_SOURCE_BUILD=1
61 -
62 -src_configure() {
63 - local myeconfargs=(
64 - $(use_enable tools)
65 - )
66 - autotools-utils_src_configure
67 -}
68 -
69 src_install() {
70 - default
71 - use doc || rm -rf "${D}"/usr/share/doc
72 + cmake-utils_src_install
73 + use doc || rm -rf "${D}"/usr/share
74 use static-libs || find "${D}" -type f -name "*.la" -delete
75 - use tools || rm -rf "${D}"/usr/share/man
76 - rmdir "${D}"/usr/share 2>/dev/null
77 }