johu 15/06/02 15:53:40 Modified: phonon-9999.ebuild phonon-4.8.3-r1.ebuild ChangeLog Log: Fix gentoo-portage-rsync-mirror merge failure. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)
Revision Changes Path 1.29 media-libs/phonon/phonon-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?r1=1.28&r2=1.29 Index: phonon-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- phonon-9999.ebuild 2 Jun 2015 07:41:48 -0000 1.28 +++ phonon-9999.ebuild 2 Jun 2015 15:53:40 -0000 1.29 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.28 2015/06/02 07:41:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.29 2015/06/02 15:53:40 johu Exp $ EAPI=5 @@ -23,7 +23,6 @@ IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist" REQUIRED_USE=" - || ( aqua gstreamer vlc ) || ( qt4 qt5 ) zeitgeist? ( qt4 ) " 1.2 media-libs/phonon/phonon-4.8.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?r1=1.1&r2=1.2 Index: phonon-4.8.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- phonon-4.8.3-r1.ebuild 2 Jun 2015 07:41:48 -0000 1.1 +++ phonon-4.8.3-r1.ebuild 2 Jun 2015 15:53:40 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 1.1 2015/06/02 07:41:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 1.2 2015/06/02 15:53:40 johu Exp $ EAPI=5 @@ -23,7 +23,6 @@ IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist" REQUIRED_USE=" - || ( aqua gstreamer vlc ) || ( qt4 qt5 ) zeitgeist? ( qt4 ) " 1.76 media-libs/phonon/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.76&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.76&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?r1=1.75&r2=1.76 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- ChangeLog 2 Jun 2015 07:41:48 -0000 1.75 +++ ChangeLog 2 Jun 2015 15:53:40 -0000 1.76 @@ -1,6 +1,10 @@ # ChangeLog for media-libs/phonon # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.75 2015/06/02 07:41:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.76 2015/06/02 15:53:40 johu Exp $ + + 02 Jun 2015; Johannes Huber <[email protected]> phonon-4.8.3-r1.ebuild, + phonon-9999.ebuild: + Fix gentoo-portage-rsync-mirror merge failure. *phonon-4.8.3-r1 (02 Jun 2015)
