removed the sed hat to disable the gnome-vfs support since it broke on some machines

4 files changed, 132 insertions, 3 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 8d681eab4ec3..bdfc87d7bb2a 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.62 2003/08/12 19:41:09 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.63 2003/08/13 00:50:30 spider Exp $
+
+*xine-lib-1_rc0-r2 (13 Aug 2003)
+
+  13 Aug 2003; <spider@gentoo.org> xine-lib-1_rc0-r2.ebuild:
+  removed the fix to disable gnome-vfs
 
   10 Aug 2003; Michael Imhof <tantive@gentoo.org> xine-lib-1_rc0-r1:
   Changed
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index a71f2a37d09e..8f67846a1529 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,11 +1,11 @@
 MD5 f02769d40b64a6e1abf21a822dcd00b7 xine-lib-0.9.13-r3.ebuild 3649
 MD5 8dd0e88bade327d8da97a308ab051016 xine-lib-1_beta11.ebuild 3616
 MD5 abda4a5d6c7a53cc72949bd871ba6605 xine-lib-1_beta10.ebuild 3446
-MD5 96a7144220498eb0ad7f69d69db26435 ChangeLog 12517
+MD5 1f689f62e9bce7c98bc71f47ed6e762c ChangeLog 12516
 MD5 e8d469034af4d1af9a8de1577d076d85 xine-lib-1_beta12.ebuild 3717
 MD5 52c7b44608472c795d16e4ff11c773a1 xine-lib-1_beta12-r1.ebuild 4153
 MD5 ef6b2cfb3aceda7f5222f195ba6b7d6a xine-lib-1_rc0-r1.ebuild 4248
-MD5 8e532ad3717e101307bec56de1db78a6 xine-lib-1_rc0-r2.ebuild 3893
+MD5 8171356dfc15962c4e63c290229d7350 xine-lib-1_rc0-r2.ebuild 3892
 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 af33e921f7041fafac652c324d3984c1 files/digest-xine-lib-1_beta10 70
 MD5 5903fa4c80658b8265910c8745913dae files/digest-xine-lib-1_beta11 70
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc0-r2 b/media-libs/xine-lib/files/digest-xine-lib-1_rc0-r2
new file mode 100644
index 000000000000..64463eb039a2
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1_rc0-r2
@@ -0,0 +1 @@
+MD5 923015bd49902cd43cd8f191f0720e4c xine-lib-1-rc0a.tar.gz 4211552
diff --git a/media-libs/xine-lib/xine-lib-1_rc0-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc0-r2.ebuild
new file mode 100644
index 000000000000..e6bbf6585fe5
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1_rc0-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc0-r2.ebuild,v 1.1 2003/08/13 00:50:30 spider Exp $ 
+
+# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
+# Commenting this out in this ebuild, because CFLAGS and CXXFLAGS are unset
+# at make time any way.
+# Brandon Low (29 Apr 2003)
+# inherit flag-o-matic
+# filter-flags "-maltivec -mabi=altivec"
+# replace-flags k6-3 i686
+# replace-flags k6-2 i686
+# replace-flags k6   i686
+
+#13 Jul 2003: drobbins: build failure using -j5 on a dual Xeon in 1_beta12
+MAKEOPTS="$MAKEOPTS -j1"
+
+# This should normally be empty string, unless a release has a suffix.
+MY_PKG_SUFFIX="a"
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc"
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome"
+
+DEPEND="oggvorbis? ( media-libs/libvorbis )
+	X? ( virtual/x11 )
+	avi? ( x86? ( >=media-libs/win32codecs-0.50 
+	       media-libs/divx4linux ) )
+	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
+		    dev-util/pkgconfig )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 
+			dev-util/pkgconfig )
+	>=media-libs/flac-1.0.4
+	>=media-libs/libsdl-1.1.5
+	>=media-libs/libfame-0.9.0
+	>=media-libs/xvid-0.9.0"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
+
+src_compile() {
+	# Make sure that the older libraries are not installed (bug #15081).
+	if [ -f /usr/lib/libxine.so.0 ]
+	then
+		einfo "Please uninstall older xine libraries.";
+		einfo "The compilation cannot proceed.";
+		die
+	fi
+
+	# Use the built-in dvdnav plugin.
+	local myconf="--with-included-dvdnav"
+	
+	# Most of these are not working currently, but are here for completeness
+	# don't use the --disable-XXXtest because that defaults to ON not OFF
+	use X \
+		|| myconf="${myconf} --disable-x11" # --disable-xv"
+	use esd	\
+		|| myconf="${myconf} --disable-esd" # --disable-esdtest"
+	use nls	\
+		|| myconf="${myconf} --disable-nls"
+	use alsa \
+		|| myconf="${myconf} --disable-alsa" # --disable-alsatest"
+	use arts \
+		|| myconf="${myconf} --disable-arts" # --disable-artstest"
+	use aalib \
+		|| myconf="${myconf} --disable-aalib" # --disable-aalibtest"
+	use oggvorbis \
+		|| myconf="${myconf} --disable-ogg --disable-vorbis"
+			   #--disable-oggtest --disable-vorbistest"
+	use avi	\
+		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
+		|| myconf="${myconf} --disable-asf"
+
+	einfo "myconf: ${myconf}"
+
+	# Very specific optimization is set by configure
+	# Should fix problems like the one found on bug #11779
+	# raker@gentoo.org (25 Dec 2002)
+	unset CFLAGS
+	unset CXXFLAGS
+
+	econf ${myconf} || die "Configure failed"
+
+	emake || die "Parallel make failed"
+}
+
+src_install() {
+	einstall || 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 COPYING ChangeLog INSTALL README TODO
+	cd ${S}/doc
+	dodoc dataflow.dia README*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please note, a new version of xine-lib has been installed,"
+	einfo "for library consistency you need to unmerge old versions"
+	einfo "of xine-lib before merging xine-ui."
+	einfo
+	einfo "This library version 1 is incompatible with the plugins,"
+	einfo "designed for the prior library versions (such as xine-d4d,"
+	einfo "xine-d5d, xine-dmd, and xine-dvdnav."
+	einfo 
+	einfo "Also make sure to remove your ~/.xine if upgrading from"
+	einfo "a previous version."
+	einfo
+}