new stable version and development version

Package-Manager: portage-2.1.4

9 files changed, 45 insertions, 78 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 863e8ab1c1cb..4fd54f094759 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.159 2008/01/08 20:36:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.160 2008/01/16 19:51:48 cardoe Exp $
+
+*cairo-1.5.6 (16 Jan 2008)
+*cairo-1.4.14 (16 Jan 2008)
+
+  16 Jan 2008; Doug Klima <cardoe@gentoo.org>
+  -files/cairo-1.5.4-sparc-alignment.patch, +cairo-1.4.14.ebuild,
+  -cairo-1.5.4-r1.ebuild, -cairo-1.5.4-r2.ebuild, +cairo-1.5.6.ebuild:
+  new stable version and development version
 
 *cairo-1.5.4-r2 (08 Jan 2008)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index b842717cafa5..31f91f3b3bbf 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cairo-1.5.4-fix-private.patch 416 RMD160 4566184daa1f13d58607c47a13055bfbf28a33db SHA1 5b3f89946de27e458440ece8b3af00516445553e SHA256 7ef56272ad699eef04388752df5127d09879c8f3f67b6408edbafa285eeea6d5
 MD5 a9dff83169192e5b605f6c72765b9f9c files/cairo-1.5.4-fix-private.patch 416
 RMD160 4566184daa1f13d58607c47a13055bfbf28a33db files/cairo-1.5.4-fix-private.patch 416
 SHA256 7ef56272ad699eef04388752df5127d09879c8f3f67b6408edbafa285eeea6d5 files/cairo-1.5.4-fix-private.patch 416
-AUX cairo-1.5.4-sparc-alignment.patch 435 RMD160 57bc95017e156bfc62c8a811ceb862af12051f8d SHA1 04480cd715d1047616ec037343be0d912115ef3a SHA256 ab99981206399bd0b73ca8b738db6723da0048114ffcf43feaa3580b052dabb4
-MD5 ed252a8c483df221022939e49d8a60de files/cairo-1.5.4-sparc-alignment.patch 435
-RMD160 57bc95017e156bfc62c8a811ceb862af12051f8d files/cairo-1.5.4-sparc-alignment.patch 435
-SHA256 ab99981206399bd0b73ca8b738db6723da0048114ffcf43feaa3580b052dabb4 files/cairo-1.5.4-sparc-alignment.patch 435
 DIST cairo-1.2.6.tar.gz 2973689 RMD160 4469a661b294e342ee77e726c1cefccd4837ae2e SHA1 b86b4017a9abd565ef11c72b7faee9082a04118f SHA256 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
 DIST cairo-1.4.10.tar.gz 3216689 RMD160 ce1cb025d47ec395577e4f4c6fe5092be85e0cbe SHA1 8371097e30650ec817b24694367110139627403e SHA256 594e78a66044898c321e378d47faf43b665b23ba638834d2787e344ba13e5132
 DIST cairo-1.4.12.tar.gz 3276610 RMD160 5ed65d5872c0561f3392e60007898d9360d83d0a SHA1 45d5257e5a0c1524bcc25660a96b2c79d012ad3f SHA256 a1a1e4ccec8da980141d903adbe83535481b4fda96a479456438d3dfbc767d5d
-DIST cairo-1.5.4.tar.gz 3283307 RMD160 2ccdbd21adf344dc7405951d919a89610deb6d14 SHA1 74f01fcea59631b077a823afd3a5146f63cb1c59 SHA256 dafc9c43fe20977ece09aeff699d42b1f55a7f7465ca76baf96d42a379d36b57
+DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
+DIST cairo-1.5.6.tar.gz 3433496 RMD160 319b452affacea71b15502a9d461a23bfc93553c SHA1 101382fc6ad2e702f74acf5486a1fea45affa608 SHA256 e6f900f10cec90b905588dff17b3c80b0fab928b93b4cd7520d39b5e3490d2bf
 EBUILD cairo-1.2.6.ebuild 1647 RMD160 6a36df2bb99acf75696cae5f8b64d42bcf2cc08f SHA1 9238226c12312ac6a1d1f1dc26611514b2b62735 SHA256 5abd3942899a397e3b325c0b6dfa8131d97a790ce3d5d4f86c0c196383bff35c
 MD5 c6648b7c38f7b294a588311c8fa1b65c cairo-1.2.6.ebuild 1647
 RMD160 6a36df2bb99acf75696cae5f8b64d42bcf2cc08f cairo-1.2.6.ebuild 1647
@@ -25,18 +19,18 @@ EBUILD cairo-1.4.12.ebuild 1968 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c
 MD5 f91e3835adfee4275068944417f29eb5 cairo-1.4.12.ebuild 1968
 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c cairo-1.4.12.ebuild 1968
 SHA256 6f25e6e271d47c75deeee9121d25098eb0c6aa25cbdf60349e76d094a4f0d912 cairo-1.4.12.ebuild 1968
-EBUILD cairo-1.5.4-r1.ebuild 2162 RMD160 538007d9f05b21831ef13deb8763171cfaa9e592 SHA1 9c76190cadbaf6ab3168a681fbe30dd830586a61 SHA256 442edae9ac2f60e7365de9ac768d22a26c894944480000905a1abfb190c32c9b
-MD5 222807885a0c2f058419f948add8a0af cairo-1.5.4-r1.ebuild 2162
-RMD160 538007d9f05b21831ef13deb8763171cfaa9e592 cairo-1.5.4-r1.ebuild 2162
-SHA256 442edae9ac2f60e7365de9ac768d22a26c894944480000905a1abfb190c32c9b cairo-1.5.4-r1.ebuild 2162
-EBUILD cairo-1.5.4-r2.ebuild 2236 RMD160 ab8ca07298f7d44c1df5a565c576dce0411d8a1a SHA1 2c2e8eabde9727f60e1d22d84f910365a1fe7f04 SHA256 0fbdf8e28f0d5e20b89749c7ac0090fafc94b6c94a5ea3524e4177be18220480
-MD5 c1ab5e1b27219ee917b56c880d458569 cairo-1.5.4-r2.ebuild 2236
-RMD160 ab8ca07298f7d44c1df5a565c576dce0411d8a1a cairo-1.5.4-r2.ebuild 2236
-SHA256 0fbdf8e28f0d5e20b89749c7ac0090fafc94b6c94a5ea3524e4177be18220480 cairo-1.5.4-r2.ebuild 2236
-MISC ChangeLog 22181 RMD160 b1216b26686b3f1a5f083f6c8a9580d2a88a6cef SHA1 456b7a8c7d9c6cbcb31ebe28fb01c36caecef27d SHA256 796253fc73e8ae1d04861fa82b0373db16cc532a8a8cda5f979fdb96b666a902
-MD5 d966298382a26501262204c7abd4b47c ChangeLog 22181
-RMD160 b1216b26686b3f1a5f083f6c8a9580d2a88a6cef ChangeLog 22181
-SHA256 796253fc73e8ae1d04861fa82b0373db16cc532a8a8cda5f979fdb96b666a902 ChangeLog 22181
+EBUILD cairo-1.4.14.ebuild 1979 RMD160 e02b8f16936817056ed0b9bc3ad92f62a03441fa SHA1 78017dbb2d8e38b903ed94a47a59c6c7c2b1b474 SHA256 56197b3bf132e8f84caece71e62368c7b3481e69458b1ca9597cd7e77200ba3f
+MD5 e1f897375811702fd8cafebc5b4da777 cairo-1.4.14.ebuild 1979
+RMD160 e02b8f16936817056ed0b9bc3ad92f62a03441fa cairo-1.4.14.ebuild 1979
+SHA256 56197b3bf132e8f84caece71e62368c7b3481e69458b1ca9597cd7e77200ba3f cairo-1.4.14.ebuild 1979
+EBUILD cairo-1.5.6.ebuild 2084 RMD160 876213a6092b0947de087fa28f4650d18d079782 SHA1 c40573a377a591d2d02707901b2b96375e3e639e SHA256 702d64857a14f26768f2e5922be9f195c93d91d22838ee2800c8c20f27eec6f3
+MD5 ee2515d392f375620585c56d43faec24 cairo-1.5.6.ebuild 2084
+RMD160 876213a6092b0947de087fa28f4650d18d079782 cairo-1.5.6.ebuild 2084
+SHA256 702d64857a14f26768f2e5922be9f195c93d91d22838ee2800c8c20f27eec6f3 cairo-1.5.6.ebuild 2084
+MISC ChangeLog 22466 RMD160 17f982cc38bbb0c4b57154cd771895f1ec168593 SHA1 a43e9b3017cd2c1f106029d66602173c39867574 SHA256 0f48f66fade93841d1a6d51ba0e42c4616467f02270605dfe80871f65ac00f37
+MD5 8168b1ae19b65e0919db8ed69d2eb0e5 ChangeLog 22466
+RMD160 17f982cc38bbb0c4b57154cd771895f1ec168593 ChangeLog 22466
+SHA256 0f48f66fade93841d1a6d51ba0e42c4616467f02270605dfe80871f65ac00f37 ChangeLog 22466
 MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
 MD5 b11544cc1116038b149ab213e9d56262 metadata.xml 316
 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 metadata.xml 316
@@ -50,16 +44,9 @@ SHA256 479281990988707e395037e580d635d725fb33bb7391130f96fac6d727204df7 files/di
 MD5 7e19929e3130311dbfe5ca0456e022ef files/digest-cairo-1.4.12 241
 RMD160 83f76aee79f965a8df771fd1c359f937b1251976 files/digest-cairo-1.4.12 241
 SHA256 43bad19a131cf5a1aa9819d12bb00d701ef6ceb7e42e525c2334475df5a12503 files/digest-cairo-1.4.12 241
-MD5 fe25ae526890515ad1b88e4205d48e9c files/digest-cairo-1.5.4-r1 238
-RMD160 4633fa8500a6e2fe0190584b2321e709232c2660 files/digest-cairo-1.5.4-r1 238
-SHA256 c01ae42cc1f8609558a4fc5cc2526d4b5b4f2810c364f1019debede2276da03e files/digest-cairo-1.5.4-r1 238
-MD5 fe25ae526890515ad1b88e4205d48e9c files/digest-cairo-1.5.4-r2 238
-RMD160 4633fa8500a6e2fe0190584b2321e709232c2660 files/digest-cairo-1.5.4-r2 238
-SHA256 c01ae42cc1f8609558a4fc5cc2526d4b5b4f2810c364f1019debede2276da03e files/digest-cairo-1.5.4-r2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkeD3r8ACgkQoeSe8B0zEfyZggCfcaJqR5tD5CCOkdGvR7uiA1k7
-3WQAn2T+tKROkcqu4ogCBHyTZWDk0udj
-=VI52
------END PGP SIGNATURE-----
+MD5 1bfda5a993199de3002c57d62aa80811 files/digest-cairo-1.4.14 241
+RMD160 61854d7f0641a8291c792ca70c10b2abcb96bb43 files/digest-cairo-1.4.14 241
+SHA256 f3a6595bf6306a3dfcf515fc210db8bd797bd477743c66b23a1367e81c168e95 files/digest-cairo-1.4.14 241
+MD5 d24f0dcab1925379fafadfe96ce3a90a files/digest-cairo-1.5.6 238
+RMD160 836fc6fc18ec1d8b985b72f4b00356d98cc7fa5b files/digest-cairo-1.5.6 238
+SHA256 9cc7d30be6806a09374c1d2cfb8aec01a935a74c220099d72db0e9a7c25f6777 files/digest-cairo-1.5.6 238
diff --git a/x11-libs/cairo/cairo-1.5.4-r2.ebuild b/x11-libs/cairo/cairo-1.4.14.ebuild
index d676e03e8e9a..ab2bf4926cfb 100644
--- a/x11-libs/cairo/cairo-1.5.4-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.4.14.ebuild
@@ -1,23 +1,24 @@
 # 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.5.4-r2.ebuild,v 1.1 2008/01/08 20:36:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.14.ebuild,v 1.1 2008/01/16 19:51:48 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
+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 ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz opengl svg X xcb test"
+IUSE="debug directfb doc glitz opengl svg 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.4
-		sys-libs/zlib
 		media-libs/libpng
-		>=x11-libs/pixman-0.9.4
 		X?	(
 				x11-libs/libXrender
 				x11-libs/libXext
@@ -32,17 +33,10 @@ 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?	(
-					>=dev-util/gtk-doc-1.6
+					>=dev-util/gtk-doc-1.3
 					 ~app-text/docbook-xml-dtd-4.2
 				)"
 
@@ -50,12 +44,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# SPARC alignment patch
-	epatch "${FILESDIR}"/${P}-sparc-alignment.patch
-
-	# Mozilla corruption patch
-	epatch "${FILESDIR}"/${P}-fix-private.patch
-
 	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
 	elibtoolize
 }
@@ -69,7 +57,7 @@ src_compile() {
 	fi
 
 	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		  $(use_enable svg) $(use_enable glitz) \
 		  $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
 		  --enable-freetype --enable-ps $(use_enable xcb) \
 		  || die "configure failed"
diff --git a/x11-libs/cairo/cairo-1.5.4-r1.ebuild b/x11-libs/cairo/cairo-1.5.6.ebuild
index c2d3e81a727b..24d7cb36be5f 100644
--- a/x11-libs/cairo/cairo-1.5.4-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.5.4-r1.ebuild,v 1.1 2007/12/27 14:19:03 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.6.ebuild,v 1.1 2008/01/16 19:51:48 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -50,9 +50,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# SPARC alignment patch
-	epatch "${FILESDIR}"/${P}-sparc-alignment.patch
-
 	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
 	elibtoolize
 }
diff --git a/x11-libs/cairo/files/cairo-1.5.4-sparc-alignment.patch b/x11-libs/cairo/files/cairo-1.5.4-sparc-alignment.patch
deleted file mode 100644
index 2a7e0f290688..000000000000
--- a/x11-libs/cairo/files/cairo-1.5.4-sparc-alignment.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cairo-path-fixed.c.orig	2007-12-27 00:01:13.000000000 +0000
-+++ src/cairo-path-fixed.c	2007-12-27 00:02:10.000000000 +0000
-@@ -415,8 +415,8 @@
- 	buf->num_points = 0;
- 	buf->buf_size = buf_size;
- 
--	buf->op = (cairo_path_op_t *) (buf + 1);
--	buf->points = (cairo_point_t *) (buf->op + buf_size);
-+	buf->points = (cairo_point_t *) (buf + 1);
-+	buf->op = (cairo_path_op_t *) (buf->points + 2 * buf_size);
-     }
- 
-     return buf;
\ No newline at end of file
diff --git a/x11-libs/cairo/files/digest-cairo-1.4.14 b/x11-libs/cairo/files/digest-cairo-1.4.14
new file mode 100644
index 000000000000..cf308e82b25d
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.4.14
@@ -0,0 +1,3 @@
+MD5 e8c442ff821c0719a69508fecba9038f cairo-1.4.14.tar.gz 3283608
+RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd cairo-1.4.14.tar.gz 3283608
+SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c cairo-1.4.14.tar.gz 3283608
diff --git a/x11-libs/cairo/files/digest-cairo-1.5.4-r1 b/x11-libs/cairo/files/digest-cairo-1.5.4-r1
deleted file mode 100644
index 716222d0cdcb..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.5.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2738af237fc125f7e7d3e7bf8c5728c4 cairo-1.5.4.tar.gz 3283307
-RMD160 2ccdbd21adf344dc7405951d919a89610deb6d14 cairo-1.5.4.tar.gz 3283307
-SHA256 dafc9c43fe20977ece09aeff699d42b1f55a7f7465ca76baf96d42a379d36b57 cairo-1.5.4.tar.gz 3283307
diff --git a/x11-libs/cairo/files/digest-cairo-1.5.4-r2 b/x11-libs/cairo/files/digest-cairo-1.5.4-r2
deleted file mode 100644
index 716222d0cdcb..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.5.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2738af237fc125f7e7d3e7bf8c5728c4 cairo-1.5.4.tar.gz 3283307
-RMD160 2ccdbd21adf344dc7405951d919a89610deb6d14 cairo-1.5.4.tar.gz 3283307
-SHA256 dafc9c43fe20977ece09aeff699d42b1f55a7f7465ca76baf96d42a379d36b57 cairo-1.5.4.tar.gz 3283307
diff --git a/x11-libs/cairo/files/digest-cairo-1.5.6 b/x11-libs/cairo/files/digest-cairo-1.5.6
new file mode 100644
index 000000000000..893818a47f92
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.5.6
@@ -0,0 +1,3 @@
+MD5 3ebb218d5625b9339df819c4c03e462e cairo-1.5.6.tar.gz 3433496
+RMD160 319b452affacea71b15502a9d461a23bfc93553c cairo-1.5.6.tar.gz 3433496
+SHA256 e6f900f10cec90b905588dff17b3c80b0fab928b93b4cd7520d39b5e3490d2bf cairo-1.5.6.tar.gz 3433496