| 1 |
jlec 10/09/06 17:08:58 |
| 2 |
|
| 3 |
Modified: gajim-0.14.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Cleaned ebuild for fixing bug 336177 |
| 6 |
|
| 7 |
(Portage version: 2.2_rc75/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-im/gajim/gajim-0.14.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/gajim-0.14.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/gajim-0.14.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/gajim-0.14.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: gajim-0.14.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- gajim-0.14.ebuild 4 Sep 2010 06:20:23 -0000 1.1 |
| 23 |
+++ gajim-0.14.ebuild 6 Sep 2010 17:08:58 -0000 1.2 |
| 24 |
@@ -1,12 +1,13 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.ebuild,v 1.1 2010/09/04 06:20:23 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.ebuild,v 1.2 2010/09/06 17:08:58 jlec Exp $ |
| 29 |
|
| 30 |
EAPI="2" |
| 31 |
|
| 32 |
PYTHON_DEPEND="2" |
| 33 |
PYTHON_USE_WITH="sqlite xml" |
| 34 |
-inherit autotools eutils python versionator |
| 35 |
+ |
| 36 |
+inherit eutils python versionator |
| 37 |
|
| 38 |
DESCRIPTION="Jabber client written in PyGTK" |
| 39 |
HOMEPAGE="http://www.gajim.org/" |
| 40 |
@@ -15,7 +16,7 @@ |
| 41 |
LICENSE="GPL-3" |
| 42 |
SLOT="0" |
| 43 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 44 |
-IUSE="avahi crypt dbus gnome idle libnotify nls spell srv trayicon X xhtml" |
| 45 |
+IUSE="avahi crypt dbus gnome idle libnotify nls spell srv X xhtml" |
| 46 |
|
| 47 |
COMMON_DEPEND=" |
| 48 |
x11-libs/gtk+:2 |
| 49 |
@@ -42,7 +43,7 @@ |
| 50 |
gnome? ( |
| 51 |
dev-python/libgnome-python |
| 52 |
dev-python/gnome-keyring-python |
| 53 |
- trayicon? ( dev-python/egg-python ) |
| 54 |
+ dev-python/egg-python |
| 55 |
) |
| 56 |
idle? ( x11-libs/libXScrnSaver ) |
| 57 |
srv? ( |
| 58 |
@@ -68,29 +69,17 @@ |
| 59 |
} |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
- # install pyfiles in /usr/lib/python2.x/site-packages/gajim |
| 63 |
- # upstream: http://trac.gajim.org/ticket/5460 |
| 64 |
- # Should be in 0.14 |
| 65 |
-# epatch "${FILESDIR}/${PN}-0.13-autotools-enable-site-packages_option.patch" |
| 66 |
epatch "${FILESDIR}"/${PV}-python-version.patch |
| 67 |
- eautoreconf |
| 68 |
echo '#!/bin/sh' > config/py-compile |
| 69 |
} |
| 70 |
|
| 71 |
src_configure() { |
| 72 |
- local myconf |
| 73 |
- |
| 74 |
- if ! use gnome; then |
| 75 |
- myconf+=" $(use_enable trayicon)" |
| 76 |
- fi |
| 77 |
- |
| 78 |
econf \ |
| 79 |
$(use_enable nls) \ |
| 80 |
$(use_with X x) \ |
| 81 |
--docdir="/usr/share/doc/${PF}" \ |
| 82 |
--libdir="$(python_get_sitedir)" \ |
| 83 |
- --enable-site-packages \ |
| 84 |
- ${myconf} |
| 85 |
+ --enable-site-packages |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.101 net-im/gajim/ChangeLog |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/ChangeLog?rev=1.101&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/ChangeLog?rev=1.101&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/ChangeLog?r1=1.100&r2=1.101 |
| 97 |
|
| 98 |
Index: ChangeLog |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v |
| 101 |
retrieving revision 1.100 |
| 102 |
retrieving revision 1.101 |
| 103 |
diff -u -r1.100 -r1.101 |
| 104 |
--- ChangeLog 4 Sep 2010 06:20:23 -0000 1.100 |
| 105 |
+++ ChangeLog 6 Sep 2010 17:08:58 -0000 1.101 |
| 106 |
@@ -1,6 +1,10 @@ |
| 107 |
# ChangeLog for net-im/gajim |
| 108 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.100 2010/09/04 06:20:23 jlec Exp $ |
| 110 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.101 2010/09/06 17:08:58 jlec Exp $ |
| 111 |
+ |
| 112 |
+ 06 Sep 2010; Justin Lecher <jlec@g.o> gajim-0.14.ebuild: |
| 113 |
+ Cleaned ebuild for fixing bug 336177 |
| 114 |
+ |
| 115 |
|
| 116 |
*gajim-0.14 (04 Sep 2010) |
Archives