Version bump, bug #273351, thank Bruno 'brubru' Tarquini for this work. Fixes bug #261130, missed dependency on libbonobo-python (gnome-python-desktop dep), thank Zhang Weiwu for report; bug #244304, use modules gnome python dependencies,thank Yu Yuwei for report.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

5 files changed, 264 insertions, 13 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 601a9d6a9ae9..72ef29a0378c 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.82 2009/10/25 17:41:10 tove Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.83 2010/01/04 19:36:50 pva Exp $
+
+*gajim-0.13.1 (04 Jan 2010)
+
+  04 Jan 2010; Peter Volkov <pva@gentoo.org> +gajim-0.13.1.ebuild,
+  +files/gajim-0.13.1-define-exception.patch,
+  +files/gajim-0.13-autotools--enable-site-packages_option.patch:
+  Version bump, bug #273351, thank Bruno 'brubru' Tarquini for this work.
+  Fixes bug #261130, missed dependency on libbonobo-python
+  (gnome-python-desktop dep), thank Zhang Weiwu for report; bug #244304, use
+  modules gnome python dependencies,thank Yu Yuwei for report.
 
   25 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove welp from metadata.xml (#141007)
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 80079f50f6c5..29b7ad0984d5 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
+AUX gajim-0.13-autotools--enable-site-packages_option.patch 3306 RMD160 9490bde83855a72a9ad92824a082657613a60c50 SHA1 49b6c710fdd0124617ef5f5745584c47eca0313e SHA256 61d761c2eb3934c0257624dd0fe791ece5f980a312cecc4ff54e6bb7515c37ea
+AUX gajim-0.13.1-define-exception.patch 1200 RMD160 da893fd0d90a30dcc342fa445ede1bdf9f29ff4a SHA1 b86708f9b72e1af5e4eaa594e19979f85f2fddea SHA256 19dc5cc453832741517d4b1064d24d452fda4b0b9013cddb3b7ae327b9c5994c
 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
+DIST gajim-0.13.1.tar.bz2 3934995 RMD160 4c117bc4e661c20dcaf03a7ef12fdded08f930bc SHA1 d4380b59cdedf46cb3d5ac47ea7fec6cf612142c SHA256 02953825e0ee8b125d6f112772f09571d06cb8493ed88d572c73791cda1c589c
 EBUILD gajim-0.11.4.ebuild 2218 RMD160 adf7b3360d07cfc12f63e7c472cbe5862dfa9598 SHA1 febbff2b8e88ecbf66a3ef3ae266003a6c80d549 SHA256 b547e451b0a93bfd447cbb2849752d019efa82acca0bcb29a3d7c6e9bd6c0e8e
 EBUILD gajim-0.12.1.ebuild 2646 RMD160 e17ce3e58f8c8d2ab12e4c0cab9f8910f7969adf SHA1 d1e2fd706b07d51367a3a532a7db003aba1a1b05 SHA256 5780495d6ef8303bc8111ac62a5d9f5a61ab037acfa0f636ba601d751c4577e0
-MISC ChangeLog 11269 RMD160 87f212d4b0de64da3228743075857bf1102866b9 SHA1 3bba2f1799470b361103fc22c88991c68e28982a SHA256 bfc1e45940cf787ad7043a02223793110643b05f2cc0e68d5c96e4d7de452a9f
+EBUILD gajim-0.13.1.ebuild 2367 RMD160 cd3444d4afba86c9067a0e5362c549395090da1e SHA1 21e7da33989ac89c8cafe3ba4f161a9f002e91ae SHA256 c38eac0a0d18394fc9511756306642e1af896ffcc2d18ade7c57f8c941645810
+MISC ChangeLog 11750 RMD160 b602d07e2d28b9a3efaaa903f2b6149eaf73b25c SHA1 d6d61cd8bb3e900af8f299537b592a8623529b8f SHA256 81f08aca478520bee9c512fc762987c60191da8aac7ac5659c58b1f35fb0ba68
 MISC metadata.xml 494 RMD160 88ad3a78822ec33575b9f197130806768b2162d9 SHA1 f7ffc3aa2608f508768f54e5f3a87397b953e83f SHA256 765a40dceb1e7eb40079e0d29f003e09882e90cac3369f7c12d977afa1119119
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrkjbsACgkQV3J2n04EauxHdACdFHJb4nIimPiZPFHsdezKaRYP
-JtMAoJ2PAnqAzDqGqUzCpKTOg2Y5b8hB
-=xJBj
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..ad683913e923
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.13-autotools--enable-site-packages_option.patch
@@ -0,0 +1,116 @@
+autotools: add --enable-site-packages option
+
+This option allows the installation of pyfiles in PYTHON/site-packages/gajim
+instead of DATADIR/gajim/src.
+
+partial backport of upstream version (http://trac.gajim.org/ticket/5460).
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,6 +65,20 @@
+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+ AC_SUBST([PYTHON_INCLUDES])
+ 
++dnl ****
++dnl enable installation in python-2.x/site-packages/gajim
++dnl ****
++AC_ARG_ENABLE(site-packages,
++  [AS_HELP_STRING([--enable-site-packages],
++	[install gajim sources in PYTHONDIR/site-packages/gajim
++instead of DATADIR/gajim/src.])]
++,
++AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
++,
++AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
++)
++
++AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")
+ AS_AC_EXPAND(DATADIR, "${datadir}")
+ AS_AC_EXPAND(LIBDIR, "${libdir}")
+ AS_AC_EXPAND(DOCDIR, "${docdir}")
+@@ -95,4 +109,11 @@
+ ***************************** 
+   Build features:
+     trayicon ......... ${have_trayicon}
++
++  Installation:
++    Prefix ........... ${prefix}
++    Python modules ... ${GAJIM_SRCDIR}
++    C modules ........ ${LIBDIR}/gajim
++    Documentation .... ${DOCDIR}
++    Others............ ${DATADIR}/gajim
+ *****************************"
+diff --git a/data/Makefile.am b/data/Makefile.am
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -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 = $(gajim_srcdir)/common
+ installdefs_DATA = defs.py
+ 
+ soundsdir = $(pkgdatadir)/data/sounds
+diff --git a/scripts/gajim.in b/scripts/gajim.in
+--- a/scripts/gajim.in
++++ b/scripts/gajim.in
+@@ -32,6 +32,6 @@
+ export datadir=@DATADIR@/gajim
+ PYTHON_EXEC=@PYTHON@
+ 
+-cd ${datadir}/src
++cd "@GAJIM_SRCDIR@"
+ export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
+ exec ${PYTHON_EXEC} -OO $APP.py "$@"
+diff --git a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -26,37 +26,16 @@
+ 		    --override $(srcdir)/trayicon.override \
+ 		    $(srcdir)/trayicon.defs > $@
+ endif
+-gajimsrcdir = $(pkgdatadir)/src
+-gajimsrc_PYTHON = $(srcdir)/*.py
++gajimsrcdir = $(gajim_srcdir)
++nobase_dist_gajimsrc_PYTHON = \
++	$(srcdir)/*.py \
++	$(srcdir)/common/*.py \
++	$(srcdir)/common/xmpp/*.py \
++	$(srcdir)/common/zeroconf/*.py \
++	$(srcdir)/command_system/*.py \
++	$(srcdir)/command_system/implementation/*.py
+ 
+-gajimsrc1dir = $(pkgdatadir)/src/common
+-gajimsrc1_PYTHON = \
+-				$(srcdir)/common/*.py
+-
+-gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
+-gajimsrc2_PYTHON = \
+-				$(srcdir)/common/xmpp/*.py
+-
+-gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
+-gajimsrc3_PYTHON = \
+-				$(srcdir)/common/zeroconf/*.py
+-
+-gajimsrc4dir = $(pkgdatadir)/src/command_system
+-gajimsrc4_PYTHON = \
+-				   $(srcdir)/command_system/*.py
+-
+-gajimsrc5dir = $(pkgdatadir)/src/command_system/implementation
+-gajimsrc5_PYTHON = \
+-				   $(srcdir)/command_system/implementation/*.py
+-
+-DISTCLEANFILES =
+-
+-EXTRA_DIST = $(gajimsrc_PYTHON) \
+-			$(gajimsrc1_PYTHON) \
+-			$(gajimsrc2_PYTHON) \
+-			$(gajimsrc3_PYTHON) \
+-			$(gajimsrc4_PYTHON) \
+-			$(gajimsrc5_PYTHON) \
++EXTRA_DIST = \
+ 			eggtrayicon.c \
+ 			trayiconmodule.c \
+ 			eggtrayicon.h \
diff --git a/net-im/gajim/files/gajim-0.13.1-define-exception.patch b/net-im/gajim/files/gajim-0.13.1-define-exception.patch
new file mode 100644
index 000000000000..0091592a42fd
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.13.1-define-exception.patch
@@ -0,0 +1,39 @@
+=== modified file 'src/common/dbus_support.py'
+--- src/common/dbus_support.py	2010-01-04 16:15:54 +0000
++++ src/common/dbus_support.py	2010-01-04 16:16:12 +0000
+@@ -60,7 +60,7 @@
+ 			raise exceptions.DbusNotSupported
+ 
+ 		if not self.present():
+-				raise exceptions.SystemBusNotPresent
++			raise exceptions.SystemBusNotPresent
+ 		return self.system_bus
+ 
+ 	def bus(self):
+
+=== modified file 'src/common/exceptions.py'
+--- src/common/exceptions.py	2010-01-04 16:15:54 +0000
++++ src/common/exceptions.py	2010-01-04 16:19:55 +0000
+@@ -68,7 +68,20 @@
+ 		Exception.__init__(self)
+ 
+ 	def __str__(self):
+-		return _('Session bus is not available.\nTry reading http://trac.gajim.org/wiki/GajimDBus')
++		return _('Session bus is not available.\nTry reading %(url)s') % \
++			{'url': 'http://trac.gajim.org/wiki/GajimDBus'}
++
++class SystemBusNotPresent(Exception):
++	"""
++	This exception indicates that there is no session daemon
++	"""
++
++	def __init__(self):
++		Exception.__init__(self)
++
++	def __str__(self):
++		return _('System bus is not available.\nTry reading %(url)s') % \
++			{'url': 'http://trac.gajim.org/wiki/GajimDBus'}
+ 
+ class NegotiationError(Exception):
+ 	'''A session negotiation failed'''
+
diff --git a/net-im/gajim/gajim-0.13.1.ebuild b/net-im/gajim/gajim-0.13.1.ebuild
new file mode 100644
index 000000000000..1e3589efb5c3
--- /dev/null
+++ b/net-im/gajim/gajim-0.13.1.ebuild
@@ -0,0 +1,92 @@
+# 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.1 2010/01/04 19:36:50 pva Exp $
+
+EAPI="2"
+
+NEED_PYTHON="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="~amd64 ~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
+	>=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"
+	# http://trac.gajim.org/ticket/5457
+	epatch "${FILESDIR}/${P}-define-exception.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
+}