public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-irc/quassel: quassel-0.10.1.ebuild quassel-0.10.0-r1.ebuild quassel-9999.ebuild quassel-0.9.2.ebuild quassel-0.9.3.ebuild quassel-0.11.0.ebuild ChangeLog
@ 2015-01-29  1:35 Johannes Huber (johu)
  0 siblings, 0 replies; only message in thread
From: Johannes Huber (johu) @ 2015-01-29  1:35 UTC (permalink / raw
  To: gentoo-commits

johu        15/01/29 01:35:36

  Modified:             quassel-0.10.1.ebuild quassel-0.10.0-r1.ebuild
                        quassel-9999.ebuild quassel-0.9.2.ebuild
                        quassel-0.9.3.ebuild quassel-0.11.0.ebuild
                        ChangeLog
  Log:
  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug #537994.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

Revision  Changes    Path
1.3                  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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild?r1=1.2&r2=1.3

Index: quassel-0.10.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quassel-0.10.1.ebuild	31 Dec 2014 13:40:29 -0000	1.2
+++ quassel-0.10.1.ebuild	29 Jan 2015 01:35:36 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.2 2014/12/31 13:40:29 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v 1.3 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -21,8 +21,8 @@
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
 	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+		app-crypt/qca:2[qt4(+)]
+		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	)
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )



1.6                  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.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild?r1=1.5&r2=1.6

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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quassel-0.10.0-r1.ebuild	31 Dec 2014 13:40:29 -0000	1.5
+++ quassel-0.10.0-r1.ebuild	29 Jan 2015 01:35:36 -0000	1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.5 2014/12/31 13:40:29 kensington Exp $
+# $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 $
 
 EAPI=5
 
@@ -21,8 +21,8 @@
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
 	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+		app-crypt/qca:2[qt4(+)]
+		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	)
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )



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

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

Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- quassel-9999.ebuild	31 Dec 2014 12:42:10 -0000	1.75
+++ quassel-9999.ebuild	29 Jan 2015 01:35:36 -0000	1.76
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.75 2014/12/31 12:42:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.76 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -27,8 +27,8 @@
 	!qt5? (
 		dev-qt/qtscript:4
 		crypt? (
-			app-crypt/qca:2
-			app-crypt/qca-ossl
+			app-crypt/qca:2[qt4(+)]
+			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 		)
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )



1.10                 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.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild?r1=1.9&r2=1.10

Index: quassel-0.9.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- quassel-0.9.2.ebuild	31 Dec 2014 13:40:29 -0000	1.9
+++ quassel-0.9.2.ebuild	29 Jan 2015 01:35:36 -0000	1.10
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.9 2014/12/31 13:40:29 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v 1.10 2015/01/29 01:35:36 johu Exp $
 
 EAPI=4
 
@@ -25,8 +25,8 @@
 SERVER_RDEPEND="
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
 	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+		app-crypt/qca:2[qt4(+)]
+		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	)
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )



1.7                  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.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild?r1=1.6&r2=1.7

Index: quassel-0.9.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quassel-0.9.3.ebuild	31 Dec 2014 13:40:29 -0000	1.6
+++ quassel-0.9.3.ebuild	29 Jan 2015 01:35:36 -0000	1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.6 2014/12/31 13:40:29 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v 1.7 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -25,8 +25,8 @@
 SERVER_RDEPEND="
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
 	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+		app-crypt/qca:2[qt4(+)]
+		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	)
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )



1.5                  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.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild?r1=1.4&r2=1.5

Index: quassel-0.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- quassel-0.11.0.ebuild	31 Dec 2014 12:42:10 -0000	1.4
+++ quassel-0.11.0.ebuild	29 Jan 2015 01:35:36 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.4 2014/12/31 12:42:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v 1.5 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -27,8 +27,8 @@
 	!qt5? (
 		dev-qt/qtscript:4
 		crypt? (
-			app-crypt/qca:2
-			app-crypt/qca-ossl
+			app-crypt/qca:2[qt4(+)]
+			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 		)
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )



1.185                net-irc/quassel/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- ChangeLog	31 Dec 2014 13:40:29 -0000	1.184
+++ ChangeLog	29 Jan 2015 01:35:36 -0000	1.185
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/quassel
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.184 2014/12/31 13:40:29 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.185 2015/01/29 01:35:36 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> 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:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug
+  #537994.
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org>
   quassel-0.10.0-r1.ebuild, quassel-0.10.1.ebuild, quassel-0.9.2.ebuild,





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-01-29  1:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-29  1:35 [gentoo-commits] gentoo-x86 commit in net-irc/quassel: quassel-0.10.1.ebuild quassel-0.10.0-r1.ebuild quassel-9999.ebuild quassel-0.9.2.ebuild quassel-0.9.3.ebuild quassel-0.11.0.ebuild ChangeLog Johannes Huber (johu)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox