Added new revision with security fix.

Package-Manager: portage-2.0.51.19

5 files changed, 340 insertions, 32 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 1fb2b8c56bd9..74b21e1066cd 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
 # 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.201 2005/04/13 17:27:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.202 2005/04/21 22:05:51 flameeyes Exp $
+
+*xine-lib-1.0-r2 (21 Apr 2005)
+
+  21 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xine-lib-XSA-2004-8.patch, +xine-lib-1.0-r2.ebuild:
+  Added new revision with security fix.
 
   13 Apr 2005; Luca Barbato <lu_zero@gentoo.org> xine-lib-1.0-r1.ebuild:
   useflag oggvorbis deprecated
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 03a5c62bdaa4..c2253592e72c 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,43 +1,46 @@
-MD5 60f92c0bf2f960ee5fe72cfd8b60e60b xine-lib-1_rc8-r1.ebuild 5688
+MD5 4524cd0ea5ddae02a44f7fb550ea3c65 ChangeLog 3244
 MD5 5529b17488d439ea93b380bacdb0a7a7 metadata.xml 239
-MD5 b6ad8f25595f1c8e8495579462e42764 xine-lib-1_rc6-r1.ebuild 5656
-MD5 fd257220f66a183e8896c0cd61cfe78c xine-lib-1.0.ebuild 8497
 MD5 c810c4550d4d5f0653d9b026d24e4b75 xine-lib-1.0-r1.ebuild 7469
-MD5 a22f72221e9670779b12630fc1b48888 ChangeLog 3055
-MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
+MD5 fd257220f66a183e8896c0cd61cfe78c xine-lib-1.0.ebuild 8497
+MD5 b6ad8f25595f1c8e8495579462e42764 xine-lib-1_rc6-r1.ebuild 5656
+MD5 60f92c0bf2f960ee5fe72cfd8b60e60b xine-lib-1_rc8-r1.ebuild 5688
+MD5 d63df93445c9928a64fb6f9981112ac3 xine-lib-1.0-r2.ebuild 7515
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
-MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r1 65
 MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68
+MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
+MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
+MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
 MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
+MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
+MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
 MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
-MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
+MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825
+MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 08c1c3433fe4230c788156a2e625962a files/xine-lib-configure-checks.patch 11823
-MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
-MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r1 65
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
 MD5 d0a2aa9bcd1263077cd8e3fe974b6910 files/xine-lib-configure-xvmc-header.patch 901
-MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
-MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
+MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
+MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
+MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 2d8a9a082f0d0ecee0002a4af25096fe files/xine-lib-XSA-2004-8.patch 1941
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r2 65
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
new file mode 100644
index 000000000000..0b3d186d000d
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.0-r2
@@ -0,0 +1 @@
+MD5 96e5195c366064e7778af44c3e71f43a xine-lib-1.0.tar.gz 7384258
diff --git a/media-libs/xine-lib/files/xine-lib-XSA-2004-8.patch b/media-libs/xine-lib/files/xine-lib-XSA-2004-8.patch
new file mode 100644
index 000000000000..77ce0d9adf43
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-XSA-2004-8.patch
@@ -0,0 +1,50 @@
+diff -ur xine-lib-1.0/src/input/librtsp/rtsp.c xine-lib-1.0-r1/src/input/librtsp/rtsp.c
+--- xine-lib-1.0/src/input/librtsp/rtsp.c	2004-07-25 19:13:54.000000000 +0200
++++ xine-lib-1.0-r1/src/input/librtsp/rtsp.c	2005-04-21 23:31:28.167133048 +0200
+@@ -17,7 +17,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+  *
+- * $Id: xine-lib-XSA-2004-8.patch,v 1.1 2005/04/21 22:05:51 flameeyes Exp $
++ * $Id: xine-lib-XSA-2004-8.patch,v 1.1 2005/04/21 22:05:51 flameeyes Exp $
+  *
+  * a minimalistic implementation of rtsp protocol,
+  * *not* RFC 2326 compilant yet.
+@@ -218,6 +218,7 @@
+   unsigned int answer_seq;
+   char **answer_ptr=s->answers;
+   int code;
++  int ans_count = 0;
+   
+   answer=rtsp_get(s);
+   if (!answer)
+@@ -268,7 +269,7 @@
+     }
+     *answer_ptr=answer;
+     answer_ptr++;
+-  } while (strlen(answer)!=0);
++  } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
+   
+   s->cseq++;
+   
+diff -ur xine-lib-1.0/src/input/mms.c xine-lib-1.0-r1/src/input/mms.c
+--- xine-lib-1.0/src/input/mms.c	2004-12-15 00:13:09.000000000 +0100
++++ xine-lib-1.0-r1/src/input/mms.c	2005-04-21 23:32:04.742572736 +0200
+@@ -579,9 +579,13 @@
+           lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n",
+                    stream_id, type, encrypted);
+           
+-          this->stream_types[stream_id] = type;
+-          this->stream_ids[this->num_stream_ids] = stream_id;
+-          this->num_stream_ids++;
++          if (this->num_stream_ids < ASF_MAX_NUM_STREAMS && stream_id < ASF_MAX_NUM_STREAMS) {
++            this->stream_types[stream_id] = type;
++            this->stream_ids[this->num_stream_ids] = stream_id;
++            this->num_stream_ids++;
++          } else {
++            lprintf ("too many streams, skipping\n");
++          }
+       
+         }
+         break;
+Only in xine-lib-1.0-r1/src/input: mms.c.orig
diff --git a/media-libs/xine-lib/xine-lib-1.0-r2.ebuild b/media-libs/xine-lib/xine-lib-1.0-r2.ebuild
new file mode 100644
index 000000000000..ca3cdfe155ab
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.0-r2.ebuild
@@ -0,0 +1,248 @@
+# 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.1 2005/04/21 22:05:51 flameeyes Exp $
+
+inherit eutils flag-o-matic gcc libtool
+
+# This should normally be empty string, unless a release has a suffix.
+MY_PKG_SUFFIX=""
+MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz"
+
+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? ( sys-kernel/linux-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}
+
+	# Adds --disable- params
+	epatch ${FILESDIR}/${PN}-configure-checks.patch
+
+	# Fix check for location of XvMC.h file
+	epatch ${FILESDIR}/${PN}-configure-xvmc-header.patch
+
+	# plasmaroo: Kernel 2.6 headers patch
+	epatch ${FILESDIR}/${PN}-1_rc7-2.6.patch
+
+	# fixes bad configure stuff
+	# for xv handling
+	epatch ${FILESDIR}/${PN}-configure.ac.patch
+
+	epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
+
+	# Fix detection of sparc64 systems
+	use sparc && epatch ${FILESDIR}/xine-lib-1_rc7-configure-sparc.patch
+
+	epatch ${FILESDIR}/${PN}-XSA-2004-8.patch
+
+	elibtoolize
+
+	# 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"
+
+	# Fix detection of hppa2.0 and hppa1.1 CHOST
+	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
+
+	libtoolize --copy --force || die "libtoolize failed"
+}
+
+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 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
+}