oggvorbis made required, and repoman'd

7 files changed, 39 insertions, 227 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 30fcd093a556..34b4c6647a3c 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.12 2002/06/23 15:49:00 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.13 2002/07/19 20:23:56 seemant Exp $
+
+*xine-lib-0.9.12-r1 (19 Jul 2002)
+
+  19 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
+  xine-lib-0.9.12-r1.ebuild files/digest-xine-lib-0.9.12-r1 :
+
+  libvorbis is required, not optional. removed oggvorbis USE flag from
+  ebuild.
 
 *xine-lib-0.9.12 (23 Jun 2002)
 
diff --git a/media-libs/xine-lib/files/digest-xine-lib-0.9.10-r1 b/media-libs/xine-lib/files/digest-xine-lib-0.9.10-r1
deleted file mode 100644
index 69d20b605797..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f17619b58b2e6c84c1421ed36045983 xine-lib-0.9.10.tar.gz 2023140
diff --git a/media-libs/xine-lib/files/digest-xine-lib-0.9.11 b/media-libs/xine-lib/files/digest-xine-lib-0.9.11
deleted file mode 100644
index 12fee9208434..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7747c6a884b65c5b15c01442b6e48b9 xine-lib-0.9.11a.tar.gz 2382182
diff --git a/media-libs/xine-lib/files/digest-xine-lib-0.9.12 b/media-libs/xine-lib/files/digest-xine-lib-0.9.12-r1
index 31ac243c26d8..31ac243c26d8 100644
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.12
+++ b/media-libs/xine-lib/files/digest-xine-lib-0.9.12-r1
diff --git a/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild b/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild
deleted file mode 100644
index 17ee045766fe..000000000000
--- a/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2002 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-0.9.10-r1.ebuild,v 1.4 2002/07/16 11:36:53 seemant Exp $ 
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
-SRC_URI="http://xine.sourceforge.net/files/xine-lib-${PV}.tar.gz"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-DEPEND="X? ( virtual/x11 )
-	avi? ( >=media-libs/win32codecs-0.50 
-	       media-libs/divx4linux )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-0.0.3.3
-	       >=media-libs/libdvdread-0.9.2 )
-	arts? ( kde-base/kdelibs )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	oggvorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-src_unpack() {
-
-unpack xine-lib-${PV}.tar.gz
-patch -p0 < ${FILESDIR}/xineconfig.patch
-
-}
-
-src_compile() {
-
-	libtoolize --copy --force
-
-	# Most of these are not working currently, but are here for completeness
-	local myconf
-	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"
-	# This breaks because with the test disabled, it defaults to "found" check with
-	# the next release until then let it autodetect.  See bug #2377.
-	# use aalib  || myconf="${myconf} --disable-aalib --disable-aalibtest"
-
-	use oggvorbis || myconf="${myconf}
-				 --disable-ogg
-				 --disable-oggtest
-				 --disable-vorbis
-				 --disable-vorbistest"
-	
-	use avi	&& myconf="${myconf}
-			   --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf}
-			   --disable-asf"
-
-	# This is ``fixes'' compilation problems when em8300 libs installed
-	# The proper fix is to follow.
-	# myconf="${myconf} --disable-dxr3 --disable-dxr3test"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-		    
-	emake || die
-}
-
-src_install() {
-	
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		docdir=${D}/usr/share/doc/${PF}/html \
-		sysconfdir=${D}/etc \
-		install || die
-
-	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 "Please also note that xine-d4d and xine-d5d plugins are"
-	einfo "not yet compatible with this new library."
-	einfo
-
-}
diff --git a/media-libs/xine-lib/xine-lib-0.9.11.ebuild b/media-libs/xine-lib/xine-lib-0.9.11.ebuild
deleted file mode 100644
index 0267bb2462d7..000000000000
--- a/media-libs/xine-lib/xine-lib-0.9.11.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2002 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-0.9.11.ebuild,v 1.3 2002/07/16 11:36:53 seemant Exp $ 
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="http://xine.sourceforge.net/files/${P}a.tar.gz"
-
-DEPEND="X? ( virtual/x11 )
-	avi? ( >=media-libs/win32codecs-0.50 
-	       media-libs/divx4linux )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-0.0.3.3
-	       >=media-libs/libdvdread-0.9.2 )
-	arts? ( kde-base/kdelibs )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	oggvorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL"
-KEYWORDS="x86"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# Patch for framebuffer support.
-	patch -p0 < ${FILESDIR}/xineconfig.patch-${PV} || die
-
-}
-
-src_compile() {
-
-	libtoolize --copy --force
-
-	# Most of these are not working currently, but are here for completeness
-	local myconf
-	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"
-	# This breaks because with the test disabled, it defaults to "found" check with
-	# the next release until then let it autodetect.  See bug #2377.
-	# use aalib  || myconf="${myconf} --disable-aalib --disable-aalibtest"
-
-	use oggvorbis || myconf="${myconf}
-				 --disable-ogg
-				 --disable-oggtest
-				 --disable-vorbis
-				 --disable-vorbistest"
-	
-	use avi	&& myconf="${myconf}
-			   --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf}
-			   --disable-asf"
-
-	# This is ``fixes'' compilation problems when em8300 libs installed
-	# The proper fix is to follow.
-	# myconf="${myconf} --disable-dxr3 --disable-dxr3test"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-		    
-	emake || die
-}
-
-src_install() {
-	
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		docdir=${D}/usr/share/doc/${PF}/html \
-		sysconfdir=${D}/etc \
-		install || die
-
-	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 "Please also note that xine-d4d and xine-d5d plugins are"
-	einfo "not yet compatible with this new library."
-	einfo
-
-}
diff --git a/media-libs/xine-lib/xine-lib-0.9.12.ebuild b/media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild
index 04a82492507e..f55ed4589f37 100644
--- a/media-libs/xine-lib/xine-lib-0.9.12.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2002 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-0.9.12.ebuild,v 1.4 2002/07/16 11:36:53 seemant Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild,v 1.1 2002/07/19 20:23:56 seemant Exp $ 
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="http://xine.sourceforge.net/files/${P}.tar.gz"
 
-DEPEND="X? ( virtual/x11 )
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="media-libs/libvorbis
+	X? ( virtual/x11 )
 	avi? ( >=media-libs/win32codecs-0.50 
 	       media-libs/divx4linux )
 	esd? ( media-sound/esound )
@@ -16,7 +21,6 @@ DEPEND="X? ( virtual/x11 )
 	arts? ( kde-base/kdelibs )
 	alsa? ( media-libs/alsa-lib )
 	aalib? ( media-libs/aalib )
-	oggvorbis? ( media-libs/libvorbis )
 	directfb? ( >=dev-libs/DirectFB-0.9.9 )"
 
 RDEPEND="${DEPEND}
@@ -48,36 +52,39 @@ src_compile() {
 
 	# Most of these are not working currently, but are here for completeness
 	local myconf
-	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 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"
+
 	# This breaks because with the test disabled, it defaults to "found" check with
 	# the next release until then let it autodetect.  See bug #2377.
 	# use aalib  || myconf="${myconf} --disable-aalib --disable-aalibtest"
 
-	use oggvorbis || myconf="${myconf}
-				 --disable-ogg
-				 --disable-oggtest
-				 --disable-vorbis
-				 --disable-vorbistest"
+	# In this release, oggvorbis is required, not optional.  upstream needs
+	# to start getting consistent.
+	#use oggvorbis \
+	#	|| myconf="${myconf} \
+	#		 --disable-ogg \
+	#		 --disable-oggtest \
+	#		 --disable-vorbis \
+	#		 --disable-vorbistest"
 	
-	use avi	&& myconf="${myconf}
-			   --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf}
-			   --disable-asf"
+	use avi	\
+		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
+		|| myconf="${myconf} --disable-asf"
 
 	# This is ``fixes'' compilation problems when em8300 libs installed
 	# The proper fix is to follow.
 	# myconf="${myconf} --disable-dxr3 --disable-dxr3test"
 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
+	econf ${myconf} || die
 		    
 	emake || die
 }