diff options
author | Ian Whyman <thev00d00@gentoo.org> | 2014-05-10 09:11:26 +0000 |
---|---|---|
committer | Ian Whyman <thev00d00@gentoo.org> | 2014-05-10 09:11:26 +0000 |
commit | b171c54a344fb81c125e2f20f1b156bbfdb6ec36 (patch) | |
tree | 74d671ee2a991a35bc3a123d0c11b5247d124e0d /x11-plugins/pidgin-sipe | |
parent | Version bump. (diff) | |
download | gentoo-2-b171c54a344fb81c125e2f20f1b156bbfdb6ec36.tar.gz gentoo-2-b171c54a344fb81c125e2f20f1b156bbfdb6ec36.tar.bz2 gentoo-2-b171c54a344fb81c125e2f20f1b156bbfdb6ec36.zip |
Version bump, thanks to Mark R. Pariente for the reminder in #509942
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-plugins/pidgin-sipe')
-rw-r--r-- | x11-plugins/pidgin-sipe/ChangeLog | 8 | ||||
-rw-r--r-- | x11-plugins/pidgin-sipe/pidgin-sipe-1.18.1.ebuild (renamed from x11-plugins/pidgin-sipe/pidgin-sipe-1.17.3.ebuild) | 19 |
2 files changed, 18 insertions, 9 deletions
diff --git a/x11-plugins/pidgin-sipe/ChangeLog b/x11-plugins/pidgin-sipe/ChangeLog index 28aa75bfb4e1..f2771db97286 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.29 2014/03/01 12:02:58 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.30 2014/05/10 09:11:26 thev00d00 Exp $ + +*pidgin-sipe-1.18.1 (10 May 2014) + + 10 May 2014; Ian Whyman <thev00d00@gentoo.org> +pidgin-sipe-1.18.1.ebuild, + -pidgin-sipe-1.17.3.ebuild: + Version bump, thanks to Mark R. Pariente for the reminder in #509942 01 Mar 2014; Pacho Ramos <pacho@gentoo.org> pidgin-sipe-1.18.0-r1.ebuild: x86 stable, bug #502212 diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.17.3.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.1.ebuild index 4da277b2c78c..c5b2fad905ee 100644 --- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.17.3.ebuild +++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.17.3.ebuild,v 1.1 2013/12/17 21:49:56 thev00d00 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.1.ebuild,v 1.1 2014/05/10 09:11:26 thev00d00 Exp $ EAPI=5 @@ -13,21 +13,23 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug kerberos ocs2005-message-hack telepathy voice" + +IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice" RDEPEND=">=dev-libs/gmime-2.4.16 dev-libs/libxml2 - dev-libs/nss + openssl? ( dev-libs/openssl ) + !openssl? ( dev-libs/nss ) kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 - >=net-im/pidgin-2.8.0[gnutls] + >=net-im/pidgin-2.8.0 ) !voice? ( >=dev-libs/glib-2.12.0:2 - net-im/pidgin[gnutls] + net-im/pidgin ) telepathy? ( >=sys-apps/dbus-1.1.0 @@ -43,7 +45,6 @@ DEPEND="dev-util/intltool " src_prepare() { - epatch "${FILESDIR}/${PN}-1.13.2-fix-sandbox-r1.patch" eautoreconf } @@ -55,7 +56,9 @@ src_configure() { $(use_enable debug) \ $(use_enable ocs2005-message-hack) \ $(use_with kerberos krb5) \ - $(use_with voice vv) + $(use_with voice vv) \ + $(use_enable !openssl nss) \ + $(use_enable openssl) } src_install() { |