diff options
| -rw-r--r-- | net-im/gajim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.15.4.ebuild | 4 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.16_beta1.ebuild | 4 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.16_beta2-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.16_beta2.ebuild | 4 |
5 files changed, 13 insertions, 9 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/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 |