summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Whyman <thev00d00@gentoo.org>2014-02-01 15:25:09 +0000
committerIan Whyman <thev00d00@gentoo.org>2014-02-01 15:25:09 +0000
commit9be61155cb5a0505472d255fa00e9b44fbae994e (patch)
tree258bd78ebf8ff7908114d451d868447a7e5d97c6 /x11-plugins/pidgin-sipe
parentrevbump ebuilds to support multilib-build, changes reviewed by aballier (diff)
downloadgentoo-2-9be61155cb5a0505472d255fa00e9b44fbae994e.tar.gz
gentoo-2-9be61155cb5a0505472d255fa00e9b44fbae994e.tar.bz2
gentoo-2-9be61155cb5a0505472d255fa00e9b44fbae994e.zip
Drop required use and default to nss
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-plugins/pidgin-sipe')
-rw-r--r--x11-plugins/pidgin-sipe/ChangeLog8
-rw-r--r--x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0-r1.ebuild (renamed from x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0.ebuild)11
2 files changed, 12 insertions, 7 deletions
diff --git a/x11-plugins/pidgin-sipe/ChangeLog b/x11-plugins/pidgin-sipe/ChangeLog
index 67c60622322a..5bd13ff8b7bf 100644
--- a/x11-plugins/pidgin-sipe/ChangeLog
+++ b/x11-plugins/pidgin-sipe/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-plugins/pidgin-sipe
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.26 2014/01/30 22:09:01 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.27 2014/02/01 15:25:09 thev00d00 Exp $
+
+*pidgin-sipe-1.18.0-r1 (01 Feb 2014)
+
+ 01 Feb 2014; Ian Whyman <thev00d00@gentoo.org> +pidgin-sipe-1.18.0-r1.ebuild,
+ -pidgin-sipe-1.18.0.ebuild:
+ Drop required use and default to nss
*pidgin-sipe-1.18.0 (30 Jan 2014)
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0-r1.ebuild
index c014f765f5ae..2b0bf66b2a4b 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0.ebuild,v 1.1 2014/01/30 22:09:01 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0-r1.ebuild,v 1.1 2014/02/01 15:25:09 thev00d00 Exp $
EAPI=5
@@ -14,13 +14,12 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos nss ocs2005-message-hack openssl telepathy voice"
-REQUIRED_USE="^^ ( openssl nss )"
+IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
RDEPEND=">=dev-libs/gmime-2.4.16
dev-libs/libxml2
- nss? ( dev-libs/nss )
openssl? ( dev-libs/openssl )
+ !openssl? ( dev-libs/nss )
kerberos? ( virtual/krb5 )
voice? (
>=dev-libs/glib-2.28.0
@@ -59,8 +58,8 @@ src_configure() {
$(use_enable ocs2005-message-hack) \
$(use_with kerberos krb5) \
$(use_with voice vv) \
- $(use_enable openssl) \
- $(use_enable nss)
+ $(use_enable !openssl nss) \
+ $(use_enable openssl)
}
src_install() {