Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: net-im/nheko/
Date: Sat, 10 Apr 2021 10:07:26
Message-Id: 1617986110.3b913fd5b389640fd84fa371698fa112cc026450.andrewammerlaan@gentoo
1 commit: 3b913fd5b389640fd84fa371698fa112cc026450
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Fri Apr 9 16:35:10 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Fri Apr 9 16:35:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3b913fd5
7
8 net-im/nheko: Fix dependencies.
9
10 dev-libs/tweeny and dev-db/lmdb++ are build-time dependencies.
11
12 There are 2 incompatible repositories for lmdb++. The old one is
13 <https://github.com/drycpp/lmdbxx> and the new one is
14 <https://github.com/hoytech/lmdbxx>.
15
16 <=net-im/nheko-0.8.1 needs the old one. dev-db/lmdb++-0.9.14.0 installs
17 the old one. dev-db/lmdb++-1.0.0 installs the new one.
18 >net-im/nheko-0.8.1 will need the new one. So the version pinning will
19 go away in the ebuild for the next version.
20
21 Closes: https://bugs.gentoo.org/781662
22
23 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
24
25 net-im/nheko/nheko-0.8.0.ebuild | 4 ++--
26 net-im/nheko/nheko-0.8.1.ebuild | 4 ++--
27 2 files changed, 4 insertions(+), 4 deletions(-)
28
29 diff --git a/net-im/nheko/nheko-0.8.0.ebuild b/net-im/nheko/nheko-0.8.0.ebuild
30 index ba84dfd69..1d9735f03 100644
31 --- a/net-im/nheko/nheko-0.8.0.ebuild
32 +++ b/net-im/nheko/nheko-0.8.0.ebuild
33 @@ -21,8 +21,6 @@ RDEPEND="
34 dev-qt/qtsvg:5
35 dev-qt/qtconcurrent:5
36 app-text/cmark
37 - dev-libs/tweeny
38 - dev-db/lmdb++
39 >=dev-libs/mtxclient-0.4.0
40 dev-cpp/nlohmann_json
41 dev-libs/qtkeychain
42 @@ -30,6 +28,8 @@ RDEPEND="
43 DEPEND="
44 ${RDEPEND}
45 dev-libs/spdlog
46 + dev-libs/tweeny
47 + <dev-db/lmdb++-1.0.0
48 "
49 BDEPEND="dev-qt/linguist-tools:5"
50
51
52 diff --git a/net-im/nheko/nheko-0.8.1.ebuild b/net-im/nheko/nheko-0.8.1.ebuild
53 index a017628ce..07a8d5310 100644
54 --- a/net-im/nheko/nheko-0.8.1.ebuild
55 +++ b/net-im/nheko/nheko-0.8.1.ebuild
56 @@ -21,8 +21,6 @@ RDEPEND="
57 dev-qt/qtsvg:5
58 dev-qt/qtconcurrent:5
59 app-text/cmark
60 - dev-libs/tweeny
61 - dev-db/lmdb++
62 >=dev-libs/mtxclient-0.4.1
63 dev-cpp/nlohmann_json
64 dev-libs/qtkeychain
65 @@ -30,6 +28,8 @@ RDEPEND="
66 DEPEND="
67 ${RDEPEND}
68 dev-libs/spdlog
69 + dev-libs/tweeny
70 + <dev-db/lmdb++-1.0.0
71 "
72 BDEPEND="dev-qt/linguist-tools:5"