summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-09-06 17:08:58 +0000
committerJustin Lecher <jlec@gentoo.org>2010-09-06 17:08:58 +0000
commita45933bd509fea22b4ad93b0609c692352fb5cfb (patch)
tree9f582816185bcd775b58485bacc6341fcbbfd1be /net-im
parentVersion bump. Fixes bug 336237. Thanks to Diego for the report. (diff)
downloadhistorical-a45933bd509fea22b4ad93b0609c692352fb5cfb.tar.gz
historical-a45933bd509fea22b4ad93b0609c692352fb5cfb.tar.bz2
historical-a45933bd509fea22b4ad93b0609c692352fb5cfb.zip
Cleaned ebuild for fixing bug 336177
Package-Manager: portage-2.2_rc75/cvs/Linux x86_64
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gajim/ChangeLog6
-rw-r--r--net-im/gajim/Manifest12
-rw-r--r--net-im/gajim/gajim-0.14.ebuild23
3 files changed, 17 insertions, 24 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/Manifest b/net-im/gajim/Manifest
index e55c44b4104c..9965363ad611 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -10,13 +10,13 @@ DIST gajim-0.14.tar.bz2 4142326 RMD160 93c1fc53225a48216efdbdcd38a5b22a289f317c
EBUILD gajim-0.13.3.ebuild 2311 RMD160 1bf58ffb76da0c4f553a1eb81a015f69164e011b SHA1 a3e3e166e50a039a82b6844c2b934eec873ef4c3 SHA256 f454753d3e12c55bd6a79194035f0c6ca02d36191fbc2c044b14e2730402518d
EBUILD gajim-0.13.4-r1.ebuild 2605 RMD160 c115075802ae815127e24010ec11e04a21e67833 SHA1 f619932717680e8da3ff76e06c253b2be2809ae8 SHA256 8c4bcf42820274ca45894a30e6a1e5ab49babb210c80a665032a678d14804913
EBUILD gajim-0.13.4.ebuild 2337 RMD160 8ec6f71031ab33bc494d82787681cb578376dfaf SHA1 c41938fb7b2a69c88eacf8bfc2f6417b364311b4 SHA256 af5d9714e0b28e4bcffd06bd23c126d4473510cf9d370a49bb4bde1b16c00edd
-EBUILD gajim-0.14.ebuild 2617 RMD160 9454b39183d6b6af554f88c6601ded11a19eb6e5 SHA1 d3299a9415ad80ca0b715b3b1a31fa22518d699b SHA256 18383e0ef2899e576d556fa1bbec65c752481c16e544d3570e22582af7637f1b
-MISC ChangeLog 14498 RMD160 6b39fb17dab6eb74942ba759a8239ccc01578762 SHA1 08874df79970f48cca2f562c3d96e3d2de45a211 SHA256 f5b5009c7bcb313a6a4ea0130716a6b2739fbe092daac4a519947af41a106ef8
+EBUILD gajim-0.14.ebuild 2273 RMD160 fb4d3f425d557c411e58be08d4177b6e12769a24 SHA1 ca4d3654a84f10b90b3200365f32b45e0173a9dc SHA256 51994983f6a015f2ee17deadd559ffe4677dd64c127bf42891d30624f6e68007
+MISC ChangeLog 14605 RMD160 abe81fd9cf2d8b458ca74865e641682dd7a78286 SHA1 f6fae592ec09c5041120231a0bab92142e9ff7c0 SHA256 a669ddac4c87359c32961de852478609fc2ead557261e484f5ddda1f983c4496
MISC metadata.xml 553 RMD160 b4780201449d6f310007285b642aaccb6c350d50 SHA1 f9751ca146c518a6f31f1c4f802044e9e3c08013 SHA256 1353489c91efdd5bb461c63152d259504c3aedcb2a3cd69847994c9b17314d9f
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkyB5U0ACgkQgAnW8HDreRa1oACfTqdyEyhV0ii/nA3tCC3pu/pi
-UfMAoII9WYJUt3P5DjvHKfOVSThGhx9+
-=BXnk
+iEYEARECAAYFAkyFIDEACgkQgAnW8HDreRbaKwCfYZq2Lwxo4zjfYFlFaWdZ9vvU
+7ewAoKzWlYI7pPaZo612DdrL2qUGpuMY
+=HCwp
-----END PGP SIGNATURE-----
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() {