diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2008-06-13 18:50:41 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2008-06-13 18:50:41 +0000 |
| commit | 34288d12d475ff49253d19ef58af87c172e37a63 (patch) | |
| tree | 705c2e73384c466d4bafc7a259d1c7084d8bf165 | |
| parent | fix deps, thanks to metalgod (diff) | |
| download | gentoo-2-34288d12d475ff49253d19ef58af87c172e37a63.tar.gz gentoo-2-34288d12d475ff49253d19ef58af87c172e37a63.tar.bz2 gentoo-2-34288d12d475ff49253d19ef58af87c172e37a63.zip | |
remove USE=test DEPEND section to stop circular depend
(Portage version: 2.1.5.5)
| -rw-r--r-- | x11-libs/cairo/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-1.6.4.ebuild | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index 04a5d99ae44c..a37b4b90910c 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/cairo # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.186 2008/06/07 19:01:26 ken69267 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.187 2008/06/13 18:50:41 cardoe Exp $ + + 13 Jun 2008; Doug Goldstein <cardoe@gentoo.org> cairo-1.6.4.ebuild: + remove USE=test DEPEND section to stop circular depend 07 Jun 2008; Kenneth Prugh <ken69267@gentoo.org> cairo-1.6.4.ebuild: amd64 stable, bug #224929 diff --git a/x11-libs/cairo/cairo-1.6.4.ebuild b/x11-libs/cairo/cairo-1.6.4.ebuild index 1837e21d340c..cd652dc3ef81 100644 --- a/x11-libs/cairo/cairo-1.6.4.ebuild +++ b/x11-libs/cairo/cairo-1.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4.ebuild,v 1.8 2008/06/07 19:01:26 ken69267 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4.ebuild,v 1.9 2008/06/13 18:50:41 cardoe Exp $ inherit eutils flag-o-matic libtool @@ -13,6 +13,9 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="debug directfb doc glitz opengl svg test X xcb" +# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it +RESTRICT="test" + RDEPEND="media-libs/fontconfig >=media-libs/freetype-2.1.9 sys-libs/zlib @@ -32,13 +35,6 @@ RDEPEND="media-libs/fontconfig DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.19 - test? ( - virtual/ghostscript - >=app-text/poppler-bindings-0.4.1 - x11-libs/pango - x11-libs/gtk+ - svg? ( >=gnome-base/librsvg-2.15.0 ) - ) X? ( x11-proto/renderproto xcb? ( x11-proto/xcb-proto ) ) doc? ( @@ -46,8 +42,6 @@ DEPEND="${RDEPEND} ~app-text/docbook-xml-dtd-4.2 )" -RESTRICT="test" - src_unpack() { unpack ${A} cd "${S}" |