diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2008-01-30 16:02:59 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2008-01-30 16:02:59 +0000 |
| commit | b6ec6e511aff0fe41aec8e01926c5492f9b59b22 (patch) | |
| tree | 8708e60026d663dc4b8f22d11307a5d9ca67dcaf /gnome-extra | |
| parent | Stable for HPPA (bug #207416). (diff) | |
| download | gentoo-2-b6ec6e511aff0fe41aec8e01926c5492f9b59b22.tar.gz gentoo-2-b6ec6e511aff0fe41aec8e01926c5492f9b59b22.tar.bz2 gentoo-2-b6ec6e511aff0fe41aec8e01926c5492f9b59b22.zip | |
Fix imagemagick circular dep; bug #206491
(Portage version: 2.1.4)
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/libgsf/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-extra/libgsf/libgsf-1.14.7.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog index 4bf277a0b845..3915177d154c 100644 --- a/gnome-extra/libgsf/ChangeLog +++ b/gnome-extra/libgsf/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-extra/libgsf # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.113 2008/01/17 19:20:08 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.114 2008/01/30 16:02:59 dang Exp $ + + 30 Jan 2008; Daniel Gryniewicz <dang@gentoo.org> libgsf-1.14.7.ebuild: + Fix imagemagick circular dep; bug #206491 17 Jan 2008; Fabian Groffen <grobian@gentoo.org> libgsf-1.12.1.ebuild: Dropped ppc-macos keyword, see you in prefix diff --git a/gnome-extra/libgsf/libgsf-1.14.7.ebuild b/gnome-extra/libgsf/libgsf-1.14.7.ebuild index 53fb2a4800ae..e5b5bc57c5a5 100644 --- a/gnome-extra/libgsf/libgsf-1.14.7.ebuild +++ b/gnome-extra/libgsf/libgsf-1.14.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.7 2007/11/27 03:49:37 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.8 2008/01/30 16:02:59 dang Exp $ inherit eutils gnome2 python multilib @@ -15,8 +15,7 @@ IUSE="bzip2 doc gnome python" RDEPEND=" >=dev-libs/glib-2.8 >=dev-libs/libxml2-2.4.16 - gnome? ( media-gfx/imagemagick - >=gnome-base/gconf-2 + gnome? ( >=gnome-base/gconf-2 >=gnome-base/libbonobo-2 >=gnome-base/gnome-vfs-2.2 ) sys-libs/zlib @@ -29,6 +28,8 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.29 doc? ( >=dev-util/gtk-doc-1 )" +PDEPEND="gnome? ( media-gfx/imagemagick )" + G2CONF="${G2CONF} \ $(use_with bzip2 bz2) \ $(use_with gnome) \ |