dlan 15/02/16 08:27:10 Modified: vlc-2.1.5-r1.ebuild ChangeLog vlc-2.1.9999.ebuild Log: revert commit, remove <media-videp/ffmpeg-2.5, since it already handled (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Revision Changes Path 1.4 media-video/vlc/vlc-2.1.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild?r1=1.3&r2=1.4 Index: vlc-2.1.5-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vlc-2.1.5-r1.ebuild 16 Feb 2015 02:16:22 -0000 1.3 +++ vlc-2.1.5-r1.ebuild 16 Feb 2015 08:27:10 -0000 1.4 @@ -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-video/vlc/vlc-2.1.5-r1.ebuild,v 1.3 2015/02/16 02:16:22 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild,v 1.4 2015/02/16 08:27:10 dlan Exp $ EAPI="5" @@ -65,7 +65,7 @@ alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avahi? ( >=net-dns/avahi-0.6:0[dbus] ) avcodec? ( - !libav? ( <media-video/ffmpeg-2.5:0= ) + !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( 1.930 media-video/vlc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.930&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.930&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.929&r2=1.930 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v retrieving revision 1.929 retrieving revision 1.930 diff -u -r1.929 -r1.930 --- ChangeLog 16 Feb 2015 02:16:22 -0000 1.929 +++ ChangeLog 16 Feb 2015 08:27:10 -0000 1.930 @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.929 2015/02/16 02:16:22 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.930 2015/02/16 08:27:10 dlan Exp $ + + 16 Feb 2015; Yixun Lan <[email protected]> vlc-2.1.5-r1.ebuild, + vlc-2.1.9999.ebuild: + revert commit, remove <media-videp/ffmpeg-2.5, since it already handled 15 Feb 2015; Yixun Lan <[email protected]> vlc-2.1.2.ebuild, vlc-2.1.4.ebuild, vlc-2.1.5.ebuild, vlc-2.1.5-r1.ebuild, vlc-2.1.9999.ebuild, 1.34 media-video/vlc/vlc-2.1.9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?r1=1.33&r2=1.34 Index: vlc-2.1.9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- vlc-2.1.9999.ebuild 16 Feb 2015 02:16:22 -0000 1.33 +++ vlc-2.1.9999.ebuild 16 Feb 2015 08:27:10 -0000 1.34 @@ -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-video/vlc/vlc-2.1.9999.ebuild,v 1.33 2015/02/16 02:16:22 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.34 2015/02/16 08:27:10 dlan Exp $ EAPI="5" @@ -65,7 +65,7 @@ alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avahi? ( >=net-dns/avahi-0.6:0[dbus] ) avcodec? ( - !libav? ( <media-video/ffmpeg-2.5:0= ) + !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? (
