diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2013-09-29 10:45:42 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2013-09-29 10:45:42 +0000 |
| commit | 53203888aab8db26f342f5801023e832dc4ff389 (patch) | |
| tree | 23137ff73eaffe51fd61051a2c7c1728371dd472 /dev-qt/qtgui | |
| parent | Support compilation in clang until upstream solves this, upstream bug #691608... (diff) | |
| download | gentoo-2-53203888aab8db26f342f5801023e832dc4ff389.tar.gz gentoo-2-53203888aab8db26f342f5801023e832dc4ff389.tar.bz2 gentoo-2-53203888aab8db26f342f5801023e832dc4ff389.zip | |
Add blocker to fix qttracereplay file collision, bug 486060 by Arfrever.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)
Diffstat (limited to 'dev-qt/qtgui')
| -rw-r--r-- | dev-qt/qtgui/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-4.8.5-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-4.8.5.ebuild | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog index cfe716dc56f3..539f5717eb2b 100644 --- a/dev-qt/qtgui/ChangeLog +++ b/dev-qt/qtgui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtgui # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.7 2013/09/23 14:39:21 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.8 2013/09/29 10:45:42 pesa Exp $ + + 29 Sep 2013; Davide Pesavento <pesa@gentoo.org> qtgui-4.8.5-r1.ebuild, + qtgui-4.8.5.ebuild: + Add blocker to fix qttracereplay file collision, bug 486060 by Arfrever. *qtgui-4.8.5-r1 (23 Sep 2013) diff --git a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild index 0fad825c978e..f17da797909a 100644 --- a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.1 2013/09/23 14:39:21 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.2 2013/09/29 10:45:42 pesa Exp $ EAPI=5 @@ -51,6 +51,7 @@ RDEPEND=" mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) + !<dev-qt/qthelp-4.8.5:4 " DEPEND="${RDEPEND} !aqua? ( diff --git a/dev-qt/qtgui/qtgui-4.8.5.ebuild b/dev-qt/qtgui/qtgui-4.8.5.ebuild index 8ec6045496ba..c9f624000fc4 100644 --- a/dev-qt/qtgui/qtgui-4.8.5.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5.ebuild,v 1.2 2013/08/27 15:52:30 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5.ebuild,v 1.3 2013/09/29 10:45:42 pesa Exp $ EAPI=5 @@ -51,6 +51,7 @@ RDEPEND=" mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) + !<dev-qt/qthelp-4.8.5:4 " DEPEND="${RDEPEND} !aqua? ( |