1 |
commit: ef740ee83434961ac37faaa65b116d3927f55609 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 26 17:04:08 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 26 17:04:08 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef740ee8 |
7 |
|
8 |
net-im/climm: Remove support for non-existent deps |
9 |
|
10 |
net-im/climm/climm-0.7.1.ebuild | 7 +++---- |
11 |
net-im/climm/metadata.xml | 3 --- |
12 |
profiles/base/package.use.mask | 4 ---- |
13 |
3 files changed, 3 insertions(+), 11 deletions(-) |
14 |
|
15 |
diff --git a/net-im/climm/climm-0.7.1.ebuild b/net-im/climm/climm-0.7.1.ebuild |
16 |
index 7d80236c015..02d797c7d53 100644 |
17 |
--- a/net-im/climm/climm-0.7.1.ebuild |
18 |
+++ b/net-im/climm/climm-0.7.1.ebuild |
19 |
@@ -10,7 +10,7 @@ SRC_URI="http://www.climm.org/source/${P}.tgz" |
20 |
LICENSE="GPL-2" |
21 |
SLOT="0" |
22 |
KEYWORDS="amd64 x86" |
23 |
-IUSE="xmpp gnutls otr tcl ssl" |
24 |
+IUSE="xmpp gnutls tcl ssl" |
25 |
|
26 |
# In case user don't need xmpp there is a choice gnutls/openssl. Since xmpp |
27 |
# requires gnutls then without explicit request to use gnutls (USE=gnutls) |
28 |
@@ -31,8 +31,7 @@ RDEPEND=" |
29 |
) |
30 |
!gnutls? ( dev-libs/openssl ) |
31 |
) |
32 |
- tcl? ( dev-lang/tcl:0 ) |
33 |
- otr? ( <net-libs/libotr-4 )" |
34 |
+ tcl? ( dev-lang/tcl:0 )" |
35 |
DEPEND="${RDEPEND} |
36 |
ssl? ( gnutls? ( virtual/pkgconfig ) )" |
37 |
|
38 |
@@ -52,7 +51,7 @@ src_configure() { |
39 |
|
40 |
econf \ |
41 |
$(use_enable xmpp) \ |
42 |
- $(use_enable otr) \ |
43 |
+ --disable-otr \ |
44 |
$(use_enable tcl) \ |
45 |
${myconf} |
46 |
} |
47 |
|
48 |
diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml |
49 |
index cba43c0e5a3..6f49eba8f49 100644 |
50 |
--- a/net-im/climm/metadata.xml |
51 |
+++ b/net-im/climm/metadata.xml |
52 |
@@ -2,7 +2,4 @@ |
53 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
54 |
<pkgmetadata> |
55 |
<!-- maintainer-needed --> |
56 |
-<use> |
57 |
- <flag name="otr">Enable encrypted conversations</flag> |
58 |
-</use> |
59 |
</pkgmetadata> |
60 |
|
61 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
62 |
index 95f4acc7076..00a5b5c5df8 100644 |
63 |
--- a/profiles/base/package.use.mask |
64 |
+++ b/profiles/base/package.use.mask |
65 |
@@ -362,10 +362,6 @@ mail-client/thunderbird system-cairo |
66 |
# you're doing. This has upstream's approval. |
67 |
dev-java/icedtea cacao jamvm |
68 |
|
69 |
-# Lars Wendler <polynomial-c@g.o> (20 Mar 2016) |
70 |
-# Need vulnerable libotr version (see bug #576914). |
71 |
-=net-im/climm-0.7.1 otr |
72 |
- |
73 |
# Patrice Clement <monsieurp@g.o> (27 Nov 2015) |
74 |
# Unsastified dependencies are upsetting repoman. Needs investigation. |
75 |
app-arch/cfv bittorrent |