[patch] diff for net-im/gajim-0.12.2

gajim-0.12.2.ebuild.diff (text/plain), 1.43 KB, created by Dmitri Bogomolov on 2009-06-08 16:11:15 UTC

--- gajim-0.12.1.ebuild	2009-06-01 03:11:20.000000000 +0300
+++ gajim-0.12.2.ebuild	2009-06-08 19:06:42.871509659 +0300
@@ -13,7 +13,7 @@
 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"
+IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml gnome-keyring crypt"
 
 DEPEND="|| (
 		( <dev-lang/python-2.5 dev-python/pysqlite )
@@ -34,9 +34,10 @@
 	idle? ( x11-libs/libXScrnSaver )
 	spell? ( app-text/gtkspell )
 	avahi? ( net-dns/avahi[dbus,gtk,python] )
+	gnome-keyring? ( dev-python/gnome-keyring-python )
+	crypt? ( dev-python/py-gnupg dev-python/pycrypto )
 	dev-python/pyopenssl
-	dev-python/sexy-python
-	dev-python/pycrypto"
+	dev-python/sexy-python"
 
 pkg_setup() {
 	if ! use dbus; then
@@ -52,15 +53,10 @@
 }
 
 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"
+	epatch "${FILESDIR}/0.12.2_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')|" \