Fixed deps for python-2.5

Package-Manager: portage-2.1.1-r2

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 29404a066fc3c4fae8ad434d8b9ee015bb50e833..03b0f240893e01edf7a44fdfa691039f6f505d2d 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.36 2007/01/09 23:46:16 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.37 2007/01/10 00:06:01 welp Exp $
+
+  10 Jan 2007; Peter Weller <welp@gentoo.org> gajim-0.11-r3.ebuild:
+  Fixed deps for python-2.5
 
   09 Jan 2007; Peter Weller <welp@gentoo.org> -gajim-0.8.2.ebuild:
   Removed obsolete 0.9.x patch

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 399bc9497ad4d2f76fa1b0b724940f28d7665853..b9d84b8cac75993fa0ebd63cd0d5a0b7dda08ce1 100644 (file)
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -12,14 +12,14 @@ EBUILD gajim-0.10.1.ebuild 2070 RMD160 2219943d92b5ec5b2b46b78126f956aac5d3c3a2
 MD5 0d84f145c9486434d5ef8ff1f784dcc5 gajim-0.10.1.ebuild 2070
 RMD160 2219943d92b5ec5b2b46b78126f956aac5d3c3a2 gajim-0.10.1.ebuild 2070
 SHA256 b4e5a6aecfbdfc302cce7aa3aa248aaa0fd55278cde39f47f41951e2dfb7201f gajim-0.10.1.ebuild 2070
-EBUILD gajim-0.11-r3.ebuild 2438 RMD160 ffba0bb33b940fbf43f407ad6f707a7b2c9bb0bd SHA1 67a6039926a348c0fba72d1e34ec0a73b327e130 SHA256 2c25ac7b0ab33c8d84671eb937bcb5f81c0360ac94fbe1daa896777991f2624a
-MD5 99802491d4ba92c60ec1ea950a198aa2 gajim-0.11-r3.ebuild 2438
-RMD160 ffba0bb33b940fbf43f407ad6f707a7b2c9bb0bd gajim-0.11-r3.ebuild 2438
-SHA256 2c25ac7b0ab33c8d84671eb937bcb5f81c0360ac94fbe1daa896777991f2624a gajim-0.11-r3.ebuild 2438
-MISC ChangeLog 5547 RMD160 47a264191b142a25388a11b34ee84ba6822edde0 SHA1 71b4bbb998513788830daaa4a03f30240b0f89af SHA256 04edd7e82d96b58d555ea666d7e406eb9579a07b2d386b680db2e46c15960a51
-MD5 d781fceb1bc8bfb51b255919203b19df ChangeLog 5547
-RMD160 47a264191b142a25388a11b34ee84ba6822edde0 ChangeLog 5547
-SHA256 04edd7e82d96b58d555ea666d7e406eb9579a07b2d386b680db2e46c15960a51 ChangeLog 5547
+EBUILD gajim-0.11-r3.ebuild 2497 RMD160 8b230dcf8c880cd4ab7b01db5dad1c17a511696e SHA1 9c26ae614440f3fd458ef0a816899e79e23d7f54 SHA256 de38a4e5312fbaa1c1587c23880cf9502f2cd99ae420b86038f898c02ad9faf5
+MD5 2816ef4e35e47e217b60f6b28c918ca1 gajim-0.11-r3.ebuild 2497
+RMD160 8b230dcf8c880cd4ab7b01db5dad1c17a511696e gajim-0.11-r3.ebuild 2497
+SHA256 de38a4e5312fbaa1c1587c23880cf9502f2cd99ae420b86038f898c02ad9faf5 gajim-0.11-r3.ebuild 2497
+MISC ChangeLog 5644 RMD160 1251a033a7061c290872eecb4d26d55fdc597b1b SHA1 91bdc0fcb054bbc6dcaf972571af762b976c6ec3 SHA256 153d4d433fd3c052ff6104c0fc1e205fd3a043aeccbd4c1d9bd449cb47b30b46
+MD5 24bb5b5b87d8e32b281dedc83b78543e ChangeLog 5644
+RMD160 1251a033a7061c290872eecb4d26d55fdc597b1b ChangeLog 5644
+SHA256 153d4d433fd3c052ff6104c0fc1e205fd3a043aeccbd4c1d9bd449cb47b30b46 ChangeLog 5644
 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 37bc857ab9c9889bfe0fc502d0c850759abcb3c6..c358718530aa4945003c98055f8696ff6d811d70 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.7 2007/01/08 18:42:49 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11-r3.ebuild,v 1.8 2007/01/10 00:06:01 welp Exp $
 
 inherit multilib python eutils
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml"
 
-DEPEND="dev-python/pysqlite
+DEPEND="|| (
+               ( <dev-lang/python-2.5 dev-python/pysqlite )
+               >=dev-lang/python-2.5
+       )
        dev-python/pygtk
        sys-devel/gettext
        dev-util/intltool