Fix dbus dep wrt bug #154521.

Package-Manager: portage-2.1.2_rc2

diff --git a/net-voip/telepathy-stream-engine/ChangeLog b/net-voip/telepathy-stream-engine/ChangeLog
index ad1e153693e3cbcd38a761cdb3c984df6c315fc9..3a7a989caaa9b66a7e10d0d52148e242a5fe49f5 100644 (file)
--- a/net-voip/telepathy-stream-engine/ChangeLog
+++ b/net-voip/telepathy-stream-engine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/telepathy-stream-engine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-stream-engine/ChangeLog,v 1.5 2006/11/16 17:21:14 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-stream-engine/ChangeLog,v 1.6 2006/11/20 17:39:47 peper Exp $
+
+  20 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
+  telepathy-stream-engine-0.3.12.ebuild,
+  telepathy-stream-engine-0.3.13.ebuild:
+  Fix dbus dep wrt bug #154521.
 
 *telepathy-stream-engine-0.3.13 (16 Nov 2006)
 

diff --git a/net-voip/telepathy-stream-engine/Manifest b/net-voip/telepathy-stream-engine/Manifest
index 3ee806268ba235f466045e9b6b8d30b7edc28c47..0883e3b130c1a756b002cc2abda89bc2182e1b29 100644 (file)
--- a/net-voip/telepathy-stream-engine/Manifest
+++ b/net-voip/telepathy-stream-engine/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST telepathy-stream-engine-0.3.12.tar.gz 365491 RMD160 d7da94ba4ec06c95fbe78351a2ecc8fe5b278161 SHA1 b54c6081db95132fbce37d5fc9285e525bd053c5 SHA256 501c493cd285fb5869d90767b207e1adabc659bb56f939086a0e8886c16149fa
 DIST telepathy-stream-engine-0.3.13.tar.gz 365613 RMD160 285a973ceae0fe0fb5680ab39307330671fa2be0 SHA1 e02aad0533a33c0f49cd9ba6785be9498c29aa9a SHA256 080a1f3df65787ca7cee8f647e03cca8272bd4f56ee73a9696c7be00e2edbb3a
-EBUILD telepathy-stream-engine-0.3.12.ebuild 935 RMD160 a96557c5059b754322b8830c1ba58617e1447d4a SHA1 792b78a83fd2873746109d261158d05ae987a079 SHA256 2c0b4c8a9c8a3c6125ec642ae0d785010050415c7ca990f049c9c7d96ab4d2ff
-MD5 fa08586d86216cb725d13be1b7fce07f telepathy-stream-engine-0.3.12.ebuild 935
-RMD160 a96557c5059b754322b8830c1ba58617e1447d4a telepathy-stream-engine-0.3.12.ebuild 935
-SHA256 2c0b4c8a9c8a3c6125ec642ae0d785010050415c7ca990f049c9c7d96ab4d2ff telepathy-stream-engine-0.3.12.ebuild 935
-EBUILD telepathy-stream-engine-0.3.13.ebuild 905 RMD160 94b03b3edb8491d5ba23b15520a6f8f8f1558cdc SHA1 632d1d7e925bc75b48e001bd08c497b096f1ea04 SHA256 615b26a583bb0c0f5b6b0d18da568c6ec9d935ccc033108fc2e0d4ce533ec062
-MD5 ce0c1d03abc0cc2d6f3ec6dd3e6ddd47 telepathy-stream-engine-0.3.13.ebuild 905
-RMD160 94b03b3edb8491d5ba23b15520a6f8f8f1558cdc telepathy-stream-engine-0.3.13.ebuild 905
-SHA256 615b26a583bb0c0f5b6b0d18da568c6ec9d935ccc033108fc2e0d4ce533ec062 telepathy-stream-engine-0.3.13.ebuild 905
-MISC ChangeLog 1181 RMD160 8effa3a0069cea04ac496784f392f3e99db6e4c6 SHA1 5ca81fe5950a319a5f24a04e4a48c1a9e358fb3b SHA256 d9946a7b5928a18f86beef9ade192ef9e82ccf7e86f7ec9539ef00d8d3879b7b
-MD5 df57821e1bbd8369f509c5ceb0b6d3c4 ChangeLog 1181
-RMD160 8effa3a0069cea04ac496784f392f3e99db6e4c6 ChangeLog 1181
-SHA256 d9946a7b5928a18f86beef9ade192ef9e82ccf7e86f7ec9539ef00d8d3879b7b ChangeLog 1181
+EBUILD telepathy-stream-engine-0.3.12.ebuild 965 RMD160 8d2790cf544828fb6ee4c7cbc8854846b241f3dc SHA1 e37a1e09e906ee105f82f705f6a247964a2f621c SHA256 c3257f99ccfa9dff52205f3ac16d1a75984b5393c6b9c6eb74cf22377ac81e23
+MD5 b8318b81d1347674868c65e0a2057d3a telepathy-stream-engine-0.3.12.ebuild 965
+RMD160 8d2790cf544828fb6ee4c7cbc8854846b241f3dc telepathy-stream-engine-0.3.12.ebuild 965
+SHA256 c3257f99ccfa9dff52205f3ac16d1a75984b5393c6b9c6eb74cf22377ac81e23 telepathy-stream-engine-0.3.12.ebuild 965
+EBUILD telepathy-stream-engine-0.3.13.ebuild 965 RMD160 28525e0cd74b3235fa1f3c32e2761701822cf06d SHA1 5ee4427e22e12e678a2f4042569cf0998eacfe07 SHA256 8dbe0d74e67e9bd3f0cead3dc4811dfba0c9cc775f148d3e8fecde7cbea86e7e
+MD5 13f8ec6adf9c8837c8159b9d60c8df72 telepathy-stream-engine-0.3.13.ebuild 965
+RMD160 28525e0cd74b3235fa1f3c32e2761701822cf06d telepathy-stream-engine-0.3.13.ebuild 965
+SHA256 8dbe0d74e67e9bd3f0cead3dc4811dfba0c9cc775f148d3e8fecde7cbea86e7e telepathy-stream-engine-0.3.13.ebuild 965
+MISC ChangeLog 1349 RMD160 de3e59da7458c7cf6a401bdc8d0996843d56e35a SHA1 0408a8fa9d473cbd2c5f85063b54bc9a69139b2c SHA256 4a9a679150be9e08846a73693dfcef76b274593c7b62dc58a05ef1651b781ab0
+MD5 17334a206ff015d35a28a37bc2cf90f1 ChangeLog 1349
+RMD160 de3e59da7458c7cf6a401bdc8d0996843d56e35a ChangeLog 1349
+SHA256 4a9a679150be9e08846a73693dfcef76b274593c7b62dc58a05ef1651b781ab0 ChangeLog 1349
 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 a21038435568c00f67fe198312305ba19277fefd092b843f9fcff07d61aa46ec files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXJ4SppoStNGKGywRAoNRAJ9tKgXwmxmFotMOzIYT4OmEtL6nMgCgzFP+
-XkpNU4LnnPdh4zlqJHMzvw4=
-=uoXs
+iD8DBQFFYehwppoStNGKGywRAsEGAJ4sfgnKAj9mMRoE2Hedma9nOFWeIQCfbo2g
+m2Pl4E0BdjNJQXYs++fWUMU=
+=u5xz
 -----END PGP SIGNATURE-----

diff --git a/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.12.ebuild b/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.12.ebuild
index 4b6b49eafbb3d12a381d3eaf37477dadca83b340..70d70b048c7d7870605ad30e0a7b853f54368a3b 100644 (file)
--- a/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.12.ebuild
+++ b/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.12.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-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.12.ebuild,v 1.1 2006/11/08 19:31:03 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.12.ebuild,v 1.2 2006/11/20 17:39:47 peper Exp $
 
 DESCRIPTION="A Telepathy client that handles channels of type 'StreamedMedia'"
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -16,12 +16,14 @@ DEPEND=">=dev-libs/glib-2.4
        >=media-libs/farsight-0.1.8
        =media-libs/gst-plugins-base-0.10*
        >=net-libs/libtelepathy-0.0.33
-       >=sys-apps/dbus-0.60"
+       || ( >=dev-libs/dbus-glib-0.71
+               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 ) )"
+
 RDEPEND="${DEPEND}"
 
 src_install() {
        emake install DESTDIR="${D}" || die "emake failed"
-       dodoc AUTHORS ChangeLog NEWS README TODO
+       dodoc TODO
 }
 
 pkg_postinst() {

diff --git a/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.13.ebuild b/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.13.ebuild
index a836867dfa49fe05afd28a0e72757ed45aca86a5..dbac0b2fbb4f9f0db920a560612e570fe75cf3ca 100644 (file)
--- a/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.13.ebuild
+++ b/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.13.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-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.13.ebuild,v 1.1 2006/11/16 17:21:14 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-stream-engine/telepathy-stream-engine-0.3.13.ebuild,v 1.2 2006/11/20 17:39:47 peper Exp $
 
 DESCRIPTION="A Telepathy client that handles channels of type 'StreamedMedia'"
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -16,7 +16,9 @@ DEPEND=">=dev-libs/glib-2.4
        >=media-libs/farsight-0.1.8
        =media-libs/gst-plugins-base-0.10*
        >=net-libs/libtelepathy-0.0.33
-       >=sys-apps/dbus-0.60"
+       || ( >=dev-libs/dbus-glib-0.71
+               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 ) )"
+
 RDEPEND="${DEPEND}"
 
 src_install() {