| 1 |
fauli 12/02/05 15:46:08 |
| 2 |
|
| 3 |
Modified: bzr-gtk-0.100.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Do not install Nautilus extension if USE=nautilus is disabled, also block if nautilus 3.0 or later is used...adjust some dependencies, reported in bug 394515 by Alexandre Rostovtsev |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: bzr-gtk-0.100.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- bzr-gtk-0.100.0.ebuild 23 Jan 2012 16:48:33 -0000 1.4 |
| 23 |
+++ bzr-gtk-0.100.0.ebuild 5 Feb 2012 15:46:08 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild,v 1.4 2012/01/23 16:48:33 tomka Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild,v 1.5 2012/02/05 15:46:08 fauli Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
PYTHON_DEPEND="2" |
| 32 |
@@ -21,17 +21,17 @@ |
| 33 |
IUSE="gconf gnome-keyring gpg +sourceview nautilus" |
| 34 |
|
| 35 |
DEPEND=">=dev-vcs/bzr-1.6_rc1 |
| 36 |
- >=dev-python/pygtk-2.8 |
| 37 |
+ dev-python/pygtk:2 |
| 38 |
dev-python/notify-python |
| 39 |
>=dev-python/pycairo-1.0" |
| 40 |
RDEPEND="${DEPEND} |
| 41 |
- nautilus? ( dev-python/nautilus-python ) |
| 42 |
+ nautilus? ( <dev-python/nautilus-python-1.0 !>=gnome-base/nautilus-3.0 ) |
| 43 |
dev-python/notify-python |
| 44 |
gnome-keyring? ( dev-python/gnome-keyring-python ) |
| 45 |
gpg? ( app-crypt/seahorse ) |
| 46 |
sourceview? ( |
| 47 |
- dev-python/pygtksourceview |
| 48 |
- gconf? ( dev-python/gconf-python ) |
| 49 |
+ dev-python/pygtksourceview:2 |
| 50 |
+ gconf? ( dev-python/gconf-python:2 ) |
| 51 |
)" |
| 52 |
|
| 53 |
S="${WORKDIR}/${MY_P}" |
| 54 |
@@ -47,4 +47,9 @@ |
| 55 |
distutils_src_install |
| 56 |
insinto /etc/xdg/autostart |
| 57 |
doins bzr-notify.desktop |
| 58 |
+ if ! use nautilus |
| 59 |
+ then |
| 60 |
+ rm -rf "${D}"/usr/lib/nautilus/ |
| 61 |
+ rm -rf "${D}"/usr/lib/python2.7/site-packages/bzrlib/plugins/gtk/nautilus-bzr.py |
| 62 |
+ fi |
| 63 |
} |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.15 dev-vcs/bzr-gtk/ChangeLog |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog?rev=1.15&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog?rev=1.15&content-type=text/plain |
| 71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog?r1=1.14&r2=1.15 |
| 72 |
|
| 73 |
Index: ChangeLog |
| 74 |
=================================================================== |
| 75 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog,v |
| 76 |
retrieving revision 1.14 |
| 77 |
retrieving revision 1.15 |
| 78 |
diff -u -r1.14 -r1.15 |
| 79 |
--- ChangeLog 5 Feb 2012 14:44:51 -0000 1.14 |
| 80 |
+++ ChangeLog 5 Feb 2012 15:46:08 -0000 1.15 |
| 81 |
@@ -1,6 +1,11 @@ |
| 82 |
# ChangeLog for dev-vcs/bzr-gtk |
| 83 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 84 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog,v 1.14 2012/02/05 14:44:51 fauli Exp $ |
| 85 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog,v 1.15 2012/02/05 15:46:08 fauli Exp $ |
| 86 |
+ |
| 87 |
+ 05 Feb 2012; Christian Faulhammer <fauli@g.o> bzr-gtk-0.100.0.ebuild: |
| 88 |
+ Do not install Nautilus extension if USE=nautilus is disabled, also block if |
| 89 |
+ nautilus 3.0 or later is used...adjust some dependencies, reported in bug |
| 90 |
+ 394515 by Alexandre Rostovtsev |
| 91 |
|
| 92 |
05 Feb 2012; Christian Faulhammer <fauli@g.o> -bzr-gtk-0.99.0.ebuild: |
| 93 |
clean up |
Archives