summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2014-05-08 11:49:43 +0000
committerJohannes Huber <johu@gentoo.org>2014-05-08 11:49:43 +0000
commit8d57572ddcb5643dad53ade750521f5dcaba978f (patch)
tree6345d33acb3358eeb14a0287c8f41a8e4372c05c /net-im
parentFix gpg signiture (diff)
downloadgentoo-2-8d57572ddcb5643dad53ade750521f5dcaba978f.tar.gz
gentoo-2-8d57572ddcb5643dad53ade750521f5dcaba978f.tar.bz2
gentoo-2-8d57572ddcb5643dad53ade750521f5dcaba978f.zip
Fix dependencies, because Agostino Sarubbo <ago@gentoo.org> is not able to check reverse dependencies.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gajim/ChangeLog8
-rw-r--r--net-im/gajim/gajim-0.15.3-r1.ebuild4
-rw-r--r--net-im/gajim/gajim-0.15.4.ebuild4
-rw-r--r--net-im/gajim/gajim-0.16_beta1.ebuild4
-rw-r--r--net-im/gajim/gajim-0.16_beta2-r1.ebuild4
-rw-r--r--net-im/gajim/gajim-0.16_beta2.ebuild4
-rw-r--r--net-im/gajim/gajim-0.16_rc1.ebuild4
7 files changed, 19 insertions, 13 deletions
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 94c5b745f996..13ae94cf7e33 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,12 @@
# 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.202 2014/05/04 16:14:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.203 2014/05/08 11:49:43 johu Exp $
+
+ 08 May 2014; Johannes Huber <johu@gentoo.org> gajim-0.15.3-r1.ebuild,
+ gajim-0.15.4.ebuild, gajim-0.16_beta1.ebuild, gajim-0.16_beta2-r1.ebuild,
+ gajim-0.16_beta2.ebuild, gajim-0.16_rc1.ebuild:
+ Fix dependencies, because Agostino Sarubbo <ago@gentoo.org> is not able to
+ check reverse dependencies.
04 May 2014; Markus Meier <maekke@gentoo.org> gajim-0.16_rc1.ebuild:
add ~arm, bug #503596
diff --git a/net-im/gajim/gajim-0.15.3-r1.ebuild b/net-im/gajim/gajim-0.15.3-r1.ebuild
index 2364cdd6d573..a8804adb399d 100644
--- a/net-im/gajim/gajim-0.15.3-r1.ebuild
+++ b/net-im/gajim/gajim-0.15.3-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.15.3-r1.ebuild,v 1.10 2014/02/19 01:12:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.3-r1.ebuild,v 1.11 2014/05/08 11:49:43 johu Exp $
EAPI=5
@@ -55,7 +55,7 @@ RDEPEND="${COMMON_DEPEND}
)
idle? ( x11-libs/libXScrnSaver )
jingle? ( net-libs/farstream:0.1[python] )
- kde? ( kde-base/kwallet )
+ kde? ( kde-base/kwalletmanager )
networkmanager? (
dev-python/dbus-python[${PYTHON_USEDEP}]
net-misc/networkmanager
diff --git a/net-im/gajim/gajim-0.15.4.ebuild b/net-im/gajim/gajim-0.15.4.ebuild
index 1bc4ed5126a2..5e8a8fb30c5f 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.10 2014/05/01 11:33:55 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.4.ebuild,v 1.11 2014/05/08 11:49:43 johu 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/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 d9fba06ee93e..23296e19c431 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.5 2014/03/06 12:27:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta1.ebuild,v 1.6 2014/05/08 11:49:43 johu 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/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 02db3fcd9b31..269c4493d6d6 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.3 2014/03/06 12:27:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta2-r1.ebuild,v 1.4 2014/05/08 11:49:43 johu 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/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 843b6358cbb9..3d7ce54df19e 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.5 2014/03/06 12:27:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta2.ebuild,v 1.6 2014/05/08 11:49:43 johu 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/kwalletmanager )
networkmanager? (
dev-python/dbus-python[${PYTHON_USEDEP}]
net-misc/networkmanager
diff --git a/net-im/gajim/gajim-0.16_rc1.ebuild b/net-im/gajim/gajim-0.16_rc1.ebuild
index 60234b2f6871..bd7ae3e7d3c7 100644
--- a/net-im/gajim/gajim-0.16_rc1.ebuild
+++ b/net-im/gajim/gajim-0.16_rc1.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_rc1.ebuild,v 1.2 2014/05/04 16:14:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_rc1.ebuild,v 1.3 2014/05/08 11:49:43 johu 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/kwalletmanager )
networkmanager? (
dev-python/dbus-python[${PYTHON_USEDEP}]
net-misc/networkmanager