summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-02-29 10:55:24 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-02-29 10:55:24 +0000
commit438f9ec08dab3bfdfb451a0790fbcab1a771fd39 (patch)
treee355f0243e83866bdf4d616fc4855f5ffc628eae /media-video
parentversion bump (diff)
downloadgentoo-2-438f9ec08dab3bfdfb451a0790fbcab1a771fd39.tar.gz
gentoo-2-438f9ec08dab3bfdfb451a0790fbcab1a771fd39.tar.bz2
gentoo-2-438f9ec08dab3bfdfb451a0790fbcab1a771fd39.zip
gnutls really requires libgcrypt, merge the useflags, bug #211759
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-0.9.0_alpha20080228.ebuild8
2 files changed, 8 insertions, 6 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 196aa876f6ce..7b2919b26a1b 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vlc
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.298 2008/02/29 08:59:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.299 2008/02/29 10:55:24 aballier Exp $
+
+ 29 Feb 2008; Alexis Ballier <aballier@gentoo.org>
+ vlc-0.9.0_alpha20080228.ebuild:
+ gnutls really requires libgcrypt, merge the useflags, bug #211759
29 Feb 2008; Christian Faulhammer <opfer@gentoo.org> vlc-0.8.6e.ebuild:
stable x86, security bug 211575
diff --git a/media-video/vlc/vlc-0.9.0_alpha20080228.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080228.ebuild
index 9a8b44c8f485..9c733d9d4b6d 100644
--- a/media-video/vlc/vlc-0.9.0_alpha20080228.ebuild
+++ b/media-video/vlc/vlc-0.9.0_alpha20080228.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080228.ebuild,v 1.1 2008/02/28 09:11:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080228.ebuild,v 1.2 2008/02/29 10:55:24 aballier Exp $
WANT_AUTOMAKE=latest
WANT_AUTOCONF=latest
@@ -46,7 +46,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="3dfx a52 aac aalib alsa altivec arts avahi bidi cdda cddb cdio daap dbus dc1394
debug directfb dts dvb dvd esd fbcon fluidsynth ffmpeg flac ggi gnome gnutls hal httpd
- id3tag jack libcaca libgcrypt libnotify lirc live lua matroska mmx modplug mp3 mpeg
+ id3tag jack libcaca libnotify lirc live lua matroska mmx modplug mp3 mpeg
musepack musicbrainz ncurses nsplugin ogg opengl optimisememory oss png pulseaudio pvr qt4
rtsp samba sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
theora truetype twolame upnp v4l v4l2 vcd vcdx vlm vorbis win32codecs wxwindows
@@ -90,7 +90,6 @@ RDEPEND="
sys-libs/zlib )
jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
libcaca? ( media-libs/libcaca )
- libgcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
libnotify? ( x11-libs/libnotify )
lirc? ( app-misc/lirc )
live? ( >=media-plugins/live-2007.02.20 )
@@ -172,7 +171,6 @@ pkg_setup() {
vlc_use_needs skins wxwindows
vlc_use_needs cdda cdio
vlc_use_needs vcdx cdio
- vlc_use_needs libgcrypt gnutls
vlc_use_needs bidi truetype
}
@@ -248,7 +246,7 @@ src_compile () {
$(use_enable id3tag) \
$(use_enable jack) \
$(use_enable libcaca caca) \
- $(use_enable libgcrypt) \
+ $(use_enable gnutls libgcrypt) \
$(use_enable libnotify notify) \
--disable-libtar \
$(use_enable lirc) \