Fix DEPEND on jabberd, see bug #195091.

Package-Manager: portage-2.1.4_rc14

4 files changed, 28 insertions, 24 deletions

diff --git a/net-im/msn-transport/ChangeLog b/net-im/msn-transport/ChangeLog
index b42827575d04..813cafabd5ea 100644
--- a/net-im/msn-transport/ChangeLog
+++ b/net-im/msn-transport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/msn-transport
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/ChangeLog,v 1.23 2007/05/06 11:47:42 genone Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/ChangeLog,v 1.24 2008/01/08 08:13:38 nelchael Exp $
+
+  08 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  msn-transport-20040531.ebuild, msn-transport-20040531-r1.ebuild:
+  Fix DEPEND on jabberd, see bug #195091.
 
   06 May 2007; Marius Mauch <genone@gentoo.org>
   msn-transport-20040531.ebuild, msn-transport-20040531-r1.ebuild:
diff --git a/net-im/msn-transport/Manifest b/net-im/msn-transport/Manifest
index bb8488700610..a75358deffab 100644
--- a/net-im/msn-transport/Manifest
+++ b/net-im/msn-transport/Manifest
@@ -26,18 +26,18 @@ MD5 5fd3cce8c18bc9ca1aa9ff085bcb3f7e files/msnt.xml 3328
 RMD160 527c83080e49c9479606fd88f672a2f4bdacc057 files/msnt.xml 3328
 SHA256 af572362ccb78b308ab2a75b05d1e06e669caea6052b6c8ad37f6755dd193d15 files/msnt.xml 3328
 DIST msn-transport-2004-05-31.tar.gz 71985 RMD160 7cebd4b4a6faab271281cc7f1d791f01a3ec9a55 SHA1 e994ba4301a82f686cba4b509db796641752436b SHA256 eb1b268acd9283c6be91b59c4196d594ec49bf4d67d64c35647701b0fa6cc092
-EBUILD msn-transport-20040531-r1.ebuild 1362 RMD160 fbbbc71020b51b08db0af4e0988cf55fe378f3b8 SHA1 f92bc73bbd78d87e121e7267db4fc36b6a8c0b4c SHA256 bd5a83dc320e261ebe697afc17f36ba7a83de07ae5d9edf8b68b8722f850c1ac
-MD5 f155f0c375f583edd56c177136b4bada msn-transport-20040531-r1.ebuild 1362
-RMD160 fbbbc71020b51b08db0af4e0988cf55fe378f3b8 msn-transport-20040531-r1.ebuild 1362
-SHA256 bd5a83dc320e261ebe697afc17f36ba7a83de07ae5d9edf8b68b8722f850c1ac msn-transport-20040531-r1.ebuild 1362
-EBUILD msn-transport-20040531.ebuild 1285 RMD160 5fd853cdca0d27b2fbd5018257a3038776289b26 SHA1 4b9c000015d207a3c6d90d3500a9319c59c13865 SHA256 a3c6d635d8801430f3837a8adfb8631281f0b449a09c2c41565128ae828419f6
-MD5 0d859ce1f5ed551b0dbe9c034af6d913 msn-transport-20040531.ebuild 1285
-RMD160 5fd853cdca0d27b2fbd5018257a3038776289b26 msn-transport-20040531.ebuild 1285
-SHA256 a3c6d635d8801430f3837a8adfb8631281f0b449a09c2c41565128ae828419f6 msn-transport-20040531.ebuild 1285
-MISC ChangeLog 3571 RMD160 7bad086a58ed4b0e8233a1e3b88ab4bc3cb7143d SHA1 7cf732f061ba63ce04acd90e7fcaa1195a015b80 SHA256 7142d46845164598fbb3dbdbc836cd26348ae3cf0fbf7b8b2f1b826d5a737827
-MD5 9915b7173a81d4052768a47136452769 ChangeLog 3571
-RMD160 7bad086a58ed4b0e8233a1e3b88ab4bc3cb7143d ChangeLog 3571
-SHA256 7142d46845164598fbb3dbdbc836cd26348ae3cf0fbf7b8b2f1b826d5a737827 ChangeLog 3571
+EBUILD msn-transport-20040531-r1.ebuild 1381 RMD160 50106748c49053a3f415e4c9218abeb92221863c SHA1 123363c706b3b560f9179eaf597afc53ed927014 SHA256 f552bbcfab591f9a1e4e0dbf1b64d008b67916be1b17861c7d279ca0e9b5c567
+MD5 22d3ec831bd875d42870c9a3e9de5cf8 msn-transport-20040531-r1.ebuild 1381
+RMD160 50106748c49053a3f415e4c9218abeb92221863c msn-transport-20040531-r1.ebuild 1381
+SHA256 f552bbcfab591f9a1e4e0dbf1b64d008b67916be1b17861c7d279ca0e9b5c567 msn-transport-20040531-r1.ebuild 1381
+EBUILD msn-transport-20040531.ebuild 1304 RMD160 04676b24fa573aea928bcf4f3433350f15ed8f6a SHA1 2c7d52bd836c98c457d61fc6213c578c4d73e086 SHA256 56aac8129b3b90df09c3bdb5f7868d85df56e4ddd9a714b9914507110ece97cf
+MD5 0d387fce3f42f3eb05efa8f810b3dbf8 msn-transport-20040531.ebuild 1304
+RMD160 04676b24fa573aea928bcf4f3433350f15ed8f6a msn-transport-20040531.ebuild 1304
+SHA256 56aac8129b3b90df09c3bdb5f7868d85df56e4ddd9a714b9914507110ece97cf msn-transport-20040531.ebuild 1304
+MISC ChangeLog 3736 RMD160 d3457608d15d4cb5befb8f678f7af7946b2348ba SHA1 3ba25a7f85306230e591ab9caeaf00a9bbf714e4 SHA256 1ded7bd05006a8a821d1308b64d9cad23a83dca265130712bcdb659fb1367593
+MD5 dff78c18bab71958df7cdace5a1abe28 ChangeLog 3736
+RMD160 d3457608d15d4cb5befb8f678f7af7946b2348ba ChangeLog 3736
+SHA256 1ded7bd05006a8a821d1308b64d9cad23a83dca265130712bcdb659fb1367593 ChangeLog 3736
 MISC metadata.xml 319 RMD160 eeea23476e8622a1f2bc58fdf41e39c4ff2793eb SHA1 6174cd1d68098a3b0b34aea05eaca7933d75024e SHA256 86e1a6a3a07b355096195b085e0c230ba083b92b10a4fdf74db972f5551a50c8
 MD5 d76a7c620d2b4630a7f3f6d6a0f4e353 metadata.xml 319
 RMD160 eeea23476e8622a1f2bc58fdf41e39c4ff2793eb metadata.xml 319
@@ -49,9 +49,9 @@ MD5 0323bbd061349595e47910e16d7883c1 files/digest-msn-transport-20040531-r1 271
 RMD160 c612c911a2db55a47eb06a48ebb932a8c2c6fd42 files/digest-msn-transport-20040531-r1 271
 SHA256 faab80b70dc98db0367e376c982445d4d114ea21c75e38123d07f55d32354b7a files/digest-msn-transport-20040531-r1 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGPb+l6J2i8a8J4okRApC3AKCYUtq8aMVPYov3r5d8cqtMLNA59ACfbYu6
-L7HPttAjQRZmEypseFW6baU=
-=yKdk
+iEYEARECAAYFAkeDMLgACgkQgo/w9rxVVVFOiwCcChUZveyhASO1kCtftOQ1uzCc
+foQAoKBFG/5AgPbzjlwt3E6N8DN02PM9
+=S8DO
 -----END PGP SIGNATURE-----
diff --git a/net-im/msn-transport/msn-transport-20040531-r1.ebuild b/net-im/msn-transport/msn-transport-20040531-r1.ebuild
index 8dd23973ca40..201cf86cc093 100644
--- a/net-im/msn-transport/msn-transport-20040531-r1.ebuild
+++ b/net-im/msn-transport/msn-transport-20040531-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/msn-transport-20040531-r1.ebuild,v 1.11 2007/05/06 11:47:42 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/msn-transport-20040531-r1.ebuild,v 1.12 2008/01/08 08:13:38 nelchael Exp $
 
 MY_PV="2004-05-31"
 #Ugly, msn-transport weired version numbers
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc x86"
 IUSE=""
 SLOT="0"
 
-DEPEND=">=net-im/jabberd-1.4
+DEPEND="|| ( net-im/jabberd net-im/jabberd2 )
 		net-misc/curl"
 
 src_compile() {
diff --git a/net-im/msn-transport/msn-transport-20040531.ebuild b/net-im/msn-transport/msn-transport-20040531.ebuild
index c6423ca838ac..88c9ad3c391a 100644
--- a/net-im/msn-transport/msn-transport-20040531.ebuild
+++ b/net-im/msn-transport/msn-transport-20040531.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/msn-transport-20040531.ebuild,v 1.13 2007/05/06 11:47:42 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/msn-transport-20040531.ebuild,v 1.14 2008/01/08 08:13:38 nelchael Exp $
 
 MY_PV="2004-05-31"
 #Ugly, msn-transport weired version numbers
@@ -15,7 +15,7 @@ KEYWORDS="~hppa ~ppc ~sparc x86"
 IUSE=""
 SLOT="0"
 
-DEPEND=">=net-im/jabberd-1.4
+DEPEND="|| ( net-im/jabberd net-im/jabberd2 )
 		net-misc/curl"
 
 src_compile() {