make sure cairo is built with png support (#138158)

(Portage version: 2.1)
 (Unsigned Manifest commit)

3 files changed, 8 insertions, 89 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 78ac450d7f67..1e63bc6aa409 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -4,7 +4,6 @@ RMD160 ef689c287f6c07b2f4ef3b6f3113643e0666d5bb files/librsvg-2.12.6-plugin_chec
 SHA256 be750dc701433a534eae98eb670311ceb7ebacf7f6a9fc58b5a4ca4681490f8d files/librsvg-2.12.6-plugin_checks.patch 1914
 DIST librsvg-1.0.3.tar.gz 213368 RMD160 829965c16b1c1c10d2624a7ae757da39d4f65234 SHA256 d5e04b1599fcb9f830f0ccd3ae1f4b41349c0bc8483c6083875079bd75f387bb
 DIST librsvg-2.12.7.tar.bz2 396901 RMD160 b7a1e61a61d1ebf595478e0bb904774d38fe92f6 SHA256 b2b351675547c9d4a33b8dd6d51063ce024bcdc834ff057bcb5d1c62ab0ed781
-DIST librsvg-2.14.2.tar.bz2 410107 RMD160 1730617d32dd94477a959002e8dfcb371fb9db3a SHA256 1d3de3eb95c49db5dccd998805acf880c289a814e5961b5111716bcb3e7cbc40
 DIST librsvg-2.14.3.tar.bz2 415420 RMD160 cbb8f663c9a74c059af7bda7776d94005b3cc64c SHA1 d3d76c74363ed72a3435caffe8b0da5449c93018 SHA256 1fe9d73067f6be070ca5fc0bc3b06e6439947b8037acbb9a2116bf94b3acd2e7
 DIST librsvg-2.9.5.tar.bz2 392785 RMD160 5c7d6ad1a543b4880d7c3bb02da7126ed9f5aa5e SHA256 33a5ae2cf0a4056d46f0f09d4bd464ccfa7fa8768a1f03833e2fad5081b9bba2
 EBUILD librsvg-1.0.3.ebuild 969 RMD160 3bd07eed459347f1ae281da3d098ec2ee4677ade SHA1 0fe02033e8ed2ec581485d2ece877e97326778e4 SHA256 23179072ac85d8bcba14535101d8f1fe4de61639bceb0e91a043afee9d175fc1
@@ -15,22 +14,18 @@ EBUILD librsvg-2.12.7.ebuild 2872 RMD160 14c5814c32359d6f2049e9185943c05262c95b9
 MD5 c80e90f970733be32c8f16886e9b4ea3 librsvg-2.12.7.ebuild 2872
 RMD160 14c5814c32359d6f2049e9185943c05262c95b92 librsvg-2.12.7.ebuild 2872
 SHA256 99df091e1152fd253cd59a3148fd4f789785e3b2ae134925865c4a3d1f258a7c librsvg-2.12.7.ebuild 2872
-EBUILD librsvg-2.14.2.ebuild 1883 RMD160 f36d07afab1680a69397bcb648eb86ba88de7f63 SHA1 0a27717641d529033e712d2ab0ce0a5847410a4a SHA256 da0c28e0c1a42751ea4b8a3f599e771ecca7ae0767d4a578e429c466afe586c5
-MD5 e4ee03da041e87b76f557f1e8e16f5d6 librsvg-2.14.2.ebuild 1883
-RMD160 f36d07afab1680a69397bcb648eb86ba88de7f63 librsvg-2.14.2.ebuild 1883
-SHA256 da0c28e0c1a42751ea4b8a3f599e771ecca7ae0767d4a578e429c466afe586c5 librsvg-2.14.2.ebuild 1883
-EBUILD librsvg-2.14.3.ebuild 1879 RMD160 89630bbb7f73d12c36a36515f96dc76fcfc47f2e SHA1 57a4b3773086c58591c770c568909ca1abf9d76f SHA256 461bbe20abf9351e8f907058dfb3a3052241bbee3435dae84d40a441957071c2
-MD5 9d8cc020057524a9b6008c3b5885a5ae librsvg-2.14.3.ebuild 1879
-RMD160 89630bbb7f73d12c36a36515f96dc76fcfc47f2e librsvg-2.14.3.ebuild 1879
-SHA256 461bbe20abf9351e8f907058dfb3a3052241bbee3435dae84d40a441957071c2 librsvg-2.14.3.ebuild 1879
+EBUILD librsvg-2.14.3.ebuild 1904 RMD160 6d8c82b293d0a4b269aecf9cd1606149fd405ec9 SHA1 b1e334a1a28dafb86d9ea9d6d9a6c6e91153129b SHA256 109852f8094e8994bb29fd8b65bbdca3e6cd30c9a733d766fa094943a86f50ca
+MD5 f4a554e2412d347c734616585fdbf025 librsvg-2.14.3.ebuild 1904
+RMD160 6d8c82b293d0a4b269aecf9cd1606149fd405ec9 librsvg-2.14.3.ebuild 1904
+SHA256 109852f8094e8994bb29fd8b65bbdca3e6cd30c9a733d766fa094943a86f50ca librsvg-2.14.3.ebuild 1904
 EBUILD librsvg-2.9.5.ebuild 1546 RMD160 e369ef0527e2122350a21051a3bb48ba81b4f138 SHA1 cee30ed70d2cc7cf660afb2a55c9fecd0cc73b2e SHA256 15dc4209bd63d453c86e751ca924c6a76fcaec5f56d31e430b065045eed9f738
 MD5 349f9dbe7f6b83ece07dd3baae7cabcf librsvg-2.9.5.ebuild 1546
 RMD160 e369ef0527e2122350a21051a3bb48ba81b4f138 librsvg-2.9.5.ebuild 1546
 SHA256 15dc4209bd63d453c86e751ca924c6a76fcaec5f56d31e430b065045eed9f738 librsvg-2.9.5.ebuild 1546
-MISC ChangeLog 12540 RMD160 2c8057813f8448903b9a6a4342a4d40d7a41ae58 SHA1 945464a9e42bda43973e6a68589a006ef82057a9 SHA256 235bd54035d9e33cbe581d9709329312bc8278497108c2deba857e0cbe0c82bc
-MD5 a9bf139c75ab1597c43c680b7e466386 ChangeLog 12540
-RMD160 2c8057813f8448903b9a6a4342a4d40d7a41ae58 ChangeLog 12540
-SHA256 235bd54035d9e33cbe581d9709329312bc8278497108c2deba857e0cbe0c82bc ChangeLog 12540
+MISC ChangeLog 12720 RMD160 2a1a363f16940a2ebe79893a69033296d51999c5 SHA1 b291fcd674de573c77a234e6004aaa7968f658e0 SHA256 1ec47cd02a0a31f11daef9565893e599b17c4100cb2b72115cfeedb21c31bc27
+MD5 d64bf9a37dc11bf6c28545e092c9b7ae ChangeLog 12720
+RMD160 2a1a363f16940a2ebe79893a69033296d51999c5 ChangeLog 12720
+SHA256 1ec47cd02a0a31f11daef9565893e599b17c4100cb2b72115cfeedb21c31bc27 ChangeLog 12720
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -41,9 +36,6 @@ SHA256 724acf226f85d4dd56ca5e3c9d4cdaa14b649d18cb32c4cb8f857b1f0f001720 files/di
 MD5 4f8e95ff01e06d834fe3a889a689f5fe files/digest-librsvg-2.12.7 247
 RMD160 83f11032d4ae615b7ba273b0a2c05a3755773fcf files/digest-librsvg-2.12.7 247
 SHA256 bbc1cc7d1f532d5084d700e0f0b89cd45403c15f4679445cab77a77b2fd647d7 files/digest-librsvg-2.12.7 247
-MD5 94cae6e146f66619aa3b8b5e392200f9 files/digest-librsvg-2.14.2 247
-RMD160 5a9e97d0c165f33036cc70b300685e48d22ec003 files/digest-librsvg-2.14.2 247
-SHA256 4d483c796a7a1ff09c3cdae293c2c32f25d3adaa56b4ebbf781f0beaa64886e4 files/digest-librsvg-2.14.2 247
 MD5 8c65731bb3937a331291e512fb4d4a56 files/digest-librsvg-2.14.3 247
 RMD160 264f14a98aacb4dd9002146a40878dc043f9ef96 files/digest-librsvg-2.14.3 247
 SHA256 e62eb5eca6b1dff27306c595b04cd7b2c25d26e1127ed2698b8ac0e6cd4c3996 files/digest-librsvg-2.14.3 247
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.14.2 b/gnome-base/librsvg/files/digest-librsvg-2.14.2
deleted file mode 100644
index 8e9d4efe5f51..000000000000
--- a/gnome-base/librsvg/files/digest-librsvg-2.14.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e149ebcbc70471b74f9ceaa9fab16c5 librsvg-2.14.2.tar.bz2 410107
-RMD160 1730617d32dd94477a959002e8dfcb371fb9db3a librsvg-2.14.2.tar.bz2 410107
-SHA256 1d3de3eb95c49db5dccd998805acf880c289a814e5961b5111716bcb3e7cbc40 librsvg-2.14.2.tar.bz2 410107
diff --git a/gnome-base/librsvg/librsvg-2.14.2.ebuild b/gnome-base/librsvg/librsvg-2.14.2.ebuild
deleted file mode 100644
index e7c6ed3028e8..000000000000
--- a/gnome-base/librsvg/librsvg-2.14.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.14.2.ebuild,v 1.1 2006/03/13 22:28:57 compnerd Exp $
-
-inherit eutils multilib gnome2 autotools
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="http://librsvg.sourceforge.net/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc gnome zlib"
-
-RDEPEND=">=media-libs/fontconfig-1.0.1
-		 >=x11-libs/gtk+-2
-		 >=dev-libs/glib-2
-		 >=media-libs/libart_lgpl-2.3.10
-		 >=dev-libs/libxml2-2.4.7
-		 >=x11-libs/pango-1.2
-		 >=x11-libs/cairo-1.0.2
-		 >=dev-libs/popt-1.5
-		 >=dev-libs/libcroco-0.6.1
-		   media-libs/freetype
-		 zlib? ( >=gnome-extra/libgsf-1.6 )
-		 gnome? ( >=gnome-base/gnome-vfs-2 )"
-# libgnomeprint dependencies are not necessary
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9
-		doc? ( >=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-
-set_gtk_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-pkg_setup() {
-	# FIXME : USEify croco support (?)
-	G2CONF="--with-croco                  \
-			--enable-pixbuf-loader        \
-			--enable-gtk-theme            \
-			--disable-mozilla-plugin      \
-			$(use_enable gnome gnome-vfs) \
-			$(use_with zlib svgz)"
-}
-
-src_install() {
-	gnome2_src_install plugindir=/usr/$(get_libdir)/nsbrowser/plugins/
-
-	# remove gdk-pixbuf loaders (#47766)
-	rm -fr ${D}/etc
-
-	# remove plugins dir since we disable the plugin
-	rm -fr ${D}/usr/lib/nsbrowser
-}
-
-pkg_postinst() {
-	set_gtk_confdir
-	gdk-pixbuf-query-loaders > ${GTK2_CONFDIR}/gdk-pixbuf.loaders
-}
-
-pkg_postrm() {
-	set_gtk_confdir
-	gdk-pixbuf-query-loaders > ${GTK2_CONFDIR}/gdk-pixbuf.loaders
-}