summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-04-12 08:04:32 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-04-12 08:04:32 +0000
commitac20dc07c5b3a04436e60636e2676abae0839d7e (patch)
treef271331da4a6d977f907e530c55c2a8d5d308788 /media-video/vlc
parentx86 stable wrt bug #311801 (diff)
downloadgentoo-2-ac20dc07c5b3a04436e60636e2676abae0839d7e.tar.gz
gentoo-2-ac20dc07c5b3a04436e60636e2676abae0839d7e.tar.bz2
gentoo-2-ac20dc07c5b3a04436e60636e2676abae0839d7e.zip
x86 stable wrt bug #314011
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'media-video/vlc')
-rw-r--r--media-video/vlc/ChangeLog5
-rw-r--r--media-video/vlc/vlc-1.0.5.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 7c16687680f7..142a12f54395 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.561 2010/04/09 09:39:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.562 2010/04/12 08:04:32 phajdan.jr Exp $
+
+ 12 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> vlc-1.0.5.ebuild:
+ x86 stable wrt bug #314011
09 Apr 2010; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
Remove patch merged upstream, bug #312347
diff --git a/media-video/vlc/vlc-1.0.5.ebuild b/media-video/vlc/vlc-1.0.5.ebuild
index ab59006239b9..8e0c7d46d7b1 100644
--- a/media-video/vlc/vlc-1.0.5.ebuild
+++ b/media-video/vlc/vlc-1.0.5.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/media-video/vlc/vlc-1.0.5.ebuild,v 1.4 2010/04/07 16:04:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v 1.5 2010/04/12 08:04:32 phajdan.jr Exp $
EAPI="2"
@@ -46,7 +46,7 @@ SRC_URI="${SRC_URI}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddax cddb cdio dbus dc1394
debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
+gcrypt ggi gnome gnutls hal httpd id3tag ieee1394 jack kate libass libcaca