make libgcrypt optional again

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

3 files changed, 16 insertions, 12 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 41bf207ea379..37b0d34942d4 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.352 2008/07/01 22:51:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.353 2008/07/03 19:06:45 aballier Exp $
+
+  03 Jul 2008; Alexis Ballier <aballier@gentoo.org> vlc-0.9.0_beta1.ebuild:
+  make libgcrypt optional again
 
 *vlc-0.9.0_beta1 (01 Jul 2008)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 163b4c725301..bad5904f4237 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -12,13 +12,13 @@ DIST vlc-snapshot-20080625.tar.bz2 15158559 RMD160 19caabbfce71ff5efcf5302488827
 EBUILD vlc-0.8.6g.ebuild 9086 RMD160 97f2951ccb49c282d68f6bbad2b1b9c43bf475cf SHA1 d3528f8373cea598576af21661969319d7a4690c SHA256 6d9338668490b13da61365e8856f4b749419dd90d135ca22970b3c4b4c93cb47
 EBUILD vlc-0.8.6h.ebuild 8989 RMD160 3f08b80bdc96d6ab57f5d5869949bf18f3a4c915 SHA1 2b9b6a353c7b467bb5468ec6770dfdb62638269b SHA256 eabf234909dfb3f9bbc36993839c00039282847cfdc580bd88ac4f6ae31cfce8
 EBUILD vlc-0.9.0_alpha20080625.ebuild 10821 RMD160 95ecf6c386355a4b5890453be37190bd2627615a SHA1 14b42e00939fa0dfeb6e413ee1eecd95ea0bd4dd SHA256 232bda01b4cb40d31cbfa267f9bc289f2c5f4bd459f807eded0f5b55899ee731
-EBUILD vlc-0.9.0_beta1.ebuild 10821 RMD160 3a72043a03f9ba05ee950b515a8cb0428d2fc952 SHA1 6d33ab02ff9e70b92d9ffff0bfa6583aeb6c9fc7 SHA256 4f413badfa40ba66419225f65cd47054063e84cc3a7b61da046d27e780ede8ac
-MISC ChangeLog 58855 RMD160 2c7d03d732a24e7676218552e4b13e47f476195a SHA1 95cd9929ffea3fad984c4a77e614cb77e0a3bf1a SHA256 db0c109882e1899974d5119869a1203ca63b187f593c418a80a51daac285e27f
+EBUILD vlc-0.9.0_beta1.ebuild 10917 RMD160 a81a9eb7e02544a0ffabf7a7aed640e6f016e3d1 SHA1 ee8573f50be8298a02dcb35b0f8a9a45b3eb7f43 SHA256 e6cbb0413881348c58e758e9f22f1b4c178098204831ecec5bb3cb5c9d55c342
+MISC ChangeLog 58964 RMD160 145e8acba59c314677c716ed023e379e50f33290 SHA1 0915e9f8f31444599a3e2d54e12326f71e2b291b SHA256 970f6dfa92832c3eca6b16604128b0fe900e2fce227b47974c452efc11329292
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhqtPEACgkQvFcC4BYPU0peaACgiUjr5jeZdfBwUFT52Yndz/WF
-RMgAn0IRvPWPugOF7m8IOow8xZtv2xGb
-=izFy
+iEYEARECAAYFAkhtI08ACgkQvFcC4BYPU0rbkwCggLRoEsPUWtCn83pZfcmXlA/G
+ezEAn2gtHzgg+b3Wni9ocbWDeE1o3k06
+=HMOn
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.9.0_beta1.ebuild b/media-video/vlc/vlc-0.9.0_beta1.ebuild
index 557ae46117df..9e1fc664c11b 100644
--- a/media-video/vlc/vlc-0.9.0_beta1.ebuild
+++ b/media-video/vlc/vlc-0.9.0_beta1.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_beta1.ebuild,v 1.1 2008/07/01 22:51:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_beta1.ebuild,v 1.2 2008/07/03 19:06:45 aballier Exp $
 
 EAPI="1"
 
@@ -40,7 +40,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddb cdio dbus dc1394
 	debug directfb dts dvb dvd esd fbcon fluidsynth +ffmpeg flac ggi gnome gnutls hal httpd
-	id3tag jack libcaca libnotify lirc live lua matroska mmx modplug mp3 mpeg
+	id3tag jack libcaca +libgcrypt libnotify lirc live lua matroska mmx modplug mp3 mpeg
 	musepack musicbrainz ncurses nsplugin ogg opengl optimisememory oss png	pulseaudio pvr +qt4
 	remoteosd 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
@@ -77,12 +77,12 @@ RDEPEND="
 		ggi? ( media-libs/libggi )
 		gnome? ( gnome-base/gnome-vfs )
 		gnutls? ( >=net-libs/gnutls-1.3.3 )
-		>=dev-libs/libgcrypt-1.2.0
 		hal? ( sys-apps/hal )
 		id3tag? ( media-libs/libid3tag
 			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 )
@@ -192,6 +192,7 @@ pkg_setup() {
 	vlc_use_needs cdda cdio
 	vlc_use_needs vcdx cdio
 	vlc_use_needs bidi truetype
+	vlc_use_force remoteosd libgcrypt
 }
 
 src_unpack() {
@@ -262,7 +263,7 @@ src_compile () {
 		$(use_enable jack) \
 		--disable-kate \
 		$(use_enable libcaca caca) \
-		--enable-libgcrypt \
+		$(use_enable libgcrypt) \
 		$(use_enable libnotify notify) \
 		--disable-libproxy \
 		--disable-libtar \
@@ -287,7 +288,6 @@ src_compile () {
 		$(use_enable pulseaudio pulse) \
 		$(use_enable pvr) \
 		$(use_enable qt4) \
-		$(use_enable remoteosd) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable samba smb) \
 		--disable-schroedinger \
@@ -324,7 +324,8 @@ src_compile () {
 		--disable-optimizations \
 		--enable-fast-install \
 		$(vlc_use_enable_force vlm vlm sout) \
-		$(vlc_use_enable_force skins skins2 qt4)
+		$(vlc_use_enable_force skins skins2 qt4) \
+		$(vlc_use_enable_force remoteosd remoteosd libgcrypt)
 
 	# Reminder to re-add this when disabling it will not be broken
 	# $(use_enable stream sout) \