revbump from upstream. reduces malloc calls. cleans up cases when malloc fails. clean...

Package-Manager: portage-2.1.2.3

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 428a9b7da06403ad441caaf0378048be7e80c702..f022a6854f56d915f8d54ad44492acb79bbbd774 100644 (file)
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.111 2007/03/21 15:21:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.112 2007/04/15 15:32:13 cardoe Exp $
+
+*cairo-1.4.4 (15 Apr 2007)
+
+  15 Apr 2007; Doug Goldstein <cardoe@gentoo.org> +cairo-1.4.4.ebuild:
+  revbump from upstream. reduces malloc calls. cleans up cases when malloc
+  fails. cleans up other assorted bugs.
 
   21 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> cairo-1.2.6.ebuild:
   Stable on alpha/ia64 wrt bug #167573.

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7f7ab4fa689ec4afdc03eb0c928ef48fbd4fc939..d89eaf096a03031ab78a27a0c4b05c1dad9ed16f 100644 (file)
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -10,6 +10,7 @@ DIST cairo-1.2.4.tar.gz 2882781 RMD160 dee558b7489aa089de6963d909a8352725e10bdd
 DIST cairo-1.2.6.tar.gz 2973689 RMD160 4469a661b294e342ee77e726c1cefccd4837ae2e SHA1 b86b4017a9abd565ef11c72b7faee9082a04118f SHA256 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
 DIST cairo-1.4.0.tar.gz 3067230 RMD160 3bb3fdf41d8452b5094708da3d03796564ed9be2 SHA1 2ce727347d8285cee4ce0c3feb0a2df18316a5d3 SHA256 583f9ae2c9b7d2ef33cfbd194148e71a335dafc226e13e213f07ff2dc398bb47
 DIST cairo-1.4.2.tar.gz 3081092 RMD160 53ad2e60507e181cb754991c1fe8f8de47f366a3 SHA1 9e7a323fc7d81d5011044d7eb22db3bf26ff7314 SHA256 7cf292ae376e7120ec548ad6a807a2f0f4f0539a304229a3bd98921453becd47
+DIST cairo-1.4.4.tar.gz 3129412 RMD160 69b71c4dc43a4f843772b6653ec158bea7680fe4 SHA1 71a7ce8352500944f7b2b73d4dc25ee947ec56ec SHA256 6469711192ebd359cd77cf299cfbea285dbba3cc857ff9268c74345bddf2b473
 EBUILD cairo-1.0.4-r1.ebuild 1445 RMD160 5e3fa202244f90fcdcb053901496539cbe9cc712 SHA1 39d88ddf61c66c059ff2eecd9767f37e20e07ecc SHA256 e1837f69fb9ebf160e4cb2794d67056d74bbbdeef6a1388875d57c61dfb06cb5
 MD5 ea84d2cd7ae20d7519117887ba901ec7 cairo-1.0.4-r1.ebuild 1445
 RMD160 5e3fa202244f90fcdcb053901496539cbe9cc712 cairo-1.0.4-r1.ebuild 1445
@@ -34,10 +35,14 @@ EBUILD cairo-1.4.2.ebuild 1900 RMD160 430544dd982ca5e43d0e7af574d4e2aa007dde6e S
 MD5 5d643cda780598aef3aa0381be503f34 cairo-1.4.2.ebuild 1900
 RMD160 430544dd982ca5e43d0e7af574d4e2aa007dde6e cairo-1.4.2.ebuild 1900
 SHA256 ad46001843c77ebee6289ee4f30d6ce8d5bfdf97bd726aeea140fea4b2f0837d cairo-1.4.2.ebuild 1900
-MISC ChangeLog 16152 RMD160 5083b415f0a4c689066174f12a0d09a6634ec448 SHA1 43b2bd80c0942bc0179cc9969351d4267160f869 SHA256 2bfdef1a94c6e700c39d20a487c9679ae1cad8bf9355cbad8fbf6425d8ed7029
-MD5 f68382c12ec0084aa060dd34d4795be7 ChangeLog 16152
-RMD160 5083b415f0a4c689066174f12a0d09a6634ec448 ChangeLog 16152
-SHA256 2bfdef1a94c6e700c39d20a487c9679ae1cad8bf9355cbad8fbf6425d8ed7029 ChangeLog 16152
+EBUILD cairo-1.4.4.ebuild 1900 RMD160 98cb280408446cc275a147856c10df2a4b457bf8 SHA1 f13eea938ee6579580f4ff18f72f08dd1631b945 SHA256 7e5dd5a19dde18e76815b762aed42ce87e446aadb67b73b2bd9a9d009a62b0ff
+MD5 7e67dbb3de11897f3fd84330628d3f08 cairo-1.4.4.ebuild 1900
+RMD160 98cb280408446cc275a147856c10df2a4b457bf8 cairo-1.4.4.ebuild 1900
+SHA256 7e5dd5a19dde18e76815b762aed42ce87e446aadb67b73b2bd9a9d009a62b0ff cairo-1.4.4.ebuild 1900
+MISC ChangeLog 16365 RMD160 a27b129ccf5edb4f9d592ffc0286fcf79d03317c SHA1 bc33218f0860a6469a0493089cda6098579034f6 SHA256 5dc771680b3d881e55c799bb5705d4396261a01f61570b4fc37e231aa32ea9b7
+MD5 04cc177801c38fde457b64b17280cb2d ChangeLog 16365
+RMD160 a27b129ccf5edb4f9d592ffc0286fcf79d03317c ChangeLog 16365
+SHA256 5dc771680b3d881e55c799bb5705d4396261a01f61570b4fc37e231aa32ea9b7 ChangeLog 16365
 MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
 MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
@@ -60,10 +65,13 @@ SHA256 dc72c6a3257c79228879534bc81f148b749d4597f2ca178c123544b514638602 files/di
 MD5 befd66c00b97c7a4c998b62a9e102e73 files/digest-cairo-1.4.2 238
 RMD160 51714588c264ff45c4352157720a5b5bd9fd82ac files/digest-cairo-1.4.2 238
 SHA256 a223f637084ce9f59606a5b06beddb6cf91a34d396c66cff11897534203f66d3 files/digest-cairo-1.4.2 238
+MD5 072ef9a2d0755f05bf78a189350e5769 files/digest-cairo-1.4.4 238
+RMD160 b7fc48f09a17c53bac545da145cf3a117749d8ab files/digest-cairo-1.4.4 238
+SHA256 952828b2c734ff068401eca786bed256ba6152e732faf1c640d88ca1719c8ae5 files/digest-cairo-1.4.4 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGAU1ikT4lNIS36YERAkyZAJ4qi0alL2gnk0l1JxgG/XqE/EofXgCfRq+6
-ByWaJkEnOM0qSSNYQb1uQMw=
-=FYoY
+iD8DBQFGIkVQoeSe8B0zEfwRArczAJ9P/CoyNohQzDGyC3TUVzf1HzyligCcDBMG
+PxLEfZsyyaoPBAa1rqNG1rs=
+=1SHH
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/cairo/cairo-1.4.4.ebuild b/x11-libs/cairo/cairo-1.4.4.ebuild
new file mode 100644 (file)
index 0000000..4149602
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.4.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.4.ebuild,v 1.1 2007/04/15 15:32:13 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/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 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
+               media-libs/libpng
+               X?      (
+                               x11-libs/libXrender
+                               x11-libs/libXext
+                               x11-libs/libX11
+                               virtual/xft
+                               xcb? ( x11-libs/libxcb
+                                               x11-libs/xcb-util )
+                       )
+               directfb? ( >=dev-libs/DirectFB-0.9.24 )
+               glitz? ( >=media-libs/glitz-0.5.1 )
+               svg? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}
+               >=dev-util/pkgconfig-0.19
+               X? ( x11-proto/renderproto
+                       xcb? ( x11-proto/xcb-proto ) )
+               doc?    (
+                                       >=dev-util/gtk-doc-1.3
+                                        ~app-text/docbook-xml-dtd-4.2
+                               )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # We need to run elibtoolize to ensure correct so versioning on FreeBSD
+       elibtoolize
+}
+
+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 svg) $(use_enable glitz) \
+                 $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+                 --enable-freetype --enable-ps $(use_enable xcb) \
+                 || 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/digest-cairo-1.4.4 b/x11-libs/cairo/files/digest-cairo-1.4.4
new file mode 100644 (file)
index 0000000..b6fb5c2
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.4.4
@@ -0,0 +1,3 @@
+MD5 a609118644e1d958d977821c6fd765a9 cairo-1.4.4.tar.gz 3129412
+RMD160 69b71c4dc43a4f843772b6653ec158bea7680fe4 cairo-1.4.4.tar.gz 3129412
+SHA256 6469711192ebd359cd77cf299cfbea285dbba3cc857ff9268c74345bddf2b473 cairo-1.4.4.tar.gz 3129412