Fixing bugs #139946, 140125, 142696

(Portage version: 2.1.1_pre3-r3)
 (Signed Manifest commit)

3 files changed, 29 insertions, 75 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index d159d3a5f475..559e8ed53806 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cairo-1.0.2-pkg_macro.patch 542 RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f025ad SHA1 0ab6c2c4aa0f441694eecc8a42e37b13efaad2bf SHA256 4ab7469075776de4fadcc733c9ceb9754b075e5a99b05fcdc247fc597b971149
 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.2.0-disappearing-text.patch 3706 RMD160 ea2e9944dd430c385387b6e817eb8029dbcc7a7f SHA1 afe40f9589b71f9c830263dc9a3cec5a467b9f68 SHA256 e08f49535cf34b8db5ce68fec31ecf887a62ccaedb8c6cd6837b7bebe5b4e785
+MD5 61d3be677427c46ca8440bc649f27073 files/cairo-1.2.0-disappearing-text.patch 3706
+RMD160 ea2e9944dd430c385387b6e817eb8029dbcc7a7f files/cairo-1.2.0-disappearing-text.patch 3706
+SHA256 e08f49535cf34b8db5ce68fec31ecf887a62ccaedb8c6cd6837b7bebe5b4e785 files/cairo-1.2.0-disappearing-text.patch 3706
+AUX cairo-1.2.0-remove-flush.patch 1233 RMD160 6bb4514c36b05ebf203f4a63d2eeff88367d84f1 SHA1 c91c379363711f6091453562b452111452f00fa3 SHA256 b6a569e31b007621f2d0413eb687ef03a45ad33f7d6ca5e40611fbf6f7359668
+MD5 3ab6c5e864007924cad063c76632096c files/cairo-1.2.0-remove-flush.patch 1233
+RMD160 6bb4514c36b05ebf203f4a63d2eeff88367d84f1 files/cairo-1.2.0-remove-flush.patch 1233
+SHA256 b6a569e31b007621f2d0413eb687ef03a45ad33f7d6ca5e40611fbf6f7359668 files/cairo-1.2.0-remove-flush.patch 1233
 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.0.tar.gz 2659930 RMD160 9dd76e43e881dfd3f20a81fc0f946e302ed7993c SHA1 c5da7f89cdd3782102357f99a47f516d11661e92 SHA256 fa3dc63029bab324682231f75af167b9370458785312a97fd0c50bf2dbd1cf21
@@ -13,14 +24,14 @@ EBUILD cairo-1.0.4.ebuild 1352 RMD160 58b5285cea7dae595e5c4742eba50fb6df4c76a0 S
 MD5 d574a0c2102b21c946b015420c2edd3e cairo-1.0.4.ebuild 1352
 RMD160 58b5285cea7dae595e5c4742eba50fb6df4c76a0 cairo-1.0.4.ebuild 1352
 SHA256 8281bafb3babbee8b4a6267b6abb8c7d605e3440d94bca574181c4f4bcdba68d cairo-1.0.4.ebuild 1352
-EBUILD cairo-1.2.0.ebuild 1786 RMD160 744771b37c74acde1375240db513e6452dd447c6 SHA1 b76f10ae35292fac094d7b1eb44223479d42a8e5 SHA256 8ddeef776f367b5b3e2901d3f50ba40fe8ba7f1defe5a81a58100b0591f19558
-MD5 b4f1d8c8a52c465ff9cf59522e7df44c cairo-1.2.0.ebuild 1786
-RMD160 744771b37c74acde1375240db513e6452dd447c6 cairo-1.2.0.ebuild 1786
-SHA256 8ddeef776f367b5b3e2901d3f50ba40fe8ba7f1defe5a81a58100b0591f19558 cairo-1.2.0.ebuild 1786
-MISC ChangeLog 11365 RMD160 94cc8a72b8024ee7fb662a167489baf090fffae9 SHA1 5a7fef070d41923d7e0e2a9d3ed1bdb4084a4b66 SHA256 4633571fdff61595d7dfa046924b794710b85e7c3737748c51918954a740f56a
-MD5 6ed19eddea01aa9fe4a72facad654cdc ChangeLog 11365
-RMD160 94cc8a72b8024ee7fb662a167489baf090fffae9 ChangeLog 11365
-SHA256 4633571fdff61595d7dfa046924b794710b85e7c3737748c51918954a740f56a ChangeLog 11365
+EBUILD cairo-1.2.0-r1.ebuild 1932 RMD160 00858160bf53ac64f8fd2722959cfa4d09b7ea39 SHA1 91c4c6a876863fdf7c7de78c52f73c53053381e4 SHA256 3fecee5c0ffb086b9b98b71a8320539f4555a4b311d67f2ae7f5a835f2c7456e
+MD5 21826853bea2a3ce16ff4459bb349174 cairo-1.2.0-r1.ebuild 1932
+RMD160 00858160bf53ac64f8fd2722959cfa4d09b7ea39 cairo-1.2.0-r1.ebuild 1932
+SHA256 3fecee5c0ffb086b9b98b71a8320539f4555a4b311d67f2ae7f5a835f2c7456e cairo-1.2.0-r1.ebuild 1932
+MISC ChangeLog 11620 RMD160 f4bc746b3cb992ce07c6f950e5d0455c24ae5a92 SHA1 3a108ae39b71a7e84996bff1bb22a83879688edc SHA256 284cdeb3bdec4c87727ec0d88d97440869c9ca692bbcc724ab369a4c9fccad95
+MD5 b138fcdee8597d7dce65f7876ac41f82 ChangeLog 11620
+RMD160 f4bc746b3cb992ce07c6f950e5d0455c24ae5a92 ChangeLog 11620
+SHA256 284cdeb3bdec4c87727ec0d88d97440869c9ca692bbcc724ab369a4c9fccad95 ChangeLog 11620
 MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
 MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
@@ -31,6 +42,13 @@ SHA256 9070cfcc6ab84d39744d2ccbac0bc1bc6c8063cee9ab3d6934c795c0189032c4 files/di
 MD5 dd098b533608d6250bc6d4fbe016256d files/digest-cairo-1.0.4 238
 RMD160 014452a883fabada98aae5064c27a524ff0594ff files/digest-cairo-1.0.4 238
 SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/digest-cairo-1.0.4 238
-MD5 fec76d54197dd9fd812361ccec8b8a57 files/digest-cairo-1.2.0 238
-RMD160 f858848d1266606cd3f597503fafe30ea96bf200 files/digest-cairo-1.2.0 238
-SHA256 81e48ff30b661a76970966ce0b8e51bfe867a69d835b890fdd84bb680259e36b files/digest-cairo-1.2.0 238
+MD5 fec76d54197dd9fd812361ccec8b8a57 files/digest-cairo-1.2.0-r1 238
+RMD160 f858848d1266606cd3f597503fafe30ea96bf200 files/digest-cairo-1.2.0-r1 238
+SHA256 81e48ff30b661a76970966ce0b8e51bfe867a69d835b890fdd84bb680259e36b files/digest-cairo-1.2.0-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE0rKwoeSe8B0zEfwRAjb/AJ9bnRlOqspLxkcBa1VuxcPjCLicwQCdHVh5
+ST8EOXwDX3ElHP9CKxC7LB4=
+=BlvZ
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.2.0.ebuild b/x11-libs/cairo/cairo-1.2.0.ebuild
deleted file mode 100644
index 21df5db2ed0c..000000000000
--- a/x11-libs/cairo/cairo-1.2.0.ebuild
+++ /dev/null
@@ -1,61 +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.0.ebuild,v 1.3 2006/07/10 06:05:27 cardoe 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 )
-	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.0 b/x11-libs/cairo/files/digest-cairo-1.2.0
deleted file mode 100644
index 9afc5cb43bc6..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5c9ad71d1b582907eee0497b196689ef cairo-1.2.0.tar.gz 2659930
-RMD160 9dd76e43e881dfd3f20a81fc0f946e302ed7993c cairo-1.2.0.tar.gz 2659930
-SHA256 fa3dc63029bab324682231f75af167b9370458785312a97fd0c50bf2dbd1cf21 cairo-1.2.0.tar.gz 2659930