rev bump

Package-Manager: portage-2.1.1_pre5-r2

5 files changed, 22 insertions, 223 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 860367e0e2cb..9cc2d50f7b7d 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,19 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cairo-1.0.2-pkg_macro.patch 542 RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f025ad SHA1 0ab6c2c4aa0f441694eecc8a42e37b13efaad2bf SHA256 4ab7469075776de4fadcc733c9ceb9754b075e5a99b05fcdc247fc597b971149
 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.2.0-disappearing-text.patch 3706 RMD160 ea2e9944dd430c385387b6e817eb8029dbcc7a7f SHA1 afe40f9589b71f9c830263dc9a3cec5a467b9f68 SHA256 e08f49535cf34b8db5ce68fec31ecf887a62ccaedb8c6cd6837b7bebe5b4e785
-MD5 61d3be677427c46ca8440bc649f27073 files/cairo-1.2.0-disappearing-text.patch 3706
-RMD160 ea2e9944dd430c385387b6e817eb8029dbcc7a7f files/cairo-1.2.0-disappearing-text.patch 3706
-SHA256 e08f49535cf34b8db5ce68fec31ecf887a62ccaedb8c6cd6837b7bebe5b4e785 files/cairo-1.2.0-disappearing-text.patch 3706
-AUX cairo-1.2.0-remove-flush.patch 1233 RMD160 6bb4514c36b05ebf203f4a63d2eeff88367d84f1 SHA1 c91c379363711f6091453562b452111452f00fa3 SHA256 b6a569e31b007621f2d0413eb687ef03a45ad33f7d6ca5e40611fbf6f7359668
-MD5 3ab6c5e864007924cad063c76632096c files/cairo-1.2.0-remove-flush.patch 1233
-RMD160 6bb4514c36b05ebf203f4a63d2eeff88367d84f1 files/cairo-1.2.0-remove-flush.patch 1233
-SHA256 b6a569e31b007621f2d0413eb687ef03a45ad33f7d6ca5e40611fbf6f7359668 files/cairo-1.2.0-remove-flush.patch 1233
 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.2.0.tar.gz 2659930 RMD160 9dd76e43e881dfd3f20a81fc0f946e302ed7993c SHA1 c5da7f89cdd3782102357f99a47f516d11661e92 SHA256 fa3dc63029bab324682231f75af167b9370458785312a97fd0c50bf2dbd1cf21
 DIST cairo-1.2.2.tar.gz 2831305 RMD160 ecb23495efb809b1a7e0af036ad3a260d68be9d5 SHA1 859b9ed4eaa200a03b9e41ccc45f3799742e6c5c SHA256 9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02
+DIST cairo-1.2.4.tar.gz 2882781 RMD160 dee558b7489aa089de6963d909a8352725e10bdd SHA1 5520b771c8b85acea78fa56fc4c39b4dca6bcc7c SHA256 c1580ca951b2f57c4f8b34549997854bc48dbaf036ca1ca6c017c03db3504ddb
 EBUILD cairo-1.0.2.ebuild 1530 RMD160 12790aa490cd8d5441abec121899226c8657757a SHA1 3eff15746f8cfacb4d64c2668240563e79b426ca SHA256 41cc3865da19f668e4083345aae63845ff1a35111edee302ce2a8779af99dff4
 MD5 e8e5d3bbc39d2d39c75c139e14d10d1a cairo-1.0.2.ebuild 1530
 RMD160 12790aa490cd8d5441abec121899226c8657757a cairo-1.0.2.ebuild 1530
@@ -22,18 +17,18 @@ EBUILD cairo-1.0.4.ebuild 1352 RMD160 58b5285cea7dae595e5c4742eba50fb6df4c76a0 S
 MD5 d574a0c2102b21c946b015420c2edd3e cairo-1.0.4.ebuild 1352
 RMD160 58b5285cea7dae595e5c4742eba50fb6df4c76a0 cairo-1.0.4.ebuild 1352
 SHA256 8281bafb3babbee8b4a6267b6abb8c7d605e3440d94bca574181c4f4bcdba68d cairo-1.0.4.ebuild 1352
-EBUILD cairo-1.2.0-r1.ebuild 1932 RMD160 00858160bf53ac64f8fd2722959cfa4d09b7ea39 SHA1 91c4c6a876863fdf7c7de78c52f73c53053381e4 SHA256 3fecee5c0ffb086b9b98b71a8320539f4555a4b311d67f2ae7f5a835f2c7456e
-MD5 21826853bea2a3ce16ff4459bb349174 cairo-1.2.0-r1.ebuild 1932
-RMD160 00858160bf53ac64f8fd2722959cfa4d09b7ea39 cairo-1.2.0-r1.ebuild 1932
-SHA256 3fecee5c0ffb086b9b98b71a8320539f4555a4b311d67f2ae7f5a835f2c7456e cairo-1.2.0-r1.ebuild 1932
 EBUILD cairo-1.2.2.ebuild 1857 RMD160 e2f0d0588c9b2d6af1abaf2566bab4c6ed39e2db SHA1 f853ae4c7859d9503a900e48bb78820da65b63f8 SHA256 0457d0745d97ba982b998530201414e14a5589274ba0efa15fe720527fc2b2d2
 MD5 6e48fb46a48d8a7cd1452fe18dfbbefe cairo-1.2.2.ebuild 1857
 RMD160 e2f0d0588c9b2d6af1abaf2566bab4c6ed39e2db cairo-1.2.2.ebuild 1857
 SHA256 0457d0745d97ba982b998530201414e14a5589274ba0efa15fe720527fc2b2d2 cairo-1.2.2.ebuild 1857
-MISC ChangeLog 11757 RMD160 70493a273e9e7a1beee942658206037f47f31c1f SHA1 3b8f3751fbe4c0cd3542b527dcbf8037dfce48bf SHA256 30c8124d96b3250c78b126988a88c0d4b4b40eeb98e337b5d6bdc0937be6ab25
-MD5 e16a0e6a1ba5d26caee96263e5133eec ChangeLog 11757
-RMD160 70493a273e9e7a1beee942658206037f47f31c1f ChangeLog 11757
-SHA256 30c8124d96b3250c78b126988a88c0d4b4b40eeb98e337b5d6bdc0937be6ab25 ChangeLog 11757
+EBUILD cairo-1.2.4.ebuild 1855 RMD160 c63c29a65c9d205996a693bf751ce3ef612ce108 SHA1 f96a38e008b793baa2da7bba1d2637ef6ea12983 SHA256 1f5f29cc9a75b9fd467a452a289f6b54351a3000fd78119c7bf05b9d9a8129c1
+MD5 66f9eab08509b946bd045f12fe9c4366 cairo-1.2.4.ebuild 1855
+RMD160 c63c29a65c9d205996a693bf751ce3ef612ce108 cairo-1.2.4.ebuild 1855
+SHA256 1f5f29cc9a75b9fd467a452a289f6b54351a3000fd78119c7bf05b9d9a8129c1 cairo-1.2.4.ebuild 1855
+MISC ChangeLog 11979 RMD160 e166ccbe2e781be473ff2423c68a4878d7628ca6 SHA1 43df47bccce8e667dd30c494dd954869ff2886fd SHA256 5b58be9bb03a02140fff96f5acbd85c778d32c9ed949fda050614ab487252169
+MD5 3aa404b2517b182c8e9db4e14390d464 ChangeLog 11979
+RMD160 e166ccbe2e781be473ff2423c68a4878d7628ca6 ChangeLog 11979
+SHA256 5b58be9bb03a02140fff96f5acbd85c778d32c9ed949fda050614ab487252169 ChangeLog 11979
 MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
 MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
@@ -44,9 +39,16 @@ 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 fec76d54197dd9fd812361ccec8b8a57 files/digest-cairo-1.2.0-r1 238
-RMD160 f858848d1266606cd3f597503fafe30ea96bf200 files/digest-cairo-1.2.0-r1 238
-SHA256 81e48ff30b661a76970966ce0b8e51bfe867a69d835b890fdd84bb680259e36b files/digest-cairo-1.2.0-r1 238
 MD5 4b3ced9cdbd2aa686576db4b60bfbf20 files/digest-cairo-1.2.2 238
 RMD160 dbccbb0df1edc7765a38c40a9c8352166057c41a files/digest-cairo-1.2.2 238
 SHA256 7f15e3daf5be673f3c54177f52f1851e3f17b3b2bf0a853c9f5fc5c666e074ca files/digest-cairo-1.2.2 238
+MD5 ad8f70972aca60be3e0459b112265b0e files/digest-cairo-1.2.4 238
+RMD160 72f3842866c3dba95a661b08a00010b85945244b files/digest-cairo-1.2.4 238
+SHA256 b04bf38f8f8c64f7e1256aa588f200c2f5619f0710745279beac16b7955eb2fe files/digest-cairo-1.2.4 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE756JoeSe8B0zEfwRAoO0AJ9HYS0OVgYsPITaV3e+dMJ78sf+jACdHeHM
+6QSaSSN32VHJ9Z4D90VLbQg=
+=k8cg
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.2.0-r1.ebuild b/x11-libs/cairo/cairo-1.2.0-r1.ebuild
deleted file mode 100644
index 0c6618255256..000000000000
--- a/x11-libs/cairo/cairo-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,69 +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.2.0-r1.ebuild,v 1.1 2006/08/04 02:35:11 cardoe Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/releases/${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 ~x86-fbsd"
-IUSE="directfb doc glitz pdf png svg X"
-
-# 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.4
-	X? (	|| (
-			( x11-libs/libXrender
-			x11-libs/libXext
-			x11-libs/libX11 )
-			virtual/x11
-		)
-		virtual/xft
-	)
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
-	png? ( media-libs/libpng )
-	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}
-
-	epatch ${FILESDIR}/${P}-disappearing-text.patch
-	epatch ${FILESDIR}/${P}-remove-flush.patch
-}
-
-src_compile() {
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(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
-}
-
-pkg_postinst() {
-	echo
-	ewarn "You will most likely need to run revdep-rebuild after emerging this"
-	echo
-}
diff --git a/x11-libs/cairo/files/cairo-1.2.0-disappearing-text.patch b/x11-libs/cairo/files/cairo-1.2.0-disappearing-text.patch
deleted file mode 100644
index 5bd59e611e76..000000000000
--- a/x11-libs/cairo/files/cairo-1.2.0-disappearing-text.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Carl Worth <cworth@cworth.org>
-Date: Wed, 26 Jul 2006 22:48:56 +0000 (-0700)
-Subject: Elide size-zero glyphs from calls to XRender functions.
-X-Git-Url: http://gitweb.freedesktop.org/?p=cairo;a=commitdiff;h=456cdb3058f3b416109a9600167cd8842300ae14
-
-Elide size-zero glyphs from calls to XRender functions.
-
-There appears to be a bug in some X servers which is triggered by
-rendering 1-bit glyphs with zero size via the functions
-XRenderAddGlyphs and XRenderCompositeText8 (and likely its variants).
-
-We avoid this bug by making a copy of the glyphs array which does not
-include any of the size-zero glyphs so that the X server never sees them.
----
-
---- a/src/cairo-xlib-surface.c
-+++ b/src/cairo-xlib-surface.c
-@@ -2674,12 +2674,13 @@ _cairo_xlib_surface_show_glyphs (void   
-     cairo_surface_attributes_t attributes;
-     cairo_xlib_surface_t *src = NULL;
- 
-+    cairo_glyph_t *output_glyphs;
-     const cairo_glyph_t *glyphs_chunk;
-     int glyphs_remaining, chunk_size, max_chunk_size;
-     cairo_scaled_glyph_t *scaled_glyph;
-     cairo_xlib_surface_font_private_t *font_private;
- 
--    int i;
-+    int i, o;
-     unsigned long max_index = 0;
- 
-     cairo_xlib_surface_show_glyphs_func_t show_glyphs_func;
-@@ -2723,6 +2724,13 @@ _cairo_xlib_surface_show_glyphs (void   
- 	(font_private != NULL && font_private->dpy != dst->dpy))
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
- 
-+    /* We make a copy of the glyphs so that we can elide any size-zero
-+     * glyphs to workaround an X server bug, (present in at least Xorg
-+     * 7.1 without EXA). */
-+    output_glyphs = malloc (num_glyphs * sizeof (cairo_glyph_t));
-+    if (output_glyphs == NULL)
-+	return CAIRO_STATUS_NO_MEMORY;
-+
-     /* After passing all those tests, we're now committed to rendering
-      * these glyphs or to fail trying. We first upload any glyphs to
-      * the X server that it doesn't have already, then we draw
-@@ -2781,7 +2789,7 @@ _cairo_xlib_surface_show_glyphs (void   
-         goto BAIL;
- 
-     /* Send all unsent glyphs to the server, and count the max of the glyph indices */
--    for (i = 0; i < num_glyphs; i++) {
-+    for (i = 0, o = 0; i < num_glyphs; i++) {
- 	if (glyphs[i].index > max_index)
- 	    max_index = glyphs[i].index;
- 	status = _cairo_scaled_glyph_lookup (scaled_font,
-@@ -2790,11 +2798,18 @@ _cairo_xlib_surface_show_glyphs (void   
- 					     &scaled_glyph);
- 	if (status != CAIRO_STATUS_SUCCESS)
- 	    goto BAIL;
--	if (scaled_glyph->surface_private == NULL) {
--	    _cairo_xlib_surface_add_glyph (dst->dpy, scaled_font, scaled_glyph);
--	    scaled_glyph->surface_private = (void *) 1;
-+	/* Don't put any size-zero glyphs into output_glyphs to avoid
-+	 * an X server bug which stops rendering glyphs after the
-+	 * first size-zero glyph. */
-+	if (scaled_glyph->surface->width && scaled_glyph->surface->height) {
-+	    output_glyphs[o++] = glyphs[i];
-+	    if (scaled_glyph->surface_private == NULL) {
-+		_cairo_xlib_surface_add_glyph (dst->dpy, scaled_font, scaled_glyph);
-+		scaled_glyph->surface_private = (void *) 1;
-+	    }
- 	}
-     }
-+    num_glyphs = o;
- 
-     _cairo_xlib_surface_ensure_dst_picture (dst);
- 
-@@ -2811,7 +2826,7 @@ _cairo_xlib_surface_show_glyphs (void   
-     }
-     max_chunk_size /= sz_xGlyphElt;
- 
--    for (glyphs_remaining = num_glyphs, glyphs_chunk = glyphs;
-+    for (glyphs_remaining = num_glyphs, glyphs_chunk = output_glyphs;
- 	 glyphs_remaining;
- 	 glyphs_remaining -= chunk_size, glyphs_chunk += chunk_size)
-     {
-@@ -2826,6 +2841,7 @@ _cairo_xlib_surface_show_glyphs (void   
- 
-   BAIL:
-     _cairo_scaled_font_thaw_cache (scaled_font);
-+    free (output_glyphs);
- 
-     if (src)
-         _cairo_pattern_release_surface (src_pattern, &src->base, &attributes);
diff --git a/x11-libs/cairo/files/cairo-1.2.0-remove-flush.patch b/x11-libs/cairo/files/cairo-1.2.0-remove-flush.patch
deleted file mode 100644
index 10c054388fb0..000000000000
--- a/x11-libs/cairo/files/cairo-1.2.0-remove-flush.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Vladimir Vukicevic <vladimir@pobox.com>
-Date: Mon, 17 Jul 2006 18:33:47 +0000 (-0700)
-Subject: [xlib] Remove XSync implementation of surface_flush
-X-Git-Url: http://gitweb.freedesktop.org/?p=cairo;a=commitdiff;h=b7191885c88068dad57d68ced69a752d1162b12c
-
-[xlib] Remove XSync implementation of surface_flush
-
-Remove the xlib implementation of surface_flush which just called XSync
-before.
----
-
---- a/src/cairo-xlib-surface.c
-+++ b/src/cairo-xlib-surface.c
-@@ -1722,14 +1722,6 @@ _cairo_xlib_surface_get_font_options (vo
-     *options = surface->screen_info->font_options;
- }
- 
--static cairo_status_t
--_cairo_xlib_surface_flush (void *abstract_surface)
--{
--    cairo_xlib_surface_t *surface = abstract_surface;
--    XSync (surface->dpy, False);
--    return CAIRO_STATUS_SUCCESS;
--}
--
- static void
- _cairo_xlib_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font);
- 
-@@ -1756,7 +1748,7 @@ static const cairo_surface_backend_t cai
-     _cairo_xlib_surface_get_extents,
-     NULL, /* old_show_glyphs */
-     _cairo_xlib_surface_get_font_options,
--    _cairo_xlib_surface_flush,
-+    NULL, /* flush */
-     NULL, /* mark_dirty_rectangle */
-     _cairo_xlib_surface_scaled_font_fini,
-     _cairo_xlib_surface_scaled_glyph_fini,
diff --git a/x11-libs/cairo/files/digest-cairo-1.2.0-r1 b/x11-libs/cairo/files/digest-cairo-1.2.0-r1
deleted file mode 100644
index 9afc5cb43bc6..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.2.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5c9ad71d1b582907eee0497b196689ef cairo-1.2.0.tar.gz 2659930
-RMD160 9dd76e43e881dfd3f20a81fc0f946e302ed7993c cairo-1.2.0.tar.gz 2659930
-SHA256 fa3dc63029bab324682231f75af167b9370458785312a97fd0c50bf2dbd1cf21 cairo-1.2.0.tar.gz 2659930