Added patch wrt #107854.

(Portage version: 2.0.53_rc4)

16 files changed, 75 insertions, 513 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 9ebbb54df64e..9386798ec51b 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.261 2005/10/04 21:05:49 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.262 2005/10/08 14:45:53 flameeyes Exp $
+
+*xine-lib-1.1.0-r6 (08 Oct 2005)
+*xine-lib-1.1.0-r5 (08 Oct 2005)
+*xine-lib-1.0.1-r4 (08 Oct 2005)
+*xine-lib-1_rc8-r2 (08 Oct 2005)
+
+  08 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xine-lib-formatstring.patch, -xine-lib-1_rc8-r1.ebuild,
+  +xine-lib-1_rc8-r2.ebuild, -xine-lib-1.0-r2.ebuild,
+  -xine-lib-1.0.1-r3.ebuild, +xine-lib-1.0.1-r4.ebuild,
+  -xine-lib-1.0.2.ebuild, -xine-lib-1.1.0-r3.ebuild,
+  -xine-lib-1.1.0-r4.ebuild, +xine-lib-1.1.0-r5.ebuild,
+  +xine-lib-1.1.0-r6.ebuild:
+  Added patch wrt #107854.
 
   04 Oct 2005; Hardave Riar <hardave@gentoo.org> xine-lib-1.1.0.ebuild:
   Keyworded ~mips.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 94d7609d27f2..e9368ebca8fa 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,26 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ed007306e123cca45e4134d6e182ee86 ChangeLog 15397
-MD5 44995c2f2dc4faa99ed2795e5e401719 files/digest-xine-lib-1.0-r2 134
-MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r3 137
-MD5 b5cff6ac57a1f66ac90f95608a138717 files/digest-xine-lib-1.0.2 137
+MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r4 137
 MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
-MD5 4d1a85868bfe068b61f70daaf95427ce files/digest-xine-lib-1.1.0-r3 138
-MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r4 138
-MD5 51e97df2f6ae538ab33a802eafb10457 files/digest-xine-lib-1_rc8-r1 138
+MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r5 138
+MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r6 138
+MD5 51e97df2f6ae538ab33a802eafb10457 files/digest-xine-lib-1_rc8-r2 138
+MD5 cd292167e0ca6e7910e1cf32091e3a27 files/xine-lib-formatstring.patch 315
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
-MD5 6bcd88857bddf4bc2006fa20cecf3061 xine-lib-1.0-r2.ebuild 7108
-MD5 92df7f26d80716f409399ea264bea29f xine-lib-1.0.1-r3.ebuild 7458
-MD5 e0a5ed983ed3a0a16e19b7ebfcaea30a xine-lib-1.0.2.ebuild 7460
-MD5 1499b348ff08d045ac115c22608b0e33 xine-lib-1.1.0-r3.ebuild 6118
-MD5 413c405eb3776803d032c38f90cd3ab6 xine-lib-1.1.0-r4.ebuild 6895
+MD5 538039a858e93478e97c33e3007a5943 xine-lib-1.0.1-r4.ebuild 7513
+MD5 32297879278925b8ed2c0f0dee48c88c xine-lib-1.1.0-r5.ebuild 6851
+MD5 a3714443acea9d27e7e5a8f7bcc6b87d xine-lib-1.1.0-r6.ebuild 6952
 MD5 1a7fe2febb92bcbc715be3fcdb0d8361 xine-lib-1.1.0.ebuild 7277
-MD5 05ac5f3e87594fa2a81a1a810983c9cf xine-lib-1_rc8-r1.ebuild 5240
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDRJ2DgIKl8Uu19MoRAnTMAJ9+8UubbE0862/ntiOuW57WaWBsSwCfeva5
-UcvSwmYalYD18qqfgAqM834=
-=rhmS
------END PGP SIGNATURE-----
+MD5 5290d821957f858ffb33ce863409c584 xine-lib-1_rc8-r2.ebuild 5296
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.0-r2 b/media-libs/xine-lib/files/digest-xine-lib-1.0-r2
deleted file mode 100644
index 1a5d1ec1e3b3..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.0-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 96e5195c366064e7778af44c3e71f43a xine-lib-1.0.tar.gz 7384258
-MD5 1f7ec3af2f5d1d4ae2594d5cd516b00d xine-lib-patches-0.tar.bz2 8141
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.0.1-r3 b/media-libs/xine-lib/files/digest-xine-lib-1.0.1-r4
index 134d0aee1a54..134d0aee1a54 100644
--- a/media-libs/xine-lib/files/digest-xine-lib-1.0.1-r3
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.0.1-r4
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.0.2 b/media-libs/xine-lib/files/digest-xine-lib-1.0.2
deleted file mode 100644
index 41d3c1094116..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.0.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f193aa14017ef104b797ccde9d82edc9 xine-lib-1.0.2.tar.gz 7774805
-MD5 d5fd94c89eb0630e78dfecfdb6db4573 xine-lib-patches-6.tar.bz2 15344
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r3 b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r3
deleted file mode 100644
index c425ae2c50b9..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3537cfd58d253b4be20a4975e7086e38 xine-lib-1.1.0.tar.gz 8036882
-MD5 6c884c588f33f695b888b3c0df7e577a xine-lib-patches-14.tar.bz2 13907
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r4 b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r5
index a223ce143348..a223ce143348 100644
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r4
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r5
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r6 b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r6
new file mode 100644
index 000000000000..a223ce143348
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r6
@@ -0,0 +1,2 @@
+MD5 3537cfd58d253b4be20a4975e7086e38 xine-lib-1.1.0.tar.gz 8036882
+MD5 d80756e3647449a2c3b2b71d659a6d19 xine-lib-patches-15.tar.bz2 14341
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc8-r1 b/media-libs/xine-lib/files/digest-xine-lib-1_rc8-r2
index 444f066512fe..444f066512fe 100644
--- a/media-libs/xine-lib/files/digest-xine-lib-1_rc8-r1
+++ b/media-libs/xine-lib/files/digest-xine-lib-1_rc8-r2
diff --git a/media-libs/xine-lib/files/xine-lib-formatstring.patch b/media-libs/xine-lib/files/xine-lib-formatstring.patch
new file mode 100644
index 000000000000..9730a798bbfc
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-formatstring.patch
@@ -0,0 +1,11 @@
+--- src/input/input_cdda.c.old	2005-05-28 11:26:59.000000000 +0200
++++ src/input/input_cdda.c	2005-10-02 01:43:47.921856832 +0200
+@@ -1473,7 +1473,7 @@ static void _cdda_save_cached_cddb_infos
+     return;
+   }
+   else {
+-    fprintf(fd, filecontent);
++    fprintf(fd, "%s", filecontent);
+     fclose(fd);
+   }
+   
diff --git a/media-libs/xine-lib/xine-lib-1.0-r2.ebuild b/media-libs/xine-lib/xine-lib-1.0-r2.ebuild
deleted file mode 100644
index 305ac87cfeeb..000000000000
--- a/media-libs/xine-lib/xine-lib-1.0-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2005 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.0-r2.ebuild,v 1.15 2005/10/04 14:57:41 flameeyes Exp $
-
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-# This should normally be empty string, unless a release has a suffix.
-MY_PKG_SUFFIX=""
-MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
-
-PATCHLEVEL="0"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa gnome sdl speex theora ipv6 altivec opengl aac fbcon ffmpeg xv xvmc nvidia i8x0 samba dxr3 vidix png mng flac oss v4l xinerama"
-RESTRICT="nostrip"
-
-RDEPEND="vorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	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.0.4 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	>=media-libs/libfame-0.9.0
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )
-	libcaca? ( media-libs/libcaca )
-	samba? ( net-fs/samba )
-	png? ( media-libs/libpng )
-	mng? ( media-libs/libmng )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
-	!=media-libs/xine-lib-0.9.13*"
-DEPEND="${RDEPEND}
-	v4l? ( virtual/os-headers )
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Exclude patch added in later revisions
-	EPATCH_EXCLUDE="05_all_gcc4.patch 07_all_wmalossless.patch"
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/
-
-	# Makefile.ams and configure.ac get patched, so we need to rerun
-	# autotools
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-	aclocal -I m4 || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake -afc || die "automake failed"
-	autoconf || die "autoconf failed"
-
-	libtoolize --copy --force || die "libtoolize failed"
-
-	elibtoolize
-}
-
-src_compile() {
-
-	#filter dangerous compile CFLAGS
-	strip-flags
-
-	#prevent quicktime crashing
-	append-flags -frename-registers
-
-	use x86 && has_pic && append-flags -UHAVE_MMX
-
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
-		append-flags -fno-web #49509
-		filter-flags -fno-unit-at-a-time #55202
-		append-flags -funit-at-a-time #55202
-	fi
-
-	is-flag -O? || append-flags -O1 #31243
-
-	# fix build errors with sse2 #49482
-	if use x86 ; then
-		if [ `gcc-major-version` -eq 3 ] ; then
-			append-flags -mno-sse2 `test_flag -mno-sse3`
-			filter-mfpmath sse
-		fi
-	fi
-
-	local myconf
-
-	# the win32 codec path should ignore $(get_libdir) and always use lib
-	use win32codecs \
-		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
-		|| myconf="${myconf} --disable-asf"
-
-	use sparc \
-		&& myconf="${myconf} --build=${CHOST}"
-
-	# enable/disable appropiate optimizations on sparc
-	[ "${PROFILE_ARCH}" == "sparc64" ] \
-		&& myconf="${myconf} --enable-vis"
-	[ "${PROFILE_ARCH}" == "sparc" ] \
-		&& myconf="${myconf} --disable-vis"
-
-	# Fix compilation-errors on PowerPC #45393 & #55460 & #68251
-	if use ppc || use ppc64 ; then
-		append-flags -U__ALTIVEC__
-		myconf="${myconf} `use_enable altivec`"
-	fi
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	if use hppa && [ "`gcc-version`" != "3.4" ] ; then
-		unset CFLAGS
-	else
-		append-flags -ffunction-sections
-	fi
-
-	if use xvmc; then
-		count="0"
-		use nvidia && count="`expr ${count} + 1`"
-		use i8x0 && count="`expr ${count} + 1`"
-		use cle266 && count="`expr ${count} + 1`"
-		if [ "${count}" -gt "1" ]; then
-			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only"
-			eerror "include support for one video card:"
-			eerror "   nvidia, i8x0, cle266"
-			eerror ""
-			die "emerge again with different USE flags"
-		fi
-
-		use nvidia && xvmclib="XvMCNVIDIA"
-		use i8x0 && xvmclib="I810XvmC"
-		use cle266 && xvmclib="viaXvMC"
-
-		if [ -n "${xvmclib}" ]; then
-			if [ -f "${ROOT}/usr/$(get_libdir)/libXvMC.so" -o -f "${ROOT}/usr/$(get_libdir)/libXvMC.a" ]; then
-				myconf="${myconf} --with-xvmc-path=${ROOT}/usr/$(get_libdir) --with-xxmc-path=${ROOT}/usr/$(get_libdir) --with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
-			elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXvMC.so" -o -f "${ROOT}/usr/X11R6/$(get_libdir)/libXvMC.a" ]; then
-				myconf="${myconf} --with-xvmc-path=${ROOT}/usr/X11R6/$(get_libdir) --with-xxmc-path=${ROOT}/usr/X11R6/$(get_libdir) --with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
-			else
-				ewarn "Couldn't find libXvMC.  Disabling xvmc support."
-			fi
-		fi
-	fi
-
-	if use xv; then
-		if [ -f "${ROOT}/usr/$(get_libdir)/libXv.so" ]; then
-			myconf="${myconf} --with-xv-path=${ROOT}/usr/$(get_libdir)"
-		elif [ -f "${ROOT}/usr/$(get_libdir)/libXv.a" ]; then
-			myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/$(get_libdir)"
-		elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.so" ]; then
-			myconf="${myconf} --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)"
-		elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.a" ]; then
-			myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)"
-		else
-			eerror "Couldn't find your libXv.  Did you set USE="xv" when you emerged xorg-x11?"
-			die "Couldn't find libXv."
-		fi
-	fi
-
-	use ffmpeg && myconf="${myconf} --with-external-ffmpeg=/usr"
-
-	econf \
-		$(use_enable gnome) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable samba) \
-		\
-		$(use_enable mng) \
-		$(use_enable png) \
-		\
-		$(use_enable aac faad) \
-		$(use_enable flac) \
-		$(use_with vorbis ogg) $(use_with vorbis ) \
-		\
-		$(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_enable libcaca caca) \
-		$(use_enable sdl) \
-		\
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable esd) \
-		${myconf} \
-		--disable-dependency-tracking || die "Configure failed"
-
-		#$(use_with dvdnav external-dvdnav) \
-		#$(use_enable macos macosx-video) $(use_enable macos coreaudio) \
-		# This will be added when polypaudio will be added to portage.
-		# $(use_enable polypaudio)
-
-	emake -j1 || die "Parallel make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-
-	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
-	dodir /usr/share/xine/libxine1/fonts
-	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
-
-	dodoc AUTHORS ChangeLog README TODO
-	cd ${S}/doc
-	dodoc dataflow.dia README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Make sure to remove your ~/.xine if upgrading from"
-	einfo "a pre-1.0 version."
-	einfo
-}
diff --git a/media-libs/xine-lib/xine-lib-1.0.1-r3.ebuild b/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild
index c85efceb272f..d1eb9b1087d2 100644
--- a/media-libs/xine-lib/xine-lib-1.0.1-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0.1-r3.ebuild,v 1.9 2005/10/04 14:57:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.1-r4.ebuild,v 1.1 2005/10/08 14:45:53 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa
 gnome sdl speex theora ipv6 altivec opengl aac fbcon ffmpeg xv xvmc nvidia i8x0
 samba dxr3 vidix png mng flac oss v4l xinerama vcd a52 mad"
@@ -49,7 +49,7 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	!=media-libs/xine-lib-0.9.13*"
 
 DEPEND="${RDEPEND}
-	v4l? ( virtual/os-headers )
+	v4l? ( sys-kernel/linux-headers )
 	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.59
 	dev-util/pkgconfig
@@ -64,6 +64,7 @@ src_unpack() {
 	# That patch is highly experimental!
 	EPATCH_EXCLUDE="07_all_vidix64.patch 03_all_kernel26.patch"
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/
+	epatch ${FILESDIR}/xine-lib-formatstring.patch
 
 	# Makefile.ams and configure.ac get patched, so we need to rerun
 	# autotools
diff --git a/media-libs/xine-lib/xine-lib-1.0.2.ebuild b/media-libs/xine-lib/xine-lib-1.0.2.ebuild
deleted file mode 100644
index 019a1b4c1fac..000000000000
--- a/media-libs/xine-lib/xine-lib-1.0.2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2005 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.0.2.ebuild,v 1.4 2005/10/04 14:57:41 flameeyes Exp $
-
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-# This should normally be empty string, unless a release has a suffix.
-MY_PKG_SUFFIX=""
-MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
-
-PATCHLEVEL="6"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa
-gnome sdl speex theora ipv6 altivec opengl aac fbcon ffmpeg xv xvmc nvidia i8x0
-samba dxr3 vidix png mng flac oss v4l xinerama vcd a52 mad"
-RESTRICT="nostrip"
-
-RDEPEND="vorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	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.0.4 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	dxr3? ( >=media-libs/libfame-0.9.0 )
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )
-	libcaca? ( media-libs/libcaca )
-	samba? ( net-fs/samba )
-	png? ( media-libs/libpng )
-	mng? ( media-libs/libmng )
-	vcd? ( media-video/vcdimager )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
-	a52? ( >=media-libs/a52dec-0.7.4-r5 )
-	mad? ( media-libs/libmad )
-	!=media-libs/xine-lib-0.9.13*"
-
-DEPEND="${RDEPEND}
-	v4l? ( virtual/os-headers )
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# That patch is highly experimental!
-	EPATCH_EXCLUDE="07_all_vidix64.patch 03_all_kernel26.patch"
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/
-
-	# Makefile.ams and configure.ac get patched, so we need to rerun
-	# autotools
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-	aclocal -I m4 || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake -afc || die "automake failed"
-	autoconf || die "autoconf failed"
-
-	libtoolize --copy --force || die "libtoolize failed"
-
-	elibtoolize
-}
-
-src_compile() {
-	#filter dangerous compile CFLAGS
-	strip-flags
-
-	#prevent quicktime crashing
-	append-flags -frename-registers
-
-	use x86 && has_pic && append-flags -UHAVE_MMX
-
-	if [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -ge "4" ] || \
-	[ "$(gcc-major-version)" -ge "4" ]; then
-		# bugs 49509 and 55202
-		append-flags -fno-web -funit-at-a-time
-		filter-flags -fno-unit-at-a-time #55202
-	fi
-
-	is-flag -O? || append-flags -O1 #31243
-
-	# fix build errors with sse2 #49482
-	if use x86 && [ $(gcc-major-version) -ge 3 ]; then
-		append-flags -mno-sse2 $(test_flag -mno-sse3)
-		filter-mfpmath sse
-	fi
-
-	local myconf
-
-	# the win32 codec path should ignore $(get_libdir) and always use lib
-	use win32codecs \
-		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
-		|| myconf="${myconf} --disable-asf"
-
-	# enable/disable appropiate optimizations on sparc
-	[ "${PROFILE_ARCH}" == "sparc64" ] \
-		&& myconf="${myconf} --enable-vis"
-	[ "${PROFILE_ARCH}" == "sparc" ] \
-		&& myconf="${myconf} --disable-vis"
-
-	# Fix compilation-errors on PowerPC #45393 & #55460 & #68251
-	if use ppc || use ppc64 ; then
-		append-flags -U__ALTIVEC__
-		myconf="${myconf} $(use_enable altivec)"
-	fi
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	if use hppa; then
-		unset CFLAGS
-	else
-		append-flags -ffunction-sections
-	fi
-
-	if use xvmc; then
-		count="0"
-		use nvidia && count="`expr ${count} + 1`"
-		use i8x0 && count="`expr ${count} + 1`"
-		use cle266 && count="`expr ${count} + 1`"
-		if [ "${count}" -gt "1" ]; then
-			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only"
-			eerror "include support for one video card:"
-			eerror "   nvidia, i8x0, cle266"
-			eerror ""
-			die "emerge again with different USE flags"
-		fi
-
-		use nvidia && xvmclib="XvMCNVIDIA"
-		use i8x0 && xvmclib="I810XvmC"
-		use cle266 && xvmclib="viaXvMC"
-
-		if [ -n "${xvmclib}" ]; then
-			if [ -f "${ROOT}/usr/$(get_libdir)/libXvMC.so" -o -f "${ROOT}/usr/$(get_libdir)/libXvMC.a" ]; then
-				myconf="${myconf} --with-xvmc-path=${ROOT}/usr/$(get_libdir) --with-xxmc-path=${ROOT}/usr/$(get_libdir) --with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
-			elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXvMC.so" -o -f "${ROOT}/usr/X11R6/$(get_libdir)/libXvMC.a" ]; then
-				myconf="${myconf} --with-xvmc-path=${ROOT}/usr/X11R6/$(get_libdir) --with-xxmc-path=${ROOT}/usr/X11R6/$(get_libdir) --with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
-			else
-				ewarn "Couldn't find libXvMC.  Disabling xvmc support."
-			fi
-		fi
-	fi
-
-	if use xv; then
-		if [ -f "${ROOT}/usr/$(get_libdir)/libXv.so" ]; then
-			myconf="${myconf} --with-xv-path=${ROOT}/usr/$(get_libdir)"
-		elif [ -f "${ROOT}/usr/$(get_libdir)/libXv.a" ]; then
-			myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/$(get_libdir)"
-		elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.so" ]; then
-			myconf="${myconf} --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)"
-		elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.a" ]; then
-			myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)"
-		else
-			eerror "Couldn't find your libXv.  Did you set USE=\"xv\" when you emerged xorg-x11?"
-			die "Couldn't find libXv."
-		fi
-	fi
-
-	use ffmpeg && myconf="${myconf} --with-external-ffmpeg=/usr"
-
-	econf \
-		$(use_enable gnome) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable samba) \
-		\
-		$(use_enable mng) \
-		$(use_enable png) \
-		\
-		$(use_enable aac faad) \
-		$(use_enable flac) \
-		$(use_with vorbis ogg) $(use_with vorbis) \
-		$(use_enable speex) \
-		\
-		$(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_enable libcaca caca) \
-		$(use_enable sdl) \
-		\
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable esd) \
-		$(use_enable vcd) --without-internal-vcdlibs \
-		$(use_with a52 external-a52dec) \
-		$(use_with mad external-libmad) \
-		--disable-polypaudio \
-		${myconf} \
-		--disable-dependency-tracking || die "Configure failed"
-
-		#$(use_with dvdnav external-dvdnav) \
-		#$(use_enable macos macosx-video) $(use_enable macos coreaudio) \
-		# This will be added when polypaudio will be added to portage.
-		# $(use_enable polypaudio)
-
-	emake -j1 || die "Parallel make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-
-	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
-	dodir /usr/share/xine/libxine1/fonts
-	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
-
-	dodoc AUTHORS ChangeLog README TODO dataflow.dia doc/README* doc/faq/faq.txt
-	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
-
-	rm -rf ${D}/usr/share/doc/xine
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Make sure to remove your ~/.xine if upgrading from a pre-1.0 version."
-	einfo
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.0-r3.ebuild b/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild
index 1187b2235a5e..c413c5959335 100644
--- a/media-libs/xine-lib/xine-lib-1.1.0-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0-r3.ebuild,v 1.4 2005/10/04 14:57:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r5.ebuild,v 1.1 2005/10/08 14:45:54 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic toolchain-funcs libtool autotools
 MY_PKG_SUFFIX=""
 MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
 
-PATCHLEVEL="14"
+PATCHLEVEL="15"
 
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -17,14 +17,24 @@ SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 sparc ~x86"
 IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa
 gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc nvidia i8x0
 samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts"
 RESTRICT="nostrip"
 
 RDEPEND="vorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
+	X? ( || ( (
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
+	xv? ( || ( x11-libs/libXv virtual/x11 ) )
+	xvmc? (
+		|| ( x11-libs/libXvMC virtual/x11 )
+		nvidia? ( media-video/nvidia-glx )
+		cle266? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
+		i8x0? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) ) )
+	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
 	win32codecs? ( >=media-libs/win32codecs-0.50 )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
@@ -49,7 +59,17 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	!=media-libs/xine-lib-0.9.13*"
 
 DEPEND="${RDEPEND}
-	v4l? ( virtual/os-headers )
+	X? ( || ( (
+			x11-base/xorg-server
+			x11-libs/libXt
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-proto/videoproto
+			x11-proto/xf86vidmodeproto )
+		virtual/x11 )
+		)
+	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	v4l? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig
 	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.59
@@ -62,6 +82,7 @@ src_unpack() {
 	cd ${S}
 
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches/
+	epatch ${FILESDIR}/xine-lib-formatstring.patch
 
 	AT_M4DIR="m4" eautoreconf
 	elibtoolize
@@ -71,6 +92,8 @@ src_unpack() {
 get_x11_dir() {
 	if [[ -f "${ROOT}/usr/$(get_libdir)/$1" ]]; then
 		echo "${ROOT}/usr/$(get_libdir)"
+	elif [[ -f "${ROOT}/usr/$(get_libdir)/xorg/$1" ]]; then
+		echo "${ROOT}/usr/$(get_libdir)/xorg"
 	elif [[ -f "${ROOT}/usr/X11R6/$(get_libdir)/$1" ]]; then
 		echo "${ROOT}/usr/X11R6/$(get_libdir)"
 	fi
diff --git a/media-libs/xine-lib/xine-lib-1.1.0-r4.ebuild b/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild
index 9fb2bfe6f492..4b1e65c486b7 100644
--- a/media-libs/xine-lib/xine-lib-1.1.0-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0-r4.ebuild,v 1.5 2005/10/06 03:42:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild,v 1.1 2005/10/08 14:45:54 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -70,7 +70,7 @@ DEPEND="${RDEPEND}
 		virtual/x11 )
 		)
 	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	v4l? ( virtual/os-headers )
+	v4l? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig
 	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.59
@@ -83,6 +83,7 @@ src_unpack() {
 	cd ${S}
 
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches/
+	epatch ${FILESDIR}/xine-lib-formatstring.patch
 
 	AT_M4DIR="m4" eautoreconf
 	elibtoolize
diff --git a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc8-r2.ebuild
index 651091f7a2d1..829b460fbbd3 100644
--- a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_rc8-r1.ebuild,v 1.24 2005/07/01 21:02:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r2.ebuild,v 1.1 2005/10/08 14:45:54 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 mips"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec pic"
 RESTRICT="nostrip"
 
@@ -60,6 +60,7 @@ src_unpack() {
 	use pic || EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 04_all_pic.patch 05_x86_hardened-mmx.patch"
 
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/
+	epatch ${FILESDIR}/xine-lib-formatstring.patch
 
 	# Fix detection of hppa2.0 and hppa1.1 CHOST
 	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure.ac