summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-01-13 19:23:29 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-01-13 19:23:29 +0000
commit161f3b3678e2dba6a7e4670af08b97d33ab517d5 (patch)
treecedd632f99f1b0e53c7804911ac365fa54e6679a /media-video
parentVersion bump. (diff)
downloadgentoo-2-161f3b3678e2dba6a7e4670af08b97d33ab517d5.tar.gz
gentoo-2-161f3b3678e2dba6a7e4670af08b97d33ab517d5.tar.bz2
gentoo-2-161f3b3678e2dba6a7e4670af08b97d33ab517d5.zip
Improve documentation installation and add an examples useflag
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog7
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild22
2 files changed, 18 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 807af8b98824..4ee8a06a0dbb 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.591 2012/12/19 00:39:42 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.592 2013/01/13 19:23:29 aballier Exp $
+
+ 13 Jan 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ Improve documentation installation and add an examples useflag
19 Dec 2012; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.2.ebuild,
-ffmpeg-0.10.4.ebuild, -ffmpeg-0.10.5.ebuild, -ffmpeg-0.11.1.ebuild,
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 0b371a2d177e..8aefda4deb71 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.109 2012/12/08 12:06:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.110 2013/01/13 19:23:29 aballier Exp $
EAPI="4"
@@ -30,11 +30,11 @@ if [ "${PV#9999}" = "${PV}" ] ; then
fi
IUSE="
aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt
- cpudetection debug doc +encode faac fdk flite fontconfig frei0r gnutls
- gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca libv4l
- modplug mp3 network openal openssl opus oss pic pulseaudio rtmp schroedinger
- sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau
- vorbis vpx X x264 xvid +zlib
+ cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+ gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
+ libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp
+ schroedinger sdl speex static-libs test theora threads truetype twolame v4l
+ vaapi vdpau vorbis vpx X x264 xvid +zlib
"
# String for CPU features in the useflag[:configure_option] form
@@ -282,8 +282,12 @@ src_compile() {
src_install() {
emake V=1 DESTDIR="${D}" install install-man
- dodoc Changelog README INSTALL
- dodoc -r doc/*
+ dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
+ use doc && dohtml -r doc/*
+ if use examples ; then
+ insinto "/usr/share/doc/${PF}/examples"
+ doins -r doc/examples/*
+ fi
for i in ${FFTOOLS} ; do
if use fftools_$i ; then