Cleaned old version, #285663

(Portage version: 2.2_rc67/cvs/Linux x86_64)

14 files changed, 19 insertions, 586 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 458859ab38c9..be8857b9cd25 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.97 2010/07/09 20:52:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.98 2010/07/11 14:49:45 jlec Exp $
+
+  11 Jul 2010; Justin Lecher <jlec@gentoo.org>
+  -files/0.11.3-misc-fixes.patch, -gajim-0.11.4.ebuild,
+  -files/gajim-0.11.4-test_fix.patch, -gajim-0.12.1.ebuild,
+  -files/0.12.1-roster_window.py_r10934.patch, -gajim-0.13.2.ebuild,
+  gajim-0.13.3.ebuild, gajim-0.13.4.ebuild, gajim-0.13.4-r1.ebuild,
+  -files/gajim-0.13-autotools--enable-site-packages_option.patch,
+  -files/0.12.1-sound-path-fix.patch,
+  +files/gajim-0.13-autotools-enable-site-packages_option.patch,
+  -files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch,
+  -files/fix_autotools_and_search_dirs.patch:
+  Cleaned old version, #285663
 
   09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> gajim-0.13.3.ebuild:
   ppc64 stable wrt #307425
diff --git a/net-im/gajim/files/0.11.3-misc-fixes.patch b/net-im/gajim/files/0.11.3-misc-fixes.patch
deleted file mode 100644
index 3a29cc312647..000000000000
--- a/net-im/gajim/files/0.11.3-misc-fixes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur gajim-0.11.3.orig/src/common/contacts.py gajim-0.11.3/src/common/contacts.py
---- gajim-0.11.3.orig/src/common/contacts.py	2007-11-04 20:52:21.000000000 +0000
-+++ gajim-0.11.3/src/common/contacts.py	2007-12-02 15:46:27.000000000 +0000
-@@ -420,6 +420,13 @@
- 			return 1
- 		if jid2 > jid1:
- 			return -1
-+    #If all is the same, compare accounts, they can't be the same
-+		account1 = data1['account']
-+		account2 = data2['account']
-+		if account1 > account2:
-+			return 1
-+		if account2 > account1:
-+			return -1
- 		return 0
- 
- 	def get_metacontacts_big_brother(self, family):
-diff -ur gajim-0.11.3.orig/src/message_window.py gajim-0.11.3/src/message_window.py
---- gajim-0.11.3.orig/src/message_window.py	2007-12-02 15:42:13.000000000 +0000
-+++ gajim-0.11.3/src/message_window.py	2007-12-02 15:43:18.000000000 +0000
-@@ -576,9 +576,12 @@
- 
- 	def _on_notebook_key_press(self, widget, event):
- 		control = self.get_active_control()
--		#when we get a key press event in conversation textview,
-+		# Ctrl+PageUP / DOWN has to be handled by notebook
-+		if event.state & gtk.gdk.CONTROL_MASK and event.keyval in (
-+		gtk.keysyms.Page_Down, gtk.keysyms.Page_Up):
-+			return False
- 		if isinstance(control, ChatControlBase):
--			#we forwarded it to message textview
-+			# we forwarded it to message textview
- 			control.msg_textview.emit('key_press_event', event)
- 			control.msg_textview.grab_focus()
- 
diff --git a/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch b/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch
deleted file mode 100644
index 5ea2cadb37a1..000000000000
--- a/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: trunk/src/roster_window.py
-===================================================================
---- trunk/src/roster_window.py (revision 10772)
-+++ trunk/src/roster_window.py (revision 10934)
-@@ -1000,7 +1000,7 @@
- 		and ('artist' in gajim.connections[account].tune \
- 		or 'title' in gajim.connections[account].tune):
-+			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
- 			self.model[child_iter][C_TUNE_PIXBUF] = \
--				gtk.gdk.pixbuf_new_from_file(
--				'../data/emoticons/static/music.png')
-+				gtk.gdk.pixbuf_new_from_file(path)
- 		else:
- 			self.model[child_iter][C_TUNE_PIXBUF] = None
-@@ -1263,6 +1263,6 @@
- 		contact = gajim.contacts.get_contact(account, jid)
- 		if 'artist' in contact.tune or 'title' in contact.tune:
--			pixbuf = gtk.gdk.pixbuf_new_from_file(
--				'../data/emoticons/static/music.png')
-+			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
-+			pixbuf = gtk.gdk.pixbuf_new_from_file(path)
- 		else:
- 			pixbuf = None
diff --git a/net-im/gajim/files/0.12.1-sound-path-fix.patch b/net-im/gajim/files/0.12.1-sound-path-fix.patch
deleted file mode 100644
index b9bf23bfb024..000000000000
--- a/net-im/gajim/files/0.12.1-sound-path-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -r 955cd2eb2893 data/defs.py.in
---- a/data/defs.py.in	Tue Feb 03 21:39:50 2009 +0100
-+++ b/data/defs.py.in	Mon Feb 16 02:05:18 2009 +0100
-@@ -2,7 +2,7 @@
- # do not edit it!
- docdir = "@DOCDIR@"
- 
--datadir = "@DATADIR@"
-+datadir = "@DATADIR@/gajim"
- 
- localedir = "@LOCALEDIR@"
- 
-diff -r 955cd2eb2893 src/common/config.py
---- a/src/common/config.py	Tue Feb 03 21:39:50 2009 +0100
-+++ b/src/common/config.py	Mon Feb 16 02:05:18 2009 +0100
-@@ -447,15 +447,15 @@
- 	}
- 
- 	soundevents_default = {
--		'first_message_received': [ True, '../data/sounds/message1.wav' ],
--		'next_message_received_focused': [ True, '../data/sounds/message2.wav' ],
--		'next_message_received_unfocused': [ True, '../data/sounds/message2.wav' ],
--		'contact_connected': [ True, '../data/sounds/connected.wav' ],
--		'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ],
--		'message_sent': [ True, '../data/sounds/sent.wav' ],
--		'muc_message_highlight': [ True, '../data/sounds/gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')],
--		'muc_message_received': [ False, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives.') ],
--		'gmail_received': [ False, '../data/sounds/message1.wav' ],
-+		'first_message_received': [ True, 'message1.wav' ],
-+		'next_message_received_focused': [ True, 'message2.wav' ],
-+		'next_message_received_unfocused': [ True, 'message2.wav' ],
-+		'contact_connected': [ True, 'connected.wav' ],
-+		'contact_disconnected': [ True, 'disconnected.wav' ],
-+		'message_sent': [ True, 'sent.wav' ],
-+		'muc_message_highlight': [ True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')],
-+		'muc_message_received': [ False, 'gc_message2.wav', _('Sound to play when any MUC message arrives.') ],
-+		'gmail_received': [ False, 'message1.wav' ],
- 	}
- 
- 	themes_default = {
-@@ -696,7 +696,8 @@
- 			default = self.soundevents_default[event]
- 			self.add_per('soundevents', event)
- 			self.set_per('soundevents', event, 'enabled', default[0])
--			self.set_per('soundevents', event, 'path', default[1])
-+			self.set_per('soundevents', event, 'path', '%s/data/sounds/%s' %
-+															(defs.datadir, default[1]))
- 
- 		for status in self.defaultstatusmsg_default:
- 			default = self.defaultstatusmsg_default[status]
diff --git a/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch b/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch
deleted file mode 100644
index 7c61f13fe133..000000000000
--- a/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-autotools: install *.py in $(pkglibdir), ie $prefix/lib/gajim
-
-diff -r 2c6ac74dd0e2 data/Makefile.am
---- a/data/Makefile.am	Tue Feb 03 15:52:16 2009 +0100
-+++ b/data/Makefile.am	Tue Feb 03 16:52:41 2009 +0100
-@@ -5,7 +5,7 @@
- desktop_in_files = gajim.desktop.in.in 
- desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
- 
--installdefsdir = $(pkgdatadir)/src/common
-+installdefsdir = $(pkglibdir)/common
- installdefs_DATA = defs.py
- 
- soundsdir = $(pkgdatadir)/data/sounds
-diff -r 2c6ac74dd0e2 scripts/gajim-remote.in
---- a/scripts/gajim-remote.in	Tue Feb 03 15:52:16 2009 +0100
-+++ b/scripts/gajim-remote.in	Tue Feb 03 16:52:41 2009 +0100
-@@ -27,6 +27,6 @@
- datadir=@DATADIR@
- PYTHON_EXEC=@PYTHON@
- 
--cd ${datadir}/gajim/src
-+cd @LIBDIR@/gajim
- export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
- exec ${PYTHON_EXEC} -OO gajim-remote.py "$@"
-diff -r 2c6ac74dd0e2 scripts/gajim.in
---- a/scripts/gajim.in	Tue Feb 03 15:52:16 2009 +0100
-+++ b/scripts/gajim.in	Tue Feb 03 16:52:41 2009 +0100
-@@ -29,6 +29,6 @@
- datadir=@DATADIR@
- PYTHON_EXEC=@PYTHON@
- 
--cd ${datadir}/gajim/src
-+cd @LIBDIR@/gajim
- export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
- exec ${PYTHON_EXEC} -OO gajim.py $@
-diff -r 2c6ac74dd0e2 src/Makefile.am
---- a/src/Makefile.am	Tue Feb 03 15:52:16 2009 +0100
-+++ b/src/Makefile.am	Tue Feb 03 16:52:41 2009 +0100
-@@ -43,18 +43,18 @@
- 		    --override $(srcdir)/trayicon.override \
- 		    $(srcdir)/trayicon.defs > $@
- endif
--gajimsrcdir = $(pkgdatadir)/src
-+gajimsrcdir = $(pkglibdir)
- gajimsrc_PYTHON = $(srcdir)/*.py 
- 
--gajimsrc1dir = $(pkgdatadir)/src/common
-+gajimsrc1dir = $(pkglibdir)/common
- gajimsrc1_PYTHON = \
- 				$(srcdir)/common/*.py 
- 
--gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
-+gajimsrc2dir = $(pkglibdir)/common/xmpp
- gajimsrc2_PYTHON = \
- 				$(srcdir)/common/xmpp/*.py 
- 
--gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
-+gajimsrc3dir = $(pkglibdir)/common/zeroconf
- gajimsrc3_PYTHON = \
- 				$(srcdir)/common/zeroconf/*.py 
- 
diff --git a/net-im/gajim/files/fix_autotools_and_search_dirs.patch b/net-im/gajim/files/fix_autotools_and_search_dirs.patch
deleted file mode 100644
index dea30dcfb545..000000000000
--- a/net-im/gajim/files/fix_autotools_and_search_dirs.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-upstream: http://trac.gajim.org/ticket/4770
-
-diff -r 15ddf05b958b -r 6c0f28cde899 configure.ac
---- a/configure.ac	Tue Feb 03 21:18:37 2009 +0100
-+++ b/configure.ac	Tue Feb 03 21:39:50 2009 +0100
-@@ -174,18 +174,12 @@
- AC_SUBST([PYTHON_INCLUDES])
- 
- AS_AC_EXPAND(DATADIR, "${datadir}")
--
--AS_AC_EXPAND(LIBDIR, ${libdir})
--
-+AS_AC_EXPAND(LIBDIR, "${libdir}")
- AS_AC_EXPAND(DOCDIR, "${docdir}")
-+AS_AC_EXPAND(LOCALEDIR, "${localedir}")
- 
- AC_SUBST(VERSION)
- AC_SUBST(PACKAGE)
--AC_SUBST(DATADIR)
--AC_SUBST(LIBDIR)
--AS_AC_EXPAND(DATADIR, "${DATADIR}")
--AC_SUBST(DOCDIR)
--AS_AC_EXPAND(DOCDIR, "${DOCDIR}")
- 
- AC_CONFIG_FILES([ 
- 	Makefile
-diff -r 15ddf05b958b -r 6c0f28cde899 data/defs.py.in
---- a/data/defs.py.in	Tue Feb 03 21:18:37 2009 +0100
-+++ b/data/defs.py.in	Tue Feb 03 21:39:50 2009 +0100
-@@ -4,4 +4,6 @@
- 
- datadir = "@DATADIR@"
- 
-+localedir = "@LOCALEDIR@"
-+
- version = "@VERSION@"
-diff -r 15ddf05b958b -r 6c0f28cde899 m4/acinclude.m4
---- a/m4/acinclude.m4	Tue Feb 03 21:18:37 2009 +0100
-+++ b/m4/acinclude.m4	Tue Feb 03 21:39:50 2009 +0100
-@@ -1,6 +1,15 @@
-+dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
-+dnl autostars m4 macro for expanding directories using configure's prefix
-+
-+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-+
-+dnl Copying and distribution of this file, with or without modification,
-+dnl are permitted in any medium without royalty provided the copyright
-+dnl notice and this notice are preserved.
-+
- dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
--dnl
--dnl example
-+
-+dnl example:
- dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
- dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
- 
-@@ -15,7 +24,7 @@
- 
-   dnl if no prefix given, then use /usr/local, the default prefix
-   if test "x$prefix" = "xNONE"; then
--    prefix=$ac_default_prefix
-+    prefix="$ac_default_prefix"
-   fi
-   dnl if no exec_prefix given, then use prefix
-   if test "x$exec_prefix" = "xNONE"; then
-@@ -26,7 +35,7 @@
-   dnl loop until it doesn't change anymore
-   while true; do
-     new_full_var="`eval echo $full_var`"
--    if test "x$new_full_var"="x$full_var"; then break; fi
-+    if test "x$new_full_var" = "x$full_var"; then break; fi
-     full_var=$new_full_var
-   done
- 
-diff -r 15ddf05b958b -r 6c0f28cde899 src/common/defs.py
---- a/src/common/defs.py	Tue Feb 03 21:18:37 2009 +0100
-+++ b/src/common/defs.py	Tue Feb 03 21:39:50 2009 +0100
-@@ -25,6 +25,7 @@
- 
- docdir = '../'
- datadir = '../'
-+localedir = '../po'
- 
- version = '0.12.1.2-svn'
- 
-diff -r 15ddf05b958b -r 6c0f28cde899 src/common/i18n.py
---- a/src/common/i18n.py	Tue Feb 03 21:18:37 2009 +0100
-+++ b/src/common/i18n.py	Tue Feb 03 21:39:50 2009 +0100
-@@ -26,10 +26,8 @@
- import os
- 
- APP = 'gajim'
--if os.path.isdir('../po'):
--	DIR = '../po'
--else:
--	DIR = '../../locale'
-+import defs
-+DIR = defs.localedir
- 
- # set '' so each part of the locale that should be modified is set
- # according to the environment variables
-diff -r 15ddf05b958b -r 6c0f28cde899 src/gtkgui_helpers.py
---- a/src/gtkgui_helpers.py	Tue Feb 03 21:18:37 2009 +0100
-+++ b/src/gtkgui_helpers.py	Tue Feb 03 21:39:50 2009 +0100
-@@ -61,7 +61,7 @@
- screen_w = gtk.gdk.screen_width()
- screen_h = gtk.gdk.screen_height()
- 
--GLADE_DIR = os.path.join('..', 'data', 'glade')
-+GLADE_DIR = os.path.join(gajim.DATA_DIR, 'glade')
- def get_glade(file_name, root = None):
- 	file_path = os.path.join(GLADE_DIR, file_name)
- 	return gtk.glade.XML(file_path, root=root, domain=i18n.APP)
diff --git a/net-im/gajim/files/gajim-0.11.4-test_fix.patch b/net-im/gajim/files/gajim-0.11.4-test_fix.patch
deleted file mode 100644
index 26abc0f63b0a..000000000000
--- a/net-im/gajim/files/gajim-0.11.4-test_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur gajim-0.11.4.orig/autogen.sh gajim-0.11.4/autogen.sh
---- gajim-0.11.4.orig/autogen.sh	2008-01-22 17:14:06.000000000 +0000
-+++ gajim-0.11.4/autogen.sh	2008-01-22 17:14:50.000000000 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env bash
-   echo "[encoding: UTF-8]" > po/POTFILES.in \
-   && ls -1 -U data/gajim.desktop.in.in data/glade/*.glade \
--  src/*py src/common/*py src/common/zeroconf/*.py >> \
-+  src/*py src/common/*py src/common/zeroconf/*.py src/osx/*.py >> \
-   po/POTFILES.in || exit 1
-   if test -z `which pkg-config 2>/dev/null`;then
-     echo "***Error: pkg-config not found***"
-diff -ur gajim-0.11.4.orig/po/POTFILES.skip gajim-0.11.4/po/POTFILES.skip
---- gajim-0.11.4.orig/po/POTFILES.skip	2008-01-22 17:14:06.000000000 +0000
-+++ gajim-0.11.4/po/POTFILES.skip	2008-01-22 17:15:27.000000000 +0000
-@@ -1 +1,2 @@
--
-+data/gajim.desktop.in
-+src/eggtrayicon.c
diff --git a/net-im/gajim/files/gajim-0.13-autotools--enable-site-packages_option.patch b/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch
index ad683913e923..ad683913e923 100644
--- a/net-im/gajim/files/gajim-0.13-autotools--enable-site-packages_option.patch
+++ b/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch
diff --git a/net-im/gajim/gajim-0.11.4.ebuild b/net-im/gajim/gajim-0.11.4.ebuild
deleted file mode 100644
index 616dd60a36f2..000000000000
--- a/net-im/gajim/gajim-0.11.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11.4.ebuild,v 1.8 2009/07/21 11:34:22 ssuominen Exp $
-
-EAPI=2
-inherit multilib python eutils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml"
-
-DEPEND=">=dev-lang/python-2.5[sqlite,xml]
-	dev-python/pygtk
-	sys-devel/gettext
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-RDEPEND="gnome? ( dev-python/gnome-python-extras
-		dev-python/gnome-python-desktop
-	)
-	dbus? ( dev-python/dbus-python dev-libs/dbus-glib )
-	libnotify? ( x11-libs/libnotify )
-	xhtml? ( dev-python/docutils )
-	srv? ( net-dns/bind-tools )
-	idle? ( x11-libs/libXScrnSaver )
-	spell? ( app-text/gtkspell )
-	avahi? ( net-dns/avahi[dbus,gtk,python] )
-	dev-python/pyopenssl"
-
-pkg_setup() {
-	if ! use dbus; then
-		if use libnotify; then
-			eerror "The dbus USE flag is required for libnotify support"
-			die "USE=\"dbus\" needed for libnotify support"
-		fi
-		if use avahi; then
-			eerror "The dbus USE flag is required for avahi support"
-			die "USE=\"dbus\" needed for avahi support"
-		fi
-	else
-		if has_version "<sys-apps/dbus-0.90" && ! built_with_use sys-apps/dbus python; then
-				eerror "Please rebuild dbus with USE=\"python\""
-				die "USE=\"python\" needed for dbus"
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-test_fix.patch"
-}
-
-src_configure() {
-	local myconf
-
-	if ! use gnome; then
-		myconf="${myconf} $(use_enable trayicon)"
-		myconf="${myconf} $(use_enable idle)"
-	fi
-
-	econf $(use_enable nls) \
-		$(use_enable spell gtkspell) \
-		$(use_enable dbus remote) \
-		$(use_with X x) \
-		--docdir="/usr/share/doc/${PF}" \
-		--prefix="/usr" \
-		--libdir="/usr/$(get_libdir)" \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}/usr/share/doc/${PF}/README.html"
-	dohtml README.html
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/gajim/
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/gajim/
-}
diff --git a/net-im/gajim/gajim-0.12.1.ebuild b/net-im/gajim/gajim-0.12.1.ebuild
deleted file mode 100644
index d38422606dc1..000000000000
--- a/net-im/gajim/gajim-0.12.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.12.1.ebuild,v 1.8 2009/10/10 16:09:27 armin76 Exp $
-
-EAPI="2"
-
-inherit multilib python eutils autotools
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml"
-
-DEPEND=">=dev-lang/python-2.5[sqlite,xml]
-	dev-python/pygtk
-	sys-devel/gettext
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-RDEPEND="gnome? ( dev-python/gnome-python-extras
-		dev-python/gnome-python-desktop )
-	dbus? ( dev-python/dbus-python dev-libs/dbus-glib )
-	libnotify? ( x11-libs/libnotify )
-	xhtml? ( dev-python/docutils )
-	srv? ( net-dns/bind-tools )
-	idle? ( x11-libs/libXScrnSaver )
-	spell? ( app-text/gtkspell )
-	avahi? ( net-dns/avahi[dbus,gtk,python] )
-	dev-python/pyopenssl
-	dev-python/sexy-python
-	dev-python/pycrypto"
-
-pkg_setup() {
-	if ! use dbus; then
-		if use libnotify; then
-			eerror "The dbus USE flag is required for libnotify support"
-			die "USE=\"dbus\" needed for libnotify support"
-		fi
-		if use avahi; then
-			eerror "The dbus USE flag is required for avahi support"
-			die "USE=\"dbus\" needed for avahi support"
-		fi
-	fi
-}
-
-src_prepare() {
-	# bug #251466 move *.py out of /usr/share
-	# upstream: (http://trac.gajim.org/ticket/4770)
-	epatch "${FILESDIR}/fix_autotools_and_search_dirs.patch"
-	# not upstream:
-	epatch "${FILESDIR}/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch"
-	# sound paths:
-	epatch "${FILESDIR}/0.12.1-sound-path-fix.patch"
-	# small fix from upstream
-	epatch "${FILESDIR}/0.12.1-roster_window.py_r10934.patch"
-
-	# fix datadir path (trunk use an env var for config this)
-	sed -i "s|'DATA',.*|'DATA', '/usr/share/gajim/data')|" \
-		   "src/common/configpaths.py" || die 'sed failed'
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if ! use gnome; then
-		myconf="${myconf} $(use_enable trayicon)"
-		myconf="${myconf} $(use_enable idle)"
-	fi
-
-	econf $(use_enable nls) \
-		$(use_enable spell gtkspell) \
-		$(use_enable dbus remote) \
-		$(use_with X x) \
-		--docdir="/usr/share/doc/${PF}" \
-		--libdir="$(python_get_sitedir)" \
-		${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}/usr/share/doc/${PF}/README.html"
-	dohtml README.html
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/gajim/
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/gajim/
-}
diff --git a/net-im/gajim/gajim-0.13.2.ebuild b/net-im/gajim/gajim-0.13.2.ebuild
deleted file mode 100644
index a9d62278c957..000000000000
--- a/net-im/gajim/gajim-0.13.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.2.ebuild,v 1.4 2010/07/06 16:04:23 arfrever Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-inherit python eutils autotools versionator
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome idle libnotify nls spell srv trayicon X xhtml"
-
-COMMON_DEPEND=">=dev-python/pygtk-2.12.0"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17-r1
-	>=dev-util/intltool-0.40.1
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-lang/python-2.5[sqlite,xml]
-	dev-python/pyopenssl
-	dev-python/sexy-python
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		trayicon? ( dev-python/egg-python ) )
-	dbus? (
-		dev-python/dbus-python
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python )
-		avahi? ( net-dns/avahi[dbus,gtk,python] ) )
-	xhtml? ( dev-python/docutils )
-	srv? ( || (
-			dev-python/libasyncns-python
-			net-dns/bind-tools ) )
-	idle? ( x11-libs/libXScrnSaver )
-	spell? ( app-text/gtkspell )
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto )"
-
-pkg_setup() {
-	if ! use dbus; then
-		if use libnotify; then
-			eerror "The dbus USE flag is required for libnotify support"
-			die "USE=\"dbus\" needed for libnotify support"
-		fi
-		if use avahi; then
-			eerror "The dbus USE flag is required for avahi support"
-			die "USE=\"dbus\" needed for avahi support"
-		fi
-	fi
-}
-
-src_prepare() {
-	# install pyfiles in /usr/lib/python2.x/site-packages/gajim
-	# upstream: http://trac.gajim.org/ticket/5460
-	epatch "${FILESDIR}/${PN}-0.13-autotools--enable-site-packages_option.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if ! use gnome; then
-		myconf+=" $(use_enable trayicon)"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_with X x) \
-		--docdir="/usr/share/doc/${PF}" \
-		--libdir="$(python_get_sitedir)" \
-		--enable-site-packages \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}/usr/share/doc/${PF}/{README.html,COPYING}"
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.13.3.ebuild b/net-im/gajim/gajim-0.13.3.ebuild
index abe8a2c58d48..b487b6908fa8 100644
--- a/net-im/gajim/gajim-0.13.3.ebuild
+++ b/net-im/gajim/gajim-0.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.3.ebuild,v 1.9 2010/07/09 20:52:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.3.ebuild,v 1.10 2010/07/11 14:49:45 jlec Exp $
 
 EAPI="2"
 
@@ -62,7 +62,7 @@ pkg_setup() {
 src_prepare() {
 	# install pyfiles in /usr/lib/python2.x/site-packages/gajim
 	# upstream: http://trac.gajim.org/ticket/5460
-	epatch "${FILESDIR}/${PN}-0.13-autotools--enable-site-packages_option.patch"
+	epatch "${FILESDIR}/${PN}-0.13-autotools-enable-site-packages_option.patch"
 	eautoreconf
 }
 
diff --git a/net-im/gajim/gajim-0.13.4-r1.ebuild b/net-im/gajim/gajim-0.13.4-r1.ebuild
index 59404b63d46a..7581b22c2603 100644
--- a/net-im/gajim/gajim-0.13.4-r1.ebuild
+++ b/net-im/gajim/gajim-0.13.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.4-r1.ebuild,v 1.1 2010/04/14 19:58:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.4-r1.ebuild,v 1.2 2010/07/11 14:49:45 jlec Exp $
 
 EAPI="2"
 
@@ -69,7 +69,7 @@ src_prepare() {
 	# install pyfiles in /usr/lib/python2.x/site-packages/gajim
 	# upstream: http://trac.gajim.org/ticket/5460
 	# Should be in 0.14
-	epatch "${FILESDIR}/${PN}-0.13-autotools--enable-site-packages_option.patch"
+	epatch "${FILESDIR}/${PN}-0.13-autotools-enable-site-packages_option.patch"
 	epatch "${FILESDIR}"/${PV}-python-version.patch
 	eautoreconf
 	echo '#!/bin/sh' > config/py-compile
diff --git a/net-im/gajim/gajim-0.13.4.ebuild b/net-im/gajim/gajim-0.13.4.ebuild
index 53f4076cbb55..119ed663eea9 100644
--- a/net-im/gajim/gajim-0.13.4.ebuild
+++ b/net-im/gajim/gajim-0.13.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.4.ebuild,v 1.3 2010/07/06 16:04:23 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.4.ebuild,v 1.4 2010/07/11 14:49:45 jlec Exp $
 
 EAPI="2"
 
@@ -63,7 +63,7 @@ src_prepare() {
 	# install pyfiles in /usr/lib/python2.x/site-packages/gajim
 	# upstream: http://trac.gajim.org/ticket/5460
 	# Should be in 0.14
-	epatch "${FILESDIR}/${PN}-0.13-autotools--enable-site-packages_option.patch"
+	epatch "${FILESDIR}/${PN}-0.13-autotools-enable-site-packages_option.patch"
 	eautoreconf
 }