gnutls really requires libgcrypt, merge the useflags, bug #211759

Package-Manager: portage-2.1.4.4

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 196aa876f6ceb202b892690a360a7a400cf01aee..7b2919b26a1b6ee333f9c822e1598c79c3a93715 100644 (file)
--- 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/Manifest b/media-video/vlc/Manifest
index 9a45fe930da0961f2d5f6d5e232be0287444e6cd..917f37100c40e8c16ee9a67be88da005ad3a130e 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -16,13 +16,13 @@ EBUILD vlc-0.8.6d.ebuild 8812 RMD160 a7c7c2874187dc4ef7b3a068b63adea2d6d60c1b SH
 EBUILD vlc-0.8.6e.ebuild 9092 RMD160 bccce3a6399a118ba27e95bd848fa8a7e72794ca SHA1 4ca720f395a5436c0b8e83ac7a66220229a0f6fa SHA256 507fbcd8980f2c29a29de17d2310b228f3949725ea59ddb8541e6d80feb3b010
 EBUILD vlc-0.9.0_alpha20080117.ebuild 10282 RMD160 d4ebda22b84d6e38c41464634a6541acb1d95178 SHA1 cb763cf9caa3e2dec4c347bcad7cb2477aa6cf9c SHA256 eb79bb917dc33cff0f62813d3e929042fd7f640845ad8d054a1508145a921bd6
 EBUILD vlc-0.9.0_alpha20080128.ebuild 10256 RMD160 b733693597e8f47737c0ec1e3a54f0299034db7d SHA1 6ecae97bff0c75c8cbfa54e16d53ae0c42824ad8 SHA256 484d2dc024818cbf90e70574c9dfbe1e8a936490d716e467019499cd564b482f
-EBUILD vlc-0.9.0_alpha20080228.ebuild 10426 RMD160 2d86e06871dbe8373fd79378d8915c962dcf3a52 SHA1 3d32e6be93c00d5a3d9e1a76e6d70b9f894a73e2 SHA256 09ff14aa396d6fec632c91d83b92666907493ef88d32137b4cf8fc08d48fd97a
-MISC ChangeLog 51177 RMD160 0c3c889e9ee3f5a679c73402dd2580819992a0d0 SHA1 6767b4806848e85b0067b2346117021cc282f926 SHA256 bbb8603777b1d8d388003e504dfe97b576dbfba74a446e17c432e0627aef5a07
+EBUILD vlc-0.9.0_alpha20080228.ebuild 10347 RMD160 549376ef9ee1bce8bc55c2c035dddb46cc5583c6 SHA1 3e112e02b81575bbcd1e48a5d485248b912d700d SHA256 dfb93907937f2b366e8ec97d03ec9413e9450812377b7bb55a0655e2f680a561
+MISC ChangeLog 51335 RMD160 c5a9d5ff848fa81eab349b13d6b8cc152dc592dc SHA1 da321588ab25c33219d1ccf1406f5d8cfc2690a5 SHA256 0158c07f7c1e2aa3a2c6180dbf6cd90f2e25522154110e0f871763abf22e55ca
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHx8neNQqtfCuFneMRAnBkAKCdLtRH1IcffjzdYt2hFvRst97k1gCdGBlW
-zea+0B/hWl9E9JKnqMVqY1c=
-=FBzH
+iD8DBQFHx+SnvFcC4BYPU0oRAudHAJ0cK8hk/J2nmrDVBj9ipu63WD/wbgCdEtVS
++883YJoCImuUxAHOgVvtF+E=
+=RV+3
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-0.9.0_alpha20080228.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080228.ebuild
index 9a8b44c8f485e1a7e6ae69a9add90b68fe1414d2..9c733d9d4b6dbe21fa2641c2e1fde88672e64cfa 100644 (file)
--- 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) \