add missing file (bug #133768)

Package-Manager: portage-2.1_rc1-r3

4 files changed, 105 insertions, 30 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 67b740842330..b9424bae5f86 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.68 2006/05/19 07:32:41 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.69 2006/05/20 20:08:16 compnerd Exp $
+
+  20 May 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/cairo-1.1.6-poppler-revert.patch, cairo-1.1.6.ebuild:
+  adding missed file, adjusting style for foser
 
 *cairo-1.1.6 (19 May 2006)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 93a9df8bd040..0bfbbad7eef5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -2,6 +2,10 @@ 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 size 2274
+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 SHA256 d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e size 1458903
 DIST cairo-1.0.4.tar.gz 1475777 RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5 size 1475777
 DIST cairo-1.1.6.tar.gz 1771669 RMD160 e5144fb7af5f46f43b8fd077017a7dfe274d6d27 SHA256 a9bea56356583d16c10991d6837f77f57810fb01d2345a98e0a40de38f8a106b size 1771669
@@ -13,14 +17,14 @@ EBUILD cairo-1.0.4.ebuild 1276 RMD160 f5aaf082096457d15c6c31cc9f24592b5599abb5 S
 MD5 a2bf15e3d3cc71a7bb47d20e346eb3e4 cairo-1.0.4.ebuild 1276
 RMD160 f5aaf082096457d15c6c31cc9f24592b5599abb5 cairo-1.0.4.ebuild 1276
 SHA256 fd945aa6125c51fd868b4d621a73f28fd604143d131924aa0ea5bd0bced392bb cairo-1.0.4.ebuild 1276
-EBUILD cairo-1.1.6.ebuild 1522 RMD160 d59d46ba43fcd5ecebd8538ae920bd686627d965 SHA1 b4c9a0a78e7cf260099993e1a74b9cd37781e482 SHA256 441a3171bd475dbb6581325162098456ae0da9349d1b26341e70563cb789ef82 size 1522
-MD5 63f44899a64d257bb0abf13a0763a00e cairo-1.1.6.ebuild 1522
-RMD160 d59d46ba43fcd5ecebd8538ae920bd686627d965 cairo-1.1.6.ebuild 1522
-SHA256 441a3171bd475dbb6581325162098456ae0da9349d1b26341e70563cb789ef82 cairo-1.1.6.ebuild 1522
-MISC ChangeLog 9945 RMD160 2b4363405c389d3a48b5562bb978fcdb43c07483 SHA1 acfdc36f80f0f9822c32b9bfb8c4c04b5a0b72d9 SHA256 96f9aadce30dc5462f35c2cbfb0f53adde565c16483c3ca9eb1d1d6ed67ee133 size 9945
-MD5 85294b3ea1047b8a142705a8adf838ee ChangeLog 9945
-RMD160 2b4363405c389d3a48b5562bb978fcdb43c07483 ChangeLog 9945
-SHA256 96f9aadce30dc5462f35c2cbfb0f53adde565c16483c3ca9eb1d1d6ed67ee133 ChangeLog 9945
+EBUILD cairo-1.1.6.ebuild 1459 RMD160 7f12b29b47ee5d5d1cd14568057b9677c34f9e88 SHA1 09e29631b1a5b767405cfc7f53329d0e3e0970cf SHA256 8bd6fcede7e536284bee8cff465ced3fc58fc7d4d1096fbd37458eafc2f60a01 size 1459
+MD5 76bc51d1dab37102783fd1af7cb3d9dd cairo-1.1.6.ebuild 1459
+RMD160 7f12b29b47ee5d5d1cd14568057b9677c34f9e88 cairo-1.1.6.ebuild 1459
+SHA256 8bd6fcede7e536284bee8cff465ced3fc58fc7d4d1096fbd37458eafc2f60a01 cairo-1.1.6.ebuild 1459
+MISC ChangeLog 10113 RMD160 95709d5bba2f20a7b2b9174cb327bb1ebd1ac1c6 SHA1 11980802b8ad9697d07df81a65718618a45579da SHA256 190abfec5b3116c78b407273d8f3ec92c2064be7b586832abe0ae9a584938304 size 10113
+MD5 c2c0f98ac2df281208cf42c1d29ff6e6 ChangeLog 10113
+RMD160 95709d5bba2f20a7b2b9174cb327bb1ebd1ac1c6 ChangeLog 10113
+SHA256 190abfec5b3116c78b407273d8f3ec92c2064be7b586832abe0ae9a584938304 ChangeLog 10113
 MISC metadata.xml 250 RMD160 684d539806b5816d52db4162821111a7097c2247 SHA1 ac078a40013a399ffdb46591efeaea633cb9ce29 SHA256 24f8c4bdcdf135d86d411c8df75eb8d711be6cb8064a2a7035e8cd48d7485ba9 size 250
 MD5 5b2746699762a19b87b1cd8bc792c688 metadata.xml 250
 RMD160 684d539806b5816d52db4162821111a7097c2247 metadata.xml 250
diff --git a/x11-libs/cairo/cairo-1.1.6.ebuild b/x11-libs/cairo/cairo-1.1.6.ebuild
index d10dd76f0d6e..87aa36b68f4c 100644
--- a/x11-libs/cairo/cairo-1.1.6.ebuild
+++ b/x11-libs/cairo/cairo-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2006/05/19 07:32:41 compnerd Exp $
+# $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
 
@@ -14,27 +14,21 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh
 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"
+	>=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
-				)"
+	>=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}
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
new file mode 100644
index 000000000000..dc96a78b6436
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.1.6-poppler-revert.patch
@@ -0,0 +1,73 @@
+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;
+ }