add gnutls useflag

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index ef2da66726efd3d560515bbd36fba4572b64cca3..1f288e56341c5405f7649d09083c8e758fdeba14 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.480 2011/11/07 13:17:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.481 2011/11/07 13:23:08 aballier Exp $
+
+  07 Nov 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+  add gnutls useflag
 
   07 Nov 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
   metadata.xml:

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 82c4997f821080bd9de69f7a356a7884788df5a8..1c61b89bb2df5a780758c243f1fc975bfdae9040 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,13 +10,13 @@ EBUILD ffmpeg-0.7.6.ebuild 8428 RMD160 605d4178c97232660275ed3e7b516b734f26dd83
 EBUILD ffmpeg-0.7.7.ebuild 8443 RMD160 b724f2c4f6ee80056bf4f93f49e5787ff2c5f1f4 SHA1 427bd743982b3f3f6673b10ca79e0a83a4ffe3dc SHA256 248ea1da5738e3eb06a4fe6d3e59e4991aac90a076fb4cc6361138a14528b8ad
 EBUILD ffmpeg-0.8.5.ebuild 8043 RMD160 6d0818622d1b63f56ca61ee97c7e2b1bb797d229 SHA1 7590930cb73be2c4333005f88a6680a23e308da1 SHA256 74aaf70cf001c3a3be73dd7ae2e28ade46f568ed6c795b5a032fda93731a18b0
 EBUILD ffmpeg-0.8.6.ebuild 8042 RMD160 4709694f4d6b3da1c20b6cd0e7f2783e8bcdd6f5 SHA1 170e0f605117aa622c6b42d1f60e252df9092b16 SHA256 ec9f7859106af231a8d8993dbd3ca2ec66b70eddc9761f7b8976f6007f558423
-EBUILD ffmpeg-9999.ebuild 8483 RMD160 a73c0c12024391fb7f25bd29a7574db7b8228555 SHA1 289b7e7c5b38defb7f4e7ac4b3c0c2d6f653e06f SHA256 101f5844994a02accc6b366d4f59d3b7ca66269a3da36a510cb109f1eeff2404
-MISC ChangeLog 69570 RMD160 f3543e7e5c752f17d3511060bc32e6b3700db33e SHA1 7385e5b564e8ab096e69929f3b2c3559253284c7 SHA256 ceaaf9ef825f9880314cb1a36d56b45664348812939c482708ba57a1e4f34cb2
+EBUILD ffmpeg-9999.ebuild 8601 RMD160 68fc39054fe75397170b34e46a938c08424a2e05 SHA1 bb16c6c583df8a11865da0181a95fb0261815b04 SHA256 b364d3ea589b19a94b3914a45fdbfcf97d5b919272682512232a56a70d95f45a
+MISC ChangeLog 69664 RMD160 6fdc4db714112ddfc816a24d8b940edeef9ccf03 SHA1 ca4f8314d0ecf31066f33d0f010ee16e81098c10 SHA256 23ef821b9b841bb2d27d0566af8aa970478b5df36599fefe984e550a86c521bf
 MISC metadata.xml 2862 RMD160 841a04e6fa02c8313032d35724df2b314e71a61b SHA1 9b8c0ecdf03b5e23b583cb83e175824845e0a099 SHA256 0db8ecae874692726285474c71dbc81af0d14c75efba28cad65a8a152ecd18f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk632mQACgkQvFcC4BYPU0oWnQCgwx/BqzSSD5f79BuoU/QXlvh6
-yVEAoKnbeKRBkte46sZGZRWXKZtSdZfx
-=zPsM
+iEYEARECAAYFAk6328EACgkQvFcC4BYPU0o44gCeKm3HyTQVrYghA499ePNqhZM0
+qPwAoKIOY0mylH+/YByjhpYDT3iHbZkQ
+=wvbB
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 5f63b49d703eeea717153f236f0c5a50f5dcbb5b..9731de496a3da003c287d88ff3f058a85b459123 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.60 2011/11/07 13:17:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.61 2011/11/07 13:23:08 aballier Exp $
 
 EAPI="4"
 
@@ -30,10 +30,10 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 fi
 IUSE="
        aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc
-       +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k modplug mp3
-       network openal openssl oss pic pulseaudio qt-faststart rtmp schroedinger sdl
-       speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X
-       x264 xvid +zlib
+       +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k
+       modplug mp3 network openal openssl oss pic pulseaudio qt-faststart rtmp
+       schroedinger sdl speex static-libs test theora threads truetype v4l vaapi
+       vdpau vorbis vpx X x264 xvid +zlib
        "
 
 # String for CPU features in the useflag[:configure_option] form
@@ -63,6 +63,7 @@ RDEPEND="
                xvid? ( >=media-libs/xvid-1.1.0 )
        )
        frei0r? ( media-plugins/frei0r-plugins )
+       gnutls? ( net-libs/gnutls )
        gsm? ( >=media-sound/gsm-1.0.12-r1 )
        ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
        jack? ( media-sound/jack-audio-connection-kit )
@@ -87,6 +88,7 @@ DEPEND="${RDEPEND}
        >=sys-devel/make-3.81
        dirac? ( dev-util/pkgconfig )
        doc? ( app-text/texi2html )
+       gnutls? ( dev-util/pkgconfig )
        ieee1394? ( dev-util/pkgconfig )
        mmx? ( dev-lang/yasm )
        rtmp? ( dev-util/pkgconfig )
@@ -120,6 +122,7 @@ src_configure() {
 
        use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
        use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
+       use gnutls && myconf="${myconf} --enable-gnutls"
 
        # Encoders
        if use encode