rev bump. always enable png since it was causing a mess without it and doesn't make sense without it really

Package-Manager: portage-2.1.2_rc2

5 files changed, 95 insertions, 16 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 776631be5fa3..cc30b1e945de 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.82 2006/10/20 13:27:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.83 2006/11/18 06:58:08 cardoe Exp $
+
+*cairo-1.2.6 (18 Nov 2006)
+
+  18 Nov 2006; Doug Goldstein <cardoe@gentoo.org> cairo-1.2.4.ebuild,
+  +cairo-1.2.6.ebuild:
+  rev bump. always enable png since it was causing a mess without it and
+  doesn't make sense without it really
 
   20 Oct 2006; Aron Griffis <agriffis@gentoo.org> cairo-1.0.4-r1.ebuild:
   Mark 1.0.4-r1 stable on alpha
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a25ef8d3f999..789a14775d50 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -13,6 +13,7 @@ DIST cairo-1.0.2.tar.gz 1458903 RMD160 59f309974fdac86253ed9a4d00e564a2fac310eb
 DIST cairo-1.0.4.tar.gz 1475777 RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb SHA1 89e72202e5b51a8914fce60f52f7c51ecdea982a SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5
 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
+DIST cairo-1.2.6.tar.gz 2973689 RMD160 4469a661b294e342ee77e726c1cefccd4837ae2e SHA1 b86b4017a9abd565ef11c72b7faee9082a04118f SHA256 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
 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
@@ -29,14 +30,18 @@ EBUILD cairo-1.2.2.ebuild 1857 RMD160 e2f0d0588c9b2d6af1abaf2566bab4c6ed39e2db S
 MD5 6e48fb46a48d8a7cd1452fe18dfbbefe cairo-1.2.2.ebuild 1857
 RMD160 e2f0d0588c9b2d6af1abaf2566bab4c6ed39e2db cairo-1.2.2.ebuild 1857
 SHA256 0457d0745d97ba982b998530201414e14a5589274ba0efa15fe720527fc2b2d2 cairo-1.2.2.ebuild 1857
-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 12344 RMD160 6a7444f230ae638025878d14708819129552be02 SHA1 1758d817374124bd491078c65e7fa9ee47e3902a SHA256 ba9638f5a9cd1736504863aaccd574285a258c9846f6698b9b3ca1699a5d10af
-MD5 70816b891acc2857cbb29105d0aaa96a ChangeLog 12344
-RMD160 6a7444f230ae638025878d14708819129552be02 ChangeLog 12344
-SHA256 ba9638f5a9cd1736504863aaccd574285a258c9846f6698b9b3ca1699a5d10af ChangeLog 12344
+EBUILD cairo-1.2.4.ebuild 1841 RMD160 06abb6b6ed60683a94a11f893f80488afeacd1d8 SHA1 bda0853c8385462d87d227e7a7673d1dc70a17b2 SHA256 b79d18e438b5eebe12c550732ea859c670caf5ec93c413daa168025e4b654d57
+MD5 fe255f923edcaf6c9fecc6a9280a70e3 cairo-1.2.4.ebuild 1841
+RMD160 06abb6b6ed60683a94a11f893f80488afeacd1d8 cairo-1.2.4.ebuild 1841
+SHA256 b79d18e438b5eebe12c550732ea859c670caf5ec93c413daa168025e4b654d57 cairo-1.2.4.ebuild 1841
+EBUILD cairo-1.2.6.ebuild 1767 RMD160 ad2917f3f5bb5d87101c9afe12268b2717f02acd SHA1 768952cd2a1d70c181f072299675ebdd9335ad90 SHA256 89b80467fcc0e659d7878e6ebd142250ae49efbf68e0f230ddb541a9927c8d71
+MD5 06b3468b8fdef50e145a86b62527aa03 cairo-1.2.6.ebuild 1767
+RMD160 ad2917f3f5bb5d87101c9afe12268b2717f02acd cairo-1.2.6.ebuild 1767
+SHA256 89b80467fcc0e659d7878e6ebd142250ae49efbf68e0f230ddb541a9927c8d71 cairo-1.2.6.ebuild 1767
+MISC ChangeLog 12576 RMD160 30a0de556f5d654fc672681189a5de7fd224a020 SHA1 cc042c26d00aa4ab17119a1c362b9d6f7fe22264 SHA256 00aa1cf6e690e2caf67f107fdf610da6a5eb9ed871f7a34adc385f191824f2a3
+MD5 3eeb4ffd977fd4d0dd1802a5b9283753 ChangeLog 12576
+RMD160 30a0de556f5d654fc672681189a5de7fd224a020 ChangeLog 12576
+SHA256 00aa1cf6e690e2caf67f107fdf610da6a5eb9ed871f7a34adc385f191824f2a3 ChangeLog 12576
 MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
 MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
@@ -56,10 +61,13 @@ SHA256 7f15e3daf5be673f3c54177f52f1851e3f17b3b2bf0a853c9f5fc5c666e074ca files/di
 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
+MD5 654e50f761ecfcb9b332c58fc27beac6 files/digest-cairo-1.2.6 238
+RMD160 7002a6abc268946edcdedfcd9f441e07afcbaa4f files/digest-cairo-1.2.6 238
+SHA256 7ede1b5a1356a4f399c0f56ec4c83683b89aa3d60c94b1ebc5039ef02bd8433b files/digest-cairo-1.2.6 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVpygamhnQswr0vIRAjaqAJ4od9yPy3FnrkyInuB4J3gJWbzoJgCfX4D2
-U4SLx9m94Da8obkesr3znOw=
-=oMMT
+iD8DBQFFXq+koeSe8B0zEfwRAnmeAJ4kpk9tlqIPtrvW1f/Q/wR8sjwFeQCeO1Ze
+KOkxn9EwGZrtNqK7qfLuU+U=
+=NbrD
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.2.4.ebuild b/x11-libs/cairo/cairo-1.2.4.ebuild
index c7c98e68a760..317dfb1840b2 100644
--- a/x11-libs/cairo/cairo-1.2.4.ebuild
+++ b/x11-libs/cairo/cairo-1.2.4.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.2.4.ebuild,v 1.1 2006/08/26 01:06:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.2.4.ebuild,v 1.2 2006/11/18 06:58:08 cardoe Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,6 +18,7 @@ RESTRICT="test"
 
 RDEPEND="media-libs/fontconfig
 		>=media-libs/freetype-2.1.4
+		media-libs/libpng
 		X?	(
 				||	(
 						(
@@ -31,7 +32,6 @@ RDEPEND="media-libs/fontconfig
 			)
 		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}
@@ -47,8 +47,8 @@ src_compile() {
 	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 \
+		  $(use_enable svg) $(use_enable pdf) \
+		  $(use_enable glitz) --enable-png --enable-freetype --enable-ps \
 		  || die "configure failed"
 
 	emake || die "compile failed"
diff --git a/x11-libs/cairo/cairo-1.2.6.ebuild b/x11-libs/cairo/cairo-1.2.6.ebuild
new file mode 100644
index 000000000000..c45192388a0d
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.2.6.ebuild
@@ -0,0 +1,61 @@
+# 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.6.ebuild,v 1.1 2006/11/18 06:58:08 cardoe Exp $
+
+inherit eutils flag-o-matic debug
+
+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
+		media-libs/libpng
+		X?	(
+				x11-libs/libXrender
+				x11-libs/libXext
+				x11-libs/libX11
+				virtual/xft
+			)
+		directfb? ( >=dev-libs/DirectFB-0.9.24 )
+		glitz? ( >=media-libs/glitz-0.5.1 )
+		svg? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9
+		X? ( x11-proto/renderproto )
+		doc?	(
+					>=dev-util/gtk-doc-1.3
+					 ~app-text/docbook-xml-dtd-4.2
+				)"
+
+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 debug) $(use_enable svg) $(use_enable pdf) \
+		  $(use_enable glitz) --enable-png --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/digest-cairo-1.2.6 b/x11-libs/cairo/files/digest-cairo-1.2.6
new file mode 100644
index 000000000000..5d40c4d7de36
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.2.6
@@ -0,0 +1,3 @@
+MD5 487b3d7515752fe57f780d0fd707b01a cairo-1.2.6.tar.gz 2973689
+RMD160 4469a661b294e342ee77e726c1cefccd4837ae2e cairo-1.2.6.tar.gz 2973689
+SHA256 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9 cairo-1.2.6.tar.gz 2973689