net-im/gajim: Fix deps to be OR indstead of AND, #503476

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 32 insertions, 28 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 0cd3ff097a6b..b5096d67e707 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.194 2014/03/06 10:30:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.195 2014/03/06 12:27:23 jlec Exp $
+
+  06 Mar 2014; Justin Lecher <jlec@gentoo.org> gajim-0.15.4.ebuild,
+  gajim-0.16_beta1.ebuild, gajim-0.16_beta2.ebuild, gajim-0.16_beta2-r1.ebuild:
+  Fix deps to be OR indstead of AND, #503476
 
   06 Mar 2014; Justin Lecher <jlec@gentoo.org> gajim-0.15.4.ebuild,
   gajim-0.16_beta1.ebuild, gajim-0.16_beta2.ebuild, gajim-0.16_beta2-r1.ebuild:
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index c7bd6c442028..f38828c1e96b 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -18,28 +18,28 @@ DIST gajim-0.15.4.tar.bz2 4473874 SHA256 27acfecf40e2da55e8f7ec5d653acaf0914376f
 DIST gajim-0.16-beta1.tar.bz2 4617116 SHA256 c51746c5456b03b95dbea9a56d961b447b1c75d603979314355df360265b6cb2 SHA512 ce2317f460b3bf1bef91f0c29bc4da715c0c59680f59a2367f0ee6b93d160e47917bb28beaac0f7c02d51868d2040e8c7ed2447b509ca05eb4429d3eaf4b857a WHIRLPOOL f70c26a1337a306ffdf616edf06cc10e94a8442df14b2cf1b65827182960937dfe37a510a702cb1942298818e82cbd1abd79ac7c180826eca82e132abcb4229d
 DIST gajim-0.16-beta2.tar.bz2 4648729 SHA256 2c88b7682b41d25cac7ccbe71a22be8968d763e72c5050570263f0e536682b16 SHA512 a2e76a99b839146275d32ba5accc4d2c2c88c7f5d42ae76c2e3f476a31de6b4c6dd4088823fb6c8fc6eedab09b3910509d347d19fb33c2672e1df2d49390f7a0 WHIRLPOOL 5cf4559ea9607ac71262b273019fe1e55b712f8bbd94999da68ff37774eb665f5b348c3fbcfc2406f4e781851c180a21b31ee5a6f2a7f5fa520373356be9f412
 EBUILD gajim-0.15.3-r1.ebuild 2897 SHA256 4bc276b5e46403712aeb95b4f9a0a1dbddf4aa1c24e15fa7df3788e7df5a6f7d SHA512 9f9bfee597b498710c0b64035b5222881d829827bfca5d022052ce46fd8e814e9a81952249bd3e6abe6288c52ea97f4ef71e303712c0b89d0a1ac8d7118fe8a7 WHIRLPOOL c94cf61e62bb5ab0c0fb3eb7d3daea2e2a7210b6da10bc4733bc5d65b804773296c0d73f9bcb2ae57975e04a245f1ffb145d1a00a853f49673a97d8fb615a837
-EBUILD gajim-0.15.4.ebuild 2960 SHA256 fd59ef531d9870155665c2f508f58dee2d4e90de7d02e0a8cd6a767c627c0c4e SHA512 06b7d876f2d17293fce43c246e5d3ac90756239b8c9520708775cfbb9fcf0f243e934453acd278e291e6cbd74895ddcbf8b344b316aee22d250973620d731e5b WHIRLPOOL a99fc7602a58215e6c3eebf26ae666585eab0116f540479509fc728c3abadef8d67f4feaa5c5b57120726f0d11a6692beb49504892d2ac084ddd22d35b187c8b
-EBUILD gajim-0.16_beta1.ebuild 2924 SHA256 1d3f3a842fd6bd1d560cd75599d7c54aebc706b6438ed6f2eee51fbc117a6e5e SHA512 961f1026e2c2b913c201c4fbdff19062e1b360a33e92c8da7740324c163ec7c416451394bccc65a778c0d155e16b8a88823764698979046797adafaeb099c9a6 WHIRLPOOL e459f0e3fa756e234f392f936b0fe20aa4a3d2d60a7bd9976c0ef09a5eaf6c5e6aa15fb50fb06032d35c017a90e4c492b491a23c3dbbc1ecb2a17f2b70f9bc64
-EBUILD gajim-0.16_beta2-r1.ebuild 3031 SHA256 21d51a6aac6fd17e9a8ba415fb738e2747179180f01707d8c1c0c7ee0063d372 SHA512 d095542ad0a67c1e3e99ac8383e740fe6ee42b6f41ac229ab3183896a59879e478d4201c44569a6287558133c1f262a70ebf0d8d31f2167ebfd47eb8ec80b9d3 WHIRLPOOL 49b3c63995ee7c3fe418b342c3f21c4ca4a47ab2b7c798e1b40dcfe3f559a6e7b885e24d65bf126c651697d1c05dd20d6885f2a997adc78b32ebace2505e71ec
-EBUILD gajim-0.16_beta2.ebuild 2919 SHA256 877a816789c2f3b9527eb5f1687e3a9db6db2de9c360c73c849a2cb5dc6f2111 SHA512 f93b35707474fa543371fae44a45a9317ce84f6b77920f02d1aa97b541fa253b6b80657aa88256630200a3125f9c4e99704aa14dd23e26442976e3c1645c11d2 WHIRLPOOL 917615bf5461ebdb74a0ec43d22f3209191188ce83ce1950a569d598f6c7c080acf67a7f33d9e54b93e521350b0a82725505858ff72ae0bad1a9bcf8491c614b
-MISC ChangeLog 28240 SHA256 903a52f9793486eb41b1a43af66d25281a51d41edfa49bab499c11fa9c5ab185 SHA512 06067d806aa98a0cdda093a24ef36e29063b6c38830b4fc7cf2e0e3b9e4b05df999edab326779aa0cd6ba012379b0b11df97226fc92b95971e3a242da955adc0 WHIRLPOOL 05ba3a6f4932ca2055ab16e8fe827b40f5c2ad4f89ab87b173e214e8e9707ff40cbae0d5c9996dcd3334b4ac4d4304362293508bf9bafe7e0d9f645353128dd1
+EBUILD gajim-0.15.4.ebuild 2967 SHA256 285bb7e48ca2ef28a7f0fa30c6f5a542fb3b32ba013abf14ade88cb405e043a4 SHA512 c065c1746fd78742aabaff26332f3cd1cb8b6edf154cd7bf822f310b9e5bcae55a7707f9bce799b5b2e79f39fe94932f5fff1900f689f110ea1b7821b1f9e04a WHIRLPOOL ebbb14fcd471ba1c37ad17683a9b19d49dfa2c942d19445070139fff046153d10b8af347fcf81c974f568dbd3073136832da64346fd521cb3a4edc3e69a579be
+EBUILD gajim-0.16_beta1.ebuild 2931 SHA256 46c133f86a86d4fba4df1342f050017dae84fb255f3e676af3de45c28c861ebf SHA512 b569c7e8343316f04c0d5f03f9c710e10104a57d5c6d0675e20a75906f0fb6866d0d8e6315a07f2d55974c8a1c01da931be752fdae62afdb860c841a9adc6600 WHIRLPOOL 837d7ae86b949b088d595dce4c29e11d2c8d0814bc4307efd2913cc02b2417b5daeed4b5db2680b5e7e934dac73fd6d25b53436e4bdce83f1237df482108b489
+EBUILD gajim-0.16_beta2-r1.ebuild 3038 SHA256 7e6872881c0be6e76a1d6a95fadf72cce3f4e455b79c2ec8505395a5bb9349ce SHA512 5ce73ca9add14ae9e61d8391f353d542c17cb2d410ba3944c42ac7ecc6c9233aaa4a0004bee61935a389a54827c3902c0e0d953d0eab5eda1d784026bb9ce3ad WHIRLPOOL 1e42bc0971d4fb41d2712115c6b2f0449be3004894f476290e145e9f612c8ce6559b76a20d473925fd0d1f6cb84decc4677d0fa37b0c864a97d589de96be5e28
+EBUILD gajim-0.16_beta2.ebuild 2926 SHA256 019e0da84230d76fab1719cf531ba77e5cea77710d2d2ccafe0c108856b6ef28 SHA512 c657215ca8bfa95af84d70fc80c453e1a8713d5345bf89661e8cc0228120a9d352fde33c18dc5c654967cdb73f1689b755182ebda80318f5d0e309d4133af645 WHIRLPOOL a7a742e8fbd6f2611501876dfae3697a94a806cb5ce1ae6f81ef4e4d8b2f4557c2ccdedc6d12fd313520bcf1588834a6b5e5a59bdbe38b794f48bdcb7a8a84b2
+MISC ChangeLog 28434 SHA256 3f9d61fa29afa1649729ad769301a556edb7fe72d577a5ed9a056b5912a4277d SHA512 89c08d410f9666cf67672af52f444ce099d1ea7c2a42c4f13644bd321c941e96d3ed9a05575fb8fffcae185b4ce13f10305ac807fb64cc4b6e39ec45c316846b WHIRLPOOL c1ed1867fce63cf1c5156c72348b3a44670a8ac62a2a75f7ccffd607a09f7cdf22192924faec750c037969c182409e0b46006c3e3a5b6688ae905eac8075ee12
 MISC metadata.xml 503 SHA256 781012e83e7e3d1480ed6413a58f8a294e3a1b4c4968b1217c9bf7b41cca3ae5 SHA512 cfc7f159daf5007962ea035289002df56575042d567aa36c495b95dcf7ca7bb931be622599537e9ea67c25b7cb75014acf38a13bda349218af7a5eb576ebb0a4 WHIRLPOOL 3ff97b378ffe5c79d63ba206dec6c346480c42aa4988bed662066efbf5599e0986c83cd1ade54bded8bb2e2ad0ab6ad6f18c791b59f11215c2a52c4503721cbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTGE4nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTGGmrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirR6oP/1644dtvkc4hL1qUEdMepj0F
-Vu0sIXQyBMwhN45pe6pDf48u7sG7dLkkdXDfdqg4sCCXQOAV/C59XnNbFnP8/Qz3
-oJWn4DgF8iZB5V5sZDlXc7DoObnhn2WjnQRR/7gw0FlPmwKKvM1GrrxAJFlK9+RS
-swAomoXkxZAVNypXab5l7Cs9Zppu0iFX/8LMEgOHPkiul9ZZ1F+6iRNvDD3BNO2K
-+KYwVN2HOZ0W2MYOIoIOI5ZjS1UWyolBsy8lDGEzieBO4S3s7VuGEeBjhpby1OR4
-RhP6y2Tnrg6kJuli+9NC27JRQ6EherbzqKflcTL4PFCH9yW1DuHMMlC8613bSsI0
-tk9p9RYhlR7qc9BuMg8HdEcVjjOIYMmOoP8pmYvMGz84Iu87ntEy+vfHDLCdyNJW
-fqoMW5Ah2QEhFB+Y4nWreXG4aLfkTloEtmVBnvETKDek2ckZEMEHtIv34rqsTYxW
-9bTWUYo9MEfyoTyp85XpaZgEqnPxOJLi4X9++M6LSMFtucrBciNMt9Nm5ovcawOa
-+dF9DnxZOyFFY9+wD6r07gsXULE5JLv1bInK/Yt6n8lohTuQgkVerJyFuo0T+y27
-ZiMuFLmD3lKZt5LhoSOiE+5SV2efTsbCHTU9kBPszr+za9s4eSyt2BamCvsVURMF
-f3r0mKAwfOq+MOMbP7Fe
-=R8Nv
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirP7kQAISIsr22bLwBui+ixFsS0KLQ
+BBbSDhUFvZ98r+z4tjdqorb2sxm/XSzpiluGmeegluYIAbLuE28UzOKPrQfFQtmW
+skjNoTwPkozDQ/2VbjCiqN6kIVzwWJRed5A1oa54c8bdLB8hRtPvwvhXghsD4Mvn
+Vq70xpObSQ6hTb6ozJcWFQLdU6/viWaMH8O5ULgp+p1Ff2nCqzh92nidBqFwaOGo
+adSiZ3hCJjLHjTZi4RYKmDaQHrn/n14jpaH6OvuoM8WquZRO6GuSKTpG4juObKSs
+Mir9+Wuxlfmd/Pb6x7CJ2aYdCNPER/Vxfyywvnh6aQC+u/FEVqYEBjZBvYnWKhdV
+1pnYSo6AccKrAoeKKUaQSynuAlUhnzECBk/UEM58qqgL7RtOwC7MTHpFrXXBZ+KX
+4WGcnbV7+w+dhzXBS+E4U6OFVjCw8CTWbAZh7q86UfOqk0kWGJs/mfLmhHNjxZZC
+8W2Tuf5wZq3wSO5hgjMk65F1EYg+G7FZUc6kJjALnU5q4r/obXBggfabEGf89EQb
+k42f1nKlFHywJvk68mjXA3aOmbMArvooQwNF1V/AtFr5fPY2TzCK3C8TK/VpCjwJ
+8SqIr0pwom5vAN+t3kMdlRRNfRUerptjVEQukDCehmvN0vlGNMCH0DQrQDjBbst5
+D6TtPEWLIul9zU4VCq89
+=50kV
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/gajim-0.15.4.ebuild b/net-im/gajim/gajim-0.15.4.ebuild
index e630d54e11f7..95ae5644490d 100644
--- a/net-im/gajim/gajim-0.15.4.ebuild
+++ b/net-im/gajim/gajim-0.15.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.4.ebuild,v 1.5 2014/03/06 10:30:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.4.ebuild,v 1.6 2014/03/06 12:27:23 jlec Exp $
 
 EAPI=5
 
@@ -58,7 +58,7 @@ RDEPEND="${COMMON_DEPEND}
 		)
 	idle? ( x11-libs/libXScrnSaver )
 	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwallet kde-base/kwalletmanager )
+	kde? ( || ( kde-base/kwallet kde-base/kwalletmanager ) )
 	networkmanager? (
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 			net-misc/networkmanager
diff --git a/net-im/gajim/gajim-0.16_beta1.ebuild b/net-im/gajim/gajim-0.16_beta1.ebuild
index 305a0c57455b..d9fba06ee93e 100644
--- a/net-im/gajim/gajim-0.16_beta1.ebuild
+++ b/net-im/gajim/gajim-0.16_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta1.ebuild,v 1.4 2014/03/06 10:30:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta1.ebuild,v 1.5 2014/03/06 12:27:23 jlec Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 	idle? ( x11-libs/libXScrnSaver )
 	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwallet kde-base/kwalletmanager )
+	kde? ( || ( kde-base/kwallet kde-base/kwalletmanager ) )
 	networkmanager? (
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 			net-misc/networkmanager
diff --git a/net-im/gajim/gajim-0.16_beta2-r1.ebuild b/net-im/gajim/gajim-0.16_beta2-r1.ebuild
index 39adc0cf40c3..02db3fcd9b31 100644
--- a/net-im/gajim/gajim-0.16_beta2-r1.ebuild
+++ b/net-im/gajim/gajim-0.16_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta2-r1.ebuild,v 1.2 2014/03/06 10:30:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta2-r1.ebuild,v 1.3 2014/03/06 12:27:23 jlec Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 	idle? ( x11-libs/libXScrnSaver )
 	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwallet kde-base/kwalletmanager )
+	kde? ( || ( kde-base/kwallet kde-base/kwalletmanager ) )
 	networkmanager? (
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 			net-misc/networkmanager
diff --git a/net-im/gajim/gajim-0.16_beta2.ebuild b/net-im/gajim/gajim-0.16_beta2.ebuild
index 055d822bf1a0..843b6358cbb9 100644
--- a/net-im/gajim/gajim-0.16_beta2.ebuild
+++ b/net-im/gajim/gajim-0.16_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta2.ebuild,v 1.4 2014/03/06 10:30:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta2.ebuild,v 1.5 2014/03/06 12:27:23 jlec Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 	idle? ( x11-libs/libXScrnSaver )
 	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwallet kde-base/kwalletmanager )
+	kde? ( || ( kde-base/kwallet kde-base/kwalletmanager ) )
 	networkmanager? (
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 			net-misc/networkmanager