reorder deps to satisfy Drac and prefer new dbus to old for new installs

Package-Manager: portage-5386-svn

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 4ea75e858dc570b97c9d32a0933e06f9591c221b..9320e650846b59b84c13712ae297e0fa49a07ddb 100644 (file)
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.29 2007/01/06 03:30:07 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.30 2007/01/06 08:28:34 antarus Exp $
+
+  06 Jan 2007; Alec Warner <antarus@gentoo.org> gajim-0.11-r3.ebuild:
+  reorder deps to satisfy Drac and prefer new dbus to old for new installs
 
   06 Jan 2007; Alec Warner <antarus@gentoo.org> gajim-0.11-r3.ebuild:
   now I can skin myself, re-order || and die to work properly

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 254a1816ffe1766b07698140fa3671a5ab7db1af..216606a5f4b7c310f7784c1c3404509ad691f33a 100644 (file)
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -13,18 +13,18 @@ EBUILD gajim-0.10.1.ebuild 2015 RMD160 8cbd45485960b659d08b23346c50af4c87aa6812
 MD5 db0090ae72c5bfb808aa0c2853a8b557 gajim-0.10.1.ebuild 2015
 RMD160 8cbd45485960b659d08b23346c50af4c87aa6812 gajim-0.10.1.ebuild 2015
 SHA256 7528f76aeff8c405c2a3dc355444e05d1f6ccf4bc2567eb24d1cb691b708b980 gajim-0.10.1.ebuild 2015
-EBUILD gajim-0.11-r3.ebuild 2313 RMD160 0ac76ffdc8015c791f9257e62b1ec09783e7031b SHA1 64da4be829872e93cf5a4ad0ce608df20005d160 SHA256 b1b8b0d343f590da479adc3922bb4bf1292e911b29b0bcbab8e62fa43a8663f5
-MD5 6503f8eae38a8672d49a337ecaa36fe9 gajim-0.11-r3.ebuild 2313
-RMD160 0ac76ffdc8015c791f9257e62b1ec09783e7031b gajim-0.11-r3.ebuild 2313
-SHA256 b1b8b0d343f590da479adc3922bb4bf1292e911b29b0bcbab8e62fa43a8663f5 gajim-0.11-r3.ebuild 2313
+EBUILD gajim-0.11-r3.ebuild 2313 RMD160 3824cb52a56b326737acd1c1fd7dcaa2a5a89f98 SHA1 b27714462a2a2b1fbafabbd487a088843f409e55 SHA256 916122a5bf8b8414fbedb72251de01e1146800b8b2a3aa415676d21e4c247d28
+MD5 8989e5d75109123f8d7eb90eb473cde8 gajim-0.11-r3.ebuild 2313
+RMD160 3824cb52a56b326737acd1c1fd7dcaa2a5a89f98 gajim-0.11-r3.ebuild 2313
+SHA256 916122a5bf8b8414fbedb72251de01e1146800b8b2a3aa415676d21e4c247d28 gajim-0.11-r3.ebuild 2313
 EBUILD gajim-0.8.2.ebuild 1190 RMD160 81610feba58eaa4127333336cb1a73f6d767f079 SHA1 9221883cd141194faca6ff687ba3d3711b8cd5b2 SHA256 017d9d24ea9443f83da9bcfcd78a28d89a55c4ef8de358fddef50b30b6a62742
 MD5 3550a55fbbb772a7e346e810966eeb14 gajim-0.8.2.ebuild 1190
 RMD160 81610feba58eaa4127333336cb1a73f6d767f079 gajim-0.8.2.ebuild 1190
 SHA256 017d9d24ea9443f83da9bcfcd78a28d89a55c4ef8de358fddef50b30b6a62742 gajim-0.8.2.ebuild 1190
-MISC ChangeLog 4609 RMD160 9dd059676ce8e16f51651b3b6afcdefec8dee9a3 SHA1 379170ea02c701e1d6921146750ba2cc9688ae05 SHA256 9c4e6d68472ab4083da075eed7fbfae91c157fe0273827e5dbebbc2e59c02edf
-MD5 4546e3c0e105334f6bbc1466c5163184 ChangeLog 4609
-RMD160 9dd059676ce8e16f51651b3b6afcdefec8dee9a3 ChangeLog 4609
-SHA256 9c4e6d68472ab4083da075eed7fbfae91c157fe0273827e5dbebbc2e59c02edf ChangeLog 4609
+MISC ChangeLog 4755 RMD160 50b37cbbfa4d1b617ceba7385c30a5235d517df8 SHA1 8fcde81817a6d1490055fb864cc2af7bf09b7749 SHA256 58ba0c90eec42d63f58b796baa3e7de5f69ab2d28873db7da5e10708e7ec57c3
+MD5 394be5cc3161ae98fe40b41858f3feab ChangeLog 4755
+RMD160 50b37cbbfa4d1b617ceba7385c30a5235d517df8 ChangeLog 4755
+SHA256 58ba0c90eec42d63f58b796baa3e7de5f69ab2d28873db7da5e10708e7ec57c3 ChangeLog 4755
 MISC metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 SHA1 873a1e33738638929c94655538bf9d46d0df79f6 SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d
 MD5 bd9809fa23d644d4ee6cb9497f22654c metadata.xml 369
 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 metadata.xml 369

diff --git a/net-im/gajim/gajim-0.11-r3.ebuild b/net-im/gajim/gajim-0.11-r3.ebuild
index e587d99675ce18ca91fd59f99fd0026ae6cad080..461fb35cc09714f765a483264619c34424ea93c6 100644 (file)
--- a/net-im/gajim/gajim-0.11-r3.ebuild
+++ b/net-im/gajim/gajim-0.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11-r3.ebuild,v 1.2 2007/01/06 03:30:07 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11-r3.ebuild,v 1.3 2007/01/06 08:28:34 antarus Exp $
 
 inherit multilib python eutils
 
@@ -21,8 +21,8 @@ DEPEND="dev-python/pysqlite
 
 RDEPEND="gnome? ( dev-python/gnome-python-extras dev-python/gnome-python-desktop )
        dbus? ( ||
-               ( <sys-apps/dbus-0.90 )
                ( >=sys-apps/dbus-0.90 dev-python/dbus-python dev-libs/dbus-glib )
+               ( <sys-apps/dbus-0.90 )
        )
        libnotify? ( x11-libs/libnotify )
        xhtml? ( dev-python/docutils )