summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2015-01-28 13:47:24 +0000
committerMichael Palimaka <kensington@gentoo.org>2015-01-28 13:47:24 +0000
commitc5c364729e847988959e691e1582f5010386b705 (patch)
treea83c2a66899299ac11003bb7823674c26e3c3196 /kde-misc
parentStable on alpha, bug 537936 (diff)
downloadhistorical-c5c364729e847988959e691e1582f5010386b705.tar.gz
historical-c5c364729e847988959e691e1582f5010386b705.tar.bz2
historical-c5c364729e847988959e691e1582f5010386b705.zip
Adjust app-crypt/qca dependencies to handle merged plugins wrt bug #537640.
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kdeconnect/ChangeLog7
-rw-r--r--kde-misc/kdeconnect/Manifest25
-rw-r--r--kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild8
3 files changed, 32 insertions, 8 deletions
diff --git a/kde-misc/kdeconnect/ChangeLog b/kde-misc/kdeconnect/ChangeLog
index 31cff32d8136..7464c7e0db98 100644
--- a/kde-misc/kdeconnect/ChangeLog
+++ b/kde-misc/kdeconnect/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-misc/kdeconnect
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/ChangeLog,v 1.11 2014/11/22 15:54:50 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/ChangeLog,v 1.12 2015/01/28 13:46:33 kensington Exp $
+
+ 28 Jan 2015; Michael Palimaka <kensington@gentoo.org> kdeconnect-0.7.3.ebuild:
+ Adjust app-crypt/qca dependencies to handle merged plugins wrt bug #537640.
22 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -kdeconnect-0.7.2.ebuild:
Cleanup old.
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index a12388c54d65..86f34590c740 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST kdeconnect-kde-0.7.3.tar.xz 133580 SHA256 e44d943b8d302dbfbe3c0164557f0100f696204beb96bde2ee5317bc0e0139ef SHA512 ea42d970afe6ee871560406f11375a2ee0b06c032a06fb3521eed30e4d6466f48f7c2ac8f5d35669f07f292b11f675537a1ae3054fa5031df8c57e51e2c78a88 WHIRLPOOL a75fd33e38c957bd1c1303292c2b2d1d7f850231aaad96c921ffd1054d6e9dee17345595263f7f4348abcee2a9bc43a60fc93c4f427a9491ab6d4009d9266c24
-EBUILD kdeconnect-0.7.3.ebuild 1336 SHA256 8d1cfee35436847b991716d788a804f14ab12010f29f31ea446031ca3873c008 SHA512 e6f76787242e345902d3ca662219dad46effdedb997672087c88ad9024e2f9124e4a8adfc71086ed20adf9d2e2eedc8774404af42fe546f8c3bd82044e9c734d WHIRLPOOL 144984a653c91f175281419533bbb244b6494d7958ab1c0c18e4423b8b7068ed73ab408f3998915f20bad1b159bc492d0e04ff774ddfe3b7ff8281ccc669a60b
-MISC ChangeLog 1842 SHA256 5d9c367e68684d607710733afaee7dd7ea04f3b51340fe65b3711f44abcd67aa SHA512 17dfb6a67b2ca041200fa9fbf92c96413003a76a3507d8b68fd70b3db3862fa9e8f193c99f798f98519b2fa61b3a04b510b9dbacfb4633c5685a775bac16f025 WHIRLPOOL ca82020482ccdbc0790a0a771ed3407c7d442b549a8694e9e70a5b38b66583538bc8251509b9922c1be1887fa6fbaccd5ba13610cee3ddfa5e3cb66676b90478
+EBUILD kdeconnect-0.7.3.ebuild 1381 SHA256 c6a2c2687b1c5ce354ea5bb3c76bbb87061e6f7811040788cac00a7869031a4d SHA512 cc601787550dc48b13580813d72269cc147c8fc2357ad83b6a4f4fe6ac1597c2184e45fed7f6f00f57325a790195950bb0efc8bf5d7add3ee61db6b02ad61593 WHIRLPOOL 4d6fdfb2f493aadd672ee9b221be28ae39fa39ebb88cdccfc57955c91dff31d59903dd5aa67d52112eec2996ccb65a1c8140e7cf621b12d77ae67fcea6334b42
+MISC ChangeLog 2007 SHA256 246031ceace018a05f67d789cb19ea2d62564480398e4b39b690b983437e399c SHA512 d7c6472fc68bfd50de16329a8bdc4d12e0ea1340dfd0ece476690be4b5a7a3dab32839348e137402828a696fc7402121c2b4f7c04e9a7bf2e04ee5380ef5e163 WHIRLPOOL cbf581239b6cb92132bda49c08e6e3d15e0a206c036574c8393ced45808f895ec7fcb045c2a1f45dc8fd5b2a687cb9557e3f2d1d87a4f7e4eb0b9d47d30c1659
MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJiBAEBCABMBQJUyOhgRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7FjcEAC0Su50JJs0VJnn9K26xYtwLDQ/1l3nqwRDuEbXOsxShrQ1hmRWc03ATy/X
+YeKn1Xh5+LLoKqg/UYu6oMNw4nmHKNzCMTIbuw6JPJXk4W9+YQNrNwQe4t48eouh
+e7kyaGjPS0Gy0aUQfBJz8Yl1qLOAzuUwKO1WGGK0Zep7AHD3zT4xHS33UQeDB7OW
+kiUmpR8Tou2pER68tOIHvyTBwA9Y2l5k46rg+szSgRfN68O9WMu6qQLwxCckjtNh
+lpGkzdlxeiSBepfUcM9bw77lIblQCDSxb2jlGuK3dIRPLpBMcJM+ZqbMcYd2u7qO
+LHn/GYdrCiplIpm21KPujBBnBoR8mSYzZnN6iUARxTpBOYO6DtGRM/lvn7glQUYU
+MZHSJRILerWKlhQt6r3ThOiMz5Vpg9VHiXPAnD/o0lYwjFgsKh4FBEWvaWxRwvUW
+/rpQ+HvhWdwDVZFIGJzZhKaOSUE5Xn89XSEjeu7+TKwCZotSxFiHZ/RNUz7JWz3w
+zi6oe8lyG/I8C7oH+LWs3/XfPJsDz8FPYpjiykH+LKu/LkWQU8TacUkFD5tVjY6Y
+siQk/K1kGRmMsMvQKYvOxHQkUXMguU6zn7c7wMxfoFjxj1qFyyLBrusNQ9EvvOVn
+lG5nsJovXqKQLOHubX6xmdoyZBbyeRTW79aWE/vxX55LMC0QxA==
+=qWJh
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild b/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild
index 447682dec874..f71ed0586eb0 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild
@@ -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/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild,v 1.2 2014/10/15 19:37:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild,v 1.3 2015/01/28 13:46:33 kensington Exp $
EAPI=5
@@ -27,13 +27,13 @@ SLOT="4"
IUSE="debug"
DEPEND="
- app-crypt/qca:2
+ app-crypt/qca:2[qt4(+)]
dev-libs/qjson
x11-libs/libfakekey
"
RDEPEND="${DEPEND}
$(add_kdebase_dep plasma-workspace)
- app-crypt/qca-ossl:2
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
net-dns/avahi
"