diff --git a/dev-python/libasyncns-python/Manifest b/dev-python/libasyncns-python/Manifest
new file mode 100644
index 0000000..914684e
--- /dev/null
+++ b/dev-python/libasyncns-python/Manifest
@@ -0,0 +1,2 @@
+DIST libasyncns-python-0.7.1.tar.bz2 20276 RMD160 fa0770d7ecd5461fe4be895c476f53cb5656b6a1 SHA1 498fad31e04ba69445bac880b7dbe980a022bda2 SHA256 0ff757f8d9bf1f07054ab7ad2d03434de4cfa6b9d6cb4bba29072728563894e0
+EBUILD libasyncns-python-0.7.1-r666.ebuild 543 RMD160 e0442162a9ad70a93c0aac7889661cdc116dea38 SHA1 95715682d7af2e7809b25f33dfbb95bd2a3d403e SHA256 c59655fe364bd90499857b685614cd257b9227c4c6183fd5007026a42161a70f
diff --git a/dev-python/libasyncns-python/libasyncns-python-0.7.1-r666.ebuild b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r666.ebuild
new file mode 100644
index 0000000..2180409
--- /dev/null
+++ b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r666.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libasyncns-python/libasyncns-python-0.7.1.ebuild,v 1.2 2009/04/12 20:51:11 hanno Exp $
+
+inherit distutils
+
+DESCRIPTION="Python bindings for libasyncns."
+HOMEPAGE="https://launchpad.net/libasyncns-python/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="x86 ~amd64"
+IUSE=""
+DEPEND=">=net-libs/libasyncns-0.4"
+RDEPEND="${DEPEND}"
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
new file mode 100644
index 0000000..3dd725f
--- /dev/null
+++ b/mail-client/sylpheed/Manifest
@@ -0,0 +1,6 @@
+AUX sylpheed-2.4-firefox.diff 612 RMD160 67c11c67c4c4b506215780a28d462f729d28fd21 SHA1 499d8de33f4daf252efeadb362ebceb52217b648 SHA256 cc9b955cb5f6b0276265caff123a13345439ee5a5ca6ab49303f5e141ba359d8
+AUX sylpheed-2.5-enchant.diff 657 RMD160 60a9f01e855283860606ff39d7efceab24f94f22 SHA1 8c2a0b08ab739dc35d57edcbb6a3a29f5c25f6b0 SHA256 b47b4829cfe20215c6daf3a80a2b3ba1afbf529ca3212986246316e9655fefab
+AUX sylpheed-2.7-menu_key.diff 861 RMD160 95bd944fddcfb1ac39793c472c69a57e2f234c7a SHA1 2a109d668638dca054ff17a56423bcb3d0c8291c SHA256 8c2f157789ecc5b7a29ae7a77c98db552d1f5e153175270e52a3be6a672e76dc
+AUX sylpheed-2.7-shared-mime-info.diff 1537 RMD160 281d4e57483ec5a4ea47b0449b2da643d9ec1393 SHA1 d828c1aa80cccc4c6ca00daf21b35fc1fbee6889 SHA256 9cf57d8e0750df6ef11a3107c119295fa1cc721e029be3fb4777e004b2174428
+DIST sylpheed-2.7.1.tar.bz2 2903079 RMD160 270607ebb48c2a2426472ddfa352021db634d0f7 SHA1 79013505355a9d359bbb3147f1916499abe1ab0e SHA256 8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4af84e23
+EBUILD sylpheed-2.7.1-r99.ebuild 1608 RMD160 f9f1b1f32645658fe7dabf4bda8b5d8ee5179037 SHA1 592fb856427e30313c35f8a041ce293723e167af SHA256 92e165839fc586dee9ffe60c6fa3d50781a6ee1dfdad6ef40e59beefe0d0c171
diff --git a/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff b/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff
new file mode 100644
index 0000000..79ee315
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff
@@ -0,0 +1,12 @@
+diff -Naur sylpheed-2.4.1.orig/libsylph/defs.h sylpheed-2.4.1/libsylph/defs.h
+--- sylpheed-2.4.1.orig/libsylph/defs.h	2006-09-22 11:58:56.000000000 +0900
++++ sylpheed-2.4.1/libsylph/defs.h	2007-05-07 17:25:18.000000000 +0900
+@@ -92,7 +92,7 @@
+ /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
+ /* #define DEFAULT_INC_PROGRAM	"imget" */
+ #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
+-#define DEFAULT_BROWSER_CMD	"mozilla-firefox -remote 'openURL(%s,new-window)'"
++#define DEFAULT_BROWSER_CMD	"firefox -remote 'openURL(%s,new-window)'"
+ 
+ #ifdef _PATH_MAILDIR
+ #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
diff --git a/mail-client/sylpheed/files/sylpheed-2.5-enchant.diff b/mail-client/sylpheed/files/sylpheed-2.5-enchant.diff
new file mode 100644
index 0000000..0501f02
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-2.5-enchant.diff
@@ -0,0 +1,17 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 2022)
++++ configure.in	(working copy)
+@@ -266,11 +266,7 @@
+ 		AC_MSG_RESULT(yes)
+ 		CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gtkspell-2.0`"
+ 		LIBS="$LIBS `$PKG_CONFIG --libs gtkspell-2.0`"
+-		if $PKG_CONFIG --atleast-version 2.0.13 gtkspell-2.0 ; then
+-			AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell)
+-		elif $PKG_CONFIG --atleast-version 2.0.12 gtkspell-2.0 ; then
+-			LIBS="$LIBS -laspell"
+-		fi
++		AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell)
+ 		AC_DEFINE(USE_GTKSPELL, 1, Use GtkSpell in editor)
+ 	else
+ 		AC_MSG_RESULT(no)
diff --git a/mail-client/sylpheed/files/sylpheed-2.7-menu_key.diff b/mail-client/sylpheed/files/sylpheed-2.7-menu_key.diff
new file mode 100644
index 0000000..685ab64
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-2.7-menu_key.diff
@@ -0,0 +1,32 @@
+--- sylpheed-2.7.1_orig/src/folderview.c	2009-06-15 06:35:28.000000000 +0200
++++ sylpheed-2.7.1/src/folderview.c	2010-07-23 21:53:07.000000000 +0200
+@@ -1634,8 +1634,9 @@
+ 
+ 	if (!event) return FALSE;
+ 
+-	if (event->button != 3)
+-		return FALSE;
++    // Show context menu
++	//if (event->button != 3)
++	//	return FALSE;
+ 
+ 	if (!gtk_tree_selection_get_selected
+ 		(folderview->selection, NULL, &iter))
+@@ -1879,6 +1880,17 @@
+ 			return TRUE;
+ 		}
+ 		break;
++    case GDK_Menu:
++        // Show context menu
++		if (folderview->selected) {
++			selected = gtk_tree_row_reference_get_path
++				(folderview->selected);
++            gtk_tree_selection_select_path(folderview->selection, selected);
++            folderview_menu_popup(folderview, event);
++            gtk_tree_path_free(selected);
++            return TRUE;
++		}
++        break;
+ 	default:
+ 		break;
+ 	}
diff --git a/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff b/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff
new file mode 100644
index 0000000..4e0783d
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff
@@ -0,0 +1,55 @@
+Index: libsylph/procmime.c
+===================================================================
+--- libsylph/procmime.c	(revision 2195)
++++ libsylph/procmime.c	(working copy)
+@@ -1483,6 +1483,9 @@
+ 		g_free(dir);
+ 		mime_type_list = g_list_concat(mime_type_list, list);
+ 
++		list = procmime_get_mime_type_list(DATADIR "/mime/globs");
++		mime_type_list = g_list_concat(mime_type_list, list);
++
+ 		if (!mime_type_list) {
+ 			debug_print("mime.types not found\n");
+ 			return NULL;
+@@ -1535,7 +1538,7 @@
+ 		g_strstrip(buf);
+ 
+ 		p = buf;
+-		while (*p && !g_ascii_isspace(*p)) p++;
++		while (*p && !g_ascii_isspace(*p) && *p != ':') p++;
+ 		if (*p) {
+ 			*p = '\0';
+ 			p++;
+@@ -1548,7 +1551,7 @@
+ 		mime_type->type = g_strdup(buf);
+ 		mime_type->sub_type = g_strdup(delim + 1);
+ 
+-		while (*p && g_ascii_isspace(*p)) p++;
++		while (*p && (g_ascii_isspace(*p) || *p == '*' || *p == '.')) p++;
+ 		if (*p)
+ 			mime_type->extension = g_strdup(p);
+ 		else
+@@ -1560,7 +1563,7 @@
+ 	fclose(fp);
+ 
+ 	if (!list)
+-		g_warning("Can't read mime.types\n");
++		g_warning("Can't read %s\n", file);
+ 
+ 	return list;
+ }
+Index: libsylph/Makefile.am
+===================================================================
+--- libsylph/Makefile.am	(revision 2195)
++++ libsylph/Makefile.am	(working copy)
+@@ -2,7 +2,8 @@
+ AM_CPPFLAGS = \
+ 	-DG_LOG_DOMAIN=\"LibSylph\" \
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+-	-DLOCALEDIR=\""$(localedir)"\"
++	-DLOCALEDIR=\""$(localedir)"\" \
++	-DDATADIR=\""$(datadir)"\"
+ 
+ INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir)
+ 
diff --git a/mail-client/sylpheed/sylpheed-2.7.1-r99.ebuild b/mail-client/sylpheed/sylpheed-2.7.1-r99.ebuild
new file mode 100644
index 0000000..239a4c9
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-2.7.1-r99.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.7.1.ebuild,v 1.2 2010/03/13 16:03:24 hattya Exp $
+
+inherit autotools eutils
+
+IUSE="crypt ipv6 ldap nls pda spell ssl xface"
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.sraoss.jp/"
+SRC_URI="http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+SLOT="0"
+
+COMMON_DEPEND=">=x11-libs/gtk+-2.4
+	nls? ( >=sys-devel/gettext-0.12.1 )
+	crypt? ( >=app-crypt/gpgme-1 )
+	ldap? ( net-nds/openldap )
+	pda? ( app-pda/jpilot )
+	spell? ( app-text/gtkspell )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	xface? ( >=media-libs/compface-1.4 )"
+RDEPEND="${COMMON_DEPEND}
+	app-misc/mime-types
+	net-misc/curl
+	x11-misc/shared-mime-info"
+
+AT_M4DIR="ac"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-2.[457]-*.diff
+
+	use crypt || cp ac/missing/gpgme.m4 ac
+
+	eautoreconf
+
+}
+
+src_compile() {
+
+	local htmldir=/usr/share/doc/${PF}/html
+
+	econf \
+		$(use_enable crypt gpgme) \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable pda jpilot) \
+		$(use_enable spell gtkspell) \
+		$(use_enable ssl) \
+		$(use_enable xface compface) \
+		--with-manualdir=${htmldir}/manual \
+		--with-faqdir=${htmldir}/faq \
+		|| die
+	emake || die
+
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
+	doicon *.png
+	domenu *.desktop
+
+}
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
new file mode 100644
index 0000000..1a20e57
--- /dev/null
+++ b/net-im/gajim/Manifest
@@ -0,0 +1,2 @@
+AUX POTFILES.in 4552 RMD160 3938e7e1b47b6572464afe48501183dafb74f442 SHA1 af9f0954e508f566ecccefe1d3ab3b13d2a1feaf SHA256 48876edaac2c2594e7291f1a98bf7ee6062c24d31306441e0fba485af4c33754
+EBUILD gajim-9999.ebuild 2506 RMD160 077f458075da2a0544e4f63c822026fecb37e97d SHA1 d4e3972754d08ac8490a5186468550100441a218 SHA256 398df5b7b500ee8d527261a76923713a95f5b295890e1840baf8e5ef0bcf05b2
diff --git a/net-im/gajim/files/POTFILES.in b/net-im/gajim/files/POTFILES.in
new file mode 100644
index 0000000..2d3d3af
--- /dev/null
+++ b/net-im/gajim/files/POTFILES.in
@@ -0,0 +1,152 @@
+[encoding: UTF-8]
+data/gajim.desktop.in.in
+data/glade/account_context_menu.glade
+data/glade/account_creation_wizard_window.glade
+data/glade/account_modification_window.glade
+data/glade/accounts_window.glade
+data/glade/add_new_contact_window.glade
+data/glade/adhoc_commands_window.glade
+data/glade/advanced_configuration_window.glade
+data/glade/advanced_menuitem_menu.glade
+data/glade/advanced_notifications_window.glade
+data/glade/atom_entry_window.glade
+data/glade/blocked_contacts_window.glade
+data/glade/change_activity_dialog.glade
+data/glade/change_mood_dialog.glade
+data/glade/change_password_dialog.glade
+data/glade/change_status_message_dialog.glade
+data/glade/chat_context_menu.glade
+data/glade/chat_to_muc_window.glade
+data/glade/choose_gpg_key_dialog.glade
+data/glade/contact_context_menu.glade
+data/glade/data_form_window.glade
+data/glade/dubbleinput_dialog.glade
+data/glade/edit_groups_dialog.glade
+data/glade/esession_info_window.glade
+data/glade/features_window.glade
+data/glade/filetransfers.glade
+data/glade/gajim_themes_window.glade
+data/glade/gc_control_popup_menu.glade
+data/glade/gc_occupants_menu.glade
+data/glade/groups_post_window.glade
+data/glade/history_manager.glade
+data/glade/history_window.glade
+data/glade/input_dialog.glade
+data/glade/input_text_dialog.glade
+data/glade/join_groupchat_window.glade
+data/glade/manage_accounts_window.glade
+data/glade/manage_bookmarks_window.glade
+data/glade/manage_pep_services_window.glade
+data/glade/manage_proxies_window.glade
+data/glade/manage_sounds_window.glade
+data/glade/message_window.glade
+data/glade/passphrase_dialog.glade
+data/glade/popup_notification_window.glade
+data/glade/preferences_window.glade
+data/glade/privacy_lists_window.glade
+data/glade/privacy_list_window.glade
+data/glade/profile_window.glade
+data/glade/progress_dialog.glade
+data/glade/remove_account_window.glade
+data/glade/roster_item_exchange_window.glade
+data/glade/roster_window.glade
+data/glade/search_window.glade
+data/glade/service_discovery_window.glade
+data/glade/service_registration_window.glade
+data/glade/single_message_window.glade
+data/glade/subscription_request_popup_menu.glade
+data/glade/subscription_request_window.glade
+data/glade/synchronise_select_account_dialog.glade
+data/glade/synchronise_select_contacts_dialog.glade
+data/glade/systray_context_menu.glade
+data/glade/vcard_information_window.glade
+data/glade/xml_console_window.glade
+data/glade/zeroconf_context_menu.glade
+data/glade/zeroconf_information_window.glade
+src/adhoc_commands.py
+src/advanced_configuration_window.py
+src/atom_window.py
+src/cell_renderer_image.py
+src/chat_control.py
+src/common/atom.py
+src/common/caps.py
+src/common/check_paths.py
+src/common/commands.py
+src/common/configpaths.py
+src/common/config.py
+src/common/connection_handlers.py
+src/common/connection.py
+src/common/contacts.py
+src/common/crypto.py
+src/common/dataforms.py
+src/common/dbus_support.py
+src/common/defs.py
+src/common/dh.py
+src/common/events.py
+src/common/exceptions.py
+src/common/fuzzyclock.py
+src/common/gajim.py
+src/common/GnuPGInterface.py
+src/common/GnuPG.py
+src/common/helpers.py
+src/common/i18n.py
+src/common/idle.py
+src/common/__init__.py
+src/common/kwalletbinding.py
+src/common/latex.py
+src/common/logger.py
+src/common/logging_helpers.py
+src/common/optparser.py
+src/common/passwords.py
+src/common/pep.py
+src/common/proxy65_manager.py
+src/common/pubsub.py
+src/common/resolver.py
+src/common/rst_xhtml_generator.py
+src/common/sleepy.py
+src/common/socks5.py
+src/common/stanza_session.py
+src/common/zeroconf/client_zeroconf.py
+src/common/zeroconf/connection_handlers_zeroconf.py
+src/common/zeroconf/connection_zeroconf.py
+src/common/zeroconf/__init__.py
+src/common/zeroconf/roster_zeroconf.py
+src/common/zeroconf/zeroconf_avahi.py
+src/common/zeroconf/zeroconf_bonjour.py
+src/common/zeroconf/zeroconf.py
+src/config.py
+src/conversation_textview.py
+src/dataforms_widget.py
+src/dialogs.py
+src/disco.py
+src/features_window.py
+src/filetransfers_window.py
+src/gajim.py
+src/gajim-remote.py
+src/gajim_themes_window.py
+src/groupchat_control.py
+src/groups.py
+src/gtkexcepthook.py
+src/gtkgui_helpers.py
+src/gtkspell.py
+src/gui_menu_builder.py
+src/history_manager.py
+src/history_window.py
+src/htmltextview.py
+src/message_control.py
+src/message_textview.py
+src/message_window.py
+src/music_track_listener.py
+src/negotiation.py
+src/network_manager_listener.py
+src/notify.py
+src/profile_window.py
+src/remote_control.py
+src/roster_window.py
+src/search_window.py
+src/secrets.py
+src/session.py
+src/statusicon.py
+src/systray.py
+src/tooltips.py
+src/vcard.py
diff --git a/net-im/gajim/gajim-9999.ebuild b/net-im/gajim/gajim-9999.ebuild
new file mode 100644
index 0000000..288b78a
--- /dev/null
+++ b/net-im/gajim/gajim-9999.ebuild
@@ -0,0 +1,102 @@
+# 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.1.ebuild,v 1.2 2010/01/05 07:22:35 pva Exp $
+
+EAPI="2"
+
+PYTHON_DEPEND="2:2.5"
+inherit python eutils autotools versionator mercurial
+
+EHG_REPO_URI="http://hg.gajim.org/gajim/"
+EHG_REVISION="otr"
+S="${WORKDIR}/${PN}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome idle libnotify nls spell srv 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
+	net-im/python-otr
+	dev-python/libasyncns-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? ( || (
+			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"
+	# http://trac.gajim.org/ticket/5457
+	#epatch "${FILESDIR}/${PN}-0.13.1-define-exception.patch"
+	cp "${FILESDIR}/POTFILES.in" "${S}/po/"
+	intltoolize --force --copy --automake
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	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"
+
+	dohtml README.html
+}
+
+pkg_postinst() {
+        python_mod_optimize /usr/share/gajim/
+}
+
+pkg_postrm() {
+        python_mod_cleanup /usr/share/gajim/
+}