Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

diff --git a/sys-auth/fingerprint-gui/ChangeLog b/sys-auth/fingerprint-gui/ChangeLog
index bbc4e1d6f355bf09b0ae1c36fcb619f69abf695c..e89cb981913d672bc143d1eb11ea46dbc21f17d4 100644 (file)
--- a/sys-auth/fingerprint-gui/ChangeLog
+++ b/sys-auth/fingerprint-gui/ChangeLog
@@ -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 <johu@gentoo.org> 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)
 

diff --git a/sys-auth/fingerprint-gui/Manifest b/sys-auth/fingerprint-gui/Manifest
index ff47c2a5eacf101bd4e59c01d321a5f2a19f70db..95ecd69d9803d5fa7802f351d2c93787415d81ad 100644 (file)
--- a/sys-auth/fingerprint-gui/Manifest
+++ b/sys-auth/fingerprint-gui/Manifest
@@ -3,14 +3,24 @@ Hash: SHA256
 
 AUX fingerprint-gui-1.04-unistd.patch 1667 SHA256 02620c0d8bc949342d4be91ef2fdc648d6b7c42ade1ad83805e01e344542e6cf SHA512 ea6f99ffc2e10d941af44b970b67c6758d31f36d67177f69b67f59bc02967a09ada9d4658ce2a7f3b3b1bf224910d787d16d8489469105957220ce60c5a363c9 WHIRLPOOL d29380dc90d6ac556e0a06961d9dffb5521587117ea573fd9cb83bfc5d567d4356c8167489c60e3c9e253f2ab86c294651f1248051d60ac3736ee65f9384fb56
 DIST fingerprint-gui-1.05.tar.gz 7001230 SHA256 4058ffa55de8ea346ae8747ec88828d2312656b3d8a54c57198b04e4032097db SHA512 6bf90dacb1e2b5f84fcded14a7b345cc613d09a886f1f103344caa00704e06f740af1ec3b9ae76f60a52e8330a68af63a035dbd53ab9a5bdce6521bcb5b3b6e8 WHIRLPOOL c0c8f5e3a87b0821aab23591ef25340cf1a1d3cde9d5e9ee2d716f600286c9eab909056021dda6e1ea7fe80731d9bf7bde437ddb406692ad1517050f1d647132
-EBUILD fingerprint-gui-1.05-r1.ebuild 2444 SHA256 50905bd5df4dca42dd7d12fcb1e63adb34c35eb8e306072a5c7fa14c5afc32b5 SHA512 b2b05c76586727da54ab5fbb12419c3542efc3440d8927f02797935d8be5452c2559bfb07be9e6f65f5cd6324ed022994778484f1f278126cbd30a7b369676dd WHIRLPOOL c331c13e4691382022734642e403cb6c96585089b1956444f668288064426243a7ab0ded6113c5bed537118c953b7fe0c4b6aac6af039a80aa5f1e3bb3d1c8d5
-EBUILD fingerprint-gui-1.05.ebuild 2153 SHA256 ea0240ef69c722f58ffe7621dd90e5513d4e0b05a0098d49d2e3f49a2b004850 SHA512 4a174690fb4a0db4efac8c671a1874f7ab15aa032c0870864d95d99ecdf5f24a986e80a06945b6b0be76ea34f146fb105644c606802c624c93272ed4d33d1dcb WHIRLPOOL 23108d8ff943d5aae9ac0dc7ff455952f87c134e21077474417f73f192098ee7b25597376fd04efa648c641092028a14f61624f77603743b8742abfa6ff12bcc
-MISC ChangeLog 1856 SHA256 ffc6c99918cec977decd8f512018e5869141005ee5eec492f2675dba1a32e3c1 SHA512 4b5a953da499d58fcf87f4a75cbd4261a97bd65e4cd8c49459bae39e59820115790ee3019ee7c3c3f6ecae5ec199e21a6523f18c42cffc88457dcf081a0873e3 WHIRLPOOL 4c30171ed044a0b4ebf2d5c985faf507b15e589edc5faa40788fc48bdc302a6ca8689bc9492869b4614c5e10151708c852d7d31953bc5586a27be8a1c7d732c7
+EBUILD fingerprint-gui-1.05-r1.ebuild 2488 SHA256 887169754521a4cd3254673c7a679790b6e66ecb454fe9eed2477885aa187de8 SHA512 18f736fd4b3b39e74684507bf623b2e81acfe681f909e721dc577ba0e85ba45a757367c60361fd0a2c5aeee6c28e2478b1b03933d027c0d55dcc37c7bd3e2e20 WHIRLPOOL 443b96fc0ad57d0a3622b88b5bd26a5340770a4f501193327744a0d356a7461a1e5c80ddebfabaff12d6bc6a009fa194c4a90c294d37c0739f2ff90b68fa7f10
+EBUILD fingerprint-gui-1.05.ebuild 2191 SHA256 41d7674fcf3113761cd240369d1c4c6dd8114b9b740bb40f23be8e74c72071b6 SHA512 9f4d987955df4568d660ca8bae97a5d61828176d35d715c4666ef87829b9c142197476c0b12f4bf9172aa73b3534652a1453a44a395240000105dc5d0d6bc354 WHIRLPOOL c38165697c3510766c8d785470711bec9d11367a6b63b51f0cdf79c8eab21c1df3abd5dd14ecf9639ef10a20ed6c93874d53722d5409364a1f0edaa0586fa313
+MISC ChangeLog 2040 SHA256 349540a97b23c7038ddab1d00a66df11e36d5cd64735b913ef255e8d10a2e809 SHA512 120a141647baeb00244d7edfceadc49852074158cdb50d6a0c793d512628a23516e7dee33d199ac706dbbede14908403dea932e40a43dc2f28486e5420f755fb WHIRLPOOL e7e511ea3314ba413105618ec924a884afb65c724590a7b30e84b9e930f853764afb023df62174112b7d790837048298a463fe00ad81de82ef9716bfdb3447e4
 MISC metadata.xml 330 SHA256 31500978cd7c73c82bf5442ee004433de86a8ba8f27353afe52c54707428fe62 SHA512 611f15046fc9268e3a05e960d557ab10f42c6b429e6bd19d8638dda5540af70ac2f853c8ad85cabee1d4cc4dc525fea6b4d8dd4ce1b7d91927e43765105dc144 WHIRLPOOL 7374cdf4adadff8480aacf7bbdee8c0117e9a20ed5ea8e68d5fe552183a45ad3dfd8226454dc915b8510f4e1babd81c549e30c3da65d73ae49681ff4d933c902
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlH1W30ACgkQknrdDGLu8JC58QD6A3a3jwJeeKpsdHJv84b3Kx9p
-cRR03jrKPNUDtOLUOPwA/1IZmx2TBpyUF3yVx+WG9vGaXyL2XFPTwajReqzdk8Le
-=irEl
+iQIcBAEBCAAGBQJUyZEfAAoJEGVpnaTzz9K9Zf0P/RSf1/sgGIr2lu2xfuLIHMTa
+6THH7jNK7pGTPWa59Z/Z4UvRM7fpPCA2HXrBz1elGY10Sp/VfsfPEFvSn/4E0pKF
+FGYcX179pXmH17Sz5nB/HGCe3PbMoAMJrGn6uiJzzV96zp9wcN42r/A/PLe3pmhe
+WIEylD83nXtzJQsB6aBehsbAgOcvZVdzzdTOMw8c0xl2XyuzXvKQ/4a/UIII3rJS
+8UpFdrV2dnVkip+WBm2RyONoAYtpbcJH9KNDVIa1/O8Iikqe7HRarLg+UEkT6xVp
+YneQyq0dO9XJEDz1fy0zScN4Bylu9PiBs2125WtOtye9+Q5dS+XAKVv6ufGHcOV+
+MpT7z6TiK6PDgOM2IzW87/FHAEN02rd8aw3odKYtJqVEUzUgZKmVar6l7OZFHHy0
+ROMHBdBlxl5ywT6b8Ls4Ab0mKffM0PG8HZNM+GTbokRQj99t9SMBD1tlw4Bert6S
+fUNmZ3/JZXDEgfyXyDRG6hthOThaQ8kn+3f7+HODIuMWwAyaLkCkg5rb+/PTU0Xc
+9RPCm6bsi7oNn2xSqXkAYJvxbDs/3Lthf/EdKUSVEQGtP2N2dltwpGeMRf5JZ07I
+AV+sLYmihZAWtB5wGLQQztMmPDqblHFQdrT9691eUXfDbHVqlEL5qfJd0hBe/Q0a
+OCoRjGhkW7M09oXpJOUR
+=hrH6
 -----END PGP SIGNATURE-----

diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
index 7a2619566fbb7f7ddba89d3ec9a47082f98f6a1b..6a6ae677017a3c32bcc396cf99d4341a6df7c5cf 100644 (file)
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
+++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
@@ -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 @@ SLOT="0"
 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.*"

diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild
index 933319d4f76c08682bf11fe687299549ad4dfeb4..92f55e7948ca3db09e6ace93bf52a02d283021dc 100644 (file)
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild
+++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild
@@ -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 @@ SLOT="0"
 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.*"