Fix for bug 315103

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

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 95cfc64ebf49a769b5bb6dc0649c52bcd01891d6..ab48fba8ee428c8a84af1435015a59825e1c323c 100644 (file)
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.94 2010/04/02 11:54:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.95 2010/04/14 19:58:10 jlec Exp $
+
+*gajim-0.13.4-r1 (14 Apr 2010)
+
+  14 Apr 2010; Justin Lecher <jlec@gentoo.org> +gajim-0.13.4-r1.ebuild:
+  Move to new Python ABI situation, fixes #315103
+  We do byte-compile ourself
 
 *gajim-0.13.4 (02 Apr 2010)
 

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index c0d49c2382672c3156955414cd4d26b1ba3692cf..372ea8b93ddae7c7a5ea3b7f869cac40826e74a5 100644 (file)
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -5,6 +5,7 @@ AUX 0.11.3-misc-fixes.patch 1401 RMD160 7bef42ecd6505b46fa4392fc72565c64ac17c0b1
 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 0.13.4-python-version.patch 372 RMD160 19ca9bca4a00eac318f5641de4bf93d1b6c0978b SHA1 7e40dcc6e3bdc8bbbe87f84052d68108ab341ecd SHA256 81978f728540946ab58b936d01e2ac6160dcbdc387453722e062008a15b93e11
 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
@@ -17,13 +18,14 @@ EBUILD gajim-0.11.4.ebuild 2218 RMD160 adf7b3360d07cfc12f63e7c472cbe5862dfa9598
 EBUILD gajim-0.12.1.ebuild 2646 RMD160 e17ce3e58f8c8d2ab12e4c0cab9f8910f7969adf SHA1 d1e2fd706b07d51367a3a532a7db003aba1a1b05 SHA256 5780495d6ef8303bc8111ac62a5d9f5a61ab037acfa0f636ba601d751c4577e0
 EBUILD gajim-0.13.2.ebuild 2303 RMD160 59c79381d3d65ac1b2d90389c8bb575c6811a0a2 SHA1 c792cff29b6dcc365f1f081fb1e38dfc7bcf0480 SHA256 251f9f23c01c0820a5827246a63ef9c3cacceded2a14192bd331f3617e2ee6b0
 EBUILD gajim-0.13.3.ebuild 2301 RMD160 bcda8a194ff6a92caa670d594ee871f7d7937e6c SHA1 2a6c14884d89c3434716c1d46d228867870abbe2 SHA256 2d5d535651cf14477f91bd245501e1e671955f664a724f0e46faebaaa87782f7
+EBUILD gajim-0.13.4-r1.ebuild 2597 RMD160 11fcec4cd02b35d4721e3bd5c391daafa2c4c61e SHA1 175d2c5e92aeeb7c9d8987eb1db89f83dc719d93 SHA256 aa2a5548daf258865240268b0069922451b57074dbd22bc66490eaec48549a5c
 EBUILD gajim-0.13.4.ebuild 2325 RMD160 5b81d129c4bbcaec25c515067f83f394276cee89 SHA1 ffc2b90e1c7cfe7aade420e589e7bdd88aea60e0 SHA256 7ceb5d1b4380ff1394ab11a352f7ece766f68b28a978c92a6633ff93ae49c97d
-MISC ChangeLog 13142 RMD160 93192dc535b78251c2c221738a889d6df65aeeaf SHA1 cece229e57e99e51047082cf2211995cd25acc89 SHA256 a81fd0d5f16b06ce52f90de457b11084da6c769d2f768eb77b63f1dd237bb82b
+MISC ChangeLog 13326 RMD160 a2ffc1f4f2fe17d7d2e4bedeb0a84fc3e77c7060 SHA1 faa702b49976fbd99a14b12637e53bb15ca18186 SHA256 30a0cd707c5a15db6cd80020d4fc12c68e79f57f37326e77a077fcc93ee0a861
 MISC metadata.xml 553 RMD160 b4780201449d6f310007285b642aaccb6c350d50 SHA1 f9751ca146c518a6f31f1c4f802044e9e3c08013 SHA256 1353489c91efdd5bb461c63152d259504c3aedcb2a3cd69847994c9b17314d9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvF3k0ACgkQgAnW8HDreRYvkwCfSuIyt0jpgJspKpO7DwilApHq
-TA0AoJtqX+c3ZS2SlDheZ3zggiFiqk66
-=x14k
+iEYEARECAAYFAkvGHlcACgkQgAnW8HDreRb8pwCfeSg7yUQME7qlvZUvuQm/MWgt
+J1AAn1XAUIHgKgQcTbns66M5Uj+2fUCk
+=6c0K
 -----END PGP SIGNATURE-----

diff --git a/net-im/gajim/files/0.13.4-python-version.patch b/net-im/gajim/files/0.13.4-python-version.patch
new file mode 100644 (file)
index 0000000..1fbc503
--- /dev/null
+++ b/net-im/gajim/files/0.13.4-python-version.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/gajim.in b/scripts/gajim.in
+index 711ddac..0098b9e 100644
+--- a/scripts/gajim.in
++++ b/scripts/gajim.in
+@@ -30,7 +30,7 @@ fi
+ [ "$APP" = "gajim-history-manager" ] && APP="history_manager"
+ 
+ export datadir=@DATADIR@/gajim
+-PYTHON_EXEC=@PYTHON@
++PYTHON_EXEC=@PYTHON@@PYTHON_VERSION@
+ 
+ cd ${datadir}/src
+ export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"

diff --git a/net-im/gajim/gajim-0.13.4-r1.ebuild b/net-im/gajim/gajim-0.13.4-r1.ebuild
new file mode 100644 (file)
index 0000000..59404b6
--- /dev/null
+++ b/net-im/gajim/gajim-0.13.4-r1.ebuild
@@ -0,0 +1,107 @@
+# 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 $
+
+EAPI="2"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite xml"
+inherit autotools eutils python 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-python/pyopenssl
+       dev-python/sexy-python
+       crypt? (
+               app-crypt/gnupg
+               dev-python/pycrypto
+               )
+       dbus? (
+               dev-python/dbus-python
+               dev-libs/dbus-glib
+               libnotify? ( dev-python/notify-python )
+               avahi? ( net-dns/avahi[dbus,gtk,python] )
+               )
+       gnome? (
+               dev-python/libgnome-python
+               dev-python/gnome-keyring-python
+               trayicon? ( dev-python/egg-python )
+               )
+       idle? ( x11-libs/libXScrnSaver )
+       srv? (
+               || (
+                       dev-python/libasyncns-python
+                       net-dns/bind-tools )
+               )
+       spell? ( app-text/gtkspell )
+       xhtml? ( dev-python/docutils )"
+
+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
+       python_set_active_version 2
+}
+
+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}"/${PV}-python-version.patch
+       eautoreconf
+       echo '#!/bin/sh' > config/py-compile
+}
+
+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} || die
+       dohtml README.html || die
+}
+
+pkg_postinst() {
+       python_mod_optimize $(python_get_sitedir)/${PN}
+}
+
+pkg_postrm() {
+       python_mod_cleanup $(python_get_sitedir)/${PN}
+}