Add libcdio dep, bug 219868

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-tuxonice x86_64, RepoMan options: --force)

3 files changed, 9 insertions, 127 deletions

diff --git a/media-video/oxine/ChangeLog b/media-video/oxine/ChangeLog
index 5737eaa7cfc4..c55fb5718cae 100644
--- a/media-video/oxine/ChangeLog
+++ b/media-video/oxine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/oxine
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.35 2008/08/01 19:13:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.36 2008/09/20 21:31:01 beandog Exp $
+
+*oxine-0.7.1-r1 (20 Sep 2008)
+
+  20 Sep 2008; Steve Dibb <beandog@gentoo.org> -oxine-0.6.3-r1.ebuild,
+  -oxine-0.7.1.ebuild, +oxine-0.7.1-r1.ebuild:
+  Add libcdio dep, bug 219868
 
   01 Aug 2008; nixnut <nixnut@gentoo.org> oxine-0.7.1.ebuild:
   Stable on ppc wrt bug 222303
diff --git a/media-video/oxine/oxine-0.6.3-r1.ebuild b/media-video/oxine/oxine-0.6.3-r1.ebuild
deleted file mode 100644
index 89c619a12ab6..000000000000
--- a/media-video/oxine/oxine-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.6.3-r1.ebuild,v 1.8 2008/04/13 21:27:30 aballier Exp $
-
-WANT_AUTOMAKE="1.9"
-inherit eutils autotools
-
-MY_P="${PN}-0.6"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="OSD frontend for xine"
-HOMEPAGE="http://oxine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/oxine/${MY_P}.tar.gz
-	mirror://sourceforge/oxine/${PN}-0_6_0-to-0_6_3.patch"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-SLOT="0"
-IUSE="X curl debug dvb jpeg nls png polling lirc v4l input_devices_joystick"
-
-RDEPEND="media-libs/xine-lib
-	curl? ( net-misc/curl )
-	input_devices_joystick? ( media-libs/libjsw )
-	jpeg? ( media-gfx/imagemagick
-		media-libs/netpbm
-		media-video/mjpegtools )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl sys-devel/gettext )
-	png? ( media-gfx/imagemagick
-		media-libs/netpbm
-		media-video/mjpegtools )
-	X? ( x11-libs/libXext x11-libs/libX11 )
-	virtual/eject"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-
-	# Check for USE flag deps
-	ewarn "Checking USE flags of dependencies .. this may take a moment"
-
-	# Video4Linux support
-	if use v4l && ! built_with_use media-libs/xine-lib v4l ; then
-		eerror "Re-emerge xine-lib with the 'v4l' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	# X
-	if ! built_with_use media-libs/xine-lib X ; then
-		eerror "Re-emerge xine-lib with the 'X' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	# Image support
-	if (use png || use jpeg ) && ! built_with_use media-libs/netpbm zlib ; then
-		eerror "In order to enable image support, media-libs/netpbm must be"
-		eerror "emerged with the 'zlib' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	if (use png || use jpeg ) && ! built_with_use media-libs/netpbm png ; then
-		eerror "To view PNG images, media-libs/netpbm must be emerged with"
-		eerror "the 'png' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	if (use png || use jpeg ) && ! built_with_use media-libs/netpbm jpeg ; then
-		eerror "To view JPEG images, media-libs/netpbm must be emerged with"
-		eerror "with the 'jpeg' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	if [[ ${REBUILD_DEPS} = 1 ]]; then
-		eerror "Check your USE flags, re-emerge the dependencies and then"
-		eerror "emerge this package."
-		die
-	fi
-
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd "${S}"
-	epatch ${DISTDIR}/${PN}-0_6_0-to-0_6_3.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-
-	# Note: Initial testing on amd64 indicates that the build will break
-	# on --disable-curltest or --disable-xinetest so don't enable them
-	# if debug is set.
-
-	# Note on images: Image support will be automatically disabled if
-	# netpbm, imagemagick or mjpegtools is not installed, irregardless
-	# of what the USE flags are set to.
-
-	# If one of the image USE flags is unset, disable image support
-	if use !png && use !jpeg ; then
-		myconf="${myconf} --disable-images"
-	fi
-
-	econf ${myconf} \
-		$( use_with X x ) \
-		$( use_with curl ) \
-		$( use_enable curl curltest ) \
-		$( use_enable debug ) \
-		$( use_enable dvb ) \
-		$( use_enable input_devices_joystick joystick ) \
-		$( use_enable lirc ) \
-		$( use_enable nls ) \
-		$( use_enable polling ) \
-		$( use_enable v4l ) \
-		--disable-rpath --disable-weather || die "econf died"
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake install died"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml doc/doc.html
-
-}
diff --git a/media-video/oxine/oxine-0.7.1.ebuild b/media-video/oxine/oxine-0.7.1-r1.ebuild
index 7ea9ad575695..3728fd41a72e 100644
--- a/media-video/oxine/oxine-0.7.1.ebuild
+++ b/media-video/oxine/oxine-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.7.1.ebuild,v 1.6 2008/08/01 19:13:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.7.1-r1.ebuild,v 1.1 2008/09/20 21:31:01 beandog Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils autotools
@@ -14,6 +14,7 @@ SLOT="0"
 IUSE="X curl debug dvb exif hal joystick jpeg lirc nls png v4l"
 
 COMMON_DEPEND="media-libs/xine-lib
+	dev-libs/libcdio
 	curl? ( net-misc/curl )
 	hal? ( sys-apps/hal )
 	joystick? ( media-libs/libjsw )