johu        15/01/29 01:47:10

  Modified:             fingerprint-gui-1.05-r1.ebuild
                        fingerprint-gui-1.05.ebuild ChangeLog
  Log:
  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
F3CFD2BD)

Revision  Changes    Path
1.2                  sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild?r1=1.1&r2=1.2

Index: fingerprint-gui-1.05-r1.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fingerprint-gui-1.05-r1.ebuild      28 Jul 2013 17:57:14 -0000      1.1
+++ fingerprint-gui-1.05-r1.ebuild      29 Jan 2015 01:47:10 -0000      1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v
 1.1 2013/07/28 17:57:14 xmw Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v
 1.2 2015/01/29 01:47:10 johu Exp $
 
 EAPI=5
 
@@ -15,15 +15,15 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="+upekbsapi"
 
-RDEPEND="app-crypt/qca
-       app-crypt/qca-ossl
+DEPEND="app-crypt/qca:2[qt4(+)]
+       || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
        sys-auth/libfprint
        sys-auth/polkit-qt
        sys-libs/pam
        x11-libs/libfakekey
        dev-qt/qtcore:4
        !sys-auth/thinkfinger"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 QA_SONAME="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
 QA_PRESTRIPPED="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"



1.2                  sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild?r1=1.1&r2=1.2

Index: fingerprint-gui-1.05.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fingerprint-gui-1.05.ebuild 7 Jul 2013 09:36:09 -0000       1.1
+++ fingerprint-gui-1.05.ebuild 29 Jan 2015 01:47:10 -0000      1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild,v 
1.1 2013/07/07 09:36:09 maksbotan Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild,v 
1.2 2015/01/29 01:47:10 johu Exp $
 
 EAPI=4
 
@@ -15,15 +15,15 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="+upekbsapi"
 
-RDEPEND="app-crypt/qca
-       app-crypt/qca-ossl
+DEPEND="app-crypt/qca:2[qt4(+)]
+       || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
        sys-auth/libfprint
        sys-auth/polkit-qt
        sys-libs/pam
        x11-libs/libfakekey
        dev-qt/qtcore:4
        !sys-auth/thinkfinger"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 QA_SONAME="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
 QA_PRESTRIPPED="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"



1.9                  sys-auth/fingerprint-gui/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog?rev=1.9&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog?rev=1.9&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog   28 Jul 2013 17:57:14 -0000      1.8
+++ ChangeLog   29 Jan 2015 01:47:10 -0000      1.9
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/fingerprint-gui
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.8 
2013/07/28 17:57:14 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.9 
2015/01/29 01:47:10 johu Exp $
+
+  29 Jan 2015; Johannes Huber <[email protected]> fingerprint-gui-1.05-r1.ebuild,
+  fingerprint-gui-1.05.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
 *fingerprint-gui-1.05-r1 (28 Jul 2013)
 




Reply via email to