Bump to 0.12.1, fixes #251298. Patches by Bruno Tarquini, ebuild mods by Bruno Tarquini and Marcin Rybarski.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

7 files changed, 373 insertions, 6 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 89fcee5ff364..3c340abea569 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.73 2009/03/07 19:57:16 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.74 2009/04/27 22:36:22 patrick Exp $
+
+*gajim-0.12.1 (27 Apr 2009)
+
+  27 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/0.12.1-roster_window.py_r10934.patch,
+  +files/0.12.1-sound-path-fix.patch,
+  +files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch,
+  +files/fix_autotools_and_search_dirs.patch, +gajim-0.12.1.ebuild:
+  Bump to 0.12.1, fixes #251298. Patches by Bruno Tarquini, ebuild mods by
+  Bruno Tarquini and Marcin Rybarski.
 
   07 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org> gajim-0.11.1.ebuild,
   gajim-0.11.2.ebuild, gajim-0.11.2-r1.ebuild, gajim-0.11.3.ebuild,
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index df06bb059ab6..17c9a2598575 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,14 +1,20 @@
-MISC ChangeLog 10011 RMD160 f36ed0052549f80500e3210a8f7593b16655e5c7 SHA1 f140c3d523e8e0b8dfd41705101023e1c59b5b67 SHA256 d45d0f196c4f43fefb01ac0659ebf3367a2e869e7e5d638ee0fc6d259674edc6
 AUX 0.11.3-misc-fixes.patch 1401 RMD160 7bef42ecd6505b46fa4392fc72565c64ac17c0b1 SHA1 a83d21691e8631391fcc6b48f53cc021bbb32a83 SHA256 9fdde00cd7236b2fe1074f8697d122b6783d7a8a27c3d285ee8a3ead518a2c37
+AUX 0.12.1-roster_window.py_r10934.patch 995 RMD160 237c4bb523eebb4ac097ce5eb5b54c6d0f6051f0 SHA1 29e3110da5597b8c031db591f333dbb6bbfdec15 SHA256 531f161e8000a22226802fa872cd5d0c018fc975b39162ecf00ead3afcf7617c
+AUX 0.12.1-sound-path-fix.patch 2479 RMD160 86391d9ec6898d075e6c5376d15897271468f0ae SHA1 51af706c53a4469973bac4dd0053550ec965b4f8 SHA256 a8d791ddeb37fdf95e0e8ec7f3fb4e66e0d97a8731cfd57ab602243678b17ce1
+AUX 0.12.1_autotools_install_pyfiles_in_pkglibdir.patch 1961 RMD160 1021c7bb94c84a87f08719943379666b9fdfdeae SHA1 75463339fece000cc1cd18291f1c7ec1f6b77dbd SHA256 a216b93bb44839d483dcb70f6ae9ab81c1e030c745385134f6674a223fc0750b
+AUX fix_autotools_and_search_dirs.patch 3464 RMD160 b2d10ebbc8873c10f6ad154e07067154e37485d0 SHA1 5f1f5a81efaccb66e0648bbe681147b732102ea6 SHA256 cde913835bda04ebc0c4f74c28681b9a6ca5ac0f2bf9d106939ed06e5d9dade8
 AUX gajim-0.11.4-test_fix.patch 866 RMD160 951dfebf5983949e620479d9453d353ae00cfe6b SHA1 513cbedbac5fae49f2ebce41f6bda3a81b744185 SHA256 d3e4eb0deea89f7b9e6cf47e3ca7c919189879b4d19b518ee60c2c0728489202
+DIST gajim-0.11.1.tar.gz 3665819 RMD160 2491d39c1beec479a32b2efbf31b2a6dc1f96b6e SHA1 5a11a26725559e0d60a17bbaaa416ef5670c42b7 SHA256 41fead82d54f5d0d91eef161a6e0fcaa673aec3430c2d3c9f04ea91917d5c8f2
+DIST gajim-0.11.2.tar.gz 3883045 RMD160 2dfd21750ccaf753066e920affa2e07016788ad6 SHA1 2869bff89df38f109a23915a4fb9a88840c59379 SHA256 e3d5ece412742b0b47311523f64f6ad739813f6e6a540c87efe15e2826e20b5a
+DIST gajim-0.11.3.tar.gz 3933538 RMD160 0cfd21e3e74d24a604fac25cffd1ce9954554dbc SHA1 05bb10476dc8d4b00f47c338e9d94097158fc236 SHA256 91e4f2ab0471885c9575163cc47fe664cc55863084e4ce12aef773b3de168dfa
+DIST gajim-0.11.4.tar.gz 3935309 RMD160 a8b212fab21fa717de33bda2b0a1ab1342b599a1 SHA1 fa3b60d935ee11a1b1f18be784344adfd7363c87 SHA256 a805d288a5bf59f7f6452d14e1d7202bd0c18f31364b87641e595e3a2eb697a8
+DIST gajim-0.12.1.tar.gz 4611614 RMD160 8d17d8083cbccff601b6583cedda93ec0d480316 SHA1 c5421a995842505d5143cacefa2b10a18ee2487e SHA256 7b5d590b548bf23ca395017bdf957d12fef59b17dbaf293152a1a6802280f4c5
 EBUILD gajim-0.11.1.ebuild 2187 RMD160 29b1d2da9fc6f8979e6d87e4428b68fdb1e0e9ad SHA1 692a83f0726cce4df86d3d99cef150629bbeb1aa SHA256 01c17cba9c56dd67df89c40128609b04667f9d9e3a1efb6045bb40096c3b40f1
 EBUILD gajim-0.11.2-r1.ebuild 2217 RMD160 5fa14c3bc6c94903abbbb2608855d751e449f6ab SHA1 231831b50d0d81b4c55aeb9e05b7cea766a55050 SHA256 cd1cb8e3beac900f0d5a4b673a8acb83607f948a7aba63ebb2d92f63ccfaa150
 EBUILD gajim-0.11.2.ebuild 2192 RMD160 4d8cf7d36fc76b65594489729373209f62e2e68b SHA1 55be64711d40927af4d83bc4c902353c3112e330 SHA256 32390a08c32bc3e12bc9b6bc3de7798c6f6923a011c3c683675ee48921e16f7a
 EBUILD gajim-0.11.3-r1.ebuild 2304 RMD160 950e2871ac95e0cd97818dea0c1c56a14dd49789 SHA1 0709796a1b6d40f0f3aef1503bdd626758513133 SHA256 fb7b011c22b1ffd75e113ebdefe9f2de00f213ca55bb3fba025585dc29320c2b
 EBUILD gajim-0.11.3.ebuild 2220 RMD160 34ee47df8aaccc90cd04510e772835f97ef93fef SHA1 29aac725e1850ce2d9a11e878594193075c38438 SHA256 c95cd4bee8c04065d6ee7a6ea2e5fc3447fab927f4e77ff32af6b8e00824e4de
 EBUILD gajim-0.11.4.ebuild 2300 RMD160 04f1a04f6af8ea81e58aef8ca4edff89a1532093 SHA1 10f486ba67282c04e590db5a6aefa070be53d4b3 SHA256 6c0251b7afe03754c86b8c66281a7d038e66f31477fc605ad346377d2161a055
+EBUILD gajim-0.12.1.ebuild 2685 RMD160 d71ffde465635b151ce55c3006de76cf311ee201 SHA1 551fdcc5b34653550180033918df49450c7d1ce6 SHA256 f04b374d17ae96ec9929a0ac6917dfbcd915f954c2277b883e2f6023140edb04
+MISC ChangeLog 10415 RMD160 253cedd16a08e5d29223bc3e6074f378a8aefc9a SHA1 2ed1bb4ef901c26c5327e610e87aeee8af9cc52f SHA256 045235c481864224307551013d886b029740a1a412eb588d6622eb1d43a8cc98
 MISC metadata.xml 587 RMD160 435dc08a9b0d827903d81b170ee20dccde5aa0c5 SHA1 f9d25817432e3deeb02b3701634272cb5c9ce72a SHA256 c9a3b2f0eede4d68da57a15a0749b2f573024acce8991778db362803033141c0
-DIST gajim-0.11.1.tar.gz 3665819 RMD160 2491d39c1beec479a32b2efbf31b2a6dc1f96b6e SHA1 5a11a26725559e0d60a17bbaaa416ef5670c42b7 SHA256 41fead82d54f5d0d91eef161a6e0fcaa673aec3430c2d3c9f04ea91917d5c8f2
-DIST gajim-0.11.2.tar.gz 3883045 RMD160 2dfd21750ccaf753066e920affa2e07016788ad6 SHA1 2869bff89df38f109a23915a4fb9a88840c59379 SHA256 e3d5ece412742b0b47311523f64f6ad739813f6e6a540c87efe15e2826e20b5a
-DIST gajim-0.11.4.tar.gz 3935309 RMD160 a8b212fab21fa717de33bda2b0a1ab1342b599a1 SHA1 fa3b60d935ee11a1b1f18be784344adfd7363c87 SHA256 a805d288a5bf59f7f6452d14e1d7202bd0c18f31364b87641e595e3a2eb697a8
-DIST gajim-0.11.3.tar.gz 3933538 RMD160 0cfd21e3e74d24a604fac25cffd1ce9954554dbc SHA1 05bb10476dc8d4b00f47c338e9d94097158fc236 SHA256 91e4f2ab0471885c9575163cc47fe664cc55863084e4ce12aef773b3de168dfa
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
new file mode 100644
index 000000000000..5ea2cadb37a1
--- /dev/null
+++ b/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..b9bf23bfb024
--- /dev/null
+++ b/net-im/gajim/files/0.12.1-sound-path-fix.patch
@@ -0,0 +1,50 @@
+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
new file mode 100644
index 000000000000..7c61f13fe133
--- /dev/null
+++ b/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch
@@ -0,0 +1,62 @@
+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
new file mode 100644
index 000000000000..dea30dcfb545
--- /dev/null
+++ b/net-im/gajim/files/fix_autotools_and_search_dirs.patch
@@ -0,0 +1,114 @@
+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/gajim-0.12.1.ebuild b/net-im/gajim/gajim-0.12.1.ebuild
new file mode 100644
index 000000000000..b06edceccbbe
--- /dev/null
+++ b/net-im/gajim/gajim-0.12.1.ebuild
@@ -0,0 +1,102 @@
+# 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.1 2009/04/27 22:36:22 patrick 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="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml"
+
+DEPEND="|| (
+		( <dev-lang/python-2.5 dev-python/pysqlite )
+		>=dev-lang/python-2.5[sqlite]
+	)
+	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/
+}