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 | 0bebf5b000dc79d22805ce7df53437701dc69a10 (patch) | |
| tree | 0a92959b186da1d15653ef3d2aa8c67a2baeab0a /gnome-extra | |
| parent | Stable for HPPA (bug #207416). (diff) | |
| download | historical-0bebf5b000dc79d22805ce7df53437701dc69a10.tar.gz historical-0bebf5b000dc79d22805ce7df53437701dc69a10.tar.bz2 historical-0bebf5b000dc79d22805ce7df53437701dc69a10.zip | |
Fix imagemagick circular dep; bug #206491
Package-Manager: portage-2.1.4
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/libgsf/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-extra/libgsf/Manifest | 16 | ||||
| -rw-r--r-- | gnome-extra/libgsf/libgsf-1.14.7.ebuild | 9 |
3 files changed, 17 insertions, 13 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/Manifest b/gnome-extra/libgsf/Manifest index 6727f41bc1fa..91f2ad7eb11c 100644 --- a/gnome-extra/libgsf/Manifest +++ b/gnome-extra/libgsf/Manifest @@ -19,14 +19,14 @@ EBUILD libgsf-1.14.3.ebuild 2121 RMD160 1788af66a92dcca6213b0d0b9e80885b28e2d41e MD5 fbed34434f3474bf4bad15dd8795b2b4 libgsf-1.14.3.ebuild 2121 RMD160 1788af66a92dcca6213b0d0b9e80885b28e2d41e libgsf-1.14.3.ebuild 2121 SHA256 3d84f593e16f2e48e6e1cb329067624561683c49526e69a2bea11900f7bb2c26 libgsf-1.14.3.ebuild 2121 -EBUILD libgsf-1.14.7.ebuild 1739 RMD160 20f387055291f07b63601abf443408485d609742 SHA1 8a4c1e289e2678907711e6fc9c4dde9e9f5bc060 SHA256 cc89420259408935dc7bff2b4365a7e0a18ac813bf6edf77012fc8f912bf98dc -MD5 e7991f3fc180a496e0a0459c6db73731 libgsf-1.14.7.ebuild 1739 -RMD160 20f387055291f07b63601abf443408485d609742 libgsf-1.14.7.ebuild 1739 -SHA256 cc89420259408935dc7bff2b4365a7e0a18ac813bf6edf77012fc8f912bf98dc libgsf-1.14.7.ebuild 1739 -MISC ChangeLog 13520 RMD160 bd29cd9a4a5a1dd2d6da78de7accbd59ec7c230b SHA1 c947e39933d97f6f368cf5707f56f62e57601111 SHA256 b43f3af5be21691a76c796408a45648a86b4aaaedb24882aab75b96f66944657 -MD5 1c233415996a1634f229271e88897aab ChangeLog 13520 -RMD160 bd29cd9a4a5a1dd2d6da78de7accbd59ec7c230b ChangeLog 13520 -SHA256 b43f3af5be21691a76c796408a45648a86b4aaaedb24882aab75b96f66944657 ChangeLog 13520 +EBUILD libgsf-1.14.7.ebuild 1760 RMD160 f2a6783369695055bad684fe4b1ec06d7c9ed60a SHA1 b88a505f6fe2a7513a9842c2357ec087bca1ea9c SHA256 14ff5333a8c5866e61398bdb2b7e3150df73f088328e1989cec6bed5ba8689c4 +MD5 43eb4baa9677eb3b0b1ff786c8f91e95 libgsf-1.14.7.ebuild 1760 +RMD160 f2a6783369695055bad684fe4b1ec06d7c9ed60a libgsf-1.14.7.ebuild 1760 +SHA256 14ff5333a8c5866e61398bdb2b7e3150df73f088328e1989cec6bed5ba8689c4 libgsf-1.14.7.ebuild 1760 +MISC ChangeLog 13635 RMD160 d7952a199aef640422bb5887067218e1c66a4a4b SHA1 b3ce7bb21b132b962e5d70a448b63cb42570b507 SHA256 5679ad71a8a43eeb9056f222ffc17cbe46ff6cd2343f12e170ae6d567f30137e +MD5 a3b89dd2969318b7a3e86fcdc7dc6397 ChangeLog 13635 +RMD160 d7952a199aef640422bb5887067218e1c66a4a4b ChangeLog 13635 +SHA256 5679ad71a8a43eeb9056f222ffc17cbe46ff6cd2343f12e170ae6d567f30137e ChangeLog 13635 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 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) \ |