Removing pdf USE flag since it doesn't have any depends anymore and Andrea Barisani <lcars@gentoo.org> is nagging me in email. (Even though he doesn't help me with LDAP.. but I help him with this..)

Package-Manager: portage-2.1.2_rc2-r5

3 files changed, 11 insertions, 88 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 8e5acf4949c1..32ac3b65f8db 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -11,7 +11,6 @@ RMD160 1189664f878f77bd00457a7db682ea6e5fd8ead7 files/cairo-1.0.4-ssp-nonsense.p
 SHA256 a6a0c993eec5687dd78325a35ee790597194b331290be0f2ae20783d7c638115 files/cairo-1.0.4-ssp-nonsense.patch 591
 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.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
@@ -26,22 +25,18 @@ EBUILD cairo-1.0.4.ebuild 1352 RMD160 3efe82e5b21189af6022aa33cdb5fad59d7e0f5b S
 MD5 6d6258b807fd508d5cb01a66433dcc31 cairo-1.0.4.ebuild 1352
 RMD160 3efe82e5b21189af6022aa33cdb5fad59d7e0f5b cairo-1.0.4.ebuild 1352
 SHA256 001e177a8e4d9375ae72bab886c14320c03510cf494e11749d3985bcb7589a73 cairo-1.0.4.ebuild 1352
-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
-EBUILD cairo-1.2.4.ebuild 1833 RMD160 a04872c879dcb5483013696c65acf00c5e4acf20 SHA1 e28c7159053cbb6baf5302e1bfedbcc8abe99fef SHA256 03e84d0354678f1ec87989a1837cff99aaead4aad55f08e12a090bd275fa17ec
-MD5 35e04b31e1b7cd4ff7f24e4e58034b6a cairo-1.2.4.ebuild 1833
-RMD160 a04872c879dcb5483013696c65acf00c5e4acf20 cairo-1.2.4.ebuild 1833
-SHA256 03e84d0354678f1ec87989a1837cff99aaead4aad55f08e12a090bd275fa17ec cairo-1.2.4.ebuild 1833
+EBUILD cairo-1.2.4.ebuild 1822 RMD160 3710f6d609daa1d801651da4583d5e1d002202e5 SHA1 90aac98789b3805bae2def29022fd482016a2f2a SHA256 4ac9de84b9bf373533e0ba6f1f33847a18a898f894040b042445dff97a39cc7f
+MD5 a492aa0b3e98300c19eee62c14fd1d0b cairo-1.2.4.ebuild 1822
+RMD160 3710f6d609daa1d801651da4583d5e1d002202e5 cairo-1.2.4.ebuild 1822
+SHA256 4ac9de84b9bf373533e0ba6f1f33847a18a898f894040b042445dff97a39cc7f cairo-1.2.4.ebuild 1822
 EBUILD cairo-1.2.6.ebuild 1759 RMD160 2132802fc9222a360ded77f17733e5cd78d46164 SHA1 2c00f15070ece6be5bc85aa2f4345263a52f0ee1 SHA256 dd74f960a091cba44e05b6e5578f3a59e23d8549699f86f85920eb42f5ba5d84
 MD5 120e61e7dd8fec5dee33da612586f8d3 cairo-1.2.6.ebuild 1759
 RMD160 2132802fc9222a360ded77f17733e5cd78d46164 cairo-1.2.6.ebuild 1759
 SHA256 dd74f960a091cba44e05b6e5578f3a59e23d8549699f86f85920eb42f5ba5d84 cairo-1.2.6.ebuild 1759
-MISC ChangeLog 13563 RMD160 b5e1dff5fa5c80eca5b8f5f0af9d457a44254564 SHA1 974847fa273052099d98f5fdec851396a0f90869 SHA256 ae74b719a7361b313a3ee132246bd26beadb55ae229d6de1a9cdc1199803db73
-MD5 16b9ba5c06fc63dcc2a52af1dc074dfc ChangeLog 13563
-RMD160 b5e1dff5fa5c80eca5b8f5f0af9d457a44254564 ChangeLog 13563
-SHA256 ae74b719a7361b313a3ee132246bd26beadb55ae229d6de1a9cdc1199803db73 ChangeLog 13563
+MISC ChangeLog 13606 RMD160 53907f24523c216152ca35cf77c2559c5ee352b6 SHA1 bfe16709ed64e13d4afa145a8c89304b70b5fa64 SHA256 000abdbb7f361f5bb6f0ea8209461206c175086ca16565803e7f3f3fc1f01490
+MD5 cfa3e2ffcd486efeddd8bd43408ae0b6 ChangeLog 13606
+RMD160 53907f24523c216152ca35cf77c2559c5ee352b6 ChangeLog 13606
+SHA256 000abdbb7f361f5bb6f0ea8209461206c175086ca16565803e7f3f3fc1f01490 ChangeLog 13606
 MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
 MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
@@ -55,9 +50,6 @@ SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/di
 MD5 dd098b533608d6250bc6d4fbe016256d files/digest-cairo-1.0.4-r1 238
 RMD160 014452a883fabada98aae5064c27a524ff0594ff files/digest-cairo-1.0.4-r1 238
 SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/digest-cairo-1.0.4-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
@@ -67,7 +59,7 @@ SHA256 7ede1b5a1356a4f399c0f56ec4c83683b89aa3d60c94b1ebc5039ef02bd8433b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFd4iYoeSe8B0zEfwRAhUMAJ9RPM7PgLSAfeZtQXqV6hynKDFU2ACeOl7c
-hbyIARnAB4StzcpEwdupmeo=
-=h2bl
+iD8DBQFFd4rroeSe8B0zEfwRAoGpAJ4rt38n5u5cRNCtbJRgHeJIPp1WZgCeO350
+pl8qJy4U0Sij+aT8QvHxkws=
+=4oA/
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.2.2.ebuild b/x11-libs/cairo/cairo-1.2.2.ebuild
deleted file mode 100644
index 332b43b9f1b0..000000000000
--- a/x11-libs/cairo/cairo-1.2.2.ebuild
+++ /dev/null
@@ -1,66 +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.2.ebuild,v 1.1 2006/08/09 07:06:42 compnerd 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_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/digest-cairo-1.2.2 b/x11-libs/cairo/files/digest-cairo-1.2.2
deleted file mode 100644
index acfb35de78db..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2460487b1257a5583c889b1b9d2033ec cairo-1.2.2.tar.gz 2831305
-RMD160 ecb23495efb809b1a7e0af036ad3a260d68be9d5 cairo-1.2.2.tar.gz 2831305
-SHA256 9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02 cairo-1.2.2.tar.gz 2831305