summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2008-06-13 18:50:41 +0000
committerDoug Goldstein <cardoe@gentoo.org>2008-06-13 18:50:41 +0000
commitb306d24a3284cbef01dccea9a558db717510c6c2 (patch)
treea848f6260682feb2f2f464d4420b0675e034a53d /x11-libs
parentfix deps, thanks to metalgod (diff)
downloadhistorical-b306d24a3284cbef01dccea9a558db717510c6c2.tar.gz
historical-b306d24a3284cbef01dccea9a558db717510c6c2.tar.bz2
historical-b306d24a3284cbef01dccea9a558db717510c6c2.zip
remove USE=test DEPEND section to stop circular depend
Package-Manager: portage-2.1.5.5
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/ChangeLog5
-rw-r--r--x11-libs/cairo/Manifest14
-rw-r--r--x11-libs/cairo/cairo-1.6.4.ebuild14
3 files changed, 20 insertions, 13 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/Manifest b/x11-libs/cairo/Manifest
index 76257c33ac45..9911329d0ebc 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST cairo-1.4.12.tar.gz 3276610 RMD160 5ed65d5872c0561f3392e60007898d9360d83d0a SHA1 45d5257e5a0c1524bcc25660a96b2c79d012ad3f SHA256 a1a1e4ccec8da980141d903adbe83535481b4fda96a479456438d3dfbc767d5d
DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
DIST cairo-1.6.4.tar.gz 5042623 RMD160 ccae736a40d985b72bda7c2f0a98a0838020658e SHA1 9d990fe39a125ceb07221623c237cd7015855d5c SHA256 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
EBUILD cairo-1.4.12.ebuild 1968 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c SHA1 10cd93281e9af9858cd0f61a0708d53681c81afd SHA256 6f25e6e271d47c75deeee9121d25098eb0c6aa25cbdf60349e76d094a4f0d912
EBUILD cairo-1.4.14.ebuild 1968 RMD160 02f89786e2cfaeb1fac9b075f3f73e79ea4169b0 SHA1 a4449ed556796354013542f11d75e2ab6a7dab69 SHA256 6d226a1a684e84f4958480105df60be0221fe24f62f64ed52c2beed817f6caa7
-EBUILD cairo-1.6.4.ebuild 2160 RMD160 d40c811ffa2ddbb29d47e966f7fd853263ce1052 SHA1 ab45f1ab4e8a02c6529f5877ef19bfbb3a51446d SHA256 c707f5f0bbd9954b73b1a2f656ffc493bf4c65f03993565fb8e7b25b90e24051
-MISC ChangeLog 25886 RMD160 702ed11bcc24aef2dbfc4dce6a6b9ebb28b25d17 SHA1 aef6d0ffb5b2141acf685a7488e264415fd189de SHA256 e95825b3666a5dc775b0b80ba85f1a3bf1704fdd41d9efb40d0fe0e0003dda6d
+EBUILD cairo-1.6.4.ebuild 2112 RMD160 515141b3f2382db010239b01dab6482809a4c968 SHA1 f4927ec5c6c6f60c223abfe35e2e00fdc6166225 SHA256 730750cf04e38bde22105fd5e47c27432b5ae0ab1b5f16d89de7f347ba2e3a1b
+MISC ChangeLog 26012 RMD160 c2db03086b2cd0055200509d62511aa28759baaa SHA1 f95fd1b3ffcaf35cd945a06bfed961f9a9a186bc SHA256 5cce670fcd1de1b585581d818c42fa83fa7567e20d218e94a84f8348515bec5c
MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhSwasACgkQoeSe8B0zEfw4fQCeM9SluoHdX7NkPwAzVpTNPOfd
+3LMAmwc8wsEdom9Uf2dSPCDt6H66+Z9B
+=st1P
+-----END PGP SIGNATURE-----
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}"