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 | b571af3159fdc631260de024c42809279963f11c (patch) | |
| tree | 763648f815b0ac441ebb686b045c7db2fd475aff /dev-vcs | |
| parent | It seems like LIBGL_ALWAYS_INDIRECT did *not* fix the issue. Trying with LIBG... (diff) | |
| download | historical-b571af3159fdc631260de024c42809279963f11c.tar.gz historical-b571af3159fdc631260de024c42809279963f11c.tar.bz2 historical-b571af3159fdc631260de024c42809279963f11c.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
Package-Manager: portage-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/Manifest | 10 | ||||
| -rw-r--r-- | dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild | 15 |
3 files changed, 21 insertions, 11 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/Manifest b/dev-vcs/bzr-gtk/Manifest index 34d00d28913f..4a4045bc2e35 100644 --- a/dev-vcs/bzr-gtk/Manifest +++ b/dev-vcs/bzr-gtk/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 AUX credits.pickle 3540 RMD160 9c1e594e7e591a7043f71c8b99b5a831414e3abc SHA1 8868a6e14e2b501bea8b70938c5fc3f8e0469e15 SHA256 eac484f4bcdff0cd26e46c6af3112b71612f26021497076df99cc2ebb5577238 DIST bzr-gtk-0.100.0.tar.gz 220559 RMD160 783d099d9be700193c1523a8c6d54826ada49187 SHA1 6f1a55a4011b6e8084783fdc3b07233c3f4fb77a SHA256 7fb86183b9eaa07b0222b085465c18d61d9ecfa5e1c6d4456d8cbffe33d9ff85 -EBUILD bzr-gtk-0.100.0.ebuild 1222 RMD160 99a04fbbe5b110057cb35f704ab10383744a8add SHA1 ea2dbc64a6b2f561b85ca80d12b91eb8a844b0c1 SHA256 3e77018cbea5174d4df0fede48e01bb0538ef02010b02bee3e784591f01f8055 -MISC ChangeLog 2185 RMD160 fe7dc6fe2e8cca1f9d493313e405ad1f341eec84 SHA1 2df137b1c34099870ca7d578e685e7df621dc4f4 SHA256 c8d995cc83cc60fcd1ce09156965271877e28fda013481898e7c6e18f491597a +EBUILD bzr-gtk-0.100.0.ebuild 1400 RMD160 c6cc01921525ed740f4243c0be0da98b3b356b4a SHA1 89eeef5f0f4438f53643a8eb67f456b44db3c608 SHA256 ad49fb26ff5e4d67ae62eeb39d75ccca7be47870e383214ded4d29ebbdee687e +MISC ChangeLog 2453 RMD160 bf1f8f19e32585a7709105cf9aee9140e4fb5830 SHA1 9821e8e04324d9c1939c264f2c93dbdea0e11c1e SHA256 20b10319d03f93235114cb39071494983ce53efb5662ec370501c44515736429 MISC metadata.xml 705 RMD160 d1bbaec951e61c53695355d9b41b4b4852c28303 SHA1 b16f1d497821168d89d5828ebf7dfd9baf6f8f06 SHA256 a52a4c522558e6a4130629a77b1ef5ffc502378eb53d65e2922123570c05c871 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk8ulj0ACgkQNQqtfCuFneNv0gCfTRYLNt54GZ58zOi1/NSwAos8 -zb4AoI8kUeDjPoiEhWbE0cIuTmpYr1cy -=XLH9 +iEYEARECAAYFAk8upJQACgkQNQqtfCuFneMeQgCeMiYsHJhJywOhm2j/s/+carjg +yugAnA2BCB9Pj39jztq6D3aHE7dcZG4s +=upti -----END PGP SIGNATURE----- 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 } |