Fix dbus dep wrt bug #154521.

Package-Manager: portage-2.1.2_rc2

diff --git a/net-libs/libtelepathy/ChangeLog b/net-libs/libtelepathy/ChangeLog
index e6fbacf2f4aba1a14e15e6e6cb102d046bace4d1..5bf5e548965296964c02842c2758617275ac5569 100644 (file)
--- a/net-libs/libtelepathy/ChangeLog
+++ b/net-libs/libtelepathy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libtelepathy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/ChangeLog,v 1.2 2006/11/09 16:25:58 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/ChangeLog,v 1.3 2006/11/20 17:35:55 peper Exp $
+
+  20 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
+  libtelepathy-0.0.38.ebuild, libtelepathy-0.0.39.ebuild:
+  Fix dbus dep wrt bug #154521.
 
 *libtelepathy-0.0.39 (09 Nov 2006)
 

diff --git a/net-libs/libtelepathy/Manifest b/net-libs/libtelepathy/Manifest
index 48a022828e83b07a91eb20d12fa8f8688b4c7d6c..06c1c004dd0bbb36b46170bc0e1fb61653c63651 100644 (file)
--- a/net-libs/libtelepathy/Manifest
+++ b/net-libs/libtelepathy/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST libtelepathy-0.0.38.tar.gz 367406 RMD160 9139cd4e9c19e6ab2f63d72521aac1331bd3893e SHA1 0c652e86cf7335cfb5e7b666f891feca2f56b8e5 SHA256 39ab68270dd94d257929f896dab8024f74f6eb94da00d3bd070c973414877a7b
 DIST libtelepathy-0.0.39.tar.gz 356054 RMD160 8252406d8e0d986d6221786e89fc88523434ebac SHA1 59f1b0a9bcb2fc77de86f80b07f8310797a43019 SHA256 80c02555c805b0528da4b85ae3535974cd64ec46f8d23145a129e794b4641917
-EBUILD libtelepathy-0.0.38.ebuild 669 RMD160 5bd66578bb885d8e0a7dc382e95cd659050120a2 SHA1 eb2423148eb89f2698c125f183578e8c11147ae9 SHA256 0b649fdf66b63ab4de695051faafcc8ad0c4648a0b63fc53be04a96695383fb0
-MD5 29ecac19f429a3f8a6a6148c2969ed4b libtelepathy-0.0.38.ebuild 669
-RMD160 5bd66578bb885d8e0a7dc382e95cd659050120a2 libtelepathy-0.0.38.ebuild 669
-SHA256 0b649fdf66b63ab4de695051faafcc8ad0c4648a0b63fc53be04a96695383fb0 libtelepathy-0.0.38.ebuild 669
-EBUILD libtelepathy-0.0.39.ebuild 669 RMD160 7decd473ae7c192ada72b9b3bd62b24d539ad070 SHA1 4453f33811283268b87f7220d2a16c039e3e8076 SHA256 a3934051e0053b5efc4f86a3014bebd5f04cdc55911f022b3cd30cb2d093c26a
-MD5 8b92247c6f711a58a64f33235b22af8f libtelepathy-0.0.39.ebuild 669
-RMD160 7decd473ae7c192ada72b9b3bd62b24d539ad070 libtelepathy-0.0.39.ebuild 669
-SHA256 a3934051e0053b5efc4f86a3014bebd5f04cdc55911f022b3cd30cb2d093c26a libtelepathy-0.0.39.ebuild 669
-MISC ChangeLog 515 RMD160 ef588732180fb7e2dfe83d338cd909700fd2a6bf SHA1 34b7d04fbf1a8724b94cbaa5b26413796ee86f55 SHA256 a18395b2c49f356b1c296de8ebcae6ce5e2178203c505ebd550ffdcebdeb389c
-MD5 680fcc2ea6bb12aaeac4b909a487bb76 ChangeLog 515
-RMD160 ef588732180fb7e2dfe83d338cd909700fd2a6bf ChangeLog 515
-SHA256 a18395b2c49f356b1c296de8ebcae6ce5e2178203c505ebd550ffdcebdeb389c ChangeLog 515
+EBUILD libtelepathy-0.0.38.ebuild 728 RMD160 a4045c49a060e599c3f7d8b11d7ef29749c735d5 SHA1 09292bf0df1e217eef1a5e3292292949ee0c5614 SHA256 ac24f43420cc15634e90983b63f42861f47aa9cad2dc99cb4d54f0f9d190348f
+MD5 c329feed947353d5f1c78f20a00a72d4 libtelepathy-0.0.38.ebuild 728
+RMD160 a4045c49a060e599c3f7d8b11d7ef29749c735d5 libtelepathy-0.0.38.ebuild 728
+SHA256 ac24f43420cc15634e90983b63f42861f47aa9cad2dc99cb4d54f0f9d190348f libtelepathy-0.0.38.ebuild 728
+EBUILD libtelepathy-0.0.39.ebuild 728 RMD160 3ada445b69960a067f0dc3b23e5c709671d79341 SHA1 e1519a5c7568fce041d81435831adf77dff71c7a SHA256 e4e19e1ff9c3dce76c0e920975d3a8b9326980833cb171130a4d4bc4df4f0399
+MD5 cbebfca29f1296c7b139bc69644dddb9 libtelepathy-0.0.39.ebuild 728
+RMD160 3ada445b69960a067f0dc3b23e5c709671d79341 libtelepathy-0.0.39.ebuild 728
+SHA256 e4e19e1ff9c3dce76c0e920975d3a8b9326980833cb171130a4d4bc4df4f0399 libtelepathy-0.0.39.ebuild 728
+MISC ChangeLog 659 RMD160 1a301393717c13068eff0f3a69a5f38845c2e6ae SHA1 2b1532d63ce32117b8ae2a71ab62c688190d78d8 SHA256 7b12e636787d445ba037fb92be13ad445432a3e00700fa1cb50cd9689ee74326
+MD5 717b27b98c49cbe18e2f832380bb4f2f ChangeLog 659
+RMD160 1a301393717c13068eff0f3a69a5f38845c2e6ae ChangeLog 659
+SHA256 7b12e636787d445ba037fb92be13ad445432a3e00700fa1cb50cd9689ee74326 ChangeLog 659
 MISC metadata.xml 305 RMD160 3cefb2764dc78feb295addb8303d83b7d71b1667 SHA1 16cd8bdf5dc735bf68dad2d62fe4132f08527087 SHA256 8067602a9c13faf07e0e9e40d41df3b348c6a6351e2787491c703288c44d1ff0
 MD5 bbeaba2a7fbf9117ecc86cfd6217a61e metadata.xml 305
 RMD160 3cefb2764dc78feb295addb8303d83b7d71b1667 metadata.xml 305
@@ -28,7 +28,7 @@ SHA256 0c512ec1bc5d9db7d8ae0e60292a11b7e98897205779958aead671d93a8c4c77 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFU1Y1ppoStNGKGywRAu8HAJ9Vy/5Fsd7QD0orQKvgm6lix8V1xQCfUqVN
-X03an50oHDG/NveKxO+USrc=
-=i0dk
+iD8DBQFFYeeCppoStNGKGywRAmlxAKCc8rE+8kjhTgFhkgfnAmMzORw6lACeP5qW
+K6GidHEcfZqUAkjTK5lUitQ=
+=wLOB
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libtelepathy/libtelepathy-0.0.38.ebuild b/net-libs/libtelepathy/libtelepathy-0.0.38.ebuild
index b2e6518ebf633a0e6a592c38970e20001052e561..32b9fa72b7e371db465efca3284a55520e17bbbf 100644 (file)
--- a/net-libs/libtelepathy/libtelepathy-0.0.38.ebuild
+++ b/net-libs/libtelepathy/libtelepathy-0.0.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/libtelepathy-0.0.38.ebuild,v 1.1 2006/10/22 16:56:25 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/libtelepathy-0.0.38.ebuild,v 1.2 2006/11/20 17:35:55 peper Exp $
 
 DESCRIPTION="A glib based library for Telepathy client development"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -11,7 +11,8 @@ KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-libs/glib-2.4
-       >=sys-apps/dbus-0.61"
+       || ( >=dev-libs/dbus-glib-0.71
+               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )"
 RDEPEND="${DEPEND}"
 
 src_install() {

diff --git a/net-libs/libtelepathy/libtelepathy-0.0.39.ebuild b/net-libs/libtelepathy/libtelepathy-0.0.39.ebuild
index d9d5f482e04091b76110aa86cf169fc8a1a4998c..49642209b19e2bb7f802733093e59ac080b710ff 100644 (file)
--- a/net-libs/libtelepathy/libtelepathy-0.0.39.ebuild
+++ b/net-libs/libtelepathy/libtelepathy-0.0.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/libtelepathy-0.0.39.ebuild,v 1.1 2006/11/09 16:25:58 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtelepathy/libtelepathy-0.0.39.ebuild,v 1.2 2006/11/20 17:35:55 peper Exp $
 
 DESCRIPTION="A glib based library for Telepathy client development"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -11,7 +11,8 @@ KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-libs/glib-2.4
-       >=sys-apps/dbus-0.61"
+       || ( >=dev-libs/dbus-glib-0.71
+               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )"
 RDEPEND="${DEPEND}"
 
 src_install() {