diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2012-02-05 15:46:08 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2012-02-05 15:46:08 +0000 |
| commit | 7a5350863683e249e258ff3569a82de05cd6c0a4 (patch) | |
| tree | e3b3280813e364ed46635706b78830a7c7609802 /dev-vcs | |
| parent | It seems like LIBGL_ALWAYS_INDIRECT did *not* fix the issue. Trying with LIBG... (diff) | |
| download | gentoo-2-7a5350863683e249e258ff3569a82de05cd6c0a4.tar.gz gentoo-2-7a5350863683e249e258ff3569a82de05cd6c0a4.tar.bz2 gentoo-2-7a5350863683e249e258ff3569a82de05cd6c0a4.zip | |
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
(Portage version: 2.1.10.44/cvs/Linux i686)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/bzr-gtk/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild | 15 |
2 files changed, 16 insertions, 6 deletions
diff --git a/dev-vcs/bzr-gtk/ChangeLog b/dev-vcs/bzr-gtk/ChangeLog index 4d3f1809844d..d460aed82828 100644 --- a/dev-vcs/bzr-gtk/ChangeLog +++ b/dev-vcs/bzr-gtk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-vcs/bzr-gtk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog,v 1.14 2012/02/05 14:44:51 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog,v 1.15 2012/02/05 15:46:08 fauli Exp $ + + 05 Feb 2012; Christian Faulhammer <fauli@gentoo.org> bzr-gtk-0.100.0.ebuild: + 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 05 Feb 2012; Christian Faulhammer <fauli@gentoo.org> -bzr-gtk-0.99.0.ebuild: clean up diff --git a/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild b/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild index d8ded40e7d29..0bda3366de85 100644 --- a/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild +++ b/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI="3" PYTHON_DEPEND="2" @@ -21,17 +21,17 @@ KEYWORDS="alpha amd64 x86" IUSE="gconf gnome-keyring gpg +sourceview nautilus" DEPEND=">=dev-vcs/bzr-1.6_rc1 - >=dev-python/pygtk-2.8 + dev-python/pygtk:2 dev-python/notify-python >=dev-python/pycairo-1.0" RDEPEND="${DEPEND} - nautilus? ( dev-python/nautilus-python ) + nautilus? ( <dev-python/nautilus-python-1.0 !>=gnome-base/nautilus-3.0 ) dev-python/notify-python gnome-keyring? ( dev-python/gnome-keyring-python ) gpg? ( app-crypt/seahorse ) sourceview? ( - dev-python/pygtksourceview - gconf? ( dev-python/gconf-python ) + dev-python/pygtksourceview:2 + gconf? ( dev-python/gconf-python:2 ) )" S="${WORKDIR}/${MY_P}" @@ -47,4 +47,9 @@ src_install() { distutils_src_install insinto /etc/xdg/autostart doins bzr-notify.desktop + if ! use nautilus + then + rm -rf "${D}"/usr/lib/nautilus/ + rm -rf "${D}"/usr/lib/python2.7/site-packages/bzrlib/plugins/gtk/nautilus-bzr.py + fi } |