summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-09-19 19:35:14 +0000
committerJustin Lecher <jlec@gentoo.org>2010-09-19 19:35:14 +0000
commitcce5d09e95d398af35f000315de9f82ced12d674 (patch)
treea3555f93902f393d064bffbdfa191598b6a5753c /net-im
parentAdded ~arm keyword (diff)
downloadhistorical-cce5d09e95d398af35f000315de9f82ced12d674.tar.gz
historical-cce5d09e95d398af35f000315de9f82ced12d674.tar.bz2
historical-cce5d09e95d398af35f000315de9f82ced12d674.zip
Fixes DEPEND on networkmanager, 337496
Package-Manager: portage-2.2_rc84/cvs/Linux x86_64
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gajim/ChangeLog5
-rw-r--r--net-im/gajim/Manifest10
-rw-r--r--net-im/gajim/gajim-0.14.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 1a2f970778ba..32ca93a71f3e 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-im/gajim
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.102 2010/09/12 07:54:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.103 2010/09/19 19:35:14 jlec Exp $
+
+ 19 Sep 2010; Justin Lecher <jlec@gentoo.org> gajim-0.14.ebuild:
+ Fixes DEPEND on networkmanager, 337496
12 Sep 2010; Justin Lecher <jlec@gentoo.org> gajim-0.14.ebuild:
USE jingle and networkmanager added, 336272
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 2d54ae9e2959..35e74c534f7b 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -10,13 +10,13 @@ DIST gajim-0.14.tar.bz2 4142326 RMD160 93c1fc53225a48216efdbdcd38a5b22a289f317c
EBUILD gajim-0.13.3.ebuild 2311 RMD160 1bf58ffb76da0c4f553a1eb81a015f69164e011b SHA1 a3e3e166e50a039a82b6844c2b934eec873ef4c3 SHA256 f454753d3e12c55bd6a79194035f0c6ca02d36191fbc2c044b14e2730402518d
EBUILD gajim-0.13.4-r1.ebuild 2605 RMD160 c115075802ae815127e24010ec11e04a21e67833 SHA1 f619932717680e8da3ff76e06c253b2be2809ae8 SHA256 8c4bcf42820274ca45894a30e6a1e5ab49babb210c80a665032a678d14804913
EBUILD gajim-0.13.4.ebuild 2337 RMD160 8ec6f71031ab33bc494d82787681cb578376dfaf SHA1 c41938fb7b2a69c88eacf8bfc2f6417b364311b4 SHA256 af5d9714e0b28e4bcffd06bd23c126d4473510cf9d370a49bb4bde1b16c00edd
-EBUILD gajim-0.14.ebuild 2418 RMD160 d5606a500e1bf53aac92e4f9bf78b0ea42f5c0a4 SHA1 88792cfe2d19b9a53ddef092e2293ff925c94671 SHA256 f37e51c244fb50a00150b98c379572163a85617f431b6b649272fca8ad4330bf
-MISC ChangeLog 14717 RMD160 74a21eb08ec68d115e39780cba8586607e669015 SHA1 e41dc382828bee49511677ff2f7452e32c941900 SHA256 ca252c8401314f52ca2341939447339107ff328a21b372fee98017d548ed6ac0
+EBUILD gajim-0.14.ebuild 2457 RMD160 a789433cf20e16560b141b6a1fefc74bc8db99f1 SHA1 598fecdce3a14d6de4d3a2165f17576d577e3856 SHA256 18f44c8809b115ff6ff9e9cd0e9b560abdf66aa0bfc1272ff647da0fee578645
+MISC ChangeLog 14825 RMD160 079aae3c20e572ca199e8806613fddb46f49e357 SHA1 587910b697065dd04018af338394a714537f3696 SHA256 929b5d53f188ce12fa4c3e7f2a2efa60ecd4ed7e8776526f6b2a4c3f68117eab
MISC metadata.xml 553 RMD160 b4780201449d6f310007285b642aaccb6c350d50 SHA1 f9751ca146c518a6f31f1c4f802044e9e3c08013 SHA256 1353489c91efdd5bb461c63152d259504c3aedcb2a3cd69847994c9b17314d9f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkyMh0MACgkQgAnW8HDreRa8nACfds1ZP7dhABVkFgY3dBd0z96v
-JDwAnijh4kNDIotL7tpup4zzDsxsLnCv
-=hhoZ
+iEYEARECAAYFAkyWZfcACgkQgAnW8HDreRaGbgCfbopQovQyg+4xMseqmzA0X8OF
+2YQAn3bDbDqu01DVEw8FXnvZvSbSC05E
+=XMXI
-----END PGP SIGNATURE-----
diff --git a/net-im/gajim/gajim-0.14.ebuild b/net-im/gajim/gajim-0.14.ebuild
index 9f994ccc9565..d95e6ac1f6c4 100644
--- a/net-im/gajim/gajim-0.14.ebuild
+++ b/net-im/gajim/gajim-0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.ebuild,v 1.3 2010/09/12 07:54:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.ebuild,v 1.4 2010/09/19 19:35:14 jlec Exp $
EAPI="2"
@@ -49,7 +49,7 @@ RDEPEND="${COMMON_DEPEND}
jingle? ( net-libs/farsight2[python] )
networkmanager? (
dev-python/dbus-python
- net-misc/networkmanager[gnome]
+ || ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] )
)
srv? (
|| (