From: Justin Lecher Date: Sat, 12 Nov 2011 12:16:34 +0000 (+0000) Subject: Corrected Slotting of media-libs/libpng and media-libs/tiff X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9f764fbcbdd2790c5488cdf6a23f85515581e514;p=gentoo.git Corrected Slotting of media-libs/libpng and media-libs/tiff Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64 --- diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 1f0170448574..722747f649ae 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.151 2011/09/08 09:20:08 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.152 2011/11/12 12:16:34 jlec Exp $ + + 12 Nov 2011; Justin Lecher qt-gui-4.6.2.ebuild, + qt-gui-4.6.2-r1.ebuild, qt-gui-4.6.3.ebuild, qt-gui-4.6.3-r2.ebuild, + qt-gui-4.7.2.ebuild, qt-gui-4.7.3.ebuild, qt-gui-4.7.3-r1.ebuild, + qt-gui-4.7.4.ebuild: + Corrected Slotting of media-libs/libpng and media-libs/tiff *qt-gui-4.7.4 (08 Sep 2011) diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest index 51be2b33774a..3b9fab2df51a 100644 --- a/x11-libs/qt-gui/Manifest +++ b/x11-libs/qt-gui/Manifest @@ -9,30 +9,20 @@ DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9c DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336 DIST qt-everywhere-opensource-src-4.7.3.tar.gz 213659173 RMD160 ab9c11c85898430fa74e5e07894f8da5e5936645 SHA1 765eb70d9779f93fefddddda5e6ddb33f4c0b71e SHA256 d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e DIST qt-everywhere-opensource-src-4.7.4.tar.gz 219424772 RMD160 347ba2c4f855b40bf3ce90adb19c1a87925e6c61 SHA1 ac7b4df34adaa6e9d1fb41743d1f15f5aac481db SHA256 321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf -EBUILD qt-gui-4.6.2-r1.ebuild 5406 RMD160 2d1fffa346058e96ad5bb286f7da1fbb590c0c5a SHA1 d0ab4fe67490e083980dafdfe0f87b834bd00a6c SHA256 9b74117d6ae32f657902eb6a60a6e38fa2117c52b0f02a498257817ec9dafc41 -EBUILD qt-gui-4.6.2.ebuild 5296 RMD160 ab8bb6867607ff4cb26ab80a6c19fee98a3c153a SHA1 38dce089ecf480391beda7679f7584c95f5afb6d SHA256 ff77bcbeeaee3214b8cf66215caeede0b478f53bc3211ca3c246a6c968540286 -EBUILD qt-gui-4.6.3-r2.ebuild 5477 RMD160 77beb639ddfe009fc0d92ec5018b090cf11ea4f6 SHA1 784fcbe538be3d6271e884e2ca758e4b34e042f7 SHA256 e450b476c37a8a98a52ce06df2e086d2329323f7b300eecc2e3f7397420623fb -EBUILD qt-gui-4.6.3.ebuild 5454 RMD160 98d7baf9a0ee82968840ee5e2a510af7a838e00b SHA1 0ca2dff37896de1826e6290f975a76725f959f66 SHA256 1bcbf0f815173da4baa6526a9a833f40c5a753840789174e8297484d4efd7664 -EBUILD qt-gui-4.7.2.ebuild 6371 RMD160 4c55a5214edec77a9af25c43bee1f3e4b41b2985 SHA1 8be870fceda1267a77e93af3a1cae670816b6301 SHA256 e579a644b30d4f32522b5ab5b556ef397a87577ccd2bdb7bab6263f92a86476b -EBUILD qt-gui-4.7.3-r1.ebuild 6428 RMD160 83539dc9f16c746d6b0eee91943ceb09cce00c2a SHA1 dda7297ab1fe5a676119dd9f708dd09291ce54b7 SHA256 b62e56cc52741466a00d88c9670b7396c22bb97bb49882e0188a2048ca108620 -EBUILD qt-gui-4.7.3.ebuild 6375 RMD160 fa7f84e708f987e98afcc29bea9c2732c64769f7 SHA1 480a2bbb8bb9e2c2c1fdee3cbb08c73028dccff7 SHA256 4d3f66275bc28e801ca8bf792f3a77a35bfe913d291f3d83bd73e889d9ac9fd2 -EBUILD qt-gui-4.7.4.ebuild 6421 RMD160 0bb51a4b6190236b83d243c2df8f458986bbb928 SHA1 95164b0ae0b2f5b58d8bbcfedfbdc9149f9e1b85 SHA256 2ac306f08cfbb181c853d5924761ad21b4b1d707b9a968425b8868ac5f9258da -MISC ChangeLog 22537 RMD160 c63d91a687511e31086aa23c03dd0b94b5f47ddc SHA1 5bc29ec9d794173708ed9b8025fc7f4d6d4c0bee SHA256 dacd2be1d1a8c4bfdda25df76efc68a14fec85212b51e0b20b606548821d8bc2 +EBUILD qt-gui-4.6.2-r1.ebuild 5393 RMD160 ea873072a18b5e9f320dac0d5c74036bda34b058 SHA1 10af63288b9b4e44bbfae36d9204674f287c6ab5 SHA256 d50b6f78971d2d9b9f638ca3f8d36e04b6c76ab2c0ecbe8fc54f679f00580620 +EBUILD qt-gui-4.6.2.ebuild 5299 RMD160 f957942dfae65dffe841074af5ecc1209098d1c4 SHA1 88b378000bd1b1c11cf9bbf872e31b67627ebed6 SHA256 16dae674a5f68af5746c00e36360209430256fa9d46573f298b2bcc59eddb154 +EBUILD qt-gui-4.6.3-r2.ebuild 5471 RMD160 2927aed151d4c8a9d80deb3feaf3148cd54763e7 SHA1 cf66e53eecf115f5ca461c2f6cb303309eec71d7 SHA256 0b21bad83248f21fbf827610be45b12d7d457b4fb76a9e069c76758c319c0bfe +EBUILD qt-gui-4.6.3.ebuild 5447 RMD160 2510dc3306bddaba4275ef17a2edc42149bd4ecd SHA1 d49e8911391ce23e8fd56c80300e8c21bb171283 SHA256 cd98fa4a6685e384f209adf698def9aabbd09c006c5e83d50f3ee7c2d23d5996 +EBUILD qt-gui-4.7.2.ebuild 6370 RMD160 6ae0bf8870f276436e7e8d2633d62eff58f13227 SHA1 512af8e106ac38b64ec72867ae049b5889e53d2d SHA256 8edc47050ad887879331cc3fd96a3d01e811de2afb2d416546743c170fc4c975 +EBUILD qt-gui-4.7.3-r1.ebuild 6427 RMD160 c1d4cd7af792f651fd5069e17726cc3a385ea771 SHA1 da17d96980cd6eac27d2455ecb7143320d7f066a SHA256 3a1ef0d23c057e050145495d387858ca5cdbe855e9dc6211aae1f6547379dc98 +EBUILD qt-gui-4.7.3.ebuild 6374 RMD160 9f7ae199e8b8b3b0fbd228c2d9f388e644136775 SHA1 43461e8c0d2326f3569212576c2c50bd3862a73f SHA256 84567f427bf5279606a316b8003b3518b2a4a116c09624d384d983a415299205 +EBUILD qt-gui-4.7.4.ebuild 6424 RMD160 9372ef4732d6143573a2a322beda80111624ddbe SHA1 6910484ba6b0cbb6548d07fb016f920a70457cd4 SHA256 6f4ef078475c3938618f6b3147a1004acd0c9e5d90ad37622ec67c8dd1d689f6 +MISC ChangeLog 22829 RMD160 ba65d0f9e9c52a244f09e411a85ead81a6d0af61 SHA1 f33238ec9df8cf32bdbba018c7fc032acaa2dea7 SHA256 688336e48a5f2edd6a88995bd3862a2f2ac569d7994b55a8dcbaae4552bf7159 MISC metadata.xml 1181 RMD160 74e177f4c687acb1df2637f28ac36cc80b4f224e SHA1 3ea8a8aba7d077d6a008b8360811f4e43538232b SHA256 49515885af0ad4b13d4f93911c0b8b84e25abcda3fdc8e5715b1aa956b18af15 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOaIjeAAoJEDZF8K7rm0r6pUUP/RQNjDIUJyoLLbqqJaLJmvS1 -CrO3eVQqgF7W/fxjWVh9A+m3XyfV1fQtXhGmfRZHvd370Z0ntviRcf4Fwciqv8Ej -dnU3tHTSdWMkohBE9hcdTDF/ojmIbezM+bZuO0Szt0AUYNQfd8SZkt5RjX9iz3eY -HQ8HBSUPXbbpYsg9Ik9UXZUUN+Y3Lc0fiQ5SD/OuVQk8k6LIil0qenxKHn0pWL1I -udGVzVxUUPzsKoVLqevOqaloszlwpewWUMtR8A5flTR1ogMqCCq4TEF0JvuRaRLi -b3gTaEIRJKWSMDWNUB5cicXzwDJjlJsGfA65sPETLWjoO6KCED7B6Ef9OUXHTD35 -N9sU7f2MiOQaxzUUL4+WdUfAi0shIxkeRVvIdjL4PC/+wOhFoCA5vTwTJ9CPqFAC -Njl8BkoPR/6e/rcfFxk+D620Ojb+jt1anrfe6xAOToL/iT/8otVgVFMFO9+Bi+Ll -969jnLvsfjt2KWmOWCxJfM62oTskVz8NyIzj1BMlL/hy+4GpLwlvffkJFafbThTz -+mAoL4iVgnHKNbvog0Z3QcoFV6XWUMcfDd6g+nJZwc5TG8D/QW3xo0ZHEQudh57I -cp5V3TBCm2lLyhfVDM1AFL2k8rCqdA8adYj/zTmaZousu29P/8p1EE6X+MPKrdlE -VyTuag8drG9KKVtWktuT -=oVgc +iEYEAREKAAYFAk6+Y7AACgkQgAnW8HDreRb00gCdEifot0hZgK/Eh7AbDu/Y14Ki +4/wAn0MQYm2sXdokwzEv3BcOBIPQZYjn +=i4be -----END PGP SIGNATURE----- diff --git a/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild index a25e1b83b2ab..a219cb044878 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild,v 1.4 2010/11/07 19:31:49 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild,v 1.5 2011/11/12 12:16:34 jlec Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3suppor RDEPEND="media-libs/fontconfig >=media-libs/freetype-2 virtual/jpeg - >=media-libs/libpng-1.2.43-r2:0 + media-libs/libpng:0 sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] @@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig gtk? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} !aqua? ( diff --git a/x11-libs/qt-gui/qt-gui-4.6.2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.2.ebuild index bb18f64f898d..47ddbc807b04 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.2.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild,v 1.11 2010/12/05 19:53:27 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild,v 1.12 2011/11/12 12:16:34 jlec Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xine RDEPEND="media-libs/fontconfig >=media-libs/freetype-2 virtual/jpeg - media-libs/libpng + media-libs/libpng:0 sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] @@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig gtk? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild index a3d251ba68be..e0ebad43ffbc 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild,v 1.3 2011/08/17 16:56:00 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild,v 1.4 2011/11/12 12:16:34 jlec Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3suppor RDEPEND="media-libs/fontconfig >=media-libs/freetype-2 virtual/jpeg - >=media-libs/libpng-1.4 + media-libs/libpng:0 sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] @@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig gtk? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3.ebuild index 3a7eb2c6427a..66ed9ddda174 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.11 2010/12/23 07:55:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.12 2011/11/12 12:16:34 jlec Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3suppor RDEPEND="media-libs/fontconfig >=media-libs/freetype-2 virtual/jpeg - >=media-libs/libpng-1.4 + media-libs/libpng:0 sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] @@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig gtk? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild b/x11-libs/qt-gui/qt-gui-4.7.2.ebuild index 13ba3f772a38..1d7e0aff4b22 100644 --- a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.9 2011/07/13 12:49:21 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.10 2011/11/12 12:16:34 jlec Exp $ EAPI="3" inherit confutils qt4-build @@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt RDEPEND="media-libs/fontconfig media-libs/freetype:2 virtual/jpeg - media-libs/libpng + media-libs/libpng:0 sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] @@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig gtkstyle? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild index e0b2970e16e9..75de3e606e93 100644 --- a/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild,v 1.1 2011/08/14 17:57:54 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $ EAPI="3" inherit confutils qt4-build @@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt RDEPEND="media-libs/fontconfig media-libs/freetype:2 virtual/jpeg - media-libs/libpng + media-libs/libpng:0 sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] @@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig gtkstyle? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/x11-libs/qt-gui/qt-gui-4.7.3.ebuild b/x11-libs/qt-gui/qt-gui-4.7.3.ebuild index b509b9106cb3..b0d4aef74a66 100644 --- a/x11-libs/qt-gui/qt-gui-4.7.3.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.3.ebuild,v 1.1 2011/05/10 20:06:02 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.3.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $ EAPI="3" inherit confutils qt4-build @@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt RDEPEND="media-libs/fontconfig media-libs/freetype:2 virtual/jpeg - media-libs/libpng + media-libs/libpng:0 sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] @@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig gtkstyle? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/x11-libs/qt-gui/qt-gui-4.7.4.ebuild b/x11-libs/qt-gui/qt-gui-4.7.4.ebuild index 49409ee79c48..7fecb6e774db 100644 --- a/x11-libs/qt-gui/qt-gui-4.7.4.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.1 2011/09/08 09:20:08 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $ EAPI="3" inherit confutils qt4-build @@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt RDEPEND="media-libs/fontconfig media-libs/freetype:2 virtual/jpeg - media-libs/libpng + media-libs/libpng:0 sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] @@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig gtkstyle? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} dev-util/pkgconfig