Sync to gentoo.org

(Portage version: 2.2_rc1/svn/Linux 2.6.25-tuxonice-r6 i686)

svn path=/testing/; revision=466

10 files changed, 10 insertions, 774 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 601aa38..574c2c4 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jul 2008; Matthias Schwarzott <zzam@gentoo.org>
+  -files/xine-lib-1.1.4-CVE-2007-1246.patch,
+  -files/xine-lib-1.1.6-fbsd.patch, -files/xine-lib-1.1.11.1-mkv.patch,
+  -files/xine-lib-1.1.11.1-qtniso.patch,
+  -files/xine-lib-1.1.12-CVE-2008-1878.patch, -xine-lib-1.1.11.1.ebuild,
+  -xine-lib-1.1.12.ebuild, -xine-lib-1.1.12-r1.ebuild,
+  xine-lib-1.1.13.ebuild:
+  Sync to gentoo.org
+
   09 Jul 2008; Matthias Schwarzott <zzam@gentoo.org> xine-lib-1.1.13.ebuild,
   +xine-lib-1.1.14.ebuild:
   Keep up with xine-lib from gentoo.org
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch b/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch
deleted file mode 100644
index 18a4fdb..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1207353205 -3600
-# Node ID ff20b8db74eabc74b7b95da4c1b44fc5d7f2ec8c
-# Parent  05ebc886fd30158b59a26e03cf2f6f3a52114b24
-Fix a regression in the Matroska demuxer.
-One '&'...
-
-diff -r 05ebc886fd30 -r ff20b8db74ea src/demuxers/ebml.c
---- a/src/demuxers/ebml.c	Fri Apr 04 18:35:33 2008 +0100
-+++ b/src/demuxers/ebml.c	Sat Apr 05 00:53:25 2008 +0100
-@@ -327,7 +327,7 @@
-   if (text)
-   {
-     text[elem->len] = '\0';
--    if (ebml_read_ascii (ebml, &elem, text))
-+    if (ebml_read_ascii (ebml, elem, text))
-       return text;
-     free (text);
-   }
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch b/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch
deleted file mode 100644
index 54a9c67..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1206976103 -3600
-# Node ID d8e1305c13820b82d896f7bc77d196b9c9645dd6
-# Parent 2cc583bdc498fd6c95b8a21c10e81a0cef4d63c6
-Revert a change which broke Quicktime atom parsing.
-
---- a/src/demuxers/demux_qt.c	Sun Mar 30 19:48:58 2008 +0100
-+++ b/src/demuxers/demux_qt.c	Mon Mar 31 16:08:23 2008 +0100
-@@ -895,11 +895,6 @@ static qt_error parse_trak_atom (qt_trak
-   for (i = ATOM_PREAMBLE_SIZE; i < trak_atom_size - 4; i++) {
-     current_atom_size = _X_BE_32(&trak_atom[i - 4]);	
-     current_atom = _X_BE_32(&trak_atom[i]);
--
--    if (current_atom_size > trak_atom_size - i) {
--      last_error = QT_NOT_A_VALID_FILE;
--      goto free_trak;
--    }
- 
-     if (current_atom == TKHD_ATOM) {
-       trak->flags = _X_BE_16(&trak_atom[i + 6]);
-
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.12-CVE-2008-1878.patch b/media-libs/xine-lib/files/xine-lib-1.1.12-CVE-2008-1878.patch
deleted file mode 100644
index 76b82cd..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.12-CVE-2008-1878.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# HG changeset patch
-# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
-# Date 1181745932 -7200
-# Node ID d0ced21e0cf2080e2d4c05e6009b76c7f42211f5
-# Parent dcabf02a88e6e20712e9367db9a7070b0f5ef02c
-Use strndup rather than just strdup to avoid overflows.
-(transplanted from 47f7f33b32805da6e8f58513c38e01dc6a595fb8)
-
---- a/src/demuxers/demux_nsf.c	Tue Apr 15 01:05:22 2008 +0100
-+++ b/src/demuxers/demux_nsf.c	Wed Jun 13 16:45:32 2007 +0200
-@@ -106,9 +106,9 @@ static int open_nsf_file(demux_nsf_t *th
- 
-   this->total_songs = header[6];
-   this->current_song = header[7];
--  this->title = strdup(&header[0x0E]);
--  this->artist = strdup(&header[0x2E]);
--  this->copyright = strdup(&header[0x4E]);
-+  this->title = strndup((char*)&header[0x0E], 0x20);
-+  this->artist = strndup((char*)&header[0x2E], 0x20);
-+  this->copyright = strndup((char*)&header[0x4E], 0x20);
- 
-   this->filesize = this->input->get_length(this->input);
- 
-
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.4-CVE-2007-1246.patch b/media-libs/xine-lib/files/xine-lib-1.1.4-CVE-2007-1246.patch
deleted file mode 100644
index 5b285ce..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.4-CVE-2007-1246.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-? default
-? enterprise
-? prakesh
-Index: src/libw32dll/DirectShow/DS_VideoDecoder.c
-===================================================================
-RCS file: /cvsroot/xine/xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c,v
-retrieving revision 1.9
-diff -u -B -r1.9 DS_VideoDecoder.c
---- src/libw32dll/DirectShow/DS_VideoDecoder.c	24 Dec 2003 16:55:36 -0000	1.9
-+++ src/libw32dll/DirectShow/DS_VideoDecoder.c	10 Mar 2007 00:33:41 -0000
-@@ -110,6 +110,7 @@
-      
-         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
-         memcpy(this->iv.m_bh, format, bihs);
-+        this->iv.m_bh->biSize = bihs;
- 
-         this->iv.m_State = STOP;
-         //this->iv.m_pFrame = 0;
-Index: src/libw32dll/dmo/DMO_VideoDecoder.c
-===================================================================
-RCS file: /cvsroot/xine/xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c,v
-retrieving revision 1.4
-diff -u -B -r1.4 DMO_VideoDecoder.c
---- src/libw32dll/dmo/DMO_VideoDecoder.c	24 Dec 2003 16:55:36 -0000	1.4
-+++ src/libw32dll/dmo/DMO_VideoDecoder.c	10 Mar 2007 00:33:41 -0000
-@@ -118,6 +118,7 @@
-      
-         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
-         memcpy(this->iv.m_bh, format, bihs);
-+        this->iv.m_bh->biSize = bihs;
- 
-         this->iv.m_State = STOP;
-         //this->iv.m_pFrame = 0;
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch b/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch
deleted file mode 100644
index 6f508c0..0000000
--- a/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
-# Date 1178289959 -7200
-# Node ID ee3cb7841d1490bb5dfb760df2f49642da9f6837
-# Parent  ce82ad163b0e36d3edefd90bfe3f2ba05ab3ace3
-Fix building of CDDA input on FreeBSD, the NetBSD patch broke it as sys/scsiio.h is not present on FreeBSD.
-
-diff -r ce82ad163b0e -r ee3cb7841d14 configure.ac
---- a/configure.ac	Wed May 02 21:51:16 2007 +0200
-+++ b/configure.ac	Fri May 04 16:45:59 2007 +0200
-@@ -1656,7 +1656,7 @@ dnl ------------------------------------
- dnl ---------------------------------------------
- 
- AC_CHECK_HEADERS([linux/cdrom.h sys/dvdio.h], [break])
--AC_CHECK_HEADERS([sys/cdio.h])
-+AC_CHECK_HEADERS([sys/cdio.h sys/scsiio.h])
- AM_CHECK_CDROM_IOCTLS(
- 	[AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])],
- 	[AC_MSG_RESULT([*** (S)VCD support will be disabled ***])])
-diff -r ce82ad163b0e -r ee3cb7841d14 src/input/input_cdda.c
---- a/src/input/input_cdda.c	Wed May 02 21:51:16 2007 +0200
-+++ b/src/input/input_cdda.c	Fri May 04 16:45:59 2007 +0200
-@@ -617,7 +617,10 @@ static int read_cdrom_frames(cdda_input_
- #elif defined(__FreeBSD__) || defined(__NetBSD__)
- 
- #include <sys/cdio.h>
-+
-+#ifdef HAVE_SYS_SCSIIO_H
- #include <sys/scsiio.h>
-+#endif
- 
- static int read_cdrom_toc(int fd, cdrom_toc *toc) {
- 
diff --git a/media-libs/xine-lib/xine-lib-1.1.11.1.ebuild b/media-libs/xine-lib/xine-lib-1.1.11.1.ebuild
deleted file mode 100644
index 261a2da..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.11.1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2008 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.11.1.ebuild,v 1.1 2008/04/07 19:42:39 aballier Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs libtool 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 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 )
-	>=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}-qtniso.patch"
-	epatch "${FILESDIR}/${P}-mkv.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 this if we actually change stuff
-		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
-
-	local myconf
-
-	# enable/disable appropiate optimizations on sparc
-	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
-	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa && unset CFLAGS
-
-	# 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) \
-		$(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) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--disable-optimizations \
-		--disable-syncfb \
-		${myconf} \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \
-		--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.12-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.12-r1.ebuild
deleted file mode 100644
index c7b4caf..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2008 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.11.1.ebuild,v 1.1 2008/04/07 19:42:39 aballier Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs libtool 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 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 )
-	>=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}-CVE-2008-1878.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
-
-	local myconf
-
-	# enable/disable appropiate optimizations on sparc
-	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
-	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa && unset CFLAGS
-
-	# 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) \
-		$(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) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--disable-optimizations \
-		--disable-syncfb \
-		${myconf} \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \
-		--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.12.ebuild b/media-libs/xine-lib/xine-lib-1.1.12.ebuild
deleted file mode 100644
index 95c6412..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.12.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2008 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.11.1.ebuild,v 1.1 2008/04/07 19:42:39 aballier Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs libtool 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 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 )
-	>=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
-
-	local myconf
-
-	# enable/disable appropiate optimizations on sparc
-	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
-	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa && unset CFLAGS
-
-	# 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) \
-		$(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) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--disable-optimizations \
-		--disable-syncfb \
-		${myconf} \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \
-		--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.13.ebuild b/media-libs/xine-lib/xine-lib-1.1.13.ebuild
index 78729f9..6be4c03 100644
--- a/media-libs/xine-lib/xine-lib-1.1.13.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.13.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