new version (0.9). removed old unstable versions.

(Portage version: 2.0.53)

12 files changed, 103 insertions, 155 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index e2af9f464f73..1b5af89ffcd2 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.10 2005/09/26 22:48:10 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.11 2005/12/25 18:10:11 svyatogor Exp $
+
+*gajim-0.9 (25 Dec 2005)
+
+  25 Dec 2005; Sergey Kuleshov <svyatogor@gentoo.org>
+  -files/gajim-0.7.1-multilib.patch, +files/gajim_0.9_muc_disconnect.patch,
+  -gajim-0.7.1.ebuild, -gajim-0.8.ebuild, -gajim-0.8-r1.ebuild,
+  +gajim-0.9.ebuild:
+  New version of Gajim with a lot of new features. Temporarily removed ~amd64
+  from KEYWORDS until gcc4 makes it to unstable.
+  
+  Removed old unstable ebuilds (previous to 0.8.2).
 
   26 Sep 2005; Luis Medinas <metalgod@gentoo.org> gajim-0.8.2.ebuild:
   Marked Stable on amd64
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index cf7bb8db30de..36692bb1c92f 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 395663d2f52667c67cdd1dd8b40bef2b ChangeLog 1591
-MD5 3fdc0fa74cf9aa8bb935b17dfd27ca69 gajim-0.7.1.ebuild 935
-MD5 aeded6d40742a2f4f21777446c628a75 metadata.xml 256
-MD5 656905dd3111adff62b7bc8386d6d008 gajim-0.8-r1.ebuild 1194
-MD5 dba3a4b9977143b405af1409247142b8 gajim-0.8.ebuild 866
-MD5 3550a55fbbb772a7e346e810966eeb14 gajim-0.8.2.ebuild 1190
 MD5 6f1aa51ef02f0ae0d5408a8efa7e49dd files/digest-gajim-0.7.1 64
-MD5 5a8c6770554dbd5a01ddb6cba24c301b files/gajim-0.7.1-multilib.patch 836
 MD5 806ff24c3bf7811892738a9118a25f1b files/digest-gajim-0.8 62
 MD5 806ff24c3bf7811892738a9118a25f1b files/digest-gajim-0.8-r1 62
 MD5 8ac503ffbd2c564b199a8c93db918653 files/digest-gajim-0.8.2 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDOIkJwUpWvClEHQoRAg2hAJ0VoDx0D/pL2Ub02IsC+uPcKI88CQCdHQjO
-/KiqGpSwO4DiclSZno6fvLo=
-=E/fl
------END PGP SIGNATURE-----
+MD5 50a52231d80cc9c182d8dda3bed77afa files/digest-gajim-0.9 63
+MD5 5a8c6770554dbd5a01ddb6cba24c301b files/gajim-0.7.1-multilib.patch 836
+MD5 f42b7288b78fd2243ed72e2b256c0218 files/gajim_0.9_muc_disconnect.patch 829
+MD5 3fdc0fa74cf9aa8bb935b17dfd27ca69 gajim-0.7.1.ebuild 935
+MD5 656905dd3111adff62b7bc8386d6d008 gajim-0.8-r1.ebuild 1194
+MD5 3550a55fbbb772a7e346e810966eeb14 gajim-0.8.2.ebuild 1190
+MD5 dba3a4b9977143b405af1409247142b8 gajim-0.8.ebuild 866
+MD5 2836aabb7473aa3c472bfd0f9a1fc79f gajim-0.9.ebuild 1885
+MD5 aeded6d40742a2f4f21777446c628a75 metadata.xml 256
diff --git a/net-im/gajim/files/digest-gajim-0.7.1 b/net-im/gajim/files/digest-gajim-0.7.1
deleted file mode 100644
index 28cbde5f8a0c..000000000000
--- a/net-im/gajim/files/digest-gajim-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f795d550749d78839d1b6a554bbff545 gajim-0.7.1.tar.bz2 438166
diff --git a/net-im/gajim/files/digest-gajim-0.8 b/net-im/gajim/files/digest-gajim-0.8
deleted file mode 100644
index 755057cf7346..000000000000
--- a/net-im/gajim/files/digest-gajim-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f9b4864c56d744d1e6f1c0b42afc4e9 gajim-0.8.tar.bz2 690391
diff --git a/net-im/gajim/files/digest-gajim-0.8-r1 b/net-im/gajim/files/digest-gajim-0.8-r1
deleted file mode 100644
index 755057cf7346..000000000000
--- a/net-im/gajim/files/digest-gajim-0.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f9b4864c56d744d1e6f1c0b42afc4e9 gajim-0.8.tar.bz2 690391
diff --git a/net-im/gajim/files/digest-gajim-0.9 b/net-im/gajim/files/digest-gajim-0.9
new file mode 100644
index 000000000000..af418f2852b6
--- /dev/null
+++ b/net-im/gajim/files/digest-gajim-0.9
@@ -0,0 +1 @@
+MD5 351c59ca1a162d134f546385b35bf804 gajim-0.9.tar.bz2 1878076
diff --git a/net-im/gajim/files/gajim-0.7.1-multilib.patch b/net-im/gajim/files/gajim-0.7.1-multilib.patch
deleted file mode 100644
index d451637a97ba..000000000000
--- a/net-im/gajim/files/gajim-0.7.1-multilib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gajim-0.7.1/Makefile	2005-06-05 12:56:42.000000000 +0200
-+++ gajim-0.7.1/Makefile	2005-06-25 13:05:42.000000000 +0200
-@@ -3,6 +3,7 @@
- MODULES		= src src/common po
- PREFIX		= /usr
- DESTDIR		= /
-+LIBDIR		= lib
- 
- FIND		= find . \( -name '*.glade' -o -name '*.py' -o -name '*.xpm' -o -name '*.gif' -o -name '*.png' -o -name '*.mo' -o -name '*.wav' \)
- 
-@@ -67,9 +68,9 @@
- 	cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/";
- 	mkdir -p "$(DESTDIR)$(PREFIX)/share/man/man1";
- 	cp gajim.1 "$(DESTDIR)$(PREFIX)/share/man/man1";
--	mkdir -p "$(DESTDIR)$(PREFIX)/lib/gajim";
-+	mkdir -p "$(DESTDIR)$(PREFIX)/$(LIBDIR)/gajim";
- 	for f in $(FILES_LIB) ; do \
--		cp "$$f" "$(DESTDIR)$(PREFIX)/lib/gajim/"; \
-+		cp "$$f" "$(DESTDIR)$(PREFIX)/$(LIBDIR)/gajim/"; \
- 	done
- 	mkdir -p "$(DESTDIR)$(PREFIX)/bin";
- 	for s in $(SCRIPTS) ; do \
diff --git a/net-im/gajim/files/gajim_0.9_muc_disconnect.patch b/net-im/gajim/files/gajim_0.9_muc_disconnect.patch
new file mode 100644
index 000000000000..078de2cc7d18
--- /dev/null
+++ b/net-im/gajim/files/gajim_0.9_muc_disconnect.patch
@@ -0,0 +1,20 @@
+--- gajim-0.9/src/common/connection.py.old (revision 4843)
++++ gajim-0.9/src/common/connection.py (revision 4844)
+@@ -378,5 +378,5 @@
+ 				self.dispatch('GC_MSG', (frm, msgtxt, tim))
+ 				if self.name not in no_log_for and not\
+-					int(float(time.mktime(tim))) <= self.last_history_line[jid][0]:
++					int(float(time.mktime(tim))) <= self.last_history_line[jid]:
+ 					gajim.logger.write('gc_msg', frm, msgtxt, tim = tim)
+ 		elif mtype == 'chat': # it's type 'chat'
+@@ -2204,5 +2204,8 @@
+ 		#last date/time in history to avoid duplicate
+ 		jid='%s@%s' % (room, server)
+-		self.last_history_line[jid]= gajim.logger.get_last_date_that_has_logs(jid)
++		last_log = gajim.logger.get_last_date_that_has_logs(jid)
++		if not last_log:
++			last_log = 0
++		self.last_history_line[jid]= last_log
+ 
+ 	def send_gc_message(self, jid, msg):
+
diff --git a/net-im/gajim/gajim-0.7.1.ebuild b/net-im/gajim/gajim-0.7.1.ebuild
deleted file mode 100644
index 5e795508166e..000000000000
--- a/net-im/gajim/gajim-0.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.7.1.ebuild,v 1.5 2005/06/28 23:01:13 agriffis Exp $
-
-inherit virtualx multilib eutils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64"
-IUSE="nls spell"
-
-DEPEND=">=dev-python/pygtk-2.4.0
-	>=dev-lang/python-2.3.0
-	>=x11-libs/gtk+-2.4
-	spell? ( >=app-text/gtkspell-2.0.4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-multilib.patch
-}
-
-src_compile() {
-	targets="idle trayicon"
-	use nls && targets="${targets} translation"
-	use spell && targets="${targets} gtkspell"
-	Xemake ${targets} || die "Xmake failed"
-}
-
-src_install() {
-	Xemake DESTDIR=${D} LIBDIR=$(get_libdir) install || die
-	dodoc README AUTHORS COPYING
-}
diff --git a/net-im/gajim/gajim-0.8-r1.ebuild b/net-im/gajim/gajim-0.8-r1.ebuild
deleted file mode 100644
index 932e90951c7d..000000000000
--- a/net-im/gajim/gajim-0.8-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.8-r1.ebuild,v 1.3 2005/08/31 18:37:47 swegener Exp $
-
-inherit virtualx multilib eutils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~ppc"
-IUSE="nls spell dbus srv"
-
-DEPEND=">=dev-python/pygtk-2.4.0
-	>=dev-lang/python-2.3.0
-	>=x11-libs/gtk+-2.4
-	spell? ( >=app-text/gtkspell-2.0.4 )
-	!alpha? ( dbus? ( >=sys-apps/dbus-0.23 ) )
-	srv? ( >=dev-python/dnspython-1.3.3 )"
-
-src_unpack() {
-	if ! built_with_use dev-python/pygtk gnome
-	then
-		einfo "Gajim requires galde python modules."
-		einfo "Please rebuild pygtk with USE=\"gnome\"."
-		die "python glade modules missing"
-	fi
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	targets="idle trayicon"
-	use nls && targets="${targets} translation"
-	use spell && targets="${targets} gtkspell"
-	Xemake ${targets} || die "Xmake failed"
-}
-
-src_install() {
-	Xemake PREFIX=/usr DESTDIR=${D} LIBDIR=/$(get_libdir) install || die
-	dodoc README AUTHORS COPYING
-}
diff --git a/net-im/gajim/gajim-0.8.ebuild b/net-im/gajim/gajim-0.8.ebuild
deleted file mode 100644
index ee1999d8e996..000000000000
--- a/net-im/gajim/gajim-0.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.8.ebuild,v 1.1 2005/08/24 21:50:17 sekretarz Exp $
-
-inherit virtualx multilib eutils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64"
-IUSE="nls spell"
-
-DEPEND=">=dev-python/pygtk-2.4.0
-	>=dev-lang/python-2.3.0
-	>=x11-libs/gtk+-2.4
-	spell? ( >=app-text/gtkspell-2.0.4 )"
-
-src_compile() {
-	targets="idle trayicon"
-	use nls && targets="${targets} translation"
-	use spell && targets="${targets} gtkspell"
-	Xemake ${targets} || die "Xmake failed"
-}
-
-src_install() {
-	Xemake PREFIX=/usr DESTDIR=${D} LIBDIR=/$(get_libdir) install || die
-	dodoc README AUTHORS COPYING
-}
diff --git a/net-im/gajim/gajim-0.9.ebuild b/net-im/gajim/gajim-0.9.ebuild
new file mode 100644
index 000000000000..faaefb335149
--- /dev/null
+++ b/net-im/gajim/gajim-0.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.9.ebuild,v 1.1 2005/12/25 18:10:11 svyatogor Exp $
+
+inherit virtualx multilib eutils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~x86"
+IUSE="dbus nls spell srv"
+
+#Removed amd64 from keywords until gcc4 is moved to unstable (#1092984)
+#amd64? ( >=sys-devel/gcc-4 )
+DEPEND=">=dev-python/pygtk-2.4.0
+	>=dev-lang/python-2.3.0
+	>=x11-libs/gtk+-2.4
+	>=dev-python/pysqlite-2.0.4
+	dbus? ( >=sys-apps/dbus-0.23 )
+	spell? ( >=app-text/gtkspell-2.0.4 )
+	srv? ( >=dev-python/dnspython )"
+
+src_unpack() {
+	if use dbus && ! built_with_use sys-apps/dbus python; then
+		eerror "Please rebuild dbus with USE=\"python\"."
+		die "Python D-bus support missing."
+	fi
+	#Until #103056 is resolved completely.
+	if ! built_with_use "<dev-python/pygtk-2.8.0-r2" gnome; then
+		eerror "Gajim requires Glade Python modules."
+		eerror "Please rebuild pygtk with USE=\"gnome\","
+		eerror "or emerge \">=pygtk-2.8.0-r2\"."
+		die "Python Glade modules missing."
+	fi
+	unpack ${A}
+	epatch "${FILESDIR}/gajim_0.9_muc_disconnect.patch"
+}
+
+src_compile() {
+	targets="idle trayicon gajim.desktop"
+	use nls && targets="${targets} translation"
+	use spell && targets="${targets} gtkspell"
+	Xemake ${targets} || die "Xemake failed"
+}
+
+src_install() {
+	Xemake PREFIX=/usr DESTDIR=${D} LIBDIR=/$(get_libdir) install || die
+	dodoc README AUTHORS COPYING Changelog
+}
+
+pkg_postinst() {
+	if use x86; then
+		einfo "If you want to make Gajim run faster,"
+		einfo "emerge dev-python/psyco, an extension"
+		einfo "module which can speed up the executuion"
+		einfo "of Python code."
+	fi
+}