mgorny 15/02/22 18:41:23
Modified: kopete-4.14.3-r1.ebuild kopete-4.14.3.ebuild
ChangeLog
Log:
Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
unconditionally, to provide a single sane path for dependency resolution. Bug
#541066.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.3 kde-base/kopete/kopete-4.14.3-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild?r1=1.2&r2=1.3
Index: kopete-4.14.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kopete-4.14.3-r1.ebuild 11 Feb 2015 03:35:17 -0000 1.2
+++ kopete-4.14.3-r1.ebuild 22 Feb 2015 18:41:23 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild,v
1.2 2015/02/11 03:35:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild,v
1.3 2015/02/22 18:41:23 mgorny Exp $
EAPI=5
@@ -108,7 +108,7 @@
virtual/latex-base
)
sms? ( app-mobilephone/smssend )
- ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+ ssl? ( app-crypt/qca:2[openssl] )
winpopup? ( net-fs/samba )
"
# telepathy? ( net-libs/decibel )"
@@ -158,9 +158,9 @@
if ! use ssl; then
if use xmpp ; then # || use irc; then
- if ! has_version app-crypt/qca-ossl ; then
+ if ! has_version "app-crypt/qca:2[openssl]" ; then
elog "In order to use ssl in xmpp you'll need
to"
- elog "install app-crypt/qca-ossl package."
+ elog "install app-crypt/qca package with
USE=openssl."
fi
fi
fi
1.7 kde-base/kopete/kopete-4.14.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?r1=1.6&r2=1.7
Index: kopete-4.14.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kopete-4.14.3.ebuild 17 Feb 2015 11:06:45 -0000 1.6
+++ kopete-4.14.3.ebuild 22 Feb 2015 18:41:23 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.6
2015/02/17 11:06:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.7
2015/02/22 18:41:23 mgorny Exp $
EAPI=5
@@ -100,7 +100,7 @@
virtual/latex-base
)
sms? ( app-mobilephone/smssend )
- ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+ ssl? ( app-crypt/qca:2[openssl] )
winpopup? ( net-fs/samba )
"
# telepathy? ( net-libs/decibel )"
@@ -149,9 +149,9 @@
if ! use ssl; then
if use xmpp ; then # || use irc; then
- if ! has_version app-crypt/qca-ossl ; then
+ if ! has_version "app-crypt/qca:2[openssl]" ; then
elog "In order to use ssl in xmpp you'll need
to"
- elog "install app-crypt/qca-ossl package."
+ elog "install app-crypt/qca package with
USE=openssl."
fi
fi
fi
1.458 kde-base/kopete/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?rev=1.458&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?rev=1.458&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?r1=1.457&r2=1.458
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- ChangeLog 18 Feb 2015 22:36:15 -0000 1.457
+++ ChangeLog 22 Feb 2015 18:41:23 -0000 1.458
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/kopete
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.457
2015/02/18 22:36:15 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.458
2015/02/22 18:41:23 mgorny Exp $
+
+ 22 Feb 2015; Michał Górny <[email protected]> kopete-4.14.3-r1.ebuild,
+ kopete-4.14.3.ebuild:
+ Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+ unconditionally, to provide a single sane path for dependency resolution. Bug
+ #541066.
18 Feb 2015; Johannes Huber <[email protected]> metadata.xml:
Cleanup metadata.xml
