summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2006-07-10 06:10:09 +0000
committerDoug Goldstein <cardoe@gentoo.org>2006-07-10 06:10:09 +0000
commitbc74c307d469fa4526805815413b2545ccc8b281 (patch)
treecfc122dd99c5fde72be4d858656a91485f5b39e4 /x11-libs
parentremove beta versions, RESTRICT=test and drop those depends which caused circu... (diff)
downloadgentoo-2-bc74c307d469fa4526805815413b2545ccc8b281.tar.gz
gentoo-2-bc74c307d469fa4526805815413b2545ccc8b281.tar.bz2
gentoo-2-bc74c307d469fa4526805815413b2545ccc8b281.zip
remove beta versions, RESTRICT=test and drop those depends which caused circular deps
(Portage version: 2.1.1_pre2-r6) (Signed Manifest commit)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/Manifest49
-rw-r--r--x11-libs/cairo/cairo-1.1.6-r1.ebuild65
-rw-r--r--x11-libs/cairo/cairo-1.1.6.ebuild56
-rw-r--r--x11-libs/cairo/cairo-1.1.8.ebuild51
-rw-r--r--x11-libs/cairo/files/cairo-1.1.6-poppler-revert.patch73
-rw-r--r--x11-libs/cairo/files/digest-cairo-1.1.63
-rw-r--r--x11-libs/cairo/files/digest-cairo-1.1.6-r13
-rw-r--r--x11-libs/cairo/files/digest-cairo-1.1.83
8 files changed, 11 insertions, 292 deletions
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 03b4d96f046e..a8f90f01bc0d 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,14 +5,8 @@ AUX cairo-1.0.2-pkg_macro.patch 542 RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f02
MD5 6600a332745a27c0333f2c8193a805fa files/cairo-1.0.2-pkg_macro.patch 542
RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f025ad files/cairo-1.0.2-pkg_macro.patch 542
SHA256 4ab7469075776de4fadcc733c9ceb9754b075e5a99b05fcdc247fc597b971149 files/cairo-1.0.2-pkg_macro.patch 542
-AUX cairo-1.1.6-poppler-revert.patch 2274 RMD160 84890590154cbc899a00a6d28c2d928f97aeb55a SHA1 087b929c4b91b6a61803372b666e387fa2401137 SHA256 801fb91581c08b4da22dd03fbcaa43a99e3fdd4b4043976e3416a237d597a644
-MD5 2fe001252c8d65a925f945d8ef745c20 files/cairo-1.1.6-poppler-revert.patch 2274
-RMD160 84890590154cbc899a00a6d28c2d928f97aeb55a files/cairo-1.1.6-poppler-revert.patch 2274
-SHA256 801fb91581c08b4da22dd03fbcaa43a99e3fdd4b4043976e3416a237d597a644 files/cairo-1.1.6-poppler-revert.patch 2274
DIST cairo-1.0.2.tar.gz 1458903 RMD160 59f309974fdac86253ed9a4d00e564a2fac310eb SHA1 3a425049499b0b067ed4dc60d94b4d0819c0841b SHA256 d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e
DIST cairo-1.0.4.tar.gz 1475777 RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb SHA1 89e72202e5b51a8914fce60f52f7c51ecdea982a SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5
-DIST cairo-1.1.6.tar.gz 1771669 RMD160 e5144fb7af5f46f43b8fd077017a7dfe274d6d27 SHA1 6c2c5dc688edca44f8087b6ffe8bfc1b7b1c3ba1 SHA256 a9bea56356583d16c10991d6837f77f57810fb01d2345a98e0a40de38f8a106b
-DIST cairo-1.1.8.tar.gz 1836232 RMD160 612b75773e0bb09aaeb879526ca54566de4b5f06 SHA1 ad660fe7bfede1882f4b81798e3e0ef8fe7ecb9b SHA256 a2ffbdec9aa4659c1d137a767138262950752e5e74b2b3de1a5e16d1944a9ddb
DIST cairo-1.2.0.tar.gz 2659930 RMD160 9dd76e43e881dfd3f20a81fc0f946e302ed7993c SHA1 c5da7f89cdd3782102357f99a47f516d11661e92 SHA256 fa3dc63029bab324682231f75af167b9370458785312a97fd0c50bf2dbd1cf21
EBUILD cairo-1.0.2.ebuild 1530 RMD160 12790aa490cd8d5441abec121899226c8657757a SHA1 3eff15746f8cfacb4d64c2668240563e79b426ca SHA256 41cc3865da19f668e4083345aae63845ff1a35111edee302ce2a8779af99dff4
MD5 e8e5d3bbc39d2d39c75c139e14d10d1a cairo-1.0.2.ebuild 1530
@@ -22,26 +16,14 @@ EBUILD cairo-1.0.4.ebuild 1288 RMD160 4516cd8984cfb468a74fa5de3a1b343959a206ad S
MD5 b329e25335b4be603bc4ba50418af8d2 cairo-1.0.4.ebuild 1288
RMD160 4516cd8984cfb468a74fa5de3a1b343959a206ad cairo-1.0.4.ebuild 1288
SHA256 0aba259c7db4ceaaa238ed82b2d255905a566ec91dc224aaa0caef766673be0d cairo-1.0.4.ebuild 1288
-EBUILD cairo-1.1.6-r1.ebuild 1663 RMD160 6783f2d7eb10b1984b11c248aadaefb3ea38c085 SHA1 dd0f1241946d8c5cb8735bcbb527059256a88e9b SHA256 c3150baf1e9f5f4149deaa727917896abd49f21264d428b872c4de7be53307a9
-MD5 bca719a7ab12186839efcfb63bc208d2 cairo-1.1.6-r1.ebuild 1663
-RMD160 6783f2d7eb10b1984b11c248aadaefb3ea38c085 cairo-1.1.6-r1.ebuild 1663
-SHA256 c3150baf1e9f5f4149deaa727917896abd49f21264d428b872c4de7be53307a9 cairo-1.1.6-r1.ebuild 1663
-EBUILD cairo-1.1.6.ebuild 1459 RMD160 7f12b29b47ee5d5d1cd14568057b9677c34f9e88 SHA1 09e29631b1a5b767405cfc7f53329d0e3e0970cf SHA256 8bd6fcede7e536284bee8cff465ced3fc58fc7d4d1096fbd37458eafc2f60a01
-MD5 76bc51d1dab37102783fd1af7cb3d9dd cairo-1.1.6.ebuild 1459
-RMD160 7f12b29b47ee5d5d1cd14568057b9677c34f9e88 cairo-1.1.6.ebuild 1459
-SHA256 8bd6fcede7e536284bee8cff465ced3fc58fc7d4d1096fbd37458eafc2f60a01 cairo-1.1.6.ebuild 1459
-EBUILD cairo-1.1.8.ebuild 1482 RMD160 671d45d956c9282e1d231c4e26263391a09d398c SHA1 dbc2a30301814b047247a38267fa593e8bf3b6da SHA256 5780f5ea60252a27976923019fa50832eb631096c21756afb0498c42cb2d6b3a
-MD5 6964c5286d99ee6615b9ddb8ee1a23b1 cairo-1.1.8.ebuild 1482
-RMD160 671d45d956c9282e1d231c4e26263391a09d398c cairo-1.1.8.ebuild 1482
-SHA256 5780f5ea60252a27976923019fa50832eb631096c21756afb0498c42cb2d6b3a cairo-1.1.8.ebuild 1482
-EBUILD cairo-1.2.0.ebuild 1741 RMD160 1fae1b6442367c1091ba84e1115704ca4e184140 SHA1 f42e232694691ae77a8da21d67247931a376adc0 SHA256 08a40e0c0bd451f4e975e7c6a6149c3752b3a8c0ae10b8c31e61be74571c2b92
-MD5 e932a0dead3b557eb6f30cc98613b8fb cairo-1.2.0.ebuild 1741
-RMD160 1fae1b6442367c1091ba84e1115704ca4e184140 cairo-1.2.0.ebuild 1741
-SHA256 08a40e0c0bd451f4e975e7c6a6149c3752b3a8c0ae10b8c31e61be74571c2b92 cairo-1.2.0.ebuild 1741
-MISC ChangeLog 10990 RMD160 8d0869b4bf8db7544be5c847226c8190efe925eb SHA1 dba6bdcced346baaa858ff6aa6c0acc98be1ee46 SHA256 2e50a73bfa2a2b17b965ca16e171f12963dd2cb51584bcfcec317e86586b7cc6
-MD5 52e8685a16db498352f09a711ae4bd8d ChangeLog 10990
-RMD160 8d0869b4bf8db7544be5c847226c8190efe925eb ChangeLog 10990
-SHA256 2e50a73bfa2a2b17b965ca16e171f12963dd2cb51584bcfcec317e86586b7cc6 ChangeLog 10990
+EBUILD cairo-1.2.0.ebuild 1786 RMD160 744771b37c74acde1375240db513e6452dd447c6 SHA1 b76f10ae35292fac094d7b1eb44223479d42a8e5 SHA256 8ddeef776f367b5b3e2901d3f50ba40fe8ba7f1defe5a81a58100b0591f19558
+MD5 b4f1d8c8a52c465ff9cf59522e7df44c cairo-1.2.0.ebuild 1786
+RMD160 744771b37c74acde1375240db513e6452dd447c6 cairo-1.2.0.ebuild 1786
+SHA256 8ddeef776f367b5b3e2901d3f50ba40fe8ba7f1defe5a81a58100b0591f19558 cairo-1.2.0.ebuild 1786
+MISC ChangeLog 11240 RMD160 ea800744c13d0c3fd54ef4cc703d977f50b3553f SHA1 6f71488f19735aee66b13b443539548b855f1620 SHA256 8a3cc2080906510ba4b870f0e6c9a6b3480fd891fb36d272a3bef5143f8cacc3
+MD5 322e6c1dda81f6078a4ca11bb9ea90ad ChangeLog 11240
+RMD160 ea800744c13d0c3fd54ef4cc703d977f50b3553f ChangeLog 11240
+SHA256 8a3cc2080906510ba4b870f0e6c9a6b3480fd891fb36d272a3bef5143f8cacc3 ChangeLog 11240
MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
@@ -52,22 +34,13 @@ SHA256 9070cfcc6ab84d39744d2ccbac0bc1bc6c8063cee9ab3d6934c795c0189032c4 files/di
MD5 dd098b533608d6250bc6d4fbe016256d files/digest-cairo-1.0.4 238
RMD160 014452a883fabada98aae5064c27a524ff0594ff files/digest-cairo-1.0.4 238
SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/digest-cairo-1.0.4 238
-MD5 418df37993023f7fd8faa3491fc6be3c files/digest-cairo-1.1.6 238
-RMD160 57011a90ed2f8ec862b76297436be4742b9c34c4 files/digest-cairo-1.1.6 238
-SHA256 ae943b88753df18ac51751996b558a249dda85399804c52dcdbe8e54fe6a74f7 files/digest-cairo-1.1.6 238
-MD5 418df37993023f7fd8faa3491fc6be3c files/digest-cairo-1.1.6-r1 238
-RMD160 57011a90ed2f8ec862b76297436be4742b9c34c4 files/digest-cairo-1.1.6-r1 238
-SHA256 ae943b88753df18ac51751996b558a249dda85399804c52dcdbe8e54fe6a74f7 files/digest-cairo-1.1.6-r1 238
-MD5 eab9611e91b340a0eb630483128ad347 files/digest-cairo-1.1.8 238
-RMD160 69f2f77bb019d569d04f5568becf1068075c3720 files/digest-cairo-1.1.8 238
-SHA256 26e97b1b8681af7aeee2bedbc9166e1c6216ec53ee7a175ae8897b42f373c392 files/digest-cairo-1.1.8 238
MD5 fec76d54197dd9fd812361ccec8b8a57 files/digest-cairo-1.2.0 238
RMD160 f858848d1266606cd3f597503fafe30ea96bf200 files/digest-cairo-1.2.0 238
SHA256 81e48ff30b661a76970966ce0b8e51bfe867a69d835b890fdd84bb680259e36b files/digest-cairo-1.2.0 238
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
-iD8DBQFEsK6ZoeSe8B0zEfwRAqsGAJ9soCIfnLvs9t8ImRBPhtH1K3fvRwCgimOd
-CeqgdTo2fZM7bDMWADaZgqc=
-=wRcB
+iD8DBQFEse82oeSe8B0zEfwRAhtUAJ45NVhSHBaET5YTsFXqc/G9TM3DYwCeJ1Rk
+kUyH3h34qcL0HGIGEd5NCzI=
+=ga1T
-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.1.6-r1.ebuild b/x11-libs/cairo/cairo-1.1.6-r1.ebuild
deleted file mode 100644
index 02eb39195154..000000000000
--- a/x11-libs/cairo/cairo-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.1.6-r1.ebuild,v 1.2 2006/06/03 20:47:24 compnerd Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc glitz pdf png svg X"
-
-RDEPEND="media-libs/fontconfig
- >=media-libs/freetype-2.1.4
- X? ( || (
- ( x11-libs/libXrender
- x11-libs/libXext
- x11-libs/libX11 )
- virtual/x11
- )
- virtual/xft
- )
- glitz? ( >=media-libs/glitz-0.5.1 )
- png? ( media-libs/libpng )
- pdf? ( >=app-text/poppler-bindings-0.4.1
- x11-libs/pango
- >=x11-libs/gtk+-2 )
- svg? ( dev-libs/libxml2 )
- !<x11-libs/cairo-0.2"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9
- X? ( || ( x11-proto/renderproto virtual/x11 ) )
- doc? ( >=dev-util/gtk-doc-1.3
- ~app-text/docbook-xml-dtd-4.2 )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # No non-cvs version of poppler has poppler_page_render
- epatch "${FILESDIR}"/${P}-poppler-revert.patch
-
- eautoreconf
-}
-
-src_compile() {
- econf $(use_enable X xlib) \
- $(use_enable png) \
- $(use_enable svg) \
- $(use_enable pdf) \
- $(use_enable doc gtk-doc) \
- $(use_enable glitz) \
- --enable-freetype \
- --enable-ps || die "./configure failed"
-
- emake || die "Compilation failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "Installation failed"
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.1.6.ebuild b/x11-libs/cairo/cairo-1.1.6.ebuild
deleted file mode 100644
index 87aa36b68f4c..000000000000
--- a/x11-libs/cairo/cairo-1.1.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.1.6.ebuild,v 1.2 2006/05/20 20:08:16 compnerd Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc glitz png X"
-
-RDEPEND="media-libs/fontconfig
- >=media-libs/freetype-2.1
- X? ( || (
- ( x11-libs/libXrender x11-libs/libX11 )
- virtual/x11
- )
- virtual/xft
- )
- glitz? ( >=media-libs/glitz-0.5.1 )
- png? ( media-libs/libpng )
- !<x11-libs/cairo-0.2"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9
- X? ( || ( x11-proto/renderproto virtual/x11 ) )
- doc? ( >=dev-util/gtk-doc-1.3
- ~app-text/docbook-xml-dtd-4.2 )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # No non-cvs version of poppler has poppler_page_render
- epatch "${FILESDIR}"/${P}-poppler-revert.patch
-
- eautoreconf
-}
-
-src_compile() {
- econf $(use_enable X xlib) \
- $(use_enable png) \
- $(use_enable doc gtk-doc) \
- $(use_enable glitz) \
- --enable-freetype || die "./configure failed"
-
- emake || die "Compilation failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "Installation failed"
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.1.8.ebuild b/x11-libs/cairo/cairo-1.1.8.ebuild
deleted file mode 100644
index 7ad3aab23f18..000000000000
--- a/x11-libs/cairo/cairo-1.1.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.1.8.ebuild,v 1.1 2006/06/23 06:43:13 compnerd Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc glitz pdf png svg X"
-
-RDEPEND="media-libs/fontconfig
- >=media-libs/freetype-2.1.4
- X? ( || (
- ( x11-libs/libXrender
- x11-libs/libXext
- x11-libs/libX11 )
- virtual/x11
- )
- virtual/xft
- )
- glitz? ( >=media-libs/glitz-0.5.1 )
- png? ( media-libs/libpng )
- pdf? ( >=app-text/poppler-bindings-0.4.1
- x11-libs/pango
- >=x11-libs/gtk+-2 )
- svg? ( dev-libs/libxml2 )
- !<x11-libs/cairo-0.2"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9
- X? ( || ( x11-proto/renderproto virtual/x11 ) )
- doc? ( >=dev-util/gtk-doc-1.3
- ~app-text/docbook-xml-dtd-4.2 )"
-
-src_compile() {
- econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
- $(use_enable png) $(use_enable svg) $(use_enable pdf) \
- $(use_enable glitz) --enable-freetype --enable-ps \
- || die "configure failed"
-
- emake || die "compile failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "Installation failed"
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/files/cairo-1.1.6-poppler-revert.patch b/x11-libs/cairo/files/cairo-1.1.6-poppler-revert.patch
deleted file mode 100644
index dc96a78b6436..000000000000
--- a/x11-libs/cairo/files/cairo-1.1.6-poppler-revert.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ruN cairo-1.1.6.orig/test/Makefile.am cairo-1.1.6/test/Makefile.am
---- cairo-1.1.6.orig/test/Makefile.am 2006-05-05 02:43:39.000000000 -0400
-+++ cairo-1.1.6/test/Makefile.am 2006-05-06 22:38:28.000000000 -0400
-@@ -330,11 +330,6 @@
- noinst_PROGRAMS += svg2png
- svg2png_CFLAGS = $(LIBRSVG_CFLAGS)
- svg2png_LDADD = $(LIBRSVG_LIBS)
--if CAIRO_CAN_TEST_PDF_SURFACE
--noinst_PROGRAMS += pdf2svg
--pdf2svg_CFLAGS = $(POPPLER_CFLAGS)
--pdf2svg_LDADD = $(LDADD) $(POPPLER_LIBS)
--endif
- endif
-
- CLEANFILES = \
-diff -ruN cairo-1.1.6.orig/test/pdf2png.c cairo-1.1.6/test/pdf2png.c
---- cairo-1.1.6.orig/test/pdf2png.c 2006-05-04 02:03:48.000000000 -0400
-+++ cairo-1.1.6/test/pdf2png.c 2006-05-06 22:25:41.000000000 -0400
-@@ -37,15 +37,13 @@
- {
- PopplerDocument *document;
- PopplerPage *page;
-+ GdkPixbuf *pixbuf;
- double width, height;
- GError *error;
- const char *filename = argv[1];
- const char *output_filename = argv[2];
- const char *page_label = argv[3];
- gchar *absolute, *uri;
-- cairo_surface_t *surface;
-- cairo_t *cr;
-- cairo_status_t status;
-
- if (argc != 4)
- FAIL ("usage: pdf2png input_file.pdf output_file.png page");
-@@ -77,28 +75,16 @@
-
- poppler_page_get_size (page, &width, &height);
-
-- surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
-- width * PIXELS_PER_POINT,
-- height * PIXELS_PER_POINT);
-- cr = cairo_create (surface);
-+ pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
-+ width * PIXELS_PER_POINT,
-+ height * PIXELS_PER_POINT);
-+ gdk_pixbuf_fill (pixbuf, 0xffffffff);
-+ poppler_page_render_to_pixbuf (page, 0, 0, width , height,
-+ PIXELS_PER_POINT, 0, pixbuf);
-
-- /* Clear background */
-- cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
-- cairo_paint (cr);
--
-- poppler_page_render (page, cr);
--
-- status = cairo_status (cr);
-- if (status)
-- FAIL (cairo_status_to_string (status));
--
-- cairo_destroy (cr);
--
-- cairo_surface_write_to_png (surface, output_filename);
--
-- status = cairo_surface_status (surface);
-- if (status)
-- FAIL (cairo_status_to_string (status));
-+ gdk_pixbuf_save (pixbuf, output_filename, "png", &error, NULL);
-+ if (error != NULL)
-+ FAIL (error->message);
-
- return 0;
- }
diff --git a/x11-libs/cairo/files/digest-cairo-1.1.6 b/x11-libs/cairo/files/digest-cairo-1.1.6
deleted file mode 100644
index 8756b164fc9e..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 82820b5a7d0135d0393b20caaea5687e cairo-1.1.6.tar.gz 1771669
-RMD160 e5144fb7af5f46f43b8fd077017a7dfe274d6d27 cairo-1.1.6.tar.gz 1771669
-SHA256 a9bea56356583d16c10991d6837f77f57810fb01d2345a98e0a40de38f8a106b cairo-1.1.6.tar.gz 1771669
diff --git a/x11-libs/cairo/files/digest-cairo-1.1.6-r1 b/x11-libs/cairo/files/digest-cairo-1.1.6-r1
deleted file mode 100644
index 8756b164fc9e..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.1.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 82820b5a7d0135d0393b20caaea5687e cairo-1.1.6.tar.gz 1771669
-RMD160 e5144fb7af5f46f43b8fd077017a7dfe274d6d27 cairo-1.1.6.tar.gz 1771669
-SHA256 a9bea56356583d16c10991d6837f77f57810fb01d2345a98e0a40de38f8a106b cairo-1.1.6.tar.gz 1771669
diff --git a/x11-libs/cairo/files/digest-cairo-1.1.8 b/x11-libs/cairo/files/digest-cairo-1.1.8
deleted file mode 100644
index 22dcba851144..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.1.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 57e239099e5770f66072eaa35d1c505b cairo-1.1.8.tar.gz 1836232
-RMD160 612b75773e0bb09aaeb879526ca54566de4b5f06 cairo-1.1.8.tar.gz 1836232
-SHA256 a2ffbdec9aa4659c1d137a767138262950752e5e74b2b3de1a5e16d1944a9ddb cairo-1.1.8.tar.gz 1836232