Remove old stuff - sync to gentoo.org

(Portage version: 2.1.6.11/svn/Linux i686)

svn path=/testing/; revision=536

10 files changed, 11 insertions, 751 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index fee6497..5a07cf6 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Apr 2009; Matthias Schwarzott <zzam@gentoo.org>
+  -files/xine-lib-1.1.15-GetImagePixels.patch,
+  -files/xine-lib-1.1.15-buffer_h_ansi.patch,
+  -files/xine-lib-1.1.15-ffmpeg.patch,
+  -files/xine-lib-1.1.15-libmpeg2-vis.patch,
+  -files/xine-lib-1.1.16.2-avutil.patch, -xine-lib-1.1.15-r1.ebuild,
+  -xine-lib-1.1.16.1.ebuild, -xine-lib-1.1.16.2.ebuild,
+  xine-lib-1.1.16.3.ebuild:
+  Remove old stuff - sync to gentoo.org
+
   09 Apr 2009; Matthias Schwarzott <zzam@gentoo.org>
   xine-lib-1.1.16.3.ebuild:
   Sync keywords to gentoo.org
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch
deleted file mode 100644
index c1c572d..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream ImageMagick changed part of the API and did not updated their
-deprecated support stuff, so bump us along for now to avoid having to downgrade.
-
-Gentoo-bug: 247292
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' xine-lib-1.1.15.orig/src/libxinevdec/image.c xine-lib-1.1.15/src/libxinevdec/image.c
---- xine-lib-1.1.15.orig/src/libxinevdec/image.c	2008-06-14 16:15:00.000000000 -0700
-+++ xine-lib-1.1.15/src/libxinevdec/image.c	2008-11-26 18:10:16.416309036 -0800
-@@ -110,7 +110,15 @@
-     width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */
-     height = MagickGetImageHeight(wand);
-     img_buf = malloc(width * height * 3);
-+/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels 
-+ * But upstream did not update their deprecated compat stuff.
-+ * So do a fun hack to make it work.
-+ * - 2008/11/26 Robin H. Johnson <robbat2@gentoo.org>
-+ */
-+#if MagickLibVersion >= 0x645
-+#define MagickGetImagePixels MagickGetAuthenticPixels
-+#endif
-     MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
-     DestroyMagickWand(wand);
- 
-     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch
deleted file mode 100644
index e3e411f..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xine-lib-1.1.15/src/xine-engine/buffer.h
-===================================================================
---- xine-lib-1.1.15.orig/src/xine-engine/buffer.h
-+++ xine-lib-1.1.15/src/xine-engine/buffer.h
-@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader 
- /* convert xine_waveformatex struct from little endian */
- void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
- 
--static inline _x_is_fourcc(void *ptr, void *tag) {
-+static __inline int _x_is_fourcc(void *ptr, void *tag) {
-   return memcmp(ptr, tag, 4) == 0;
- }
- 
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch
deleted file mode 100644
index 27279be..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1221306490 -3600
-# Node ID f5ff69fc65d3229ac9908b13c5bb0b9317adf80c
-# Parent  89c3e23896babb1fc6fe0f4299fa645a47297d4c
-Compilation fixes for ffmpeg API & ABI changes.
-
-diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ff_audio_decoder.c
---- a/src/combined/ffmpeg/ff_audio_decoder.c	Fri Sep 05 21:26:59 2008 +0200
-+++ b/src/combined/ffmpeg/ff_audio_decoder.c	Sat Sep 13 12:48:10 2008 +0100
-@@ -322,7 +322,7 @@
- 
-     if (!this->output_open) {
-       if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
--        avcodec_decode_audio (this->context,
-+        avcodec_decode_audio2 (this->context,
-                               (int16_t *)this->decode_buffer,
-                               &decode_buffer_size,
-                               &this->buf[0],
-diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ffmpeg_decoder.h
---- a/src/combined/ffmpeg/ffmpeg_decoder.h	Fri Sep 05 21:26:59 2008 +0200
-+++ b/src/combined/ffmpeg/ffmpeg_decoder.h	Sat Sep 13 12:48:10 2008 +0100
-@@ -33,6 +33,10 @@
- #  include "../../libffmpeg/libavcodec/avcodec.h"
- #endif
- 
-+#if LIBAVCODEC_VERSION_MAJOR > 51
-+#define bits_per_sample bits_per_coded_sample
-+#endif
-+
- typedef struct ff_codec_s {
-   uint32_t          type;
-   enum CodecID      id;
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch
deleted file mode 100644
index c85fa60..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-src/libmpeg2/motion_comp_vis.c checks for ENABLE_VIS therefore we also need to check for it.
-
---- src/libmpeg2/motion_comp.c
-+++ src/libmpeg2/motion_comp.c
-@@ -68,7 +68,7 @@
- 	mpeg2_mc = mpeg2_mc_altivec;
-     } else
- #endif
--#ifdef ARCH_SPARC
-+#if defined(ARCH_SPARC) && defined(ENABLE_VIS)
-     if (mm_accel & MM_ACCEL_SPARC_VIS) {
- #ifdef LOG
- 	fprintf (stderr, "Using VIS for motion compensation\n");
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch b/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch
deleted file mode 100644
index 3e92db9..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Alexis Ballier <aballier@gentoo.org>
-# Date 1236540650 -3600
-# Node ID 044a503f894304328c991f6495f9e14c4c4e5ecb
-# Parent  ba642133c0c8b4ece4cb4d2a98355afde7264900
-Fix build with libavutil >= 50.0.0
-
-PIX_FMT_RGBA32 was #defined to PIX_FMT_RGB32 since 2006.
-
-diff -r ba642133c0c8 -r 044a503f8943 src/combined/ffmpeg/ff_video_decoder.c
---- a/src/combined/ffmpeg/ff_video_decoder.c	Sun Mar 08 16:33:02 2009 +0000
-+++ b/src/combined/ffmpeg/ff_video_decoder.c	Sun Mar 08 20:30:50 2009 +0100
-@@ -588,7 +588,7 @@
-       img->width,
-       this->bih.biHeight);
- 
--  } else if (this->context->pix_fmt == PIX_FMT_RGBA32) {
-+  } else if (this->context->pix_fmt == PIX_FMT_RGB32) {
-           
-     int x, plane_ptr = 0;
-     uint32_t *argb_pixels;
-@@ -1304,7 +1304,7 @@
- 
- 	  /* initialize the colorspace converter */
- 	  if (!this->cs_convert_init) {
--	    if ((this->context->pix_fmt == PIX_FMT_RGBA32) ||
-+	    if ((this->context->pix_fmt == PIX_FMT_RGB32) ||
- 	        (this->context->pix_fmt == PIX_FMT_RGB565) ||
- 	        (this->context->pix_fmt == PIX_FMT_RGB555) ||
- 	        (this->context->pix_fmt == PIX_FMT_BGR24) ||
diff --git a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
deleted file mode 100644
index d9207bd..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.10 2008/10/06 22:03:02 aballier Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs libtool multilib autotools
-
-# This should normally be empty string, unless a release has a suffix.
-if [[ "${P/_pre/}" != "${P}" ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else
-	MY_PKG_SUFFIX=""
-	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
-	S="${WORKDIR}/${MY_P}"
-
-	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
-fi
-VDR_PATCHES="${PN}-1.1.11-gentoo-vdr-20080401"
-SRC_URI="${SRC_URI}
-		mirror://gentoo/${VDR_PATCHES}.tar.bz2
-		http://dev.gentoo.org/~zzam/distfiles/overlay/${VDR_PATCHES}.tar.bz2"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="-aalib -libcaca -arts esd win32codecs nls +dvd +X directfb +vorbis +alsa
-gnome sdl speex +theora ipv6 altivec opengl aac -fbcon +xv xvmc
--samba dxr3 vidix mng -flac -oss +v4l xinerama vcd +a52 +mad -imagemagick +dts
--debug +modplug -gtk pulseaudio -mmap -truetype wavpack +musepack +xcb -jack
--real +vis vdr"
-
-RDEPEND="X? ( x11-libs/libXext
-	x11-libs/libX11 )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-	xinerama? ( x11-libs/libXinerama )
-	win32codecs? ( >=media-libs/win32codecs-0.50 )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	flac? ( >=media-libs/flac-1.1.2 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	dxr3? ( >=media-libs/libfame-0.9.0 )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	theora? ( media-libs/libogg media-libs/libvorbis >=media-libs/libtheora-1.0_alpha6 )
-	speex? ( media-libs/libogg media-libs/libvorbis media-libs/speex )
-	libcaca? ( >=media-libs/libcaca-0.99_beta1 )
-	samba? ( net-fs/samba )
-	mng? ( media-libs/libmng )
-	vcd? ( media-video/vcdimager )
-	a52? ( >=media-libs/a52dec-0.7.4-r5 )
-	mad? ( media-libs/libmad )
-	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdca )
-	aac? ( >=media-libs/faad2-2.6.1 )
-	>=media-video/ffmpeg-0.4.9_p20070129
-	modplug? ( media-libs/libmodplug )
-	nls? ( virtual/libintl )
-	gtk? ( =x11-libs/gtk+-2* )
-	pulseaudio? ( media-sound/pulseaudio )
-	truetype? ( =media-libs/freetype-2* media-libs/fontconfig )
-	virtual/libiconv
-	wavpack? ( >=media-sound/wavpack-4.31 )
-	musepack? ( media-libs/libmpcdec )
-	xcb? ( >=x11-libs/libxcb-1.0 )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	real? (
-		x86? ( media-libs/win32codecs )
-		x86-fbsd? ( media-libs/win32codecs )
-		amd64? ( media-libs/amd64codecs ) )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt
-		 x11-proto/xproto
-		 x11-proto/videoproto
-		 x11-proto/xf86vidmodeproto
-		 xinerama? ( x11-proto/xineramaproto ) )
-	v4l? ( virtual/os-headers )
-	dev-util/pkgconfig
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "$FILESDIR"/${P}-libmpeg2-vis.patch
-	epatch "$FILESDIR"/${P}-buffer_h_ansi.patch
-	epatch "$FILESDIR"/${P}-ffmpeg.patch
-	epatch "$FILESDIR"/${P}-GetImagePixels.patch
-
-	# add vdr-xine patch
-	if use vdr; then
-		echo
-		einfo "Adding support for vdr-xine"
-
-		epatch "${WORKDIR}/${VDR_PATCHES}"/*
-
-		# fill in better fifo directory
-		sed -i src/vdr/input_vdr.c \
-			-e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|'
-
-		# only need to run autotools if we actually changed stuff
-
-		# add this, else libtool-2.2.4 will abort aclocal step
-		sed -i -e '/AC_PROG_CC/aAC_PROG_CXX'  "${S}"/configure.ac
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_compile() {
-	#prevent quicktime crashing
-	append-flags -frename-registers -ffunction-sections
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr
-		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
-		filter-flags -fno-omit-frame-pointer #breaks per bug #149704
-		is-flag -O? || append-flags -O2
-	fi
-
-	# Set the correct win32 dll path, bug #197236
-	local win32dir
-	if has_multilib_profile ; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	# Too many file names are the same (xine_decoder.c), change the builddir
-	# So that the relative path is used to identify them.
-	mkdir "${WORKDIR}/build"
-
-	elibtoolize
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable samba) \
-		$(use_enable altivec) \
-		$(use_enable v4l) \
-		\
-		$(use_enable mng) \
-		$(use_with imagemagick) \
-		$(use_enable gtk gdkpixbuf) \
-		\
-		$(use_enable aac faad) --with-external-libfaad \
-		$(use_with flac libflac) \
-		$(use_with vorbis) \
-		$(use_with speex) \
-		$(use_with theora) \
-		$(use_with wavpack) \
-		$(use_enable modplug) \
-		$(use_enable a52 a52dec) --with-external-a52dec \
-		$(use_enable mad) --with-external-libmad \
-		$(use_enable dts) --with-external-libdts \
-		$(use_enable musepack) --with-external-libmpcdec \
-		\
-		$(use_with X x) \
-		$(use_enable xinerama) \
-		$(use_enable vidix) \
-		$(use_enable dxr3) \
-		$(use_enable directfb) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) \
-		$(use_enable aalib) \
-		$(use_with libcaca caca) \
-		$(use_with sdl) \
-		$(use_enable xvmc) \
-		$(use_with xcb) \
-		\
-		$(use_enable oss) \
-		$(use_with alsa) \
-		$(use_with arts) \
-		$(use_with esd esound) \
-		$(use_with pulseaudio) \
-		$(use_with jack) \
-		\
-		$(use_enable vcd) --without-internal-vcdlibs \
-		\
-		$(use_enable win32codecs w32dll) \
-		$(use_enable real real-codecs) \
-		\
-		$(use_enable mmap) \
-		$(use_with truetype freetype) $(use_with truetype fontconfig) \
-		\
-		$(use_enable debug) \
-		$(use_enable vis) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--disable-optimizations \
-		--disable-syncfb \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=${win32dir} \
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
-		--enable-fast-install \
-		--disable-dependency-tracking || die "econf failed."
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
-		install || die "emake install failed."
-
-	dodoc ChangeLog
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.16.1.ebuild b/media-libs/xine-lib/xine-lib-1.1.16.1.ebuild
deleted file mode 100644
index 3d61367..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.16.1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.10 2008/10/06 22:03:02 aballier Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs libtool multilib autotools
-
-# This should normally be empty string, unless a release has a suffix.
-if [[ "${P/_pre/}" != "${P}" ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else
-	MY_PKG_SUFFIX=""
-	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
-	S="${WORKDIR}/${MY_P}"
-
-	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
-fi
-VDR_PATCHES="${PN}-1.1.16.1-gentoo-vdr-20090118"
-SRC_URI="${SRC_URI}
-		mirror://gentoo/${VDR_PATCHES}.tar.bz2
-		http://dev.gentoo.org/~zzam/distfiles/overlay/${VDR_PATCHES}.tar.bz2"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="-aalib -libcaca -arts esd win32codecs nls +dvd +X directfb +vorbis +alsa
-gnome sdl speex +theora ipv6 altivec opengl aac -fbcon +xv xvmc
--samba dxr3 vidix mng -flac -oss +v4l xinerama vcd +a52 +mad -imagemagick +dts
--debug +modplug -gtk pulseaudio -mmap -truetype wavpack +musepack +xcb -jack
--real +vis vdr"
-
-RDEPEND="X? ( x11-libs/libXext
-	x11-libs/libX11 )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-	xinerama? ( x11-libs/libXinerama )
-	win32codecs? ( >=media-libs/win32codecs-0.50 )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	flac? ( >=media-libs/flac-1.1.2 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	dxr3? ( >=media-libs/libfame-0.9.0 )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	theora? ( media-libs/libogg media-libs/libvorbis >=media-libs/libtheora-1.0_alpha6 )
-	speex? ( media-libs/libogg media-libs/libvorbis media-libs/speex )
-	libcaca? ( >=media-libs/libcaca-0.99_beta14 )
-	samba? ( net-fs/samba )
-	mng? ( media-libs/libmng )
-	vcd? ( media-video/vcdimager )
-	a52? ( >=media-libs/a52dec-0.7.4-r5 )
-	mad? ( media-libs/libmad )
-	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdca )
-	aac? ( >=media-libs/faad2-2.6.1 )
-	>=media-video/ffmpeg-0.4.9_p20070129
-	modplug? ( media-libs/libmodplug )
-	nls? ( virtual/libintl )
-	gtk? ( =x11-libs/gtk+-2* )
-	pulseaudio? ( media-sound/pulseaudio )
-	truetype? ( =media-libs/freetype-2* media-libs/fontconfig )
-	virtual/libiconv
-	wavpack? ( >=media-sound/wavpack-4.31 )
-	musepack? ( media-libs/libmpcdec )
-	xcb? ( >=x11-libs/libxcb-1.0 )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	real? (
-		x86? ( media-libs/win32codecs )
-		x86-fbsd? ( media-libs/win32codecs )
-		amd64? ( media-libs/amd64codecs ) )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt
-		 x11-proto/xproto
-		 x11-proto/videoproto
-		 x11-proto/xf86vidmodeproto
-		 xinerama? ( x11-proto/xineramaproto ) )
-	v4l? ( virtual/os-headers )
-	dev-util/pkgconfig
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# add vdr-xine patch
-	if use vdr; then
-		echo
-		einfo "Adding support for vdr-xine"
-
-		epatch "${WORKDIR}/${VDR_PATCHES}"/*
-
-		# fill in better fifo directory
-		sed -i src/vdr/input_vdr.c \
-			-e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|'
-
-		# only need to run autotools if we actually changed stuff
-
-		# add this, else libtool-2.2.4 will abort aclocal step
-		sed -i -e '/AC_PROG_CC/aAC_PROG_CXX'  "${S}"/configure.ac
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_compile() {
-	#prevent quicktime crashing
-	append-flags -frename-registers -ffunction-sections
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr
-		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
-		filter-flags -fno-omit-frame-pointer #breaks per bug #149704
-		is-flag -O? || append-flags -O2
-	fi
-
-	# Set the correct win32 dll path, bug #197236
-	local win32dir
-	if has_multilib_profile ; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	# Too many file names are the same (xine_decoder.c), change the builddir
-	# So that the relative path is used to identify them.
-	mkdir "${WORKDIR}/build"
-
-	elibtoolize
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable samba) \
-		$(use_enable altivec) \
-		$(use_enable v4l) \
-		\
-		$(use_enable mng) \
-		$(use_with imagemagick) \
-		$(use_enable gtk gdkpixbuf) \
-		\
-		$(use_enable aac faad) --with-external-libfaad \
-		$(use_with flac libflac) \
-		$(use_with vorbis) \
-		$(use_with speex) \
-		$(use_with theora) \
-		$(use_with wavpack) \
-		$(use_enable modplug) \
-		$(use_enable a52 a52dec) --with-external-a52dec \
-		$(use_enable mad) --with-external-libmad \
-		$(use_enable dts) --with-external-libdts \
-		$(use_enable musepack) --with-external-libmpcdec \
-		\
-		$(use_with X x) \
-		$(use_enable xinerama) \
-		$(use_enable vidix) \
-		$(use_enable dxr3) \
-		$(use_enable directfb) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) \
-		$(use_enable aalib) \
-		$(use_with libcaca caca) \
-		$(use_with sdl) \
-		$(use_enable xvmc) \
-		$(use_with xcb) \
-		\
-		$(use_enable oss) \
-		$(use_with alsa) \
-		$(use_with arts) \
-		$(use_with esd esound) \
-		$(use_with pulseaudio) \
-		$(use_with jack) \
-		\
-		$(use_enable vcd) --without-internal-vcdlibs \
-		\
-		$(use_enable win32codecs w32dll) \
-		$(use_enable real real-codecs) \
-		\
-		$(use_enable mmap) \
-		$(use_with truetype freetype) $(use_with truetype fontconfig) \
-		\
-		$(use_enable debug) \
-		$(use_enable vis) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--disable-optimizations \
-		--disable-syncfb \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=${win32dir} \
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
-		--enable-fast-install \
-		--disable-dependency-tracking || die "econf failed."
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
-		install || die "emake install failed."
-
-	dodoc ChangeLog
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild b/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild
deleted file mode 100644
index a00cde7..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.16.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.10 2008/10/06 22:03:02 aballier Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs libtool multilib autotools
-
-# This should normally be empty string, unless a release has a suffix.
-if [[ "${P/_pre/}" != "${P}" ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else
-	MY_PKG_SUFFIX=""
-	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
-	S="${WORKDIR}/${MY_P}"
-
-	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
-fi
-VDR_PATCHES="${PN}-1.1.16.1-gentoo-vdr-20090118"
-SRC_URI="${SRC_URI}
-		mirror://gentoo/${VDR_PATCHES}.tar.bz2
-		http://dev.gentoo.org/~zzam/distfiles/overlay/${VDR_PATCHES}.tar.bz2"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="-aalib -libcaca -arts esd win32codecs nls +dvd +X directfb +vorbis +alsa
-gnome sdl speex +theora ipv6 altivec opengl aac -fbcon +xv xvmc
--samba dxr3 vidix mng -flac -oss +v4l xinerama vcd +a52 +mad -imagemagick +dts
--debug +modplug -gtk pulseaudio -mmap -truetype wavpack +musepack +xcb -jack
--real +vis vdr"
-
-RDEPEND="X? ( x11-libs/libXext
-	x11-libs/libX11 )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-	xinerama? ( x11-libs/libXinerama )
-	win32codecs? ( >=media-libs/win32codecs-0.50 )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	flac? ( >=media-libs/flac-1.1.2 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	dxr3? ( >=media-libs/libfame-0.9.0 )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	theora? ( media-libs/libogg media-libs/libvorbis >=media-libs/libtheora-1.0_alpha6 )
-	speex? ( media-libs/libogg media-libs/libvorbis media-libs/speex )
-	libcaca? ( >=media-libs/libcaca-0.99_beta14 )
-	samba? ( net-fs/samba )
-	mng? ( media-libs/libmng )
-	vcd? ( media-video/vcdimager )
-	a52? ( >=media-libs/a52dec-0.7.4-r5 )
-	mad? ( media-libs/libmad )
-	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdca )
-	aac? ( >=media-libs/faad2-2.6.1 )
-	>=media-video/ffmpeg-0.4.9_p20070129
-	modplug? ( media-libs/libmodplug )
-	nls? ( virtual/libintl )
-	gtk? ( =x11-libs/gtk+-2* )
-	pulseaudio? ( media-sound/pulseaudio )
-	truetype? ( =media-libs/freetype-2* media-libs/fontconfig )
-	virtual/libiconv
-	wavpack? ( >=media-sound/wavpack-4.31 )
-	musepack? ( media-libs/libmpcdec )
-	xcb? ( >=x11-libs/libxcb-1.0 )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	real? (
-		x86? ( media-libs/win32codecs )
-		x86-fbsd? ( media-libs/win32codecs )
-		amd64? ( media-libs/amd64codecs ) )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt
-		 x11-proto/xproto
-		 x11-proto/videoproto
-		 x11-proto/xf86vidmodeproto
-		 xinerama? ( x11-proto/xineramaproto ) )
-	v4l? ( virtual/os-headers )
-	dev-util/pkgconfig
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-avutil.patch"
-
-	# add vdr-xine patch
-	if use vdr; then
-		echo
-		einfo "Adding support for vdr-xine"
-
-		epatch "${WORKDIR}/${VDR_PATCHES}"/*
-
-		# fill in better fifo directory
-		sed -i src/vdr/input_vdr.c \
-			-e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|'
-
-		# only need to run autotools if we actually changed stuff
-
-		# add this, else libtool-2.2.4 will abort aclocal step
-		sed -i -e '/AC_PROG_CC/aAC_PROG_CXX'  "${S}"/configure.ac
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_compile() {
-	#prevent quicktime crashing
-	append-flags -frename-registers -ffunction-sections
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr
-		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
-		filter-flags -fno-omit-frame-pointer #breaks per bug #149704
-		is-flag -O? || append-flags -O2
-	fi
-
-	# Set the correct win32 dll path, bug #197236
-	local win32dir
-	if has_multilib_profile ; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	# Too many file names are the same (xine_decoder.c), change the builddir
-	# So that the relative path is used to identify them.
-	mkdir "${WORKDIR}/build"
-
-	elibtoolize
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable samba) \
-		$(use_enable altivec) \
-		$(use_enable v4l) \
-		$(use_enable mng) \
-		$(use_with imagemagick) \
-		$(use_enable gtk gdkpixbuf) \
-		$(use_enable aac faad) --with-external-libfaad \
-		$(use_with flac libflac) \
-		$(use_with vorbis) \
-		$(use_with speex) \
-		$(use_with theora) \
-		$(use_with wavpack) \
-		$(use_enable modplug) \
-		$(use_enable a52 a52dec) --with-external-a52dec \
-		$(use_enable mad) --with-external-libmad \
-		$(use_enable dts) --with-external-libdts \
-		$(use_enable musepack) --with-external-libmpcdec \
-		$(use_with X x) \
-		$(use_enable xinerama) \
-		$(use_enable vidix) \
-		$(use_enable dxr3) \
-		$(use_enable directfb) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) \
-		$(use_enable aalib) \
-		$(use_with libcaca caca) \
-		$(use_with sdl) \
-		$(use_enable xvmc) \
-		$(use_with xcb) \
-		$(use_enable oss) \
-		$(use_with alsa) \
-		$(use_with arts) \
-		$(use_with esd esound) \
-		$(use_with pulseaudio) \
-		$(use_with jack) \
-		$(use_enable vcd) --without-internal-vcdlibs \
-		$(use_enable win32codecs w32dll) \
-		$(use_enable real real-codecs) \
-		$(use_enable mmap) \
-		$(use_with truetype freetype) $(use_with truetype fontconfig) \
-		$(use_enable debug) \
-		$(use_enable vis) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--disable-optimizations \
-		--disable-syncfb \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=${win32dir} \
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
-		--enable-fast-install \
-		--disable-dependency-tracking
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
-		install || die "emake install failed."
-
-	dodoc ChangeLog
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.16.3.ebuild b/media-libs/xine-lib/xine-lib-1.1.16.3.ebuild
index 2f9c794..cbf4af7 100644
--- a/media-libs/xine-lib/xine-lib-1.1.16.3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.16.3.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://xine.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 IUSE="-aalib -libcaca -arts esd win32codecs nls +dvd +X directfb +vorbis +alsa
 gnome sdl speex +theora ipv6 altivec opengl aac -fbcon +xv xvmc