From: Doug Goldstein Date: Mon, 1 Jan 2007 20:17:09 +0000 (+0000) Subject: png USE flag did nothing for cairo. It always hardcoded on, removed png USE flag... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=460b62248f77ae328d40cc8f2fefdf11509cbac9;p=gentoo.git png USE flag did nothing for cairo. It always hardcoded on, removed png USE flag. So I'm removing the check from here. Package-Manager: portage-2.1.2_rc4-r4 --- diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog index 0a8cd5d6575d..a30b7e275d39 100644 --- a/gnome-base/librsvg/ChangeLog +++ b/gnome-base/librsvg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/librsvg -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.126 2006/12/21 05:31:31 compnerd Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.127 2007/01/01 20:17:09 cardoe Exp $ + + 01 Jan 2007; Doug Goldstein librsvg-2.14.4.ebuild, + librsvg-2.16.0.ebuild, librsvg-2.16.1.ebuild: + png USE flag did nothing for cairo. It always hardcoded on, removed png USE + flag. So I'm removing the check from here. 21 Dec 2006; Saleem Abdulrasool -librsvg-1.0.3.ebuild: diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index 517bb2c27d52..ec54d2005561 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -15,26 +15,26 @@ EBUILD librsvg-2.12.7-r1.ebuild 1913 RMD160 e8ac03074b25259a9eb916d600c14e5eecf9 MD5 d714f5fb5d939047d04a5f2f2dff7c9d librsvg-2.12.7-r1.ebuild 1913 RMD160 e8ac03074b25259a9eb916d600c14e5eecf9022b librsvg-2.12.7-r1.ebuild 1913 SHA256 52d6a0cfacda794c41668fdbe9ed25ec0d19a5eb321e4dac7caca5530438c592 librsvg-2.12.7-r1.ebuild 1913 -EBUILD librsvg-2.14.4.ebuild 1907 RMD160 982f696d6112fe2bad41f452c569416c438a323c SHA1 7eff9e2ddb8ebcb61a8be81583daf5e23d3c60c9 SHA256 16e76b892213de011da7cd461c10edd0331503afc8e381aa6a4a49ab6a2e2755 -MD5 97f7ed487a14be0f0591c19c68a5d960 librsvg-2.14.4.ebuild 1907 -RMD160 982f696d6112fe2bad41f452c569416c438a323c librsvg-2.14.4.ebuild 1907 -SHA256 16e76b892213de011da7cd461c10edd0331503afc8e381aa6a4a49ab6a2e2755 librsvg-2.14.4.ebuild 1907 -EBUILD librsvg-2.16.0.ebuild 2006 RMD160 4b40b6f664bb1e9530a233fda521eff722540826 SHA1 191149f07e6704daa52946a5ada27970860c017f SHA256 69842c52b0d532407625e2a2bd7a57a4ca57346988a9d0aeb77072be8215051c -MD5 1021b182aeb94ddec1a7914747d6ffb2 librsvg-2.16.0.ebuild 2006 -RMD160 4b40b6f664bb1e9530a233fda521eff722540826 librsvg-2.16.0.ebuild 2006 -SHA256 69842c52b0d532407625e2a2bd7a57a4ca57346988a9d0aeb77072be8215051c librsvg-2.16.0.ebuild 2006 -EBUILD librsvg-2.16.1.ebuild 2013 RMD160 4c7e2038e5290ca682250617efddaf534e9cc721 SHA1 9fcf1aadbeea016663247e501f5b20faabfe7849 SHA256 edd7878b0afaa55ff0d5f1fa916b098ea4a496448071119beb9ea76687d4b1c4 -MD5 50c9640479926d5a219c5c9f53c85be2 librsvg-2.16.1.ebuild 2013 -RMD160 4c7e2038e5290ca682250617efddaf534e9cc721 librsvg-2.16.1.ebuild 2013 -SHA256 edd7878b0afaa55ff0d5f1fa916b098ea4a496448071119beb9ea76687d4b1c4 librsvg-2.16.1.ebuild 2013 +EBUILD librsvg-2.14.4.ebuild 1748 RMD160 35caec7d5be9dcce7e1ac3a2ebf14f3452ba87a5 SHA1 d62daf9c01e76feb09e489cbee085f86f6fdd08a SHA256 eca517db92c17145aaf8e692887a86d36ad62e5252660f66105e3cfb04fcdd9d +MD5 4ed059678723d9c9ac2d0aef7a6df0a9 librsvg-2.14.4.ebuild 1748 +RMD160 35caec7d5be9dcce7e1ac3a2ebf14f3452ba87a5 librsvg-2.14.4.ebuild 1748 +SHA256 eca517db92c17145aaf8e692887a86d36ad62e5252660f66105e3cfb04fcdd9d librsvg-2.14.4.ebuild 1748 +EBUILD librsvg-2.16.0.ebuild 1850 RMD160 cd794d113d1dfa1d7261e41ad0c52ced49d125bc SHA1 e073fb8ee9728bc2485ae9d8efd1a2349e0d75c4 SHA256 a683ed7739b508f0e560bc2c063cb8ccdee349a306d548d8b862ffc37029b289 +MD5 66e65fc21da300531c0f0a22cd09fb2c librsvg-2.16.0.ebuild 1850 +RMD160 cd794d113d1dfa1d7261e41ad0c52ced49d125bc librsvg-2.16.0.ebuild 1850 +SHA256 a683ed7739b508f0e560bc2c063cb8ccdee349a306d548d8b862ffc37029b289 librsvg-2.16.0.ebuild 1850 +EBUILD librsvg-2.16.1.ebuild 1859 RMD160 fee894b6525067034afb6280498c85b0231868dd SHA1 14fda2ab9bc1f5f0d900eec373d330463fbe9342 SHA256 80bc4f7bdeb4ca10e8c717d14b2be2c4f1c3be6539756cec0f3cbb43ddfe5360 +MD5 48fb71c3504e675204bc13ac00cdb6b2 librsvg-2.16.1.ebuild 1859 +RMD160 fee894b6525067034afb6280498c85b0231868dd librsvg-2.16.1.ebuild 1859 +SHA256 80bc4f7bdeb4ca10e8c717d14b2be2c4f1c3be6539756cec0f3cbb43ddfe5360 librsvg-2.16.1.ebuild 1859 EBUILD librsvg-2.9.5.ebuild 1546 RMD160 777f3aea5e829d1f22486075d8e73cf4f509d26d SHA1 4db6320905e2c2847ca3f0cb8ee2c3d297e88bb4 SHA256 5703b19d40542b06a83245bd890e4ddc76da5edd1ee4faa34616668ca2e01d83 MD5 51b920b38ffcdc52216f68508a398312 librsvg-2.9.5.ebuild 1546 RMD160 777f3aea5e829d1f22486075d8e73cf4f509d26d librsvg-2.9.5.ebuild 1546 SHA256 5703b19d40542b06a83245bd890e4ddc76da5edd1ee4faa34616668ca2e01d83 librsvg-2.9.5.ebuild 1546 -MISC ChangeLog 15324 RMD160 619e2e5d98215beed56666f6008cba263444f415 SHA1 98a6dc2a455e886e17348bcc691b3ba726100093 SHA256 ebb6afbac16fce7cf912b62728510b160bc1355d4cbfbe6ad7c7346bde80c507 -MD5 b8deacb91d75fdb528207739b39b686c ChangeLog 15324 -RMD160 619e2e5d98215beed56666f6008cba263444f415 ChangeLog 15324 -SHA256 ebb6afbac16fce7cf912b62728510b160bc1355d4cbfbe6ad7c7346bde80c507 ChangeLog 15324 +MISC ChangeLog 15567 RMD160 0946f0fbb258d4218de888895dedb5b1ad565f45 SHA1 d1d88c423458be2b8f5bb3ef30a425e45abc44a8 SHA256 d1ec0a91b7dfec155fd39111d7153eb5f434c05e714949eb526fcdde3d2c959f +MD5 76fac428fe79d53ecbf5c288860555ba ChangeLog 15567 +RMD160 0946f0fbb258d4218de888895dedb5b1ad565f45 ChangeLog 15567 +SHA256 d1ec0a91b7dfec155fd39111d7153eb5f434c05e714949eb526fcdde3d2c959f ChangeLog 15567 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 diff --git a/gnome-base/librsvg/librsvg-2.14.4.ebuild b/gnome-base/librsvg/librsvg-2.14.4.ebuild index 21a68a543d57..f36a33cf4af0 100644 --- a/gnome-base/librsvg/librsvg-2.14.4.ebuild +++ b/gnome-base/librsvg/librsvg-2.14.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.14.4.ebuild,v 1.10 2006/10/20 16:37:35 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.14.4.ebuild,v 1.11 2007/01/01 20:17:09 cardoe Exp $ inherit eutils multilib gnome2 autotools @@ -41,12 +41,6 @@ set_gtk_confdir() { } pkg_setup() { - - if ! built_with_use x11-libs/cairo png; then - einfo "Please re-emerge x11-libs/cairo with the png USE flag set" - die "cairo needs the png flag set" - fi - G2CONF="--with-croco \ --enable-pixbuf-loader \ --enable-gtk-theme \ diff --git a/gnome-base/librsvg/librsvg-2.16.0.ebuild b/gnome-base/librsvg/librsvg-2.16.0.ebuild index f7bb569440de..326dc501c102 100644 --- a/gnome-base/librsvg/librsvg-2.16.0.ebuild +++ b/gnome-base/librsvg/librsvg-2.16.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.16.0.ebuild,v 1.12 2006/12/09 21:38:42 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.16.0.ebuild,v 1.13 2007/01/01 20:17:09 cardoe Exp $ inherit multilib gnome2 eutils @@ -40,11 +40,6 @@ pkg_setup() { --disable-gnome-print \ $(use_enable gnome gnome-vfs) \ $(use_with zlib svgz)" - - if ! built_with_use x11-libs/cairo png; then - einfo "Please re-emerge x11-libs/cairo with the png USE flag set" - die "cairo needs the png flag set" - fi } src_unpack() { diff --git a/gnome-base/librsvg/librsvg-2.16.1.ebuild b/gnome-base/librsvg/librsvg-2.16.1.ebuild index 264f12fa0c25..fe9a5aea7937 100644 --- a/gnome-base/librsvg/librsvg-2.16.1.ebuild +++ b/gnome-base/librsvg/librsvg-2.16.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.16.1.ebuild,v 1.1 2006/12/17 17:23:58 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.16.1.ebuild,v 1.2 2007/01/01 20:17:09 cardoe Exp $ inherit multilib gnome2 eutils @@ -40,11 +40,6 @@ pkg_setup() { --disable-gnome-print \ $(use_enable gnome gnome-vfs) \ $(use_with zlib svgz)" - - if ! built_with_use x11-libs/cairo png; then - einfo "Please re-emerge x11-libs/cairo with the png USE flag set" - die "cairo needs the png flag set" - fi } src_unpack() {