diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-19 18:55:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-19 18:55:38 +0000 |
| commit | 0db514cfb9451b9deb99a07e4a828efd786da38d (patch) | |
| tree | 5b0f7defe9acd504567882817af2ef78dcd0be01 /x11-libs/qt-gui | |
| parent | ppc stable #300655 (diff) | |
| download | gentoo-2-0db514cfb9451b9deb99a07e4a828efd786da38d.tar.gz gentoo-2-0db514cfb9451b9deb99a07e4a828efd786da38d.tar.bz2 gentoo-2-0db514cfb9451b9deb99a07e4a828efd786da38d.zip | |
Require SLOT="0" of media-libs/jpeg wrt #301560.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-gui')
| -rw-r--r-- | x11-libs/qt-gui/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/qt-gui/qt-gui-4.6.1.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 2d161122ad1d..0106a740a7da 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.91 2010/01/19 14:50:12 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.92 2010/01/19 18:55:38 ssuominen Exp $ + + 19 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + qt-gui-4.6.0-r2.ebuild, qt-gui-4.6.1.ebuild: + Require SLOT="0" of media-libs/jpeg wrt #301560. *qt-gui-4.6.1 (19 Jan 2010) diff --git a/x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild index 4b953ef6ae10..5c716380c81b 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.0-r2.ebuild,v 1.3 2010/01/17 19:13:31 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild,v 1.4 2010/01/19 18:55:38 ssuominen Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -12,7 +12,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xine RDEPEND="media-libs/fontconfig >=media-libs/freetype-2 - media-libs/jpeg + media-libs/jpeg:0 media-libs/libpng sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] diff --git a/x11-libs/qt-gui/qt-gui-4.6.1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.1.ebuild index 3be3d5280f4c..c957d11d0eca 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.1.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.1.ebuild,v 1.1 2010/01/19 14:50:12 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.1.ebuild,v 1.2 2010/01/19 18:55:38 ssuominen Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -12,7 +12,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xine RDEPEND="media-libs/fontconfig >=media-libs/freetype-2 - media-libs/jpeg + media-libs/jpeg:0 media-libs/libpng sys-libs/zlib ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] |