diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-09-06 17:08:58 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-09-06 17:08:58 +0000 |
| commit | 52892a1b08429162badd104634f334bc337ee7dc (patch) | |
| tree | 9111104854593d81a4db15d7119d7ea80f2fa826 /net-im | |
| parent | Version bump. Fixes bug 336237. Thanks to Diego for the report. (diff) | |
| download | gentoo-2-52892a1b08429162badd104634f334bc337ee7dc.tar.gz gentoo-2-52892a1b08429162badd104634f334bc337ee7dc.tar.bz2 gentoo-2-52892a1b08429162badd104634f334bc337ee7dc.zip | |
Cleaned ebuild for fixing bug 336177
(Portage version: 2.2_rc75/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gajim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.14.ebuild | 23 |
2 files changed, 11 insertions, 18 deletions
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog index 8b170a0de869..4ad6e46cff4f 100644 --- a/net-im/gajim/ChangeLog +++ b/net-im/gajim/ChangeLog @@ -1,6 +1,10 @@ # 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.100 2010/09/04 06:20:23 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.101 2010/09/06 17:08:58 jlec Exp $ + + 06 Sep 2010; Justin Lecher <jlec@gentoo.org> gajim-0.14.ebuild: + Cleaned ebuild for fixing bug 336177 + *gajim-0.14 (04 Sep 2010) diff --git a/net-im/gajim/gajim-0.14.ebuild b/net-im/gajim/gajim-0.14.ebuild index 474133f6d346..006f27cb4022 100644 --- a/net-im/gajim/gajim-0.14.ebuild +++ b/net-im/gajim/gajim-0.14.ebuild @@ -1,12 +1,13 @@ # 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.14.ebuild,v 1.1 2010/09/04 06:20:23 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.ebuild,v 1.2 2010/09/06 17:08:58 jlec Exp $ EAPI="2" PYTHON_DEPEND="2" PYTHON_USE_WITH="sqlite xml" -inherit autotools eutils python versionator + +inherit eutils python versionator DESCRIPTION="Jabber client written in PyGTK" HOMEPAGE="http://www.gajim.org/" @@ -15,7 +16,7 @@ SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}. LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="avahi crypt dbus gnome idle libnotify nls spell srv trayicon X xhtml" +IUSE="avahi crypt dbus gnome idle libnotify nls spell srv X xhtml" COMMON_DEPEND=" x11-libs/gtk+:2 @@ -42,7 +43,7 @@ RDEPEND="${COMMON_DEPEND} gnome? ( dev-python/libgnome-python dev-python/gnome-keyring-python - trayicon? ( dev-python/egg-python ) + dev-python/egg-python ) idle? ( x11-libs/libXScrnSaver ) srv? ( @@ -68,29 +69,17 @@ pkg_setup() { } 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} + --enable-site-packages } src_install() { |