Remove older version

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1191738E)

5 files changed, 8 insertions, 496 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index c4a384d928e3..c3ad1eeb2e60 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.142 2013/02/25 06:57:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.143 2013/03/02 14:09:26 lu_zero Exp $
+
+  02 Mar 2013; Luca Barbato <lu_zero@gentoo.org>
+  -files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch,
+  -files/0001-libcdio-support-recent-cdio-paranoia.patch,
+  -files/0001-svq3-replace-unsafe-pointer-casting-with-intreadwrit.patch,
+  -libav-9.1.ebuild:
+  Remove older version
 
 *libav-9.2 (25 Feb 2013)
 
diff --git a/media-video/libav/files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch b/media-video/libav/files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch
deleted file mode 100644
index de2369f46656..000000000000
--- a/media-video/libav/files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6c62098827d3020c852a975f88084945867bf029 Mon Sep 17 00:00:00 2001
-From: Diego Biurrun <diego@biurrun.de>
-Date: Sat, 16 Feb 2013 23:05:05 +0100
-Subject: [PATCH] build: The libopencore-amrnb encoder depends on
- audio_frame_queue
-
-CC: libav-stable@libav.org
-Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-(cherry picked from commit d0fd1dd559b8362bdbca3405f739e0cc202d62e7)
----
- libavcodec/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 1ae17cd..0f55b80 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -574,7 +574,7 @@ OBJS-$(CONFIG_LIBILBC_ENCODER)            += libilbc.o
- OBJS-$(CONFIG_LIBMP3LAME_ENCODER)         += libmp3lame.o mpegaudiodecheader.o \
-                                              audio_frame_queue.o
- OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER)  += libopencore-amr.o
--OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER)  += libopencore-amr.o
-+OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER)  += libopencore-amr.o audio_frame_queue.o
- OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER)  += libopencore-amr.o
- OBJS-$(CONFIG_LIBOPENJPEG_DECODER)        += libopenjpegdec.o
- OBJS-$(CONFIG_LIBOPENJPEG_ENCODER)        += libopenjpegenc.o
--- 
-1.8.1.2
-
diff --git a/media-video/libav/files/0001-libcdio-support-recent-cdio-paranoia.patch b/media-video/libav/files/0001-libcdio-support-recent-cdio-paranoia.patch
deleted file mode 100644
index 5bf7974a6d99..000000000000
--- a/media-video/libav/files/0001-libcdio-support-recent-cdio-paranoia.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From eab6903cdaf0501a80cd4971604d390a9d920db4 Mon Sep 17 00:00:00 2001
-From: Luca Barbato <lu_zero@gentoo.org>
-Date: Thu, 17 Jan 2013 11:24:01 +0100
-Subject: [PATCH] libcdio: support recent cdio-paranoia
-
-Upstream decided to split the paranoia interface and move the headers
-accordingly.
----
- configure             | 7 +++++--
- libavdevice/libcdio.c | 7 +++++++
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 8cc9cdc..6a8990d 100755
---- a/configure
-+++ b/configure
-@@ -1201,6 +1201,8 @@ HAVE_LIST="
-     asm_mod_y
-     attribute_may_alias
-     attribute_packed
-+    cdio_paranoia_h
-+    cdio_paranoia_paranoia_h
-     closesocket
-     cmov
-     CommandLineToArgvW
-@@ -3551,8 +3553,9 @@ enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack &&
- 
- enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
- 
--enabled libcdio &&
--    check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
-+if enabled libcdio; then
-+    check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
-+fi
- 
- enabled x11grab                                           &&
- require X11 X11/Xlib.h XOpenDisplay -lX11                 &&
-diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
-index e846ee6..06ddb4a 100644
---- a/libavdevice/libcdio.c
-+++ b/libavdevice/libcdio.c
-@@ -23,8 +23,15 @@
-  * libcdio CD grabbing
-  */
- 
-+#include "config.h"
-+
-+#if HAVE_CDIO_PARANOIA_H
- #include <cdio/cdda.h>
- #include <cdio/paranoia.h>
-+#elif HAVE_CDIO_PARANOIA_PARANOIA_H
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
-+#endif
- 
- #include "libavutil/log.h"
- #include "libavutil/mem.h"
--- 
-1.8.0.2
-
diff --git a/media-video/libav/files/0001-svq3-replace-unsafe-pointer-casting-with-intreadwrit.patch b/media-video/libav/files/0001-svq3-replace-unsafe-pointer-casting-with-intreadwrit.patch
deleted file mode 100644
index 30d682efd458..000000000000
--- a/media-video/libav/files/0001-svq3-replace-unsafe-pointer-casting-with-intreadwrit.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 366b72f149a7b6a024ff5edd09ed5ae160755753 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Thu, 11 Oct 2012 16:08:22 +0100
-Subject: [PATCH] svq3: replace unsafe pointer casting with intreadwrite
- macros
-
-Signed-off-by: Mans Rullgard <mans@mansr.com>
----
- libavcodec/svq3.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
-index c4d5a1b..6099e77 100644
---- a/libavcodec/svq3.c
-+++ b/libavcodec/svq3.c
-@@ -409,17 +409,17 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
-                 int32_t mv = pack16to32(mx,my);
- 
-                 if (part_height == 8 && i < 8) {
--                    *(int32_t *) h->mv_cache[dir][scan8[k] + 1*8] = mv;
-+                    AV_WN32A(h->mv_cache[dir][scan8[k] + 1*8], mv);
- 
-                     if (part_width == 8 && j < 8) {
--                        *(int32_t *) h->mv_cache[dir][scan8[k] + 1 + 1*8] = mv;
-+                        AV_WN32A(h->mv_cache[dir][scan8[k] + 1 + 1*8], mv);
-                     }
-                 }
-                 if (part_width == 8 && j < 8) {
--                    *(int32_t *) h->mv_cache[dir][scan8[k] + 1] = mv;
-+                    AV_WN32A(h->mv_cache[dir][scan8[k] + 1], mv);
-                 }
-                 if (part_width == 4 || part_height == 4) {
--                    *(int32_t *) h->mv_cache[dir][scan8[k]] = mv;
-+                    AV_WN32A(h->mv_cache[dir][scan8[k]], mv);
-                 }
-             }
- 
-@@ -487,11 +487,11 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
-         for (m = 0; m < 2; m++) {
-             if (s->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1]+6] != -1) {
-                 for (i = 0; i < 4; i++) {
--                    *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.f.motion_val[m][b_xy - 1 + i*h->b_stride];
-+                    AV_COPY32(h->mv_cache[m][scan8[0] - 1 + i*8], s->current_picture.f.motion_val[m][b_xy - 1 + i*h->b_stride]);
-                 }
-             } else {
-                 for (i = 0; i < 4; i++) {
--                    *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0;
-+                    AV_ZERO32(h->mv_cache[m][scan8[0] - 1 + i*8]);
-                 }
-             }
-             if (s->mb_y > 0) {
-@@ -499,14 +499,14 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
-                 memset(&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4);
- 
-                 if (s->mb_x < (s->mb_width - 1)) {
--                    *(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.f.motion_val[m][b_xy - h->b_stride + 4];
-+                    AV_COPY32(h->mv_cache[m][scan8[0] + 4 - 1*8], s->current_picture.f.motion_val[m][b_xy - h->b_stride + 4]);
-                     h->ref_cache[m][scan8[0] + 4 - 1*8] =
-                         (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride + 1]+6] == -1 ||
-                          h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride    ]  ] == -1) ? PART_NOT_AVAILABLE : 1;
-                 }else
-                     h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE;
-                 if (s->mb_x > 0) {
--                    *(uint32_t *) h->mv_cache[m][scan8[0] - 1 - 1*8] = *(uint32_t *) s->current_picture.f.motion_val[m][b_xy - h->b_stride - 1];
-+                    AV_COPY32(h->mv_cache[m][scan8[0] - 1 - 1*8], s->current_picture.f.motion_val[m][b_xy - h->b_stride - 1]);
-                     h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1]+3] == -1) ? PART_NOT_AVAILABLE : 1;
-                 }else
-                     h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE;
--- 
-1.7.12
-
diff --git a/media-video/libav/libav-9.1.ebuild b/media-video/libav/libav-9.1.ebuild
deleted file mode 100644
index 710909b535ae..000000000000
--- a/media-video/libav/libav-9.1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.1.ebuild,v 1.4 2013/02/17 11:42:03 lu_zero Exp $
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.libav.org/libav.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video."
-HOMEPAGE="http://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
-fi
-
-SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/9"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-	+encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
-	network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
-	x264 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext neon ssse3 vis"
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
-
-RDEPEND="
-	!media-video/ffmpeg
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia
-				<dev-libs/libcdio-0.90[-minimal] ) )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		fdk? ( media-libs/fdk-aac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode]
-			media-libs/libogg
-		)
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20111017 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	pulseaudio? ( media-sound/pulseaudio )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	ssl? (
-		openssl? ( dev-libs/openssl )
-		!openssl? ( net-libs/gnutls )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	vaapi? ( x11-libs/libva )
-	vdpau? ( x11-libs/libvdpau )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	ssl? ( virtual/pkgconfig )
-	test? ( sys-devel/bc )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
-	test? ( encode zlib )
-"
-
-src_prepare() {
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-	epatch "${FILESDIR}"/0001-libcdio-support-recent-cdio-paranoia.patch
-	epatch "${FILESDIR}"/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch
-}
-
-src_configure() {
-	local myconf="${EXTRA_LIBAV_CONF}"
-	local uses i
-
-	use zlib && TOOLS+=" cws2fws"
-
-	myconf+="
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	"
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bzip2 || myconf+=" --disable-bzlib"
-	use sdl || myconf+=" --disable-avplay"
-
-	if use ssl; then
-		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
-			|| myconf+=" --enable-gnutls"
-	fi
-
-	use custom-cflags && myconf+=" --disable-optimizations"
-	use cpudetection && myconf+=" --enable-runtime-cpudetect"
-
-	use vdpau || myconf+=" --disable-vdpau"
-
-	use vaapi && myconf+=" --enable-vaapi"
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=" --enable-nonfree"
-		use fdk && myconf+=" --enable-nonfree --enable-libfdk-aac"
-		use mp3 && myconf+=" --enable-libmp3lame"
-		use amr && myconf+=" --enable-libvo-amrwbenc"
-		use aac && myconf+=" --enable-libvo-aacenc"
-		uses="faac theora vorbis x264 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=" --enable-lib${i}"
-		done
-	else
-		myconf+=" --disable-encoders"
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=" --enable-libcdio"
-	use ieee1394 && myconf+=" --enable-libdc1394"
-	use pulseaudio && myconf+=" --enable-libpulse"
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=" --disable-indev=v4l"
-	use v4l || myconf+=" --disable-indev=v4l2"
-	for i in alsa oss jack; do
-		use ${i} || myconf+=" --disable-indev=${i}"
-	done
-	use X && myconf+=" --enable-x11grab"
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=" --disable-outdev=${i}"
-	done
-	# libavfilter options
-	use frei0r && myconf+=" --enable-frei0r"
-	use truetype &&  myconf+=" --enable-libfreetype"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf+=" --enable-pthreads"
-
-	# Decoders
-	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=" --enable-lib${i}"
-	done
-	use jpeg2k && myconf+=" --enable-libopenjpeg"
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=" --disable-${i#*:}"
-	done
-
-	# pass the right -mfpu as extra
-	use neon && myconf+=" --extra-cflags=-mfpu=neon"
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && use x86 ; then
-		myconf+=" --disable-mmx --disable-mmxext"
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=" --enable-pic"
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" == "native" ]] && i="host" # bug #273421
-		myconf+=" --cpu=${i}"
-		break
-	done
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=" --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf+=" --target-os=mingw32"
-				;;
-			*linux*)
-				myconf+=" --target-os=linux"
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=" --enable-hardcoded-tables"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	cd "${S}"
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-
-	MAKEOPTS+=" V=1"
-}
-
-src_compile() {
-	local i
-
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		for i in ${TOOLS}; do
-			emake tools/${i}
-		done
-	fi
-}
-
-src_install() {
-	local i
-
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*.txt
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		for i in ${TOOLS}; do
-			dobin tools/${i}
-		done
-	fi
-
-	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
-		dosym  ${i} /usr/bin/${i/av/ff}
-	done
-}
-
-pkg_postinst() {
-	elog "Please note that the programs formerly known as ffplay, ffserver"
-	elog "and ffprobe are now called avplay, avserver and avprobe."
-	elog
-	elog "ffmpeg had been replaced by the feature incompatible avconv"
-}
-
-src_test() {
-	echo ${WORKDIR}/fate
-	LD_LIBRARY_PATH="${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavresample:${S}/libavutil" \
-		emake -j1 fate SAMPLES="${WORKDIR}/fate"
-}