media-libs/xine-lib: Synchronize to gentoo.org

svn path=/testing/; revision=436

9 files changed, 90 insertions, 473 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 9a27e25..4f24f2f 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  -xine-lib-1.1.4-r2.ebuild, -xine-lib-1.1.6.ebuild, -xine-lib-1.1.7.ebuild,
+  xine-lib-1.1.8.ebuild, xine-lib-1.1.11.ebuild, +xine-lib-1.1.11.1.ebuild,
+  +files/xine-lib-1.1.11.1-mkv.patch, +files/xine-lib-1.1.11.1-qtniso.patch:
+  Synchronize to gentoo.org
+
   03 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   +xine-lib-1.1.11.ebuild:
   Updated vdr-xine patched ebuild to xine-lib-1.1.11
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index bbf9266..b5981b4 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,22 +1,16 @@
+AUX xine-lib-1.1.11.1-mkv.patch 628 RMD160 6066f4e7f3e4ea45e3e629ca084c9c7719fd060c SHA1 2b1700262d0afd30515cf3a4bf74c6d7ba1b4d5a SHA256 51a0d028abbbefddc07dd0dce2e0eada4667902fc69597943223407301579daa
+AUX xine-lib-1.1.11.1-qtniso.patch 817 RMD160 89aec70dc2709f80441c1704734e58e7e7b52905 SHA1 5912924bfd5e1fdc77c97cfc5b44f9b6a0fe3c98 SHA256 a341c8096174500671afd01120f3d365611173c467b72071688662252ebd709f
 AUX xine-lib-1.1.4-CVE-2007-1246.patch 1304 RMD160 56394c48df401162c225f956a9b83fc8c3970668 SHA1 f4088a8e984d05535ea33d23a2010b2c7943de44 SHA256 6771d7b21d68882501f20d338f794d8400ec683dec5e90b7bce54bafd7b9dceb
 AUX xine-lib-1.1.6-fbsd.patch 1308 RMD160 da5504c5d49e0d80a5afe66eeed3f3b17609b7e2 SHA1 95cf14d4d35d11cd16df229de78a66b8d6b3c327 SHA256 dc87be5e854af5f208c928506b9c6c0f63f391231aed383b0e633664964141dd
 AUX xine-lib-1.1.8-dxr3.patch 543 RMD160 4fc1c9ae238c416f097e85b47a8ba4e04fb1c14f SHA1 d5d1ad4ad4a88dda30207d67f3e5e2b6b174fabd SHA256 d6cd3a848de564ccaa82f92e32983ce3a444db357c56b9312be226eac7a81aff
 DIST xine-lib-1.1.11-gentoo-vdr-20080401.tar.bz2 23275 RMD160 176a118dcd1510032cedef0e75074edc14e9a551 SHA1 d6fc9c08cfe480023d1eddb8b90923c71f9198c1 SHA256 8b5fa96e2371bd377cce7989928e1be6e955b1294972afffefbd7717bec6ce2d
+DIST xine-lib-1.1.11.1.tar.bz2 7409526 RMD160 563b6a1aa3ad55073825df832919008c0ba24610 SHA1 77de8ff38c942376bd3a84d291d6b7d0060ebfeb SHA256 fc45fcf7c9ed2d7e7157ae322dbdb3129baedda93ee0e47caee7fe1d55b748ed
 DIST xine-lib-1.1.11.tar.bz2 7404364 RMD160 ad4521be876ec09cb715cd9c784625ae3989c6c9 SHA1 fc5a853eba5b1d1602f4fcd3ca5f7d572db1f89a SHA256 a8c89df7d53d0581b6f9187f453fcc50022e0f261faa5606377ae4bfb53402fc
-DIST xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697 RMD160 709bd9cdcbb289b6f211d6dd32043cffe404771a SHA1 2795b6059f906b2b94cd04f848a4b34eff7bedab SHA256 97306a31b76175e72edc578e74636deda88a1752bb6a70457f72c2fc16a5aba9
-DIST xine-lib-1.1.4-xcb.patch.bz2 22346 RMD160 0e993341e7ca4bd1ae3604235a1004f1c5d6ee07 SHA1 51fb50edec0b3d66ef4b18667d332a885c5a8983 SHA256 8dc146699eadd52fcf1b1df296505fb24e5382696c40d325de22c782f7ca21bb
-DIST xine-lib-1.1.4.tar.bz2 6997816 RMD160 c77de004c9c3b74dca3de08aea0feb27db70a4c2 SHA1 ee3496a3de8d9935ca23ff1fae3677a61ce1cb21 SHA256 e5515631b46a74be462a6076194d136d1c49adfd817f97e3a5e6dba88eab6c23
-DIST xine-lib-1.1.5-gentoo-vdr-20070414.tar.bz2 24163 RMD160 782c4da560f94ecf6bc44bc26352588d2d86f416 SHA1 4b62db9c4ca5097b5481a435dc58ccffae7eba59 SHA256 0a034e1e91b1057f3b5c053478a08c11b040e1df0c4922bb39fc93d4ae70fea9
-DIST xine-lib-1.1.6.tar.bz2 7293043 RMD160 938be4d24a41439428162dde0f1d0dd59a4b376a SHA1 f7c865d08991be875eb986dab2640e788946e426 SHA256 ead4cd9b9db554e0a7473670dd666df7a43f87945ee701419a2ca258cbc31a3a
-DIST xine-lib-1.1.7-gentoo-vdr-20070614.tar.bz2 24036 RMD160 ee66a3044a5b595103db46384b802399e0dd5916 SHA1 1bf66c7a9b0709da124b159d2e37331c8c644652 SHA256 8d53ca9038d51d02d592209783070ce0065543820079dfa2bf170a12499406b2
-DIST xine-lib-1.1.7.tar.bz2 7295585 RMD160 7cb3f7d1c2eca6dd7a52197305a1ffd74dc4acae SHA1 acbd545b818f0eb120be60e1116152000544020f SHA256 6f6fce2f75df97892d653e08fc272ed012eb3b7b53178e6b59eb958437acccab
 DIST xine-lib-1.1.8-gentoo-vdr-20070904.tar.bz2 28836 RMD160 648273f7365691538d006e1f56ba608d13d798b9 SHA1 eb0d1f37f86c5b7fbea93ac2cd8d9fa7b99434ce SHA256 83fee623dae5909faaa3e4bec83d6fab33c1071fd9e164e185ffb6577794940f
 DIST xine-lib-1.1.8.tar.bz2 7284933 RMD160 b926caa13d5b3f3c74eee681aa6c47c6083c1349 SHA1 48c7402ee2ada28e4b271d9dfb2bcb4d812e7daf SHA256 6c9f11bdec714f8df36b5140a7c8cc6ec81dd8a7673f4756e940cee4f4833c0e
-EBUILD xine-lib-1.1.11.ebuild 6093 RMD160 92087ef847cc23c5f72a35dd5dcb09a988c8f9a5 SHA1 039ca23f96a7a31722c064e251d232aee014d6b8 SHA256 1157500c7ddee482540bce488e1dde6b5504a1ccd0da7f048dc088f2852b944d
-EBUILD xine-lib-1.1.4-r2.ebuild 6289 RMD160 aa2e809b0ca054e137922e90b097600c7faaebf3 SHA1 43ae34db4be6be7e57d14a14bf57f5303341370c SHA256 57b8a843b0b3b632c2e6ce156e9b500a7fe2057bcf4210944fd4ba6f2b630d13
-EBUILD xine-lib-1.1.6.ebuild 6266 RMD160 65aef7642b804cf4f3aa4462cbe5e13d029c9874 SHA1 ab7713e2c46dac6cd35179d51f361ea45a31b72c SHA256 924ea4386779badd40227184a58374a1e8bd9716298baaccbdfc2c2a6b584df7
-EBUILD xine-lib-1.1.7.ebuild 6245 RMD160 7db5f044288bdf4965887cee10878f5e728a323b SHA1 834360f350b1e6d12a2b4c2c3d46bc7ad3feb779 SHA256 86e21dd13a5c4e6a21cf3c25083d6c05dee8cf82e99464c85d890bdfeeefd832
-EBUILD xine-lib-1.1.8.ebuild 6245 RMD160 6c1bdbecff1f25e9b2fe6fbf140d040bcf68042d SHA1 b1d23398d3ebc8a94d23abd3e927cd0a3da9136f SHA256 48dbaf08ca005bf627b87008b60f3aad3aca5aaf85f96d69e6d6268f32b9576d
+EBUILD xine-lib-1.1.11.1.ebuild 6176 RMD160 92c52695c7bac8bdd4c706cfd78ef80517771498 SHA1 d664bae77d3bf46e7607e496a3bf4cdf115dd9a3 SHA256 6fc32ef312f0c643c7ca2464f8b0871c80822fe797fbfe4ff50528a2d5fc0466
+EBUILD xine-lib-1.1.11.ebuild 6095 RMD160 9f73087e2ef1ee73eb45352db170471f710105d3 SHA1 28b584fa307161febc3568ec12a44afd89779fc5 SHA256 f953b3831385ae36dde402de411296085f8246d9340ecf79dbd36217fec51d2c
+EBUILD xine-lib-1.1.8.ebuild 6253 RMD160 5a2e3a074f18ca3aa8c423fb9cf1b476b65d3d9c SHA1 575bb2c9bcaebeabdbb8d873f9cdfd10e1b39583 SHA256 cecb78b7b068df2a7328ce7cea51825cbec3aaa2c0e53ad6e69e41d7e45fc66b
 EBUILD xine-lib-9999.ebuild 5533 RMD160 29b0ebacb66dc77307fda00cde32c6321b10e456 SHA1 98f0f922b2f1f196e72069a403794a14453ce2d5 SHA256 1dc638263f48595ab66bae8a7f319b2642f3b04a2161b560bb154fcdb0552d5d
-MISC ChangeLog 2535 RMD160 0223054a0b591f6f273952326827207c3b36fd0e SHA1 59d7826fa48f68d83b72d17330f040f8888c0147 SHA256 d72aba00f697d7d5a74209ba14763d29191764c4c5b3515c11567677e981d667
+MISC ChangeLog 2847 RMD160 a852bd1048efe2c4c6f5cfd0cfdf117850d81b32 SHA1 2fd7e737e3d484af57604ad5e7898e912fedb84d SHA256 53b3fceb06affcd6735ffd19473f8111420f0cc4ec24cf3e2dad8f66c1f2d47b
 MISC metadata.xml 482 RMD160 4ad7da31113020d5de3a47ea5b367b186e93c7cb SHA1 8d99078eabffe305b5d8f8e5af9e27a2f6339890 SHA256 02042c581c6cb0316663d998281da538fdd14f8d4c0466edb0b6022b0ea9b7a3
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
new file mode 100644
index 0000000..18a4fdb
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch
@@ -0,0 +1,20 @@
+# 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
new file mode 100644
index 0000000..54a9c67
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch
@@ -0,0 +1,23 @@
+
+# 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/xine-lib-1.1.7.ebuild b/media-libs/xine-lib/xine-lib-1.1.11.1.ebuild
index 027b693..6c6f913 100644
--- a/media-libs/xine-lib/xine-lib-1.1.7.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.11.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.7.ebuild,v 1.1 2007/06/12 14:29:55 drac Exp $
+# $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
 
@@ -14,22 +16,22 @@ else
 
 	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
 fi
-
+VDR_PATCHES="${PN}-1.1.11-gentoo-vdr-20080401"
 SRC_URI="${SRC_URI}
-		mirror://vdrfiles/${PN}/${P}-gentoo-vdr-20070614.tar.bz2"
+		mirror://vdrfiles/${PN}/${VDR_PATCHES}.tar.bz2"
 
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~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
-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 vdr-net"
+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 )
@@ -57,7 +59,7 @@ RDEPEND="X? ( x11-libs/libXext
 	a52? ( >=media-libs/a52dec-0.7.4-r5 )
 	mad? ( media-libs/libmad )
 	imagemagick? ( media-gfx/imagemagick )
-	dts? ( || ( media-libs/libdca media-libs/libdts ) )
+	dts? ( media-libs/libdca )
 	>=media-video/ffmpeg-0.4.9_p20070129
 	modplug? ( media-libs/libmodplug )
 	nls? ( virtual/libintl )
@@ -87,26 +89,24 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-qtniso.patch"
+	epatch "${FILESDIR}/${P}-mkv.patch"
 
-	# add some vdr relevated patches
+	# add vdr-xine patch
 	if use vdr; then
 		echo
-		einfo "Add VDR patches"
+		einfo "Adding support for vdr-xine"
 
-#		epatch ${WORKDIR}/${PN}-gentoo-vdr/050-libmpeg2.patch # obselelt up from 1.1.7 ?
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/060-max-showings.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/070-export-functions.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/080-threading-redraw.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/100-main-gentoo-vdr.patch
+		epatch "${WORKDIR}/${VDR_PATCHES}"/*
 
-		if use vdr-net; then
-			epatch ${WORKDIR}/${PN}-gentoo-vdr/110-vdr-${PN}-1.1.2-network.diff
-		fi
+		# 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
-
-	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
@@ -154,7 +154,7 @@ src_compile() {
 		$(use_with theora) \
 		$(use_with wavpack) \
 		$(use_enable modplug) \
-		$(use_enable a52) --with-external-a52dec \
+		$(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 \
@@ -203,7 +203,9 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" \
+	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.11.ebuild b/media-libs/xine-lib/xine-lib-1.1.11.ebuild
index 59fc0ee..a2d6e7a 100644
--- a/media-libs/xine-lib/xine-lib-1.1.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.11.ebuild
@@ -96,7 +96,7 @@ src_unpack() {
 		echo
 		einfo "Adding support for vdr-xine"
 
-		epatch ${WORKDIR}/${VDR_PATCHES}/*
+		epatch "${WORKDIR}/${VDR_PATCHES}"/*
 
 		# fill in better fifo directory
 		sed -i src/vdr/input_vdr.c \
diff --git a/media-libs/xine-lib/xine-lib-1.1.4-r2.ebuild b/media-libs/xine-lib/xine-lib-1.1.4-r2.ebuild
deleted file mode 100644
index 5f24b34..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2007 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.4.ebuild,v 1.3 2007/01/29 18:50:01 flameeyes Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="latest"
-
-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
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-xcb.patch.bz2
-	mirror://vdrfiles/${PN}/${P}-gentoo-vdr-20070130.tar.bz2"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~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
-vdr vdr-net"
-
-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/libdts )
-	>=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 )
-	!=media-libs/xine-lib-0.9.13*"
-
-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 "${WORKDIR}/${P}-xcb.patch"
-	epatch "${FILESDIR}/${P}-CVE-2007-1246.patch"
-
-	# add some vdr relevated patches
-	if use vdr; then
-		echo
-		einfo "Add VDR patches"
-
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/040-centre_crop_out.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/050-libmpeg2.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/060-max-showings.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/070-export-functions.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/080-threading-redraw.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/100-main-gentoo-vdr.patch
-
-		if use vdr-net; then
-			epatch ${WORKDIR}/${PN}-gentoo-vdr/110-vdr-${PN}-1.1.2-network.diff
-		fi
-
-	fi
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-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
-
-	# debug useflag used to emulate debug make targets. See bug #112980 and the
-	# xine maintainers guide.
-	use debug && append-flags -UNDEBUG -DDEBUG
-
-	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) --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_enable vcd) --without-internal-vcdlibs \
-		\
-		$(use_enable win32codecs w32dll) \
-		\
-		$(use_enable mmap) \
-		$(use_with truetype freetype) $(use_with truetype fontconfig) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--disable-optimizations \
-		--disable-syncfb \
-		--disable-jack \
-		${myconf} \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \
-		--enable-fast-install \
-		--disable-dependency-tracking || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
-		install || die "Install failed"
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.6.ebuild b/media-libs/xine-lib/xine-lib-1.1.6.ebuild
deleted file mode 100644
index 63ebdb2..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.6.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2007 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.5.ebuild,v 1.2 2007/04/14 12:13:47 genstef Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="latest"
-
-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
-
-SRC_URI="${SRC_URI}
-	mirror://vdrfiles/${PN}/${PN}-1.1.5-gentoo-vdr-20070414.tar.bz2"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~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 vdr-net"
-
-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/libdts )
-	>=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 )
-	)
-	!=media-libs/xine-lib-0.9.13*"
-
-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 some vdr relevated patches
-	if use vdr; then
-		echo
-		einfo "Add VDR patches"
-
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/050-libmpeg2.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/060-max-showings.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/070-export-functions.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/080-threading-redraw.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/100-main-gentoo-vdr.patch
-
-		if use vdr-net; then
-			epatch ${WORKDIR}/${PN}-gentoo-vdr/110-vdr-${PN}-1.1.2-network.diff
-		fi
-
-	fi
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-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) --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 -j1 DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
-		install || die "Install failed"
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.8.ebuild b/media-libs/xine-lib/xine-lib-1.1.8.ebuild
index 51d84cb..dcac5d6 100644
--- a/media-libs/xine-lib/xine-lib-1.1.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.8.ebuild,v 1.2 2007/09/04 12:22:40 drac Exp $
 
@@ -93,12 +93,12 @@ src_unpack() {
 		echo
 		einfo "Add VDR patches"
 
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/060-max-showings.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/080-threading-redraw.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/100-main-gentoo-vdr.patch
+		epatch "${WORKDIR}/${PN}-gentoo-vdr/060-max-showings.patch"
+		epatch "${WORKDIR}/${PN}-gentoo-vdr/080-threading-redraw.patch"
+		epatch "${WORKDIR}/${PN}-gentoo-vdr/100-main-gentoo-vdr.patch"
 
 		if use vdr-net; then
-			epatch ${WORKDIR}/${PN}-gentoo-vdr/110-vdr-${PN}-1.1.2-network.diff
+			epatch "${WORKDIR}/${PN}-gentoo-vdr/110-vdr-${PN}-1.1.2-network.diff"
 		fi
 
 		sed -i src/vdr/input_vdr.c \