pesa 15/03/29 03:42:21 Modified: qtcore-4.8.5-r2.ebuild ChangeLog Log: Add blocker to prevent file collision on downgrade, thanks to Zero_Chaos in bug #544666. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.11 dev-qt/qtcore/qtcore-4.8.5-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild?r1=1.10&r2=1.11 Index: qtcore-4.8.5-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qtcore-4.8.5-r2.ebuild 28 Sep 2014 20:46:41 -0000 1.10 +++ qtcore-4.8.5-r2.ebuild 29 Mar 2015 03:42:21 -0000 1.11 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild,v 1.10 2014/09/28 20:46:41 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild,v 1.11 2015/03/29 03:42:21 pesa Exp $ EAPI=5 @@ -19,7 +19,8 @@ sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl:0 ) + !dev-qt/qttranslations:4 !<x11-libs/cairo-1.10.2-r2 " RDEPEND="${DEPEND}" 1.68 dev-qt/qtcore/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/ChangeLog?rev=1.68&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/ChangeLog?rev=1.68&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/ChangeLog?r1=1.67&r2=1.68 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- ChangeLog 8 Mar 2015 14:00:04 -0000 1.67 +++ ChangeLog 29 Mar 2015 03:42:21 -0000 1.68 @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtcore # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.67 2015/03/08 14:00:04 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.68 2015/03/29 03:42:21 pesa Exp $ + + 29 Mar 2015; Davide Pesavento <[email protected]> qtcore-4.8.5-r2.ebuild: + Add blocker to prevent file collision on downgrade, thanks to Zero_Chaos in + bug #544666. 08 Mar 2015; Davide Pesavento <[email protected]> qtcore-5.4.1.ebuild: Remove all keywords from "live" branch.
