From d01f0e98bbadb1f03d31d4c8a03f52a190fcd406 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 22 Feb 2015 18:41:39 +0000 Subject: [PATCH] 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. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- kde-base/kdeplasma-addons/ChangeLog | 7 +++- kde-base/kdeplasma-addons/Manifest | 32 +++++++------- .../kdeplasma-addons-4.14.3.ebuild | 4 +- kde-base/kopete/ChangeLog | 8 +++- kde-base/kopete/Manifest | 34 ++++++++------- kde-base/kopete/kopete-4.14.3-r1.ebuild | 8 ++-- kde-base/kopete/kopete-4.14.3.ebuild | 8 ++-- kde-misc/kdeconnect/ChangeLog | 8 +++- kde-misc/kdeconnect/Manifest | 37 ++++++++-------- kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild | 4 +- kde-misc/kdeconnect/kdeconnect-0.8.ebuild | 4 +- media-sound/tomahawk/ChangeLog | 8 +++- media-sound/tomahawk/Manifest | 34 ++++++++------- media-sound/tomahawk/tomahawk-0.8.2.ebuild | 4 +- media-sound/tomahawk/tomahawk-9999.ebuild | 4 +- net-im/dianara/ChangeLog | 7 +++- net-im/dianara/Manifest | 32 +++++++------- net-im/dianara/dianara-1.2.4.ebuild | 4 +- net-im/kadu/ChangeLog | 7 +++- net-im/kadu/Manifest | 32 +++++++------- net-im/kadu/kadu-0.12.3.ebuild | 4 +- net-im/ktp-auth-handler/ChangeLog | 7 +++- net-im/ktp-auth-handler/Manifest | 32 +++++++------- .../ktp-auth-handler-0.9.0.ebuild | 4 +- net-im/psi/ChangeLog | 8 +++- net-im/psi/Manifest | 36 ++++++++-------- net-im/psi/psi-0.14-r4.ebuild | 8 ++-- net-im/psi/psi-0.15.ebuild | 8 ++-- net-im/psi/psi-9999.ebuild | 8 ++-- net-im/qutim/ChangeLog | 8 +++- net-im/qutim/Manifest | 34 ++++++++------- net-im/qutim/qutim-0.3.1-r1.ebuild | 6 +-- net-im/qutim/qutim-0.3.2.ebuild | 6 +-- net-irc/konversation/ChangeLog | 7 +++- net-irc/konversation/Manifest | 32 +++++++------- .../konversation/konversation-1.5.1.ebuild | 4 +- net-irc/quassel/ChangeLog | 9 +++- net-irc/quassel/Manifest | 42 ++++++++++--------- net-irc/quassel/quassel-0.10.0-r1.ebuild | 7 +--- net-irc/quassel/quassel-0.10.1.ebuild | 7 +--- net-irc/quassel/quassel-0.11.0.ebuild | 7 +--- net-irc/quassel/quassel-0.9.2.ebuild | 7 +--- net-irc/quassel/quassel-0.9.3.ebuild | 7 +--- net-irc/quassel/quassel-9999.ebuild | 7 +--- sys-auth/fingerprint-gui/ChangeLog | 8 +++- sys-auth/fingerprint-gui/Manifest | 34 ++++++++------- .../fingerprint-gui-1.05-r1.ebuild | 5 +-- .../fingerprint-gui-1.05.ebuild | 5 +-- 48 files changed, 356 insertions(+), 287 deletions(-) diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog index 7a1d7a9fb970..4e1c54ecfd74 100644 --- a/kde-base/kdeplasma-addons/ChangeLog +++ b/kde-base/kdeplasma-addons/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdeplasma-addons # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.274 2015/02/18 16:26:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.275 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny kdeplasma-addons-4.14.3.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. 18 Feb 2015; Michał Górny -kdeplasma-addons-4.12.5.ebuild: Remove KDE SC 4.12 diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest index 00e7d5299057..b072d843a9cd 100644 --- a/kde-base/kdeplasma-addons/Manifest +++ b/kde-base/kdeplasma-addons/Manifest @@ -2,25 +2,25 @@ Hash: SHA256 DIST kdeplasma-addons-4.14.3.tar.xz 1791328 SHA256 12d58e30362729473db208c0650676dac0fdae8b3f223ce92e8df41e3e928f24 SHA512 e4382aa1aab27ddcdecdd53ca0d931b9d53d27dfe4b53736642e1e030ac940ee6909029d7ddb865ee13567facb4e380d3c23601b9ea985151fccba8860077925 WHIRLPOOL 13b3a9f6706bbdda6ab4010aedbb1da4f677de771e3bd5f7c6dc2074db413860ea26bbeae919b7927e31116f535f51ef67ada1d2aa3b368ca4df23f4146a4165 -EBUILD kdeplasma-addons-4.14.3.ebuild 1826 SHA256 ae356e84137b571dcd67d83d4d383285c79848795a7b54d2dd4749102b430a14 SHA512 19ee163d368762a484c967c6232050d5ad34b0555d84a2b6f75d95003c26cf29a5401794564aa4cd5ff656af865051a1cfb9c88a021fa3e32847eb9cfc6c3b89 WHIRLPOOL c252c2f8abc87f5524ebf6fd5fe863a9aa3e888e5eb4e64bb81c53964231e71e4291078043325d324d843d087d5bdc5521d836a09cb1915a5b4cfb8b9d66dac0 -MISC ChangeLog 37960 SHA256 c4e3e82bc290246c38af644eda7c9c52f9bce10b92df2b78ede5624833aa275b SHA512 646ef1ef6c274a11faab3676882648a0b5eb25cc05404f79e7b56bdaae52b6b522396a97563eed8590d39a5607decf134c91a8948254fedd9e5b03b388d0b560 WHIRLPOOL 4e6419d77a8cf584e730c57b91a6b9fbb0f32dfbfa4cd26d5474caad7f3b58735ab14d498351343f4a100d611138dbc18379b16a4f98dda298f635f7135fe935 +EBUILD kdeplasma-addons-4.14.3.ebuild 1801 SHA256 d3b75dd6818302a0cbf8c85c619f876cdd721aa3f165bf212f22d9dbf043a49d SHA512 41bedb160a18a08edcb780433c2ade7a8b90f9fca03a62dc1919fbc362457c1eeabe570ebe490dbfcfb73fa98c65f16e5b4cb602da19df0b06b1c161743f236a WHIRLPOOL ba6ebd972a92568e3787187757198e163ef4d9da6096747e86c877b602546e75baa43377752a41528a533178cfa58b95682376d8db72e8cf1ef7ba87a5dfe77a +MISC ChangeLog 38205 SHA256 ffd3d8a3699013607f96c4c23d31555f73fad8f458292aee38b8beecdda4fad4 SHA512 4a49c93cb06d60bbc00aa174fd119c44a95d7e1c240d0138a6b8cf494118670797fe971b84a4f25c03d606532255a236b65c97c9c69f7e80bdbcb22b83989bab WHIRLPOOL 3d300dccf2da95c15f33de4070d4c7670e20b43a1b13180afdb735e2f0c680cd6dcde4d98516bf5060792ea0cba9d167edf39fa2f0215b964f376acca7eab79b MISC metadata.xml 1085 SHA256 8aae2baceaced2ddd8220a4b45df6e7f064cac64e722eb64bbef0fd8c58a3b9d SHA512 b3411467a19bffaa0f8957e6ea7e8b6ab42173838e6df36818ef58668817d02a5206126bfda8e854b18ce6cf7dd88b359a8d961deeaac7f9396a3753e934aaff WHIRLPOOL 711eab4f22667e726919a7618de2bc7a48fa3eb2d26d6fc3f9da785898095f9a00fcf63118df2298a3a93d9b999d54373627a04f01111b0415183b34e892cc24 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJU5L1hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObM8QALEXFDNmwB5DNbJbN/uM42Fq -zHbMuANUPRvreCtC3Fs6ZOMblwyZHvl+WXLwCsIyR2bYWZua7QzNwqJp7JakhE18 -PZFMvp9r50p9UYEsdC8sIQIviR2ReZVEmsbmo2xUuElWZQO+JwpMlP5NzqqNkpPK -TGgZFqrHTMojtUSjvfCtcLqs91nLc5AQ12AyA0m7PEGZ2JCD0G3nriHIKZkmagh4 -hMjexajpnBfhHlW2rmBUjsMwLoZqtZEIU9Ol5nUUQBP+JFKQaimam+jPzpYObaYZ -aFLosHwQn1DNCz+fNip9D3yHkwyZ4nAtvbktVoPn9vaWbHRpYJi6uYUbFZjuTIjv -Me4NMWloDz0IBVM861sSL7PC+qPdv9mAEFj5ddWBHLopUZvbc+4QSYVcE//qU+iz -m8PJTSWXLuAiSzV9s6Dddt82B17+R45CioHGME2OE3wRndtbBQZWYlp3Y6r6lfF0 -u6dg9JaV03Wxd2HFb5LAeFDuE5JhLJDK9N680KEJPnbZ0HDAdRDeg0GsEpfmwZ1D -amAK9GPZNF8FwTvtxWAu/LEPjANTUBFqfyfkwQ/qrVUrLPa/ha/5QviQwNu9/OEV -gSMnf156naPO4oENUC9IrSjBpwAv5qtimQczsgKqyQ3UKRNx9MFE9kgKTLTCrmNI -xD12hurKqxdV52Cez092 -=4erU +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHuoP/jOytR1fuGsfDK2ojCpRUreD +ihixE/ptqyFtpWkQ8Hmnn5++SpBoBFeW9xZ0Fd3WMD2IX+Hna+aslD9H1oELdNJJ +QKe/wQWf7xtkXkvDyNn+XnoCGcZKssD6814/uISolz3xKUGM3EOMEJraa6EuD04D +MrgzPbSwl7DgggzUVR6CK8lpYHFFgNdSxLkLdYzlHY5qBRY+wMFrUbPxVP7U3ON9 +8OlbvvSkWLwxAsPCkkXJWK219NWD9tgTBjDG1Hq3pAi+4x+r0pz+jfucRftRttgT +htdhqiWQiCpGCH3PufW8VHofMTvJduVD9mYETbcs938W87XNQcv/iHkf8KAAalUk +2UTRS712mKsKPJm4+605kVNbutdWaT9uykrVkdre5eZj0I2kJ2uQc9BnFAj9pJUz +jhXz52i2jsQwPHtkLOn5llyl+k+/yxz2eQ9+6clVD8QZEVC+3PLaodZxANcjAlKr +K6Kg/NJoHjL4oldZKkh07LHhEGPjsvkumWIe/BC4IbG3FZs7WQxyWceTd6yDuJfK +fJGv5GQJE4WrFHWRBDxeu2mCdXU2rn+ADv9Uxip3mKkARzU6r/tWFbtzhAe0gWxe +v1aY49ohXtXIOFHp+1WifPz7LsXQezCoOCRgrh+KT/lzdK27+Oxt4gmloTfjV9it +r8OHqk3FdX2PqxNWRfHt +=OrAM -----END PGP SIGNATURE----- diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild index ea23fd5b3f4c..512f3b203cdf 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild @@ -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/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.6 2015/02/17 11:06:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND} dev-cpp/eigen:2 " RDEPEND="${COMMON_DEPEND} - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] " src_configure() { diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index fb2c3495cbe3..271801063c28 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kopete # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.457 2015/02/18 22:36:15 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.458 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny kopete-4.14.3-r1.ebuild, + kopete-4.14.3.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. 18 Feb 2015; Johannes Huber metadata.xml: Cleanup metadata.xml diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest index 507c24653827..fbee67de38fe 100644 --- a/kde-base/kopete/Manifest +++ b/kde-base/kopete/Manifest @@ -2,24 +2,26 @@ Hash: SHA256 DIST kopete-4.14.3.tar.xz 6317288 SHA256 ba23c6dea57233e0861865a1d76c356b0d3f7037f95e2166d0daef14e6c13845 SHA512 33a433da426e7a4a519f033bb14635f31c92954f8e6c46b41759f4e1e41197aed9d07894b163a1e484648ac0e9f92914afe20dfbaa8ddff56b8751d426afd9fc WHIRLPOOL 62d8df47f3214b8cf05fc9ffab3662cc10a1402fd2d33339adb91cd91651c2652dc1dd637130f9e77bf77825b23e19c813f5c43614160cd4dcec945c19e3542e -EBUILD kopete-4.14.3-r1.ebuild 4243 SHA256 fa229c7f45d093d1c1bb3608fb0140400e031f047f4af1803ef556513150e15e SHA512 9f8d65460ad3b6a4807fed74e974c452053e464866f4ca62a5ba93f1ddc2a9f592bcc1554b6f7b2403ea84def1b3c0520f0aa4f957ef1d63b11f8ff1ef5718d9 WHIRLPOOL 2240ad87640bd0b9617680dfe270d8887db39681486bdc78d90e8c8107f9d324658c1095d6eb894db1d79b55c8fe449ec3fe14bd28f110c9fe4276a9a210bc1a -EBUILD kopete-4.14.3.ebuild 4098 SHA256 c0de1946b0eb148c52f974710ceccb83472b6a1997d2fb6635c4835043e31dd4 SHA512 bc929ec02d6cf1a1761cf1ee31c61a119066b9949ab3c454341067ae641c42ddad4b4731eae9b77423a9a54cf9dd2fb8d8172698ea491baad88a3fbfc1385a2f WHIRLPOOL 79e64936fa3fcbbf32dfdc1a1819018cd0f6c6169562610c650f5a2d2d404e388f87a7da5be989b56513031a319c1fdf88912f1f826b8845867f6e4cb40cc17c -MISC ChangeLog 62193 SHA256 c5f198a6df17f38147872ac7cdd64fc3d586fa9e5a37c9c0b90b3e1d17550edd SHA512 2ef34fe126bff6608ac27d8a0dca757e265b87847f7d6f29c18e2136fdd19f3a0e4a051b0f54ed248f4e811872f78c9216e5ba442a9ba228f4fa9e8b9b00a8cc WHIRLPOOL 21cbf02f94bf3902ad65f8fec14d04b8e9e982204149de3545fbc4d97a36100c93843353fa1f95721bdbc6e2dd75eb4ff54c87bc624107170004c519fbad25bc +EBUILD kopete-4.14.3-r1.ebuild 4234 SHA256 d942980f22d3b77f0a2101ac49211f1bab6ea110a00239bee80a438a94c7eb2f SHA512 d1750f1cef64e2a19b352f183f02ddda25fcb8438211a82f04b07102e1f0c7fe7bca133b8683744021683853bffb9337d431d5d9a1e45393d281e2646ce9b3dc WHIRLPOOL 83f5469d152f7ada6e5d5d10c0af5e7fa5c4cf6b01a36ffb3be90235d5c3287295b90c7cc5d7992f320c58b5a612e868b0186e462682dc3386571d86a8232019 +EBUILD kopete-4.14.3.ebuild 4093 SHA256 65772788abd5e74c7e9fa69b436deace309fc93002a29781bc61eff3e9ca85cc SHA512 e7a9f3addff1d8ddb1ee202632de5eeef5336d612e93184f7b86ed12c891254a8592db82095862bff4df9b2d40c4b10ddd97656e147b92ff1126e09482693d54 WHIRLPOOL 7ca69974c4b48d5c876616c432de01b01c75f73d8e4e6b103f8720cbe70c6ba013189478f5d93ce10ee3b2f4233acf0d80bb740568886b97351540ab12af56e9 +MISC ChangeLog 62457 SHA256 1b38221c6b012c7b15b1d8f5db373b6aac5fdb1063ff2aea720a0dc67c57f125 SHA512 0693be43212d51a461cd78033bc1a25fa79839c6b54234dd76a77c299a7ea8e31edea1084d482924b749f61f922a92e324f55c0a7ac0eb1493a756d65e6b8c39 WHIRLPOOL fb4d8a57da577840a9b33b29bc6b2dab5f7c1ba6860a0c49208782f9f7b92e9f8818f9d6235266399f29107fa9c5b5f2af22f731d7aded5dead8159148d85068 MISC metadata.xml 2374 SHA256 d73201a3b2991d6bc67c6007b8893e51138e451f9c5f297696e03eb256976b79 SHA512 e13aec1cfd3c9c6367e898f0ce5f09d6bf6bfcb9db8dd3d1096f9065e3561124e88a4bce26cf6b95a71c37e3afd76a8da362b27ad75b46f3dc2ad1afd7320012 WHIRLPOOL f089b44618bfb9a97d5013fa89ecc19cef7353c6b173b8157bb85d130792d1dc9bb49f5302fa2e89163662bf3e5ef6a7f1650133f5e9e1d98b2a584bd463e2ff -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU5RPcAAoJEGVpnaTzz9K9dXoP/06DVAajkuEAZ5pF/L1QPslb -EpCyKutBtH13uVQHhlnkaB0YCVln4f4O7Ey/0d8Sv+AXjcaKJwjDun/wpl48rUJD -7JI6EX8bnLbST2SZPv54xT5y0+vZ5aBaGUSqPDbxNqpwlccQRW+706D5JYqLRWoi -AulxIyW9RNZXka0+p0iWrfUCuLPeDRhaR7g5BVJQrul6KLEA7DNLMQaGwFfqKWx6 -r1sBK+EKOh2mP4zqEI/2DGmoPvJSqkaPtDYOgpL/jcgSpxYSQMQ5VQLm8gsqsFss -rvuOD9W2anP3JMaj0vTRbsFf6NbSHgS1hNpSOPV48szR2qV4e0NmF2DjeVOdMroy -5mtlf+m4l5Tyr6+6xfx6eaWPdtCODqzudDjKlmBi0QAOKTyI552KOtK4bvNYpK0Q -tx38m1Z3AC2Z7R2VYcIWZKzAir6wEMi1ch7TR7La4O6FXR7m2Ku9mJt7Vjgk3olT -89N/Bq7FIVEj9PcZNN8DsB8TSQbD2gi/gvSvj+8Elz/oQADa11nJ0UWDn6QAN/Zh -aMK/U/8rJG+b/9FiPcFXpAt7X2F1ZBZc9R/Hyq/9WR9mk5QJt9IpO7zZCLRy+rjk -8GYCm1qozcbpwSE1rLtFBpVnRkraVFN64h3AwT7qgoy7USAbytI4bHuac8w0SUQ6 -P6ocPgLcMtd3fYk9XHBd -=Wi9L +iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7jMP/RW0K30SutsXAHNRdzdXY9Mt +1iiRhiBtMvqjGlrlbOqKvjtyEM8TjY+G+FvquJa0pNwsXrf6YN6ifnd1uYRqXz1i +nMbjQC9UWx/NzGmJ1JR5MGIdMwEN54rG0qrX40VLgj8GmsKSbRAk5GlJAz01scdq +9iuqsMG/pn7vyNP8M1MZPOxM38/oFsw9/l7rFBirGlso5Qu6crmLfsM4k2vAF3lE +JgNMnJvwNsaX11JLLY/YFHZPe1qUAV4giB+Y8f4IsHDVbf5NBGPXlPKk9FJonQrK +NHyl32j8fpZl8XtWKXB6l0ZJNiSZc4d9fy5Fg/5FuuR35/qf89wOFGZ8QPL7SPfV +diJWrtNHIn/A9so1sjC/aODIgRt7OOjUWSE6hG5dd8XGviS1POnYIlh+smLaypL2 +eB9BuMce0u/3+yymrrGBMo1WEjOH/nXLOpciIyRMy/z53J61kTQCcX2L/nVgaYR3 +2AWHOYbFDGlKN4SkIcu9M23sAbx2I1hFkD19KVNYAw130yXJDUPB4vevaH+86vpg +qFZ4qyDRIurE/AMnRvrYmyLKHAPLDBGPJtQbaqOeXPdsOt+GxU6P2nxM2n02Ffl2 +v/22U0wld64oDMEBRDPHcDiG9gL4cOKXb622ViAJ0vrdyAsrbPCDqTL0Wl2NXiqn +12o9Xg2MSlDcOWKO41l/ +=CuED -----END PGP SIGNATURE----- diff --git a/kde-base/kopete/kopete-4.14.3-r1.ebuild b/kde-base/kopete/kopete-4.14.3-r1.ebuild index c4162719efb9..290f9215e0f3 100644 --- a/kde-base/kopete/kopete-4.14.3-r1.ebuild +++ b/kde-base/kopete/kopete-4.14.3-r1.ebuild @@ -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/kde-base/kopete/kopete-4.14.3-r1.ebuild,v 1.2 2015/02/11 03:35:17 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -108,7 +108,7 @@ RDEPEND="${COMMONDEPEND} virtual/latex-base ) sms? ( app-mobilephone/smssend ) - ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + ssl? ( app-crypt/qca:2[openssl] ) winpopup? ( net-fs/samba ) " # telepathy? ( net-libs/decibel )" @@ -158,9 +158,9 @@ pkg_postinst() { if ! use ssl; then if use xmpp ; then # || use irc; then - if ! has_version app-crypt/qca-ossl ; then + if ! has_version "app-crypt/qca:2[openssl]" ; then elog "In order to use ssl in xmpp you'll need to" - elog "install app-crypt/qca-ossl package." + elog "install app-crypt/qca package with USE=openssl." fi fi fi diff --git a/kde-base/kopete/kopete-4.14.3.ebuild b/kde-base/kopete/kopete-4.14.3.ebuild index cd0a08e7c719..8222445070be 100644 --- a/kde-base/kopete/kopete-4.14.3.ebuild +++ b/kde-base/kopete/kopete-4.14.3.ebuild @@ -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/kde-base/kopete/kopete-4.14.3.ebuild,v 1.6 2015/02/17 11:06:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND} virtual/latex-base ) sms? ( app-mobilephone/smssend ) - ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + ssl? ( app-crypt/qca:2[openssl] ) winpopup? ( net-fs/samba ) " # telepathy? ( net-libs/decibel )" @@ -149,9 +149,9 @@ pkg_postinst() { if ! use ssl; then if use xmpp ; then # || use irc; then - if ! has_version app-crypt/qca-ossl ; then + if ! has_version "app-crypt/qca:2[openssl]" ; then elog "In order to use ssl in xmpp you'll need to" - elog "install app-crypt/qca-ossl package." + elog "install app-crypt/qca package with USE=openssl." fi fi fi diff --git a/kde-misc/kdeconnect/ChangeLog b/kde-misc/kdeconnect/ChangeLog index 1d4a45cb4e02..7becaa3aa7f5 100644 --- a/kde-misc/kdeconnect/ChangeLog +++ b/kde-misc/kdeconnect/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-misc/kdeconnect # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/ChangeLog,v 1.14 2015/02/21 08:03:41 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/ChangeLog,v 1.15 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny kdeconnect-0.7.3.ebuild, + kdeconnect-0.8.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. *kdeconnect-0.8 (21 Feb 2015) diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest index 923e18919e3a..2a9e37056ac5 100644 --- a/kde-misc/kdeconnect/Manifest +++ b/kde-misc/kdeconnect/Manifest @@ -3,25 +3,26 @@ Hash: SHA256 DIST kdeconnect-kde-0.7.3.tar.xz 133580 SHA256 e44d943b8d302dbfbe3c0164557f0100f696204beb96bde2ee5317bc0e0139ef SHA512 ea42d970afe6ee871560406f11375a2ee0b06c032a06fb3521eed30e4d6466f48f7c2ac8f5d35669f07f292b11f675537a1ae3054fa5031df8c57e51e2c78a88 WHIRLPOOL a75fd33e38c957bd1c1303292c2b2d1d7f850231aaad96c921ffd1054d6e9dee17345595263f7f4348abcee2a9bc43a60fc93c4f427a9491ab6d4009d9266c24 DIST kdeconnect-kde-0.8.tar.xz 141916 SHA256 c33611c076a327a67f9974ffa5662f2c093dda6ad14024e434027f9f19d9a0ab SHA512 7c7c460648960dde501596c85282eddd4d9add3b1be291b6d22a75f316cce6cdee0015d81b275eaa7c66758dcf16fa21da1be9b79f12b68c76bad343eef7250e WHIRLPOOL 0d302b4c6005100db9bc44ca590ee330bc6f432af02bfd1d2f27b367f38b6d4993828a3726c2bf3acaafcaa00c1724a9592ee8a652152f6b811923c351d3f499 -EBUILD kdeconnect-0.7.3.ebuild 1366 SHA256 2af6b86b612e72d748f7572bed42d47ead4fe137cf1c879a6b1514ec3ac82468 SHA512 9f601b307441f5cfb298b75174d221e9f98f7e354415758e4ec5899134cca9c0eb4f9bb2c5eaf152f376fa6055b15d9cc8e568649599582067151c8adc5aa43e WHIRLPOOL f9c5a3baf42b686b067d55b7f0847cef317798000661fd55593adc9ef65254e861db7ac22e61e7980da20cf307aeaae12ce9157c23dad1425093366a5e263579 -EBUILD kdeconnect-0.8.ebuild 1350 SHA256 b0ccd81ffc0c394970a7ce77e48bc27ff7423c76f89d7e278b31bd65653a9907 SHA512 f21836efe1c1998481770a9c834ca848af23334900af4885c0a1aa7c8ed08a9aa69a34b542407bedec1fdaa4a08fb4a27533175bd741dfa136ff36b2ec3e00a9 WHIRLPOOL ce898232157b762bbd89c5c0b6eed7df5bef4795fdb002bfe166f03df5cce10e05eb35357067a83dcf617aedf049f98b97331272a5b36cfbb4a47dfb556b9e70 -MISC ChangeLog 2292 SHA256 6a3653388bbf8fd80733195b340036b4b31811e9a871d44461ee5b6557b970be SHA512 73c9f9cf43f25e1c9adcd40d9f3b8331694517dd09e085309289626af9a7bec7f7e7eae17b3ea6b9b59c7fa25b7599f2584074e743a8339011a895a3287ccc3f WHIRLPOOL 0744aee327ca619e88eb7e11faa1dd489dea3681263a9e66b644385fa7c9f1f9812d8159689057593fddf5886d7738f3ffccfbd01ccf04dcb29d74886ae7a409 +EBUILD kdeconnect-0.7.3.ebuild 1334 SHA256 74422ad079460575bf9862579234e6c9ed8a3dfafa53b43b4984e9cafc35375f SHA512 5c032f26e8359046af5a48e2be9bd3e1675f85e18c255cbaa4ef7176a77013877d1231823826e92949015c03cd34718ea7a13727ecf3cbcd29e6700f2f264a77 WHIRLPOOL bf75687ff8bd1368452cdcff2db306c6db9e0dc87ad6f605512541ca6ce6661683177535bbf091464a6213da7e315424d55b8389fbe1287f3910392bf29cbc16 +EBUILD kdeconnect-0.8.ebuild 1318 SHA256 02cd5b032e506e491b4d787326fbe67946944ff698ee022a5193b2897783fdac SHA512 317b83f9667cc71ac9cd61b09cb23ca705532bf99be0d4a236d0784c5b10d7d3ecb2e7c68cd497641896f2350ee7bc0999c2c59a16c735e20cf0f2d56c8b8f34 WHIRLPOOL 97d8cacdc1b59b716778f24fd0d4824f0025b2ecc13d8673559e5de175eaf715ec0cb7a52103c4e3433e79ed65b3be066c2c5f8baf70f6df2e07209a07027985 +MISC ChangeLog 2551 SHA256 c17e6557049a9f9573fb366a1fa98e4c335949d9fafdf6b0f6c9aab03dfd9269 SHA512 e3d45b31172c0120808f898e2ede7128b8948583b71f731c711df09516ed3408d1a5ea69cf08bd55afde327700230d566c0809328ccf6d22d7b50637bf46f54f WHIRLPOOL f424200f18d562c23771eefee6cf07f431f5d23acb2a4ac3ee977d3fa0e5d8288ed193ed60ca098531bf8f7d928f01efbbc21e49a730b9b42c29231f1e331bbe MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJiBAEBCABMBQJU6DvfRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 -MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh -7FdIEADHNFIuVTue5TqPMzNU9AmZ04aJ1JJh++gK8YJt9vUpB00WPxK7PYl+gHpY -VvsDTmif/h/YJcWmmmUarcJJulZvl2MR+IkmHZlZm6B74pOWdbW7lVSr3N3bZ7hi -OIn28vX7QRq8EGHz/cOznIRijOa8Cfj+vKjum9k2uKLU8naK+VoZm3DMKcyIqDZb -WV0MDidny2/6RCuy++CNensChIVtzVGoITAGQVVCLbmv3agbtPZhEyeLA7D272tS -hB18yJZpbgbs9l3/ufaEF+woIsZZGhk1jhKfvuVWKoVGAZOPODZTHlRFaqXqh9j5 -AeYWdueS0bv0v5nzpvYOSHIUhZokeSrJZY5U9VwGjo51nmfGFpud0MfYITVK9rY9 -ztBMq257Tw1LFOXmRPQO3AxheO33cOHSCvdBM+Yjjubi2ySOTiuW5VwRZ7g2HS0o -mXHTgUFnH45PmOPsDqcWCcC9rMApThgn+iosFowW/zuPE2M/yh7n7JdjBLEUlLoM -qtFkePCJVkZ9MBrkUUR5UZ73yEQJ0z1kWkstKh/yN6MOvKTECYu2YAGTu4a8hACL -jCGXC7POEKyIn96u0nguuhaKkgnYiIhhDIUav8uKPFet0LRerWxc/Iv/c7rieypH -SS+qzAdYxw+Uk6N8QoSct9o2wfbck3bV8xn4+TfFNfDEdh8Dxg== -=g9lQ +iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOI6sQAOEc2VDymtcduV/Ki9grtaLY +6k+dYRzIYRJMcABRaFDNWZqpncXCDEnHtG21gw1qo19No4I41/3UzRMC8Ub1+FUV +uDnYoZOlSDxsjqxGY+gHvG5BLDVJjVD5O1qHN/9cEh7s2h5Cf8Tb4kMdwXAYI6JB +oSmGQfV29LsLzVyRxdbe1HhlsJEjnvLyAlUE6QfGGT7sV4WZwo9ID4JIkl0vTafw +klrmnVphVdHdhwhFnO0KrW/3Tx/kimbCBHMHLE37/9rBsXBU5wUrfk7+uHlQkOuB +ze8JQCez670YHKHdNJdaQ2+7PreGebQcBegmoRAjBlYL4c/dH2cvU8DP9p/C4Jia +lEybUD9zYl+o/313DYFYUlAV2yJ1BU0AhzhqhKlxX+3JRyCng/CPlyToJt3JysVl +iLvA2e/dJehRfFOugbVmQXKH51u8oXejO5EFhg8lglMkC8uHtK54VSFgPKcoET+f +c9K8aAG4sDb3rZiFERwl6DaNLbLy7H6SG7/6+0O67N62W/zf/qImBaNxAzngCunt +cJfxiFMahEwp6OPaVxB1E/d/5Bpn9MzOWx2a+DrRNSmkaQghnyBXZDf+iJbL7U+N +Hk1/19WPk2hLFlUDXTD6POFjGBzWPsXR3pxZvm7/0wXfIRn1CAw9WibCMOF3azuW +3RmoKK43dvlEKSXDsR2A +=MvIa -----END PGP SIGNATURE----- diff --git a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild b/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild index c450bf9a012b..3782259d7307 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-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.4 2015/02/02 14:44:04 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -33,7 +33,7 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_kdebase_dep plasma-workspace) - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] " [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P} diff --git a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild index 5d1bb183fba9..f9f5cbe665f0 100644 --- a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild @@ -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/kde-misc/kdeconnect/kdeconnect-0.8.ebuild,v 1.1 2015/02/21 08:03:41 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.8.ebuild,v 1.2 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -34,7 +34,7 @@ COMMON_DEPEND=" " RDEPEND="${COMMON_DEPEND} $(add_kdebase_dep plasma-workspace) - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] " DEPEND="${COMMON_DEPEND} sys-devel/gettext diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog index 2b4dc5c6cedb..ae3e1a010576 100644 --- a/media-sound/tomahawk/ChangeLog +++ b/media-sound/tomahawk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/tomahawk # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.44 2015/01/29 22:44:23 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.45 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny tomahawk-0.8.2.ebuild, + tomahawk-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. 29 Jan 2015; Johannes Huber tomahawk-9999.ebuild: Fix qt5 build. diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest index 42e218589c30..43606a804c8b 100644 --- a/media-sound/tomahawk/Manifest +++ b/media-sound/tomahawk/Manifest @@ -2,24 +2,26 @@ Hash: SHA256 DIST tomahawk-0.8.2.tar.bz2 8563213 SHA256 522d2ef873f8548990ac1fc736c11dd08c347687c77d63b520f55207f19db3ae SHA512 30a95a583796a0a8082aaaf3e3555719b91eb18a8744eb72865c8105d16128b2b477d82838ae6914d38c6b0f09e700761e84083dab79d1375acb1ad88d919a26 WHIRLPOOL f81f3ffd41e9439355a6a9d7808c92a1c8d1295f18eea90be3a4f788e4dcfa80a956b85f8b3745f4c241ca306f51b43762d3d6a38635bc92d0fa59e35af1cc31 -EBUILD tomahawk-0.8.2.ebuild 2237 SHA256 90b5d63a635d648c898657285d551a8c612388eb68278e59f97ed3d544454820 SHA512 cbbb1b4d0d643fa3ecd20eefea5804f2351744de3f3c3cf7075de7422d311e05e262410be985844d1cb07b3a9f4a657a9e9189c5c289cef76382b5a7314e5f68 WHIRLPOOL b895a714d710b4986a5569662fcdfe90e2d404b289be50debed0d3dc545fceb7d964881191c111319c9bc96efa79ec277090422b1341c3de6dc44d360b988209 -EBUILD tomahawk-9999.ebuild 2190 SHA256 25804bcf030127113bc67f67f13880308cc8e8404aa0dc1880eeb97bfc27b87c SHA512 dc3e7041743c357639b14dc1793ed74a9567d2686df9d3ddaf9fba002ac8d3016e60c73f48be415ee4d08b0e015427cd816c09fb003480ea571897e65ca31175 WHIRLPOOL fb27097ad21c63912dad6e18d69cdf1a94637a90c350bbf18361654d89effd943bebbaad6f443b0b5fc5b1c62020f2e774f597facfafc90acf84efbe83904036 -MISC ChangeLog 7111 SHA256 2912f5b1605ecbdc11294c62b9b150a03ca95fcfaa87442a584ebb0952ab5b29 SHA512 2f95b834bf25c290377c4282f1c3f931c256470401498c02fd2abf01e27a32a80469b4217852fd979a908ee5d76adc215035de849c48e41c635d32b3dba79d89 WHIRLPOOL c157559268cc2e8f24776467c3faf5bf1e39f5906312eadf79bb2a96e67848af93f11f56dc4d010d415c8df36f905493e56fd02d1e9fde4760acf9e68f2f54be +EBUILD tomahawk-0.8.2.ebuild 2211 SHA256 0edd326cc1deb340574f797ba4e1680a6db1e4517621045358223cb1c10824ef SHA512 bf07b0da2ad20a22b4a2948b54b80782be29cfb04b34403773ca3a260e206fe68f32fa51fa331d4cb32cbd67cf82989359e9a36542b1b424513de1f769e9ebcd WHIRLPOOL b8d23c7fd0c4fbe0756907ae116db7bf0901e9164309c3ecf2222f7b25aa7d60d975a299c9104b5d2ea0d608a886f61e76b21ef2449b7a6e612663cbf5262fc9 +EBUILD tomahawk-9999.ebuild 2164 SHA256 383ab0bea11db34204a9cbe723c32368b9ab849663e12e959278cc45fe80b451 SHA512 b9be3f6e824f81732d5bbd301e2ad138e2355a7dbbc6ade4fea8f1ed4efb61cff7164850bfccaae8348d7311f5938cea3c3b7cec766b5df037f86d5bac44f258 WHIRLPOOL eef6efca5ad58a5098c90c8e7f1b1c0cb8260d5885f944373756a870c7457231f5740a9e4ba58c790bbfbcd4bf5594cef1c62cfec2d6438b9d4a38c19b60d182 +MISC ChangeLog 7373 SHA256 645a9f84bf3028231304c643c8fb25fc3a2b980d500cff1a9268ee738468f571 SHA512 4073c334b6bf7ed563f19147404cb04fdf7ff6d9f8ed13b62a3032111648b0dbe64f71c694e3599518024234e76f74376d4077784df4535905c8dcdb93ab75df WHIRLPOOL a48284c6516afda486c2ab1bcbe1cab18f48ff3334518972487cb5991c5ba91b5e3047d342398a72eef89b7be459b77d3d288c3d0fd813d32f75f6549b55ddd7 MISC metadata.xml 449 SHA256 49d0ed467fa509bfdabea945cda8147db6980b565d5cf57ef0f7122d918973f6 SHA512 618943cbf72f232ab56ab529e08e9fb1f600b9c7885dc1a3d7e84f0bbf19bfd13befc253bbfc5b6f22863e9d890040f749fcbf50fe7c3c10825464f30f654343 WHIRLPOOL d13c16baef4735c911d00c682bea15832f0f0dc75b45e151171f498db29820ad8a8ffcc5d98fedafdc66857f681cd3f1455dfa71b71065d82a25bb56f8c5e7a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUyrfIAAoJEGVpnaTzz9K9F6sP/3mDxdDCDlgqTjQxeOsjB3SN -mZ/cEIRfSFhIwGAvh57hBxNw5vBxmQFGtHCbmR6K+sv6NSdbOhBQExzo30IMrk8k -NCxiM+dWIT9YRmedFDAZCADEBbf8gReNP0GCqh7qxg1uWuC/zHiw8VyrGJehml/Y -iFg1Xkvly/g23ige37w2BDV08Z4zLlxzZ2zEJ+ElXArcK2bDWzNR8aCkMpb34xor -F/hbSVVBmaG5EsJqG79iorIuvVspFERUAtMNFxDf/pRA28dHh2nbyaxSeF/wH5vF -2ONOHKxhdqoGNqmJLk+uD/oLym5BDfYhukPfiXlMM3fXRzJXs9E5Ms73oIvlum3J -vMg7MDqKg7nUiuBSGx1XtqxNHhYFzf8tpH/sRkOEfCeMjScHzSohhQ6KyFuVbuCX -MgRGDDMU0AO7hw3mauMSeBm77hgMdi2To91AotDCmo4Jz1xfd+GABbRDPbQl4AwX -4TO1vmrl/I6vKEtG0pdutMvbwK3NSDyTJQxFuySjggK9dXDT78nJyvDM+aiUEDke -bQJcY/R7OmNZw4LIDM1jJ8idQZvXIEtdEyUaE/26+xiMV2JMAJcKP6UTkjxngozU -mh0gVTHS/Y/TDYu2h3JqHnNVPhdAjqdb4ZoRJzxiFpUUX8WLj3TD7d3NJXb2UgmI -sVNxeCYEc5zccN3xP4Pr -=wCos +iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwEQQAN9Lf+ceH4F8CDYE9hYUxXn8 +8GvfvRwZoJ9c0XC3qwjlw2L2sZHRf/3jBMDJPef0ZIx+AQjVp/599IiS49ivYtTN +TNs4/JHrnGqvbLP3631aftIVqbzwwPiH17jCzzNe+S65HMAvnHlAdXvNOx/tZ0zi +xwp+nSjYnZWlhWvvt9NIECe34cCb5KzN7c6cxmvqcp+0rkB1K+fLAE2S9aYruX4q +1mB1z5flfVCpYVGnhwInasMm/mo3fR4eW5tGX8H/ZbpdBlWgvL4qhK40Y+wHt9yO +UpEj42PWv3zv0EpaQDAoFSs/vY/84ikId1ifewQDCo5ZTfTaah6ZvteTsLN0TWXb +oeRL3N4WZ1zph4Cop0askfEp66T0dcrxu/Sf/8AwW0PNCubkG24O9OM4cdL8QEb9 +tCrFUhvR3+xRobKmX3wHxh1zqTY6rdricDsPeJ8m2zBAWi5nzrmrK9wLPF2b4oTg +hYq+PAMooJ6vTZcD/awuDjg96kJqahuv5Bx1XCgzznqlNuupNCNaTuP8UTtlwmk0 +Tjy1PALhaKwf+FaV/5k7NtgbFVG3j6tYpLsuEdFKH6/3UCOBapzJwNht2QzyVJuh +jy1PXQsZA40TZ1ujGQLy/2q8M2BtrJODnv6mjs4iLGTXQr8xNC0QqzPUqqGEHyeu +RrhiSn9YhFSoq/wtrWqz +=6MGB -----END PGP SIGNATURE----- diff --git a/media-sound/tomahawk/tomahawk-0.8.2.ebuild b/media-sound/tomahawk/tomahawk-0.8.2.ebuild index 9d3fdeef89d6..dfda962ea28b 100644 --- a/media-sound/tomahawk/tomahawk-0.8.2.ebuild +++ b/media-sound/tomahawk/tomahawk-0.8.2.ebuild @@ -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/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.2 2015/01/29 00:27:02 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -70,7 +70,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] " DOCS=( AUTHORS ChangeLog README.md ) diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild index 67408eb89bb6..3f46894e3551 100644 --- a/media-sound/tomahawk/tomahawk-9999.ebuild +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -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/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.30 2015/01/29 22:44:23 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.31 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -68,7 +68,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] " DOCS=( AUTHORS ChangeLog README.md ) diff --git a/net-im/dianara/ChangeLog b/net-im/dianara/ChangeLog index 209823b35632..863124f1e8c9 100644 --- a/net-im/dianara/ChangeLog +++ b/net-im/dianara/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/dianara # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/ChangeLog,v 1.19 2015/01/29 00:38:21 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/ChangeLog,v 1.20 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny dianara-1.2.4.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. 29 Jan 2015; Johannes Huber -dianara-1.2.1.ebuild, dianara-1.2.4.ebuild: diff --git a/net-im/dianara/Manifest b/net-im/dianara/Manifest index 96df1ea2ca8f..2c5d8c8f4e22 100644 --- a/net-im/dianara/Manifest +++ b/net-im/dianara/Manifest @@ -2,23 +2,25 @@ Hash: SHA256 DIST dianara-v1.2.4.tar.gz 540237 SHA256 8e58042e551646a09bd3c47838a1fb6d65c90501547ce4ed85944814d6e609d2 SHA512 78bacd0a02f5070b54d0a0aa74282592ab60aa734143c50f00f97f0dc09308f0571205608e0150fd4eb5cdca0083a5a2b0acaa2f90a00f84cd9cc6737dee30c7 WHIRLPOOL 940a6c2a0a1e15accaee24b40b96a87c0f8d947d65bfa7e7d3155ccdf90ca73b0ae6a8a7bc5f3281736f298f1748a352638d772153479fa5d4f1d1119febf636 -EBUILD dianara-1.2.4.ebuild 1099 SHA256 d59aa91b31ec1bd251ff78e6a78e71a6b30588fda66cbdcb1b215aef1b1fa8ce SHA512 bbf18463477997de9ba86e1e207c9c3dc9f105855aeacb2871887ccb54c678383bb0c764ab9c867a78d4edd653b3594d21c83250dbcb5bef2f62478b7c9246b3 WHIRLPOOL 4347f789ae9a21b7061b48b016608b4045aabbd8dc910ecfd2f8b083169f839dbf5ee4928a81d323597ab7ddc65993fdfa665335a7e16422cbd0f0d9f5e81ccf -MISC ChangeLog 2662 SHA256 ea4e17ce0ecd8476686f47a8d75244c11dac89c179db0f8441efc52e176bc2c1 SHA512 a29c0a44ecf79e24ff0d1eab620c4b9e35f88933bf4359f7679aab40d908eef9d762088296f1a6e6403141b16b000d7b0177bbe68e97cb1832a343a14f21d134 WHIRLPOOL ee0a3bda975d1cd42dadf71836d1d421cfc64eccdb459bfcfeda817ef88f027d4f43b75b179c0bee1db7736aea0a771d672aed54fce555a8ab53eb890686c61e +EBUILD dianara-1.2.4.ebuild 1073 SHA256 0724df32fcb7a7187db418a3b0a4f0984c70acfdc2cae07a0506347baf6c3f79 SHA512 5babcf58a82346492a150fb7c400d5dbe2ad1cbefb953421696b741c7e0e55cf24189fd1a10791a653273d9c2a05d4cd3a43abf59ef4fa499144744f12b5e155 WHIRLPOOL 009d477586e6f9f4e55b4d1ea7c6593901b1ae3584ccc2da3fc6de71654073792d2170a27b50f52439f8263219850365222b0160e61dca5a4edee902836eb8f0 +MISC ChangeLog 2899 SHA256 db2dd3578a07aaf43fd30d8b188a5784b67f48cb7bdc87540de40e31e9d255dc SHA512 7ed2b4faaee1bc3215e0e76ff00284c7d2c8663de141a4cb5f098344e7e3fc4dc4e97240e6fc6568e318275b36fb2437094ef7896465ac77a55eaaaee142dab6 WHIRLPOOL ab2b098b25b6e8a7af7f2c0661775689dc39f7d7c9547b3c5321c62968664e8cce68cf18acdb2d87b33f2abe642f23611ade53bb52b01e9905dfa082091e4a34 MISC metadata.xml 358 SHA256 0ef1fb1342181a03b47a6d516764261b8630a660eca17df29022819511718ef8 SHA512 bb317af7a7d451ac8d384875ebb54fef0510e365f26f811500f8b6a504a212531183d179757a2b98b394154cb46f1bb4a58292ef7ca7253572c56f46c6836123 WHIRLPOOL 4ae6b483ee32c58a3b9442e75faa9553dfcc467f8dacc9e211f4a6f05157184c070afff84a4e905b488c18442c31751fb4f2bc6f4c0b5406cd2ac9cdc54c74ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUyYD+AAoJEGVpnaTzz9K9AU4P/2Q3LvlLAmbEWYaTVA7R3fbb -oIrBgMbhlQt4iHyUvd763xE3ryCqSF6USvb7ySGPtdemKUkUQ3bnZbXt0VDnCP8n -fDssojLMYbS/IYFPsnF2VgxZsyOcqv4w+DOxmW78x2oDKgULl+A53oDff/jS4pVo -/jbu7xXkHRTZrGkqXzuRZwXPsynjZl79cTyHZ7cG0Vv/qmdPlrNxMVEiky5f3joW -pPUu2GX+PmS2FVDDYnZ6wG6eQnwuxiuGMtPJNAazYHlmTHWq79Qg+mroIWU/hvIS -3A7x+FXcKJhLaDCJk8FVrjWC/JVhU1SrAw9W3CsxcJl66BtMaObwK84W9I0Fd2Yd -IwYyoJl5lv/rHNDdk3x8rv+KbKsRrd6xKt1AKrkrEc4QqlqtpQ+EYtjJsXI1OOpu -TNaM/Q2fCFeRxnuVjE4XfAMVlqeIW0fq/w6XSp/LmBvU2Vhg+04sO+9uovlSEXKi -RWLRIdfvlJ5jsrVLrP02L0ANsw1QxFK6SjqHKi8wdmGA36IBz6RPI5ZVtAqxTi+z -Y21kij2+tmngd6H160AgjWyqtpF+1dyX+N4WzWjb3TfTzp1Nwe/kQeJKngFQ/gkK -NNS23slK5wRrDVZOG36TpWGrduSzg+VpfPy+FPqC/SdIaOJ/ui10ZSeiOKXPrwhJ -nCdsJ8a0ZiA4zGTuWTkC -=HlwJ +iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7M0P/Aie1Lqr0N+cuh3kTqIH+sn5 +xdRsEtlEbwXMaFUcKYCQakHi3dkVbg8N1o3fhIHRpY+YBfGzDcOX//Ad5Yb4Oeee +eNXGcy3KvLjKiZTHgJABVwxDcoID92tRKzH/XAz9AjF6P6hi7uJiIsoC2J9c/7I5 +IXfpg9sxooYMSSJXTsYbVDc3zsiadvyw0XMMg+1Fy5PsGR98n9lfHR/T+oK2sqTf +CCxSOJk5H/vyHCLSJdRmFMmAw+B8ouNhqe/Xw9yWt3kkoaNTu46IooltrOwIB64m +jts2vvD9JHGDk3DH8Rr9IyDke3Jz0P7fUYZjg8gIufd97bDG9z+hX+CDOTG8ePO1 +azNhQ0k13gdjX6bZXou066VwXo4hWWZB4e0XhgYBYNdVjj+kMxHo4m9VjbXJu4ka +fF5JIJL5E2WThAINTmcSSQSqznwVdx+WgQnEuUISIj/JB2KSYFZ37z6248tEr5gj +IXCUTwC/kYia3404uulS3FhZsvI5eppYqYZz7xqvd5GPihxcKmNdTzWjM/Z2ZaH/ +lTeLPQGuAPsaYT087wmw613K1Rj5DylIm5YzPiklB7qMgMHefFbeTCkE4YbniYbq +MnyKhk+JM3s/nZZNDI1W6NiV5vSaK4zODV5GpGmdC+QYTzkMtjD5NS37993Y1RNf +LkGKWZM+75fIrZLIsqhc +=5hqr -----END PGP SIGNATURE----- diff --git a/net-im/dianara/dianara-1.2.4.ebuild b/net-im/dianara/dianara-1.2.4.ebuild index f1ca72085d76..7ebfde0707cc 100644 --- a/net-im/dianara/dianara-1.2.4.ebuild +++ b/net-im/dianara/dianara-1.2.4.ebuild @@ -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-im/dianara/dianara-1.2.4.ebuild,v 1.4 2015/01/29 00:38:21 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.4.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -25,7 +25,7 @@ DEPEND=" dev-qt/qtgui:4 sys-apps/file" RDEPEND="${DEPEND} - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] " S=${WORKDIR}/${MY_P} diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog index 8f7e0c94ede3..06e899000de7 100644 --- a/net-im/kadu/ChangeLog +++ b/net-im/kadu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/kadu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.153 2015/01/29 00:42:13 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.154 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny kadu-0.12.3.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. 29 Jan 2015; Johannes Huber kadu-0.12.3.ebuild: Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest index 3ece2576e99c..afec528197a3 100644 --- a/net-im/kadu/Manifest +++ b/net-im/kadu/Manifest @@ -2,23 +2,25 @@ Hash: SHA256 DIST kadu-0.12.3.tar.bz2 5106482 SHA256 d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8 SHA512 0aeaec9ac3ce5a1860571721e307a8d5e6657a30780125e21d153901ce5f2870ba3ea6ebc272bbb6f35a56ed9a24127abfc8f25b9eb88d01ecf9c931fa5c851c WHIRLPOOL 0a2b1b9684577d95027b9107fc51e8a8f290b7ed38a18bf282f9589eb3dd5ca7a9fa61b088e2fb2be8d4d16e6d4e72d766476e36f7d65cc55a2d5efae53bb8ca -EBUILD kadu-0.12.3.ebuild 2634 SHA256 8b1530f9d94a43a625fd1827f8e14a31ffec4cfd7152f374d0b76c9444d1d3cb SHA512 ca33aa1d7bf3b548c769c9e37ceea8cf94fd9e02f6a18de96972edacf9a74d09ec77f2840a47897c78451493f7ee37a4b03d00bfdc07d47e119dd36030fb12ca WHIRLPOOL 92f4010014b396b6dbea0d72ccc08c2e2c1f5f7ea44d15dc8c1d72d2f9e26db1a7b4308786a322d9eb79d0c7d8736b6b4470e8c59843ad3cf3c4bea3f49bc480 -MISC ChangeLog 21990 SHA256 971ba9f5d4e042bcdca806bf41ef737cdc2fabb71b76a83eb68fd2e235e83299 SHA512 8c32ad2d55109e9e5b1665726f3b41460f699efa24e024ef70129119be2aee91e7a9bb875802a255e8caea1b48661653c64c9b87ac2bc8e0da5f210e864fd068 WHIRLPOOL 3fe49a1b40dfc9097ee586de4b37be8bd83a0aa3359112bc9b010943b07775947870c7a7688d49aef04937a5bad869d1a0d673e48f17347c1af68f0a8f543217 +EBUILD kadu-0.12.3.ebuild 2608 SHA256 d75075050e8934070730fc2ef406772c770c37d2ef04871aea443c74c95455fb SHA512 b6cecb694053bda06970944adce7be549dbd974cd6cfcc7858ea9ef1668a6f91a2c76a7cb78170dd925e8a03059ea6a94dcb78cc0c852f3c135ef8fb8cccd963 WHIRLPOOL d42b098d2a56074bcf9ae881d40c2cb263fd6b983aebb52d1024a85d2713be5e0ef635523206ff0331e314c3cc0ee0c6fe3d2b3eb2cee6dcdd9d1598c869f103 +MISC ChangeLog 22225 SHA256 7ebb4c378d905c45e380711993109109567b218e5cb407a00b4c38ef36099d63 SHA512 86a39ce83a63ee43a204f41a6a5047f1ac0f367ab67f2b98d612f2fa9dee90f406cded94d23052d9d446c13e450fc9b55fb92ea094c60fbbee5813a3b16b417f WHIRLPOOL 48fcc46a8615718a71f924ed21388f84a9b6b98d3fec22cf8b80c0552c2c42101c702a47700d3a970928500a7ccb488ad2a3ebd5c6f6482b65750d746703eef4 MISC metadata.xml 577 SHA256 38cad9cdfd2009798cc27cff9bb4946903f3bd8e42fd09f1af4c6327a4c513dc SHA512 18dc27fa927c25ea682f5548dc63b52c5227c8fd29343be73254ba2c4fa5d374f9315e7a468ed310926fe58044fbbf07a1893d77b405d94871120fdd2444610d WHIRLPOOL 381df376b9754e3a594624d648e85b7ee79bc25509373a8011404cc44d51a8d13f38242717fa1601f2985f2195571cfd4f46e7768016c79ae1fb4ce55a75cbe1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUyYHmAAoJEGVpnaTzz9K9AaoP/Rz3aXZCQiKXTyddjScjkqcv -AnQw9WECTATUnnNiU8vYqFk3qT4vqFtfprDoXy32bxGRRO7Xyr7FzdRu5LhxWYds -ebH3VKmKtxjSwahFtHAxg/NSUUNIwSH5jLbYB8zJZO9PRazrpNjVSCZXbp7Rcy70 -DlJSOp+/HJqY8nEjc9w0MQ0IQNEcZ+fRBT5fQnzuSCN9n7qWIVh3+v0gtA80rT2j -2Ig+0vgQlyrmLTuvoENDR2JOxjNYSTXsLHNY7q7bKerPoskoro52Z28zWEomOPWk -NsQY5NKgOHAfCHwJP70i/d+b7Mi3QmuVPBbZAhggjoWAVVIHdNuiWKKNVNmiEpRF -V0u6Esy4q3ZmYQ/GtC2kHb6HR8YSP/qUbg5oVoJ4AQo3pejyQaADR+7dY5LJQFIa -LRrSUNlzVAu3rij06ZTTzy1v7p/72s+k72Qt7BzfaY2t5oBzKmQfvJWFXeY4pumd -UAU7QQnL+B3eXoDw6ujRDTVOMbHNtGijdpGSf/T3DsjCFEzXsRN3tC4/F2auqut3 -TiarETYm/2uSz0JNNeBf0EPCajdDO+NLYqOuRWTLDexpx4VGRlMcP3rTcISAiugq -3F+wV9kSwBXFv9CubQNhstiioBKVFmPWeHgSrWpPDAcp2GCjLI8IW7jmwgxpluz9 -9bcSDGq6WivmDdgRM4vq -=+QjA +iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmdkP/R450WDdORxJgk224zBnhRYF +LHSA6L0q3mtg6J8ZfGv8UouR9EopqaIhWITx0tGwj3SA1NsBPbJoN3kmhrsjQFXt +z5ooHK8pXm4iYHPOBcSLU/Xjc+ZD1js0Sskyz/0INrvgAeYTfb7XYRDUANjKfVPX +g0puMNLyHfNAdxzq5556pOvn/945qdRx8Hv87yWjN/DZEN0tkNvuoEShTFYoWaFb +YgFqlPycMGbEzT/kLFWTpJFj5MgxZB6uE/bI7DVZgWpD8VNALvFzVrQSO0VAZODe +pMUZDY95lGP1xLq7JO/8ZdwE4jR4MUioS7i4TXHz6qIenwfDnO3ML0zTEFIj3qe5 +YeWnXdg+153H+Wr87uhQ/DJpa6TpoeVvC12Kvwyb0GNKmuF/LEyqZaDcoo6WsuTe +yEjL/2A8cTayWyGer3XC/l2U9wayzQKy2HDs695F25etjjSYgIFjW/9G19m79gBp +6rdwKenjuw3CcR0CYS9mDn/kxiCieJP3xlVvkut0JD5+/7h5pqBOCG1TsZD7HNOe +jrSj53pmLg4rqNgac3cOS+so1j/+fD61Enm1kUGbONt+P3scScshOAxU8dqh6qSq +goraro6lg4t4wQZV6kmaWZ2nbpXz/LnXb7FEvfUTrU5JRTyW2e4w+/3kM/mW9xiZ +CvMiZh1nLJ3U8IqT3aRk +=hWKW -----END PGP SIGNATURE----- diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild index b8b0c955968e..28692f79e107 100644 --- a/net-im/kadu/kadu-0.12.3.ebuild +++ b/net-im/kadu/kadu-0.12.3.ebuild @@ -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-im/kadu/kadu-0.12.3.ebuild,v 1.8 2015/01/29 00:42:13 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.12.3.ebuild,v 1.9 2015/02/22 18:41:23 mgorny Exp $ EAPI="4" @@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto " RDEPEND="${COMMON_DEPEND} - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] >=dev-qt/qtsvg-4.7.0:4 speech? ( app-accessibility/powiedz ) " diff --git a/net-im/ktp-auth-handler/ChangeLog b/net-im/ktp-auth-handler/ChangeLog index ef67c9db547e..905278ff55a9 100644 --- a/net-im/ktp-auth-handler/ChangeLog +++ b/net-im/ktp-auth-handler/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/ktp-auth-handler # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.33 2015/01/29 00:45:46 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.34 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny ktp-auth-handler-0.9.0.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. 29 Jan 2015; Johannes Huber ktp-auth-handler-0.9.0.ebuild: Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug diff --git a/net-im/ktp-auth-handler/Manifest b/net-im/ktp-auth-handler/Manifest index b7c23afea338..f668781cb45e 100644 --- a/net-im/ktp-auth-handler/Manifest +++ b/net-im/ktp-auth-handler/Manifest @@ -2,23 +2,25 @@ Hash: SHA256 DIST ktp-auth-handler-0.9.0.tar.bz2 49212 SHA256 6eb07a75200bd18154f42fbe1ff64a9fb0799b709899c3cb31474523b418478e SHA512 915790f317d82a34b2daaf81eae47af0d68e6602de57902801d7904f3b64165556554a12a076bb40037ccdc6e74c39328dfdaefd2e30dd1018952ec3e4fae675 WHIRLPOOL ed97c5c475650fd6f20e55afe2deae9266531aa024874294110266d990018a93f9be51ab2ea982f25474375ee63e8c20dd7fbcad8b3b04ebe3aac66d467c016d -EBUILD ktp-auth-handler-0.9.0.ebuild 970 SHA256 1cd71a41c60ead15a4fed6628eef30220f9ec3324afa4c7a1b3a46d7734bdfb9 SHA512 4481740453c356e9adf2aab8059e98b9214fc2f9d0f449065a74c5969cc43cd15cdfa82db30765587ea3f5305c5de1a49b7a5fb987729a5666000107268af8c3 WHIRLPOOL 9c49a949270cf7a6baef07d2c223c2098988e0ae7aa4798a8a722f6e87e0beecf06593a77ad4fc7c8dfff58d4b5ad94ca8f35da551d307ba3c08c813e769a45d -MISC ChangeLog 4947 SHA256 8465419894f445cc3f9f754878bb91f96b09de89e4c29b2003fabd0586775022 SHA512 cfe8351de894df9dd56a6c9399889a640db39cb16ad05b9a9be3aa31e7b09d44b20a46866fa61d5bef061c7364fb25733a7b8e3d9e8de0f7a5a3663d0a7dcac6 WHIRLPOOL 8e96b852f225825e9227fcfc73c15fcde8f53b403ad360c41e286fcb7547801f79a5d44e87adc9103382df621dd9ae35a6da64ecc0666987928f3c5ab40b926f +EBUILD ktp-auth-handler-0.9.0.ebuild 944 SHA256 df226655bc3a00a22a2f8f10c5b6f05eea517285516731e0b0e50c875cda05de SHA512 5e7b7dd8bb45f415500c5cf0339170baed613f0a93cd941fde7ceb31ec7906bfdedddb36a5b2ea3ea543ea7ebe808b51de16b9061839bcfe9498720341d8f7c5 WHIRLPOOL 2d27686d6dd252bb2f3b3223cba23a960f6826c8c77dc5b0424881236a79109fcaa693a8ee5b3985d3937a45625f408cb19da80c4779798413675b619b75c19f +MISC ChangeLog 5193 SHA256 f5eabedf1f47d1b15d9075a281d3c9694b61198a203d6f0d9dfb35653f903ee9 SHA512 bdf2f1b525408fcb8a70bd2aca460c07f72c6af1006a84d49c930321da1d5a4fa1f3b1cd2c840c032a2db256bf02e4d44ff8953a7aa4ea8dd0b79a30ed139a58 WHIRLPOOL bf3874c5eb39dab8c3da9e2134ea971d3fa6ccf43beb8d6d8811aa127af024ef6546d556eef977e8ec5bce0a974a6df7ea3efee101285b33783d9a16a00630ac MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUyYK7AAoJEGVpnaTzz9K9nWMP/2tuAFZ/UkZ23rju2MKS+Ihp -AQaon1n+kPPYPaD0mBDv4FHsbLfcUtqW/TDOdjbcmdVrrv3LWIZ9Sx74yaSRcfdw -RY7YeSspyMRKyuNP/JyuzujAhWxECOSbNEH8XLqjOZNNwXLMaV3lH+NxhOa/Pzgt -nDuOykP65LdoHOoIntGCzfgyZOOIltFh3sLNcTDLdAh649EXIJ1hSDn3Xe2HpOWO -F/9pQ4BS3s1HCVqo5VNFRckGZiaIRfSdzYn8b9v3UOcSte+m+TFfj3BJocD6EDik -xoLzyRlI3tLHBV8w31my0JO+GfEx76kvjA7+sy44F/RGSyfCJ9KI0DSljg9Qr1gV -o+eF2uAvxyFs0jOvQUEmfqYOjPG67doIXDsnLvxEKdOMVr8kpf+KTaGtNChBw+UJ -yLfoxpVUSSQJ3X5zpVdos1d/N7Nh38LwGJuPPH1QzKQAWgtKJ/BOLjdchJNnJ01p -pPNV8rTQ2CJV+TagFxa03S4vwOP9z/KchB1XBJiZAvC27cHPnmOJdF9ZiTKFs2Sc -+gMerM6/RCOZIexHvUv5qP7/yiMsEt0ZlqUOvyHfuQmfw9HxwJfuBb2TK0DkrP77 -QAQNOhr3WqPk3m+kG4TAbiFPIQLLimZFFtEpLjdCcFDFOyDHdfT3PKHJdh7rz7p4 -o0H2NEyTGvMb6r57vigv -=3R0B +iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLRMP/A39f4tEsFAoPwh+DugH6bVo +bEG13NSLOX2g/hinPgNFVJUjc/39ULegTh+O9GnVBqrhOAOW6AKbQUx4/8pWwT9q +Fh1wz6jvohpwCF6xaqS16HV8A+QpfDdJ9K4fBqi/C30bqU/ru5kMDCllQX+pZVu7 +w5uM4BXePIBufcZtXsG45GUXRtjLv3ICauoC+DtrTT5uyZTeJxTpNeWYe+hOBdML +QMvxPc9TO4sxlTCiCO6EzdtZ0E4wh4zOkCWWFKip70zMi9n0n3h+EKKPvn+rLkyO +HO1Ssn3PwHCuKi0cdQESJjyUEs1JhYXUr79L7pgYXW20vPusOuk0WXSeFx1cS0Bc +xOAJEwAyaEYeGdQCJHV4tyhFProfllop5B56k3RP2z4fhiIg6HqxQ9jYQ9oHoSfH +K7ROxpQg9v/jk6IcQNlsgjti4U7NA7GsEv65ulrF3gLtVvS5/17WuB/wDKjO1RAZ +4uOM//GpUQbYfpo6MxKPKPlnrz3nza74Nr2a3A7OqobNTpg2ceg+gd7oOLL4v5u6 +oM11dMPwHBqpyLX6tmVB+tPSL1s5EpD7+dkVYFtSLLls9F4+HknIsNNLr4DN6gbI +fRvv1a2hxXKHJTbv7e6rFTqC6sVpBoDcq4H+NF0nyIDQgaTMABeiyn009h/QMyUt +9c0mT2HofP1FVrq9oYeL +=GwMj -----END PGP SIGNATURE----- diff --git a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild index 8612ee28878e..2ca78b883054 100644 --- a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild +++ b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild @@ -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-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.2 2015/01/29 00:45:46 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -29,5 +29,5 @@ DEPEND=" >=net-libs/telepathy-qt-0.9.5[qt4] " RDEPEND="${DEPEND} - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] " diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index b1ccdedbe8ad..1ab1bfb59757 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/psi # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.240 2015/01/29 01:08:31 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.241 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny psi-0.14-r4.ebuild, + psi-0.15.ebuild, psi-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. 29 Jan 2015; Johannes Huber psi-0.14-r4.ebuild, psi-0.15.ebuild, psi-9999.ebuild: diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest index fdc7719b2ac2..22216d93ffd4 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -23,25 +23,27 @@ DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a32 DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344 DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc WHIRLPOOL a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759 DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40 -EBUILD psi-0.14-r4.ebuild 5073 SHA256 a6f5745f424ff62b70d22c3b8a8608bf6093e7a86a1f55f593654e2428e74073 SHA512 18b576bbc41056fa6f3005600f597284c4c16f580bce7f515c9f82ed5060905f8b5db3a9402ab8fe46d61b6a79474f0665db63f251b05a475b683b1b1e510199 WHIRLPOOL ffb59d1d691988892d2b8ba67cbbc4359de0a950037503cd62338da52cb24db9e110f512f2e2b5c0b2dd3a8f1b3858d83ebf1c788f5082aae24ed6ea57890b9a -EBUILD psi-0.15.ebuild 3122 SHA256 c9f534dfd45350601704854bd27a2f5ecffe0af25c29cff1848fc89feff27bf0 SHA512 3aaee5680b99d86629292c0856511262a9244ab1b762a2fea4b55e7b2cc5f859e6598c9b85a1ed38473c5de25f69402390dc5e6c75aa90c27b289fae12f44807 WHIRLPOOL 89101bfe53e8c8672551d5d4a52b4caabab05223ddbb24a52a5e182bb516c624cddf5ff77a2cbd39e424d9907ba7650c1f0ff020dbfe17a39627e49f291b7a84 -EBUILD psi-9999.ebuild 5928 SHA256 607bc005c5de4e537dd5cdf70fc41bbffa34708a590c76801739405aa95fa955 SHA512 bb1112bfcab12622073a5b25ff2cb055bc686d8c3fd6c23468a8fa9eb2840ea9628afa38d8a8ff713d35681c188362166fc239467bfe9f3df5025901511f7b6c WHIRLPOOL 38215cb079d82683de7e3d7764739c04564610262b830b197f8d81736cc4fa8944035fbb6f525b613756a4cefe119795ef8c190392d02e4a23f8105b3aded897 -MISC ChangeLog 35441 SHA256 e205e2fdbfdcb2955bd41a47f240a82a2ba546b7826e6694afc0c769ec83381b SHA512 806e1847c9aea16e1f40f99dcdefa59ec57b7d5cc69535decef1d82d251839c764d82a0847621df2bafa1591fc1b83c94ac36a5937f5d5c4adbda4eacb21de3a WHIRLPOOL dacc710550fd70000639eb025069bc56578f61be2452d751fb7a5d8107a1ffa83801da5cd833f7828efa5301cb8c01aa0e3040b0296582e813122aca1cc39d58 +EBUILD psi-0.14-r4.ebuild 4990 SHA256 ab9edf40ec6ee28975d60e41d8348b72bab3886ea107a9f2e86cd1d212bf6b67 SHA512 0d8244d18e95b6068f2573be563a51fd1cd2faea7c76a0c36e4289f1bf1f803f203e329981fa981ff30acd456a9519875e0fc7428f6a2c5e5b2ac7b25776965b WHIRLPOOL c8bc9763349508cdec3e7a3d484da98ca1ac575332d4dd63365adf0f99dc912d8a68e4c590b52909ab5928ca9decf3363d8658c088be6d68b2c736766813f9a4 +EBUILD psi-0.15.ebuild 3039 SHA256 bc6352af0f4cdaf938fe795661305964f1d7b298dd8362ca648763354deefb20 SHA512 96574b77a9e1bd5491ece0d9b05ac9282108e181e365d209f3112e84019fc6a86c9d20bff5e965cf0dc782e60f5847df4ae755346e893e5f2c60767a89352654 WHIRLPOOL 7b0c9fe210816bab743369a9ec809284799264a95076cbdc2f0f756577d15f82cdc751923499e25b51b3ef78def73cd4328e1c3ba2245d502d434a013cbf4e6e +EBUILD psi-9999.ebuild 5845 SHA256 b9fb6514e00bdeaac1e00724ad0ac80b2f86baacdfd1b00a576accd28aa73ac0 SHA512 6396713633767c6b69dfd3062f46f70e5d5c6feef03a2e12dfecec67f536141a74dd4ff9b822d4abc0d8851e0e0a054b0d977039a5ea3706afebba7f61d957fc WHIRLPOOL c57a4dea523df6c4f8ba89d8ae513d4b896e76fc6d786a161b5a891241bf51c85c9e781c82f23a0ae0e1e7c6c0e53de8c267f02c5248a43f71710636ff9ce840 +MISC ChangeLog 35712 SHA256 8026777583042eda061ed263d046c346b9e0ec33edbde7037632344a78ed2601 SHA512 9993041f11f2f43c8155811adbe3ba7e9d093154f15414e03ef829ac2c910c47ab25454f25faa2e3db55bd74355ab85e018e952e849cefdea7cca2e0de6292cc WHIRLPOOL 47291c43344e3cb58c26fb99d23a56b23be70efafddcdfe5e17c60de0809c4c7218c8a20f0b22388d31fda754b122aedcdeeda5570b2e3a48088f8531b6abb0f MISC metadata.xml 1012 SHA256 4fa097914fca02a97f51a7cbe42533d2ef26b74e844826bb674be8bdc4634b62 SHA512 6db07cb78a6efdead59b6de56bb8557c2bd3793dcad652ecaa92f51bc3e13af17b4665a4b6b66b5264b2d47354863d85bd317d0b84ac0f7a3fec21ad0997b68f WHIRLPOOL 32c281f7954ef840e32f7acc035d822e297af7e6997a82b296cfc2e91bcf46fdab10b33577f1eee2a1cc65f9fa45980632132167ec16b4a922e73ca3adc00cf9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUyYgUAAoJEGVpnaTzz9K9pFcQAImIx1RBV81XqCZ5SocJrg0T -nlcgJAcmMelFSVlGmQPXKsObcZP17o7OWB2kPhKov5bKZxHlg8uDcsYvRagtx6dX -L8Ej+wDTKlgvY+R/bxw2veMHuM86zV7sssWxQ6BelV9mVHRlEbe7YuTXPNAbqVWE -Q8dIlPsSAZmzgGbNxCZhSeZKPd28AZDPLuKwjmV9vOyOhPHGnroAxOAn4f3KGIxB -x9EqiIGt2qb8d+W1ay+zhetVTqwHlbDFwj3T2gUPdId2ZQrJl231k2zes6Lqx8Pl -Ldsrp2aYYp2orVnCSWMV5wcNL2nVuRyPV8gNpZpNbNVgVTKg4pJpLMjHHNqQLP6v -+/559S9Kp2DTN5Es0QCbyWV3Y0TiD8xNOnwKzaHOUeiXdUnLhV4rw4PW7gaHTION -8y5aTfzxjFDSRSDK7i3wAOcQ8LPtga58qmg1QBzBIlW7BdVROVuReeJsECBu9AP0 -vxVGCnCGOu019Y4MH1brTzcjv0vrPd2BQwDc/gmwmR6yt/HM7KFj+KZE0Ix9uj3B -8RLdZUbjZnYXFMPxoYo9hMe5unacCFwaqD3rfCuwGOtwKlgqGk5wpLR5OfkRJreI -FBUIjeaYi8gQiqU2Uhwv0kTbbFbb4djY5wfGbSpPNl/KaqT7xDTGnTUp5rtAB7TF -p5JxTU5KnbEjczobYeMt -=xcw7 +iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyWYP/jI/ffGhTUdQOSQdhTnQhFLK +j3pnRZ67w+kRrWvLT3RPnwsSd8AEBDipUAAaCBkmlnGW86+o1KSeWsTZRy62sDfz +sPG0Dt9kS6dVHWFpgZf/ksQWx5xw2fwuE1BMao/k63fs8KaPlhCm82YTxsMMVBcN +xY1X/VYsSyNWGMPAhNqINSeQDPWiYIxOyaYgxH2TpeF+ky5B5YBdTMSGmJ3OHXXG +dKtE17l/hP4F4t15UThszyhinhPNvv+EUVi8Sglr1RHWkZnXKuhITgMGyGOtbvQ+ +V9qAZptn8pVvZSoRJDuGPpDrJ8bbDOpMSN6637zTpjG09Tlg5Hd6qcY2kUJDaTnV +uAX8Y8OjHkMkQn8UaJSbqGsLtLduKy/wjojudywTrtgjqiInujLI0+yKtf1EbgJR +L+HNsR0mIK8i0XO5RYhUGoY3445EWwSZ8Bv9bOlGyLFoOVRv+gifjHKbXUjaxC6s +UUAcmG9Q9lteV3dIFzFfMxtIVXde7oWo86UxzuAD4AWL8yCUcdA940oSA68U+p+h +1ayS4bMtncoeWuWSA2SgDraqD2fGnRqaevlJwnkOySgXfbsZh3i38oRyXfZewFWv +PcQdlKBNBRBYTEnBZHfF3PX5NK0zhBX+HzKghefTWBQIPI9vVJszkLLI5GxU//vd +v7yVB3OOJo9saxit1f4t +=k+OJ -----END PGP SIGNATURE----- diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild index 42cde2588bfe..07bf235665d3 100644 --- a/net-im/psi/psi-0.14-r4.ebuild +++ b/net-im/psi/psi-0.14-r4.ebuild @@ -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-im/psi/psi-0.14-r4.ebuild,v 1.17 2015/01/29 01:08:31 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.18 2015/02/22 18:41:23 mgorny Exp $ EAPI=4 @@ -44,10 +44,10 @@ DEPEND="${RDEPEND} sys-devel/qconf doc? ( app-doc/doxygen )" -PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) +PDEPEND="crypt? ( app-crypt/qca:2[gpg] ) jingle? ( net-im/psimedia - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) - ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )" + app-crypt/qca:2[openssl] ) + ssl? ( app-crypt/qca:2[openssl] )" S=${WORKDIR}/${MY_P} diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild index 4c184b6db199..58a23f0a5ef4 100644 --- a/net-im/psi/psi-0.15.ebuild +++ b/net-im/psi/psi-0.15.ebuild @@ -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-im/psi/psi-0.15.ebuild,v 1.5 2015/01/29 01:08:31 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.6 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -37,10 +37,10 @@ DEPEND="${RDEPEND} sys-devel/qconf doc? ( app-doc/doxygen )" -PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) +PDEPEND="crypt? ( app-crypt/qca:2[gpg] ) jingle? ( net-im/psimedia - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) - ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )" + app-crypt/qca:2[openssl] ) + ssl? ( app-crypt/qca:2[openssl] )" DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15' FORCE_PRINT_ELOG=1 diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index 1db012c8c4d2..e3a9b25509f9 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -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-im/psi/psi-9999.ebuild,v 1.22 2015/01/29 01:08:31 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.23 2015/02/22 18:41:23 mgorny Exp $ EAPI="4" @@ -54,12 +54,12 @@ DEPEND="${RDEPEND} virtual/pkgconfig " PDEPEND=" - crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) + crypt? ( app-crypt/qca:2[gpg] ) jingle? ( net-im/psimedia - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) + app-crypt/qca:2[openssl] ) - ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + ssl? ( app-crypt/qca:2[openssl] ) " RESTRICT="test" diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog index 61fbb75f0874..01923cb53abb 100644 --- a/net-im/qutim/ChangeLog +++ b/net-im/qutim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/qutim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.36 2015/01/29 01:18:11 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.37 2015/02/22 18:41:22 mgorny Exp $ + + 22 Feb 2015; Michał Górny qutim-0.3.1-r1.ebuild, + qutim-0.3.2.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. 29 Jan 2015; Johannes Huber qutim-0.3.1-r1.ebuild, qutim-0.3.2.ebuild: diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest index 9b068a2d4f88..6114a3b2bcb1 100644 --- a/net-im/qutim/Manifest +++ b/net-im/qutim/Manifest @@ -6,24 +6,26 @@ AUX qutim-0.3.1-cmake-2.8.12-qt-build.patch 4506 SHA256 c9354118436e71c978c0fca5 AUX qutim-0.3.2-astral-migrate-qt-telepaphy.patch 5761 SHA256 865b38868e90a599b9123eb5d42e6946c39e98871ee5e39aea3fe4b08b82a956 SHA512 e930fe3f6d33fc27c5cc578fceb09280c72201290e0e3eb97f57d8fd08616e4234b526db1a0445f78ef0338b1b6c83f60ff8be1123a8a5639a5b9d58f51d2f26 WHIRLPOOL 7c16f5f04fa367e48da1e20242d20a4b7c84024a7aa860a6ab70f8b8b7102e3b9d965d13666083e275ff3232248faf1811393d64ff1f7bff3bf2957cfe87de60 DIST qutim-0.3.1.tar.bz2 12056208 SHA256 a85f2bbb1d8010ee5506b0e82185a21a950d2fa36f72373a192070859e4944e1 SHA512 c3902aad605596bca943a2de706dcf1c35a0cf55df1309d8d0a7a4950a5900bc60829d6a785e408cbb66f21ba6ac3e5315d8d5140eed476ebee3bcb94cd3bc57 WHIRLPOOL 06a04a87f7cf24cf9440d263c835bb3273336838f9a927fc0debccec44861e057b5c97e5ab24d6f89c42edca6f183023396116fd0f5a32d04abfc01fdb27222a DIST qutim-0.3.2.tar.xz 10232436 SHA256 326bd4048cdee2913b6a01900d15736c54b431b4ec1a11c88e567920c2948849 SHA512 0767552e31d6e999f6622f14a48e2da7f4497b4a958550189dce38709689cb5f12e9b91a55b5d94d1a24f3e8149cf8453dea56b7e5a8c1758a6579c4142f01cb WHIRLPOOL dac2bb0c43e4bc195c2374aa885ae8174317eccb8e02d011902f4416b3808bf598507e1c74668f1ff04a53bd828d8695c93cc83e04342fdb92688b44236eb2a5 -EBUILD qutim-0.3.1-r1.ebuild 3678 SHA256 94952c5eabe309062731f78ab5690007250bac2fa92fd76cbdcc147a777dec91 SHA512 a878f75c2f6e6c637c55a5545dfcec0724addf9326ef2027cd2f9e717170378fff177064f5886ce1cca8d0b9f9c01089551905a69e2a77e878e043e5e627ea60 WHIRLPOOL b77f48f81533f136e1eb57402f0c07ed4ef8fad2de48cce963932b1015d00adc4ada04d555e7816343d54dfeb6651436794fe4a48283385299a5b3313be12c57 -EBUILD qutim-0.3.2.ebuild 5836 SHA256 8f11e04b7dd4fb9ffe51e4d4c26e43bffe4ab7d68c8d254cc76407866fa53b0a SHA512 6d4ec912ebc57249d41002896e338d37ceea970b3d0476614aa290256e2651df8df0dbd95e55e1f8339c2fd43961b7397abe9f677c2d02c7e7163042a78cc3dc WHIRLPOOL e260d220b5bf5abd977de405bde8a54e7d788f414acf87a96112a194a517bb274308cf4f304e29ca8511e162659e8f9f84f6ea2f877b6797f1bcf9e4132a18e0 -MISC ChangeLog 6016 SHA256 b7680fb961dcace4957366e77fe5fdfb84ec81f7a4080c1e69b08a0a4a20f94c SHA512 5eef3b063d21833356526072505d7c62628cea116aaf8aac21d028d346434ed2c65f9bbc923d8a0d809a24858bcc779ecdbf7b158760e28f53cfe115f4ddbb99 WHIRLPOOL 42f08589667b6d79015cfebee607fa948e4d057c8ddb4152dc2e33c0f30c2baaf8f8844b307c9ae2620dbc8eb8cc1cf4403e878375aba565be887cf16207aec3 +EBUILD qutim-0.3.1-r1.ebuild 3623 SHA256 0895b47872ac2b44d3fc85e562be32e921e45046416fc2f4990a543e6086f920 SHA512 e8571eb1d903660cb7810f8beb26de42258df3b9bb5c1f30ff6c043b00eb7f6cf7f738481481364b13cb7195e70b355c93c6d59dab28d27c5c0b94a97742dc65 WHIRLPOOL 2ab08021d7211cb8926af9e7952ce1ed267eee14686bfa89384aaac5a9e726a35db27912bbd8c8ee1ecdf3132cbced1e522f5ba2deeb4e2876c015b1d3fbbc7a +EBUILD qutim-0.3.2.ebuild 5781 SHA256 f0b0f007b14f009f252f8599e0013dc767955329616911757b0ca61788708b64 SHA512 ec5c35abcee4bf74c312210b92d70398b7b5f34ae8d6267e23270711173e9f91f43457af7968e87526dfcbdcec2ef4db08152935e925aa17339475f393528a26 WHIRLPOOL 9df7003564bdc05ff9273adec1fb8e898f9bb1c28ba2744d68bbac0108b077891e781172bd3b2a69b7fa739f02cc52b17c6e784e1853b014a59763d40a562464 +MISC ChangeLog 6276 SHA256 d56e1a4452387f76a1c9cffc12d0e73e193dc1ddf8a36b0d07e13572310a67cf SHA512 7696a188bcff782268c747cc8f7d5dd7dc4de4b9cc7633ff8a3ac901cbde82e6211223e74bbacffe2cf4c06305a74e335e15055a198198537722178e8167165d WHIRLPOOL feabfde24a3e18263649e8866d824e89d512c755b40daee620226ce44d6a01fa1ec86888310579164e3bab452879b3ae2aba30d74acc864d07aed2ccff35c4b1 MISC metadata.xml 2434 SHA256 73b5c832bc3d5eb0787755eadae66cbc21c74d63cf395a58d5f3a8ed8d81b586 SHA512 13c5934ca4c08f919ca822d3f3c129de3728fa7f6f135395d96496c78f745dfc1e8bac3f6640d9bc8ecea38310af32fc532c8b0d3d0d13ecb7c4c5e07a66cb7e WHIRLPOOL 59841e549ad2993588e4a2e09251f1ab86756577366d3cc045ee4707eb05166e5a7e04d7425b46d76b422d0bdb3f06af2f8bb6fdea508d3bfbedc13b80ae971f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUyYpUAAoJEGVpnaTzz9K9f0QP/3pTOgjtiF+7vga6JoTdiVAC -cuf16/W6nCwgZVkEoJBeXHXrA9lC4SF6hPy/uPRUnRy3DGclf6TBQ6nLM9hUSM83 -VV6veR0q1Ci2WwQJgS0Gjl1RFLa+GNElVzMJRdF62EyaHanX3vaXREG7IjviIGdT -E6p/30bTk/fgheBzyH4XkmEV4oiZPPBhunHvamKcm/hiGE5oc+4RPid5euIPD854 -vbNYEGn9R2n/E4JMsKQa7ftEnBZHf3uJsc2GoPZxWM/hDMsdVOmpnJMIhYCn6dUI -epkf1gPrVuCGr4+MxPbwH/Oaxa1KCrbOGuB0Ef/R5ocO1NjnHI3RF0OhhZhEXsAO -vfRxSlai0aWP2rHOoi1oP0RV0rEjKHH2ogvgjSsBPRX61pd9c66M8AsUkaWByI2E -Z5DklKCg+as9rxrOu+SqlEnBpOGGztOPvnM2iMIQKGNaUVSNztI4IcBJypflTCWc -89V71lpthpMjF/Yk5tFlVie5JoZHD5Ml2/qn50uqQc6SzjKPM0SvyxSi9ZbGde1s -+UrKBHWnipo3BNbxxjpkJvH1eWrf/HSPOnrrVoguXubBPo505g+UQi+40uG40p71 -7FI7C6CZXSdoPKHnTSnL+fF/EpHjgkygEko2KxlLuBN3vBVr3J2OjI0dIkASKdMM -PygaEAVx5eS4yQfsajWA -=ms9l +iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOflgP/3cBP9yEr54naI79o1Bii41o +A+IiVivrnXKJvPgUfaeIfErbQPu22ZECLy57l3zrojIKp8TKPWlhU6OPJggaLdBZ +iVUgDOzeUPZYdcrxb8DetVJZoYu4FoMB0f5xrkGYegIH0tIz4UU6yY9n48MfUQmn +VzOm7XzFQ7cIZeXd1AANa0zrXotUssRFtz1KWe2mr6Me6eGxuz0s/ueBDmUkDetw +CxMgpMUu7eHfTB/bixCtp3Uap7faw6+I0rRw1WNr5nu/xOjVWNO5T8O/YNy8r0hn +ecdRqzjKVIDxqRSOHfQOtp9dRapb2HIbxeZynPuOrlF6O1rjR90gIEM490+qyICz +XEFMV3XMNmA9sO6WGbpuBFaSenPCiLLhZ8CXZj5stqLZVHM3s1WXn8+DZer87usk +sBfF0+GYTlmIe8SEiVf8R+R/zlhZrLgFIPRc1xvNLbc8fKSOHh34/Fvo5qNQJN6z +Dwv3Gq+K4d5MI4f67t6kwrbTB9Rn8GP/kRwU+/n30jF/xs8BK0ofKj8O4wo0jx7Z +DZSYwbHRPuPeiacoKYJnsp2JygQKMB3wLDRVykcZ98PlON3NoDURPXD6FFHHCUZN +LXYcwW8H7+UNTiXcQTTxMx2TMX5HYq640eA7ogpbElEKvX+TqBU1h8T7c+ApMMBF +UsWML6bzOOMxrYD5762h +=3KgN -----END PGP SIGNATURE----- diff --git a/net-im/qutim/qutim-0.3.1-r1.ebuild b/net-im/qutim/qutim-0.3.1-r1.ebuild index 14a8ec1d783c..b4388b2b2a23 100644 --- a/net-im/qutim/qutim-0.3.1-r1.ebuild +++ b/net-im/qutim/qutim-0.3.1-r1.ebuild @@ -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-im/qutim/qutim-0.3.1-r1.ebuild,v 1.3 2015/01/29 01:18:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.4 2015/02/22 18:41:22 mgorny Exp $ EAPI=5 @@ -70,8 +70,8 @@ DEPEND="${CDEPEND} kde? ( dev-util/automoc ) " RDEPEND="${CDEPEND} - jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) - oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + jabber? ( app-crypt/qca:2[gpg] ) + oscar? ( app-crypt/qca:2[openssl] ) " DOCS=( AUTHORS ChangeLog ) diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild index 3758f6dc3dc7..91f24e4f194c 100644 --- a/net-im/qutim/qutim-0.3.2.ebuild +++ b/net-im/qutim/qutim-0.3.2.ebuild @@ -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-im/qutim/qutim-0.3.2.ebuild,v 1.6 2015/01/29 01:18:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.7 2015/02/22 18:41:22 mgorny Exp $ EAPI=5 @@ -88,8 +88,8 @@ DEPEND="${CDEPEND} kde? ( dev-util/automoc ) " RDEPEND="${CDEPEND} - jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) - oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + jabber? ( app-crypt/qca:2[gpg] ) + oscar? ( app-crypt/qca:2[openssl] ) || ( kde-apps/oxygen-icons kde-base/oxygen-icons ) " diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog index 951d6d88cb27..60a275740c87 100644 --- a/net-irc/konversation/ChangeLog +++ b/net-irc/konversation/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-irc/konversation # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.121 2015/01/29 01:20:50 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.122 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny konversation-1.5.1.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. 29 Jan 2015; Johannes Huber konversation-1.5.1.ebuild: Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest index 58a0e3f5e452..15524dfe53e5 100644 --- a/net-irc/konversation/Manifest +++ b/net-irc/konversation/Manifest @@ -2,23 +2,25 @@ Hash: SHA256 DIST konversation-1.5.1.tar.xz 3188288 SHA256 97838dc3cb07210c96154958237e216ad05cffa334f5e549d8619b4c70961986 SHA512 c34def02b776692134e40f6a6fc8a7d362a58d1365a247f21828e08a0df95aface809e23f187f7c445112ce3e8cc41826ef8558de5b224258269c67ea6826615 WHIRLPOOL 44e78a0353673401ab36f2d292e18d19305d0aede43b5b929407fc0cb9d5389816b2840e7acecd644c172eada9eee52f8bbca5d9dfa252189d57fcc646fe644a -EBUILD konversation-1.5.1.ebuild 1055 SHA256 1d6502e1475b89c4076f228bc49bd96a5f02e5d6e75cf0f72390229c2836054a SHA512 03a2e39e9d341ffacf34170b479ae416b90a5c97c792d755882911e4253d00674153d526e75465d9f9e23019448bdad77fad6aa302c25d0e4ece7fcb189ce39b WHIRLPOOL 4007355642e4778fd2b8309a60e476abc30b5783c27b1fb0e578afd357c1613fc176657b6da0b36264b0f6a6b5270078edf843445b643859554593b59b8be687 -MISC ChangeLog 17667 SHA256 6ee667f009da3c069100005774fb8f6679b0602e29ac9746b2338e753092f3c5 SHA512 b45316cd65ff712fa0310875f28661e8cb75d57198f5f282a604d875d9842c3ac6e6604e785e8b21ccb65d9e4ddf17030dedeedd784ccf7f51710edbf82e1f41 WHIRLPOOL e64a7296eb7cb40bbe9a2c234a8bf987fe696bad8d159f0ecfab1601f348ab9bfaf75fac310e34ad8c45394429d59d1885edcb4344d629908000566417ada12c +EBUILD konversation-1.5.1.ebuild 1029 SHA256 bfc0443a7511b90078bc0dcc1fa1fd535d06405c8a62c0952a4503dc408d96e7 SHA512 101f96f6e26d6cabb9eee9c920932867954c28393d628431ddcd7748e5c8f28d2fbdcf69d837e105288c3e1963a126eef4469053047e4abe5c655f1291a2652e WHIRLPOOL ae472cdb3211dd57cd9384fcf6c80deb750bf9c3d9a19139657988f3106bacd3e42104a74529e070094c19d743422ccf19f57afcd877130ce1b4638084aa2b05 +MISC ChangeLog 17909 SHA256 c9cb390473fa29f11d7033b6831d7c8b25683de004a97feebf5dc467f2fd3bda SHA512 2757423f50b61f4cbaf5f6ec86d10d02a630b2d4aa26815ff260e61578ad6b626ab0febadab82132757787a83ade1ef51c4fa1a8b23f40d4a6c8ccbb0ed37ca6 WHIRLPOOL 4993f1c6d0836b1be92d2aeee236df5f50f5d28acab95a884c38f88f1a5758e129b6e1d44c29fbdbe7428efa093f5f8fd3009706efec41b049953042d8fe587c MISC metadata.xml 177 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce SHA512 65c9833c0dfd58cbec68d7c3d88849dbd9477cd76cc983fc580d531525998cf280c6b708b9d3eb970f9b6e18bcf21da194bbb0a1931efbfc4164b1709226cff0 WHIRLPOOL 427f0f186ab280f1f9aaa3f27f89fc69743a38848e0e2d369013da2c907faabc47e4a66497ae6079376c7742db639f42d07262bc011c0e8311cd6228a9867b48 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUyYrzAAoJEGVpnaTzz9K9CFsP+wdyCP273iznSS+xEwKdnQMg -5QOtXgwSqT7w/SRQK6rhJ38bR5us+GGeuACDihoJLQapLxrSFG3vrg3/xbQN3lJ7 -u97Q+MVP7H4cUZbllkw6mYD/xgZw8QlbHjlfozRWWDbwIVY5R+YEin3VENqlzJaW -fIzeRKBvqM0Z+IA+td2dGVQzXejebYhl92yiX2J+FVWZL9XOxf+JpzvxZfeEDRKa -z03kFu8GcxrMUzQ6Vf99fEaEMwy85Do4dnv8jSmuKDVWmaj31lhAZjsfhA2yPDIr -24mu/8r2t1gKu5hc1jpifGdubRaareYmluiGd37RmwaHTK1y4xni2Nxx5c+4HyZq -1EhdcdOkNitKbRVF88ta8/4n7zy+OZjsUMYmh87mURDk/OhrITvFij2daKSZOUGb -9x40jgZMM5/QkWUvWPPW7+6R8xLVJoFRPxjUY3xzkWhuVrGNVsmADp6ZAsqqO2Du -2KEXwlJcg0OOfHcq++ILBD5CJE0nSp+1/3FwngjDIARJPLRdCtiRgyfLMGnu0b7H -5iOK+HushVED7qfsH9GH0htWcYygJyT2Pnptr2LD3RCF2bNcJsmtIm2H3FCxHbMA -3UFxlVYBxmrbNIOu+0V1zMYDaWFSfGldiOvuWa8doJnEcIFHEYDrLooHq7o/KBj6 -xuXwJyc9TUADeuQfUVb6 -=xgCX +iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO26gQAI6TzOvo5SMYvM2ekAkrFiyx +SOpbGe6wYqIhaQyutAup0Xtg47EX6ZJjCROz2b4V1mcJs9LgYx7zeOoPRMuucc3L ++8HERXQ+OPaqcz2vG6FePpLYSYfucC2bVQyMg9rgZpL785oi5ESmUQiH9OyQ3SuR +OxJv2koYhiFb0nrP/iNKEdCa+0/HAv/ESaupfO+PUA8PUP0r0JPlnf7+V6yQzASJ +yWy02UBkgwlN1dhYeDUtlqqqqD4+8S0/YP1L3paXXtKC2QAfwJcoD5PNjoTlhjSz +8xTN8xSmW08LZjkjx6J5ZOhz+PiTeFyU6Xm/SRrxIvSuBJvpiRTwhbcgvKm9A2Jn ++3dhTuic7uRlotm2sUqT1lqL2CZjBGeRzoMZbDj3pCSwjni+H4hWXoHjXqeubh5I +dNlte+rBWXHSvE4V5GBS4+ZZr51oVLsI+V/+WOqXOt7gWmuCjXM5SpyILX72+Vs4 +xp6yK78A0w+STmjnDGgb1ikXNfWTW1ehN2mzFOAUR9eTinPNShw4bhpJ63VrTsrw +Krcq6EU3gdPkKM6LbXxucvOV11PRI3VhGBkKUqZxvHk4EB0yaBa2sZ/MvAW30sUH +OSgX4wPnDCLM1ILkTjxnWUicpI3E3UNPKuVoMeDfbq2LXnc+l1JJ5YYmA83/aBa8 +B9icB7UPLJTNvzRmAr6q +=rqGD -----END PGP SIGNATURE----- diff --git a/net-irc/konversation/konversation-1.5.1.ebuild b/net-irc/konversation/konversation-1.5.1.ebuild index bb4b76ed8297..cecf4e9b496a 100644 --- a/net-irc/konversation/konversation-1.5.1.ebuild +++ b/net-irc/konversation/konversation-1.5.1.ebuild @@ -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/konversation/konversation-1.5.1.ebuild,v 1.4 2015/01/29 01:20:50 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -25,7 +25,7 @@ DEPEND=" crypt? ( app-crypt/qca:2[qt4(+)] ) " RDEPEND="${DEPEND} - crypt? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + crypt? ( app-crypt/qca:2[openssl] ) " src_configure() { diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog index 57094bc0e59d..1bf1a9571fc6 100644 --- a/net-irc/quassel/ChangeLog +++ b/net-irc/quassel/ChangeLog @@ -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 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 quassel-9999.ebuild: Update dependencies for Qt5 based kde support. diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest index f41ac4c3c16a..279784e51553 100644 --- a/net-irc/quassel/Manifest +++ b/net-irc/quassel/Manifest @@ -11,28 +11,30 @@ DIST quassel-0.10.1.tar.bz2 2872973 SHA256 0d17b7d2284d9ef29ba4dad515ec84ce41a56 DIST quassel-0.11.0.tar.bz2 2875387 SHA256 99a191b8bc2a410f7020b890ec57e0be49313f539da9f4843675bb108b0f4504 SHA512 51450559df2c0fee9a54b76a9342edb9a3b834f1f58edc556e0c1bf1f9366c846d95e7953e1b48c6ecf67ea4255b3574ed3ce537962eec222c5c03ab02852c1d WHIRLPOOL c2ffb7e052a5d412aec5d1b8bacc8cdb8144c20d62d699ca1d8972fd5e8fe6ce89da49251a02c22008061b344d9408b3f018b3b39623703b4d980c289cd5613a DIST quassel-0.9.2.tar.bz2 2782855 SHA256 f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0 SHA512 81e343b9b7df7473c9d899df9ad8c4baa779545ac4fe15c3b7d47f3e9473d24aa78c8cfc1833b79ec5b4b3173e8d83e22394a50b7184f348b3f1155bb3724f3d WHIRLPOOL 0b5b45c1bb400f5e2728d5e74f35bc5ef010c029c242940b83c4e6ec3a0c0d16d0c9d9848278d075a548e4e15736f142cc99d4741b8e4901d6589b7f7e05996f DIST quassel-0.9.3.tar.bz2 2783132 SHA256 ec29df5c55a02f91d15fa23618b42fc82b0bb912594420cc6340a40567ea3d4d SHA512 f200c23fe0e0459dfc116dcd194184a8be28e65d8116859925c1887c6cff290316a704ca3666c0a5b65ed93e2a6a65aed890babb466fe3996bf9c0e08f988e98 WHIRLPOOL fd9b3bd2241845de69e907d2fc3d895054289c271584b07c99b3032effda44183cd2ba3f0d4b1590e93a72a3735ecca6a1d53c1ccd0a3fc32fc6dc5ec5b2281a -EBUILD quassel-0.10.0-r1.ebuild 5042 SHA256 976e84bbc95ff822140c6c667a9736dd3769d753ac910182dadb77e77daf009d SHA512 9fab41c22d5b3ae7c6a140adce507d09f1f3ee2826bc49df2d001bfcf5397f917f39b6d3d31984e86992af84a8b7a31c198bc43f4529228d214ac6e5c7123a7d WHIRLPOOL 925a2f8e04baf458605528435ba55f5e5c27f6fffdf53b7bf3cc37a9786430fac4b8cfd7517ede83879c05746d9af674be4e79638ef72d573c4587a1ea61460b -EBUILD quassel-0.10.1.ebuild 5040 SHA256 6fc15042184ca2c42fb804f07159b8fadb66186eb3fbbe7723c668b52c6cd724 SHA512 a78477d1ec822eabedb3a3c7863ad0d825c5e2cc54c06d7dcbb892f03cdf547b9bc7c9d2742d3b23c034d6fb0914a3174ab6c26b8f673ef1966a3dd7da475c88 WHIRLPOOL 1f92c9e4b49faa1db472e7019708ce11647e839b1b01e7c7a360fcc8fc9c0ece2bd4c038dcd74c088867e38a1d88151926e75451620399f330004bcaf706a68b -EBUILD quassel-0.11.0.ebuild 5672 SHA256 453b7d1b5f1e24a210d6de90e95f1111699d532223480e994cbd598d4f97e966 SHA512 cec003ca353242479add16c54f9f3d7045bf6118c64497a85aac1295f17b5ca67fe64186fa0ce86886cecfae58211a808f087af3e866e4cb579df9cd69aadb2e WHIRLPOOL 3a5451b41385664af130e2153c5b00b228e7724310bfcc2182ac22093b21d4f495fd12d52fae0d341f52e99793d9131b60ff79652485734bb503479c3db5291f -EBUILD quassel-0.9.2.ebuild 5264 SHA256 f5ee8089a04ad593b9730596632e2dd53e6d6998b4b071ffb2da8bd00806ddd0 SHA512 7e54f8987561bf564bfe2513b7f524624c5bb0e344e735153d9f63faed932bb233098a224692e8cf39955006a8f4b31a01846de3d6c27acdc23c3d279208074a WHIRLPOOL e82f0fef87e47fdfc889a88699b025d7954186ad61a9bc36e31558703dae94c6741cbc3bb99697e6d7f06ff46a2d54aa6250722bb1338cdb9e730e0c87f5ee05 -EBUILD quassel-0.9.3.ebuild 5170 SHA256 8525c3215fc309260803fb9655ad7da5fe5e7b5844bdf7b744cac8589bb661d8 SHA512 9301ea3cf0daec33d39198733ddd9a7be3877f527920d5b9b67af45d722e12a2de822ba2b073a6fd0ce21908d6626760cbaa8c6c2a8ea7303da7d586ffbaaed1 WHIRLPOOL ab214c083cf16ac1dae733f88e4d967bf2983e2525d7984c96a17423aea968cb284ae674aa4303a0ca1bd47f97e046abaa360741f1a343b6f6ece318c2b5d7f8 -EBUILD quassel-9999.ebuild 6000 SHA256 089cdedaff63193b733b17687f1865bd884c7a89984609978d3f8bc47a546358 SHA512 f1b2acb1c27afac3d9947922c8f90af6b0f58b9c3f995ca694137f97150eaca6846bcc524b37cf7a0df35ae370e342d0e74cd941ea543100fbf9128dc0b0b26e WHIRLPOOL 20e48d1971f608e6f75345921c1bac647e10717fdc5f7c2cb9991fac1ccf52dcda18a9c866bcab2c095b6342e3c9ab5cc1e36d826f28a98478e26f19ddc183a2 -MISC ChangeLog 29552 SHA256 33683dbf2dc260d9c9000211595c928aa6965c5ef3f65ae758f8d9d3afdcbef8 SHA512 7ac552f786583b9a413fb1b0648833216486dc787ee4c14da94d8e7c7f9d31329f314413255a2a7ae47d7843a96686ec9eaea8e7ea448c7aabbb27f72afa910f WHIRLPOOL 0e74b98f02dad15589b54c7352949fed8abe69c48b068146d512f7733aabe4b13ea2b9fb0a21df4be82b358fe89806f0982060236dfe5cde7dd67f413bd772a6 +EBUILD quassel-0.10.0-r1.ebuild 4994 SHA256 b20c3c0a51e489c538781c0d3020868c13f5f8ec1104c6e318c10a5d47b64f84 SHA512 12bcde0120b0835578644e72f4053040f9a4a63c877921733bcb250d57a8416506e85bc7b51f3a28d4a9a8871f2763d2f41fc2b4af9ee66bc8a49e20d44cf38b WHIRLPOOL dfb7c50e1e93a942161f523b85af3bc57bdfe50a5489600f98d5bfbba00720fdeb472ed96de7d305cfe512e09cd345949ed056311df62faf872630ee51ff0eca +EBUILD quassel-0.10.1.ebuild 4992 SHA256 745fb12a19a2411205bbedd6467650fc2eba4c88ca9e38989e4e2c49805b32d6 SHA512 10fb8dcbb1d6904921b553c42b9208e781493c98e0d352eb2767ba11048220cf7c2298d976f78d6cf64ac57e15f94dd5bb7a910d585ee8f6f8c8247c493ea2ef WHIRLPOOL d1249dcb052278fdc1bbd607d6862186a74247499be001f70d8a7ba925031ce2e9dcb75ab2352c05fa7d960d6209c6abeafc23266b1c0b8ee7b787723dddfc75 +EBUILD quassel-0.11.0.ebuild 5621 SHA256 6bc36f01160007c3411ab3b903213672f8319d893b97e6f42983a0fcb24b2def SHA512 7993183acef66aa5fb9fb117da4643e70a9fdd78344023a25d65074e662e103f4372e54975a81a92628ca6c865de511c85cbc9e7f5596fe8a424b37634be20d4 WHIRLPOOL 1b187e13784805c2af85277482a1b5dae27a7be632f67224781b609f2179f0528bd7e94d3bc5bdd0a8148349f683cfbdfe062becdee43efc16974c2a471fd295 +EBUILD quassel-0.9.2.ebuild 5216 SHA256 47bc6b669c17f03119dbbbb19be0e60bb256c2048e9749763c6cacd0e93919ea SHA512 c6c8945a15ee6d6dbc9a4bff2d729d33c39663c067ee19a79c3e8eb8de12c982805614464b961429985610b75049e9c4e975e8207a256957aeb493cd2f033f18 WHIRLPOOL 8143fb89d51531d2704513e2fa07ac7775101c71a2591e056157bd85b3cb4f8f38ecc3149938403a3c27dd422e796c042ad89ab6669d5dbf748cbc61762fb19c +EBUILD quassel-0.9.3.ebuild 5122 SHA256 27e9695a431a476a9a922069237c9f396586c458e16026607365dd79dcb3e545 SHA512 358540b9daa8bf5b72a8d13f107f9e35d73b0c931d9958c43f0677925d6ca194e3186dfec2a8dc0807371d37341b78df4424756c8c54dc63dd2abde59bfa30ff WHIRLPOOL 129f99548c1fa7916f67457d21848da920534dc2e63bc554b09e35b8dbd71302aafb0f90e5ebe78246106fceb919f3cf73b6dacee53aa13928721e335eefc22c +EBUILD quassel-9999.ebuild 5949 SHA256 1be872f9e03a6ee270716857ee97c17c0fa36d990269fe44652a9570e20e8e9b SHA512 6138c310954f5ace10270296eced8b882c3191b386b99c0b21a7603d835a8655c9299d33b923befafa59bfc9abafd804eeede8c4170c3cdab8a98227176733ef WHIRLPOOL fc73c334975331bf70aebc0e981db80ee642161d6a772506aca713cbee05a15849e2b2b9bf8fa4d6a72c5874d683d4858716e5a32f0eb22d1af01506064853bd +MISC ChangeLog 29908 SHA256 3b2c42f91ae65dc20ae3beb079d2bfe83233cf70b22477c74037829d5c045545 SHA512 8491fe68fbf164d3bd45f1f56087c6b5eaee4f08651ed9704472b5808f8cc764a9fe5391975e482f8fbadfc57cf0e0a1bdc2e14e48e5d45722cb985e6de93130 WHIRLPOOL f926632696dbb4684856c21645c9d3cdc394311bf1ade60340b0baf5a71d37f5c63d052982564667ab4f360f477122b049c3882f4483733ad52a56677b6365ab MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU4mixAAoJEGVpnaTzz9K9ECEP/0OE+g9Yxev/PZ4SgWyrXa7n -m8L3jFjvBE8PVygMVHI91loTLtwLqw1ECkcC5N5wEszuraIiDS7KRwOd/YGjLXFv -DIWHad3S8wWR3V88HX3fil+oP6S4ICpPbI4IIYEhS1ARgqdFLZk1opWaeZFISPvx -6TQwxGXWDaWpx5Xt17d+FEC1kKaHs6OpzInBql+y0e+CcToE9tVTCEU32/YBmWZa -Y11ollBxKcMUnj0TIPt0tXBzJE8hzqIjcbiuyoTnSji62pLzIkwQnXRZizXwYfA1 -cPJCVx10f9GKCAQ6GaWofQ1hFao81YTJnkJ8XAsTgQzrZAWFVa6fYLc4Wv/p+2hl -+arLgEH2zj/8yiWqNqVJrpMQ1tg27gx+WetcRSl+I0wvcWgq1sPxEPw/6e580sAo -xpM9MTh2dV49IUeAshRDyQIFlaHol/K5BblSex51M75xDIhchbUDCtXZHpNNz58h -/2Qy+y5N/wMm4SwW+fhrAZbpwkHqZ4e2lIB0+fJvZPfSCjsNm8zeFWGfvqCgClYj -sPuZmst5n35JbFupwmxWRPk/qResgpowtc14Kl8U/duwFV9cyGK8Lk7yR9u1fZO5 -hgs4EJSC2fB4+7o9Ijc1eMuE6HPYoKw8JR8Dsx1IhZpa+lMuSAJs73iNWC4PwTpl -wpb/E/odQeMGbDFoVafA -=H6wN +iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOewMQANG8P8wpeW73woKv27EDnDvG +XklidI5toGPjANjZVX9wiPq32bEF4wR+zcitvYJsLfr4xNjiC80QQtJStST29SCM +GBShB6ix/eIgPLBunjzFV/HHYWHRl99ZSgCo/EUsU8neFH5CKISM1mXVVOp0yNNq +4Kw7zQukAK2P8xkAktWsgW/6bxkenhIUD1N5Vh0Dq16c6BHiDbFdjkRjDwqq3e74 +hyQHFnQS3/jgJEYbwGKugAIMD9BZW4p0OG8wHcWGIL8bdhbA1y6OS1wnzH7cg/C0 +uMJdHoc07yAHv0CmYbRW+Mz+m3a7pqrU+KfeQZBJ8lfDaVgfBiBL3ydOEE18G1/g +RCGaJmUFOPhAAj57Oyq/KymbfRcgJ76Kyb4nUGGc7T+lmi8GYb2iRkjBzt6/9Why +QxG5rSBunFnQO95UR3L7sy2uGGgY3PLibzgl4rYkII8UJDXrWHu/oTWrmLvK15Pz +hpIDd/hlRkWhx90ial8jw0FYgUNsbi6eoqwnDLkjfFKHsAB2RIu+tb3BZjV3hsUu +0513Z6cvWvDbEOw0R8jfcDPSnq/wu+3bLDb+hsj+M95TWldd4ycS0C/mx25Zh3DA +CP8wihxRhLtonMvpgUm9mUN5ey10zBibMEm/BQMT3cKsKZsvkqIrao3zlV6AM7Br +MfpezjnywmCKRn6eNVfh +=2Wmb -----END PGP SIGNATURE----- diff --git a/net-irc/quassel/quassel-0.10.0-r1.ebuild b/net-irc/quassel/quassel-0.10.0-r1.ebuild index 6b2d45f9d4f6..500092dc1a47 100644 --- a/net-irc/quassel/quassel-0.10.0-r1.ebuild +++ b/net-irc/quassel/quassel-0.10.0-r1.ebuild @@ -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 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo 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 ) diff --git a/net-irc/quassel/quassel-0.10.1.ebuild b/net-irc/quassel/quassel-0.10.1.ebuild index 59d7daf8fd9b..a45eef1ca392 100644 --- a/net-irc/quassel/quassel-0.10.1.ebuild +++ b/net-irc/quassel/quassel-0.10.1.ebuild @@ -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 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo 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 ) diff --git a/net-irc/quassel/quassel-0.11.0.ebuild b/net-irc/quassel/quassel-0.11.0.ebuild index 1343ad137b4e..719dfc198dc5 100644 --- a/net-irc/quassel/quassel-0.11.0.ebuild +++ b/net-irc/quassel/quassel-0.11.0.ebuild @@ -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 @@ SERVER_RDEPEND=" ) !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] ) ) diff --git a/net-irc/quassel/quassel-0.9.2.ebuild b/net-irc/quassel/quassel-0.9.2.ebuild index 618c52562755..e59e0db12e4f 100644 --- a/net-irc/quassel/quassel-0.9.2.ebuild +++ b/net-irc/quassel/quassel-0.9.2.ebuild @@ -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 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo 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 ) diff --git a/net-irc/quassel/quassel-0.9.3.ebuild b/net-irc/quassel/quassel-0.9.3.ebuild index 3adbb2c5a9a5..b111291dfb26 100644 --- a/net-irc/quassel/quassel-0.9.3.ebuild +++ b/net-irc/quassel/quassel-0.9.3.ebuild @@ -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 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo 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 ) diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index 4b97b4941737..7fc867d36850 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -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 @@ SERVER_RDEPEND=" ) !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] ) ) diff --git a/sys-auth/fingerprint-gui/ChangeLog b/sys-auth/fingerprint-gui/ChangeLog index e89cb981913d..3d98e27d5055 100644 --- a/sys-auth/fingerprint-gui/ChangeLog +++ b/sys-auth/fingerprint-gui/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-auth/fingerprint-gui # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.10 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny fingerprint-gui-1.05-r1.ebuild, + fingerprint-gui-1.05.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. 29 Jan 2015; Johannes Huber fingerprint-gui-1.05-r1.ebuild, fingerprint-gui-1.05.ebuild: diff --git a/sys-auth/fingerprint-gui/Manifest b/sys-auth/fingerprint-gui/Manifest index 95ecd69d9803..cdf8ccdcc5f0 100644 --- a/sys-auth/fingerprint-gui/Manifest +++ b/sys-auth/fingerprint-gui/Manifest @@ -3,24 +3,26 @@ 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 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 +EBUILD fingerprint-gui-1.05-r1.ebuild 2444 SHA256 ce3dc0fcb969abf9640b88660cb263e92091225dc21570696b6f1af89c48fc7f SHA512 f189ded21b4abba4caa85ce153268d489510b2dfc29df7a004c487e6ebb5b078b76c1e03751a1613318ed089e817bf03552afc5549b95029f87e1e1dde851f08 WHIRLPOOL cf730c8fc697b600dee64ba50bfcf8424158b7585a02ae03c834fbbb9a744703500fa82f5d55897bca97dbf4d830d811a45a30ec2155099514829b80baac3f25 +EBUILD fingerprint-gui-1.05.ebuild 2147 SHA256 e368c090b481edd521417817948fc82b3da38bd66fe233d79f144820dc7af959 SHA512 e123388101bc2397cbc47987239773cd4c584543c51a3621954444774c43d32c4b5071ee60669deb8d63cab4e6d8d55d4fe283ddca9e86827b54d788e2ffa5bd WHIRLPOOL da4f4b62671dfc19522781e03d9a968790a3a3a9835a6c903127aee949afb5022eef5b31a606b52ff731a2487a67b7a62b8e29ad387c8f031f5e1e01d38d0656 +MISC ChangeLog 2319 SHA256 d6263450f058a2b2eddbb5caba2d1cf5dfa9ef7512920bc5c7f07626d3df89ed SHA512 34041a420a282e420bf5577ee43b14da57e15bf4d560e41457c328f89cf4edc53b2ba97f0e884f43a3058183e4d0bebf3781a250cf62e276c1d18dc2ebe99168 WHIRLPOOL c5ee33cb1f981fcf57a96de53a941bb155d2dc53b105b528e8a636c60ce72c3f803c672d4733b245d18a89c4508d1e2d760db3d4169369695633ad368cb3e828 MISC metadata.xml 330 SHA256 31500978cd7c73c82bf5442ee004433de86a8ba8f27353afe52c54707428fe62 SHA512 611f15046fc9268e3a05e960d557ab10f42c6b429e6bd19d8638dda5540af70ac2f853c8ad85cabee1d4cc4dc525fea6b4d8dd4ce1b7d91927e43765105dc144 WHIRLPOOL 7374cdf4adadff8480aacf7bbdee8c0117e9a20ed5ea8e68d5fe552183a45ad3dfd8226454dc915b8510f4e1babd81c549e30c3da65d73ae49681ff4d933c902 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -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 +iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOv0IP/j/Dtlpasx+p2lK35mw5fDlx +0z2gd917ywq+d7ae42IC+O/RBIvbNzEbN4UaDk75shR6N7AkvrSWqZ3N08xmpWny +eqHq7kDruMBph/xMaTjW66pyhLKU7eJB4jEJmCkodcQYvTKFyZFSI+Aria1xuqih +PlUK6zAp0SuQdTWY5pfA6hxVlbfyCpGjYBf9hvs8gOo4m2/dFDQVscOG6O2y3f2m +4XnKaK97Eyf52U0DuOEnxT0SJd35CXxRL0aOa8e4stLsdiqjcbhyisnmTdCIQSkV +Ukx9mC23OUv5G+FVG+RRAkgnY95/OSkKDWSsVbdI6dU+bmFBUxkYyjuvZEZ5rOEF +oTvztpPezFKeaE40JkIfOSw6hcZ+f2hwUaGI7skml7epKPAcJatvTgoS6YcP/ouj +ZKdJXdzMoEnMKU85YwEu4JBochtB0NrAzYkl1QNNhL0kE+zp0JlGU/O6LHFnV68x +6FwTJqn6OPbULXOvCTmPm7VQnW49s5+5S1cXLDdM0HpxxAKS9dego+9kOkeSuD5c +lRqeO1bM23sPBrP5OfFvmnuQYQNv7cIuos+TGKcFMEfdPeLZqLWsRtx+disvHoYJ +ICGoNlHVhCPupclHD2BAKZjIYyxBgn+4J7+KuL5QeYDBuYVhGytdd0IW86UpsYF8 +cPPOUrFbrRJO4EE1h/6e +=piuG -----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 6a6ae677017a..d1bb7b660a4b 100644 --- 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-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.2 2015/01/29 01:47:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -15,8 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+upekbsapi" -DEPEND="app-crypt/qca:2[qt4(+)] - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) +DEPEND="app-crypt/qca:2[openssl,qt4(+)] sys-auth/libfprint sys-auth/polkit-qt sys-libs/pam diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild index 92f55e7948ca..c6805e5ad71d 100644 --- 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-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.2 2015/01/29 01:47:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $ EAPI=4 @@ -15,8 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+upekbsapi" -DEPEND="app-crypt/qca:2[qt4(+)] - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) +DEPEND="app-crypt/qca:2[openssl,qt4(+)] sys-auth/libfprint sys-auth/polkit-qt sys-libs/pam -- 2.26.2