mgorny      15/02/22 18:41:23

  Modified:             quassel-0.10.0-r1.ebuild quassel-0.10.1.ebuild
                        quassel-0.11.0.ebuild quassel-9999.ebuild
                        quassel-0.9.2.ebuild quassel-0.9.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.7                  net-irc/quassel/quassel-0.10.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild?r1=1.6&r2=1.7

Index: quassel-0.10.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quassel-0.10.0-r1.ebuild    29 Jan 2015 01:35:36 -0000      1.6
+++ quassel-0.10.0-r1.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/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 
1.6 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 
1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -20,10 +20,7 @@
 
 SERVER_RDEPEND="
        dev-qt/qtscript:4
-       crypt? (
-               app-crypt/qca:2[qt4(+)]
-               || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-       )
+       crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
        !postgres? ( dev-qt/qtsql:4[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        postgres? ( dev-qt/qtsql:4[postgres] )
        syslog? ( virtual/logger )



1.4                  net-irc/quassel/quassel-0.10.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild?rev=1.4&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild?rev=1.4&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild?r1=1.3&r2=1.4

Index: quassel-0.10.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quassel-0.10.1.ebuild       29 Jan 2015 01:35:36 -0000      1.3
+++ quassel-0.10.1.ebuild       22 Feb 2015 18:41:23 -0000      1.4
@@ -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/net-irc/quassel/quassel-0.10.1.ebuild,v 1.3 
2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v 1.4 
2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -20,10 +20,7 @@
 
 SERVER_RDEPEND="
        dev-qt/qtscript:4
-       crypt? (
-               app-crypt/qca:2[qt4(+)]
-               || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-       )
+       crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
        !postgres? ( dev-qt/qtsql:4[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        postgres? ( dev-qt/qtsql:4[postgres] )
        syslog? ( virtual/logger )



1.6                  net-irc/quassel/quassel-0.11.0.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild?r1=1.5&r2=1.6

Index: quassel-0.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quassel-0.11.0.ebuild       29 Jan 2015 01:35:36 -0000      1.5
+++ quassel-0.11.0.ebuild       22 Feb 2015 18:41:23 -0000      1.6
@@ -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/net-irc/quassel/quassel-0.11.0.ebuild,v 1.5 
2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v 1.6 
2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -26,10 +26,7 @@
        )
        !qt5? (
                dev-qt/qtscript:4
-               crypt? (
-                       app-crypt/qca:2[qt4(+)]
-                       || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-               )
+               crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
                postgres? ( dev-qt/qtsql:4[postgres] )
                !postgres? ( dev-qt/qtsql:4[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        )



1.80                 net-irc/quassel/quassel-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.80&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.80&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.79&r2=1.80

Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- quassel-9999.ebuild 16 Feb 2015 22:01:22 -0000      1.79
+++ quassel-9999.ebuild 22 Feb 2015 18:41:23 -0000      1.80
@@ -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/net-irc/quassel/quassel-9999.ebuild,v 1.79 
2015/02/16 22:01:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.80 
2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -27,10 +27,7 @@
        )
        !qt5? (
                dev-qt/qtscript:4
-               crypt? (
-                       app-crypt/qca:2[qt4(+)]
-                       || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-               )
+               crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
                postgres? ( dev-qt/qtsql:4[postgres] )
                !postgres? ( dev-qt/qtsql:4[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        )



1.11                 net-irc/quassel/quassel-0.9.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild?r1=1.10&r2=1.11

Index: quassel-0.9.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quassel-0.9.2.ebuild        29 Jan 2015 01:35:36 -0000      1.10
+++ quassel-0.9.2.ebuild        22 Feb 2015 18:41:23 -0000      1.11
@@ -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/net-irc/quassel/quassel-0.9.2.ebuild,v 1.10 
2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v 1.11 
2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=4
 
@@ -24,10 +24,7 @@
 
 SERVER_RDEPEND="
        >=dev-qt/qtscript-${QT_MINIMAL}:4
-       crypt? (
-               app-crypt/qca:2[qt4(+)]
-               || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-       )
+       crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
        !postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
        syslog? ( virtual/logger )



1.8                  net-irc/quassel/quassel-0.9.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild?rev=1.8&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild?rev=1.8&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild?r1=1.7&r2=1.8

Index: quassel-0.9.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quassel-0.9.3.ebuild        29 Jan 2015 01:35:36 -0000      1.7
+++ quassel-0.9.3.ebuild        22 Feb 2015 18:41:23 -0000      1.8
@@ -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/net-irc/quassel/quassel-0.9.3.ebuild,v 1.7 
2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v 1.8 
2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -24,10 +24,7 @@
 
 SERVER_RDEPEND="
        >=dev-qt/qtscript-${QT_MINIMAL}:4
-       crypt? (
-               app-crypt/qca:2[qt4(+)]
-               || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-       )
+       crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
        !postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
        syslog? ( virtual/logger )



1.190                net-irc/quassel/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.190&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.190&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.189&r2=1.190

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- ChangeLog   16 Feb 2015 22:01:22 -0000      1.189
+++ ChangeLog   22 Feb 2015 18:41:23 -0000      1.190
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.189 
2015/02/16 22:01:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.190 
2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <[email protected]> quassel-0.10.0-r1.ebuild,
+  quassel-0.10.1.ebuild, quassel-0.11.0.ebuild, quassel-0.9.2.ebuild,
+  quassel-0.9.3.ebuild, quassel-9999.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.
 
   16 Feb 2015; Johannes Huber <[email protected]> quassel-9999.ebuild:
   Update dependencies for Qt5 based kde support.




Reply via email to