summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-08-26 19:04:08 +0200
committerMichał Górny <mgorny@gentoo.org>2018-08-26 19:04:08 +0200
commitef740ee83434961ac37faaa65b116d3927f55609 (patch)
tree17c6f31800e02ce9c017e16cac25b4da450a25a9
parentnet-fs/smbtad: Remove support for non-existent deps (diff)
downloadgentoo-ef740ee8.tar.gz
gentoo-ef740ee8.tar.bz2
gentoo-ef740ee8.zip
net-im/climm: Remove support for non-existent deps
-rw-r--r--net-im/climm/climm-0.7.1.ebuild7
-rw-r--r--net-im/climm/metadata.xml3
-rw-r--r--profiles/base/package.use.mask4
3 files changed, 3 insertions, 11 deletions
diff --git a/net-im/climm/climm-0.7.1.ebuild b/net-im/climm/climm-0.7.1.ebuild
index 7d80236c0153..02d797c7d539 100644
--- a/net-im/climm/climm-0.7.1.ebuild
+++ b/net-im/climm/climm-0.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.climm.org/source/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="xmpp gnutls otr tcl ssl"
+IUSE="xmpp gnutls tcl ssl"
# In case user don't need xmpp there is a choice gnutls/openssl. Since xmpp
# requires gnutls then without explicit request to use gnutls (USE=gnutls)
@@ -31,8 +31,7 @@ RDEPEND="
)
!gnutls? ( dev-libs/openssl )
)
- tcl? ( dev-lang/tcl:0 )
- otr? ( <net-libs/libotr-4 )"
+ tcl? ( dev-lang/tcl:0 )"
DEPEND="${RDEPEND}
ssl? ( gnutls? ( virtual/pkgconfig ) )"
@@ -52,7 +51,7 @@ src_configure() {
econf \
$(use_enable xmpp) \
- $(use_enable otr) \
+ --disable-otr \
$(use_enable tcl) \
${myconf}
}
diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml
index cba43c0e5a33..6f49eba8f496 100644
--- a/net-im/climm/metadata.xml
+++ b/net-im/climm/metadata.xml
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
-<use>
- <flag name="otr">Enable encrypted conversations</flag>
-</use>
</pkgmetadata>
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 95f4acc70762..00a5b5c5df89 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -362,10 +362,6 @@ mail-client/thunderbird system-cairo
# you're doing. This has upstream's approval.
dev-java/icedtea cacao jamvm
-# Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2016)
-# Need vulnerable libotr version (see bug #576914).
-=net-im/climm-0.7.1 otr
-
# Patrice Clement <monsieurp@gentoo.org> (27 Nov 2015)
# Unsastified dependencies are upsetting repoman. Needs investigation.
app-arch/cfv bittorrent