Add libcdio dep, bug 219868

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-tuxonice x86_64
RepoMan-Options: --force

4 files changed, 11 insertions, 132 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/Manifest b/media-video/oxine/Manifest
index 863be986d8e8..662bc360a354 100644
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -1,7 +1,4 @@
-DIST oxine-0.6.tar.gz 8336102 RMD160 8d9ba313cbb24d8f2011d58035ca87da41df4982 SHA1 f59572c9152d53c359f1ee9024496835b117770c SHA256 3c02716dcaecf98e518aaf8b04f16d387c73bcf1aa21f71f60684f1a7e5956d2
 DIST oxine-0.7.1.tar.gz 3653511 RMD160 503e9134e4a87cb7c066319bb323c958293b85be SHA1 fa81f1380f94bfbd1cc0bb648b8ff8c4e77aa6ee SHA256 bfe9e4f49996234eabf788397969c90901197b2b1823cdb9a61e529f5c0f6a7d
-DIST oxine-0_6_0-to-0_6_3.patch 603146 RMD160 95fe1124bd070a4330534dc2742a05cb8deff062 SHA1 88234f73298c97cd1dc0026bcc6212bc7460b207 SHA256 32531361b3ec6579e598259ab90cf9f685491fbee7be735c17e3db10d8e88816
-EBUILD oxine-0.6.3-r1.ebuild 3388 RMD160 e12d3e2444963d52b4707433929f972bedd88aa6 SHA1 58674dc0b58b1361213abf0d5b59ecb80a85bdf8 SHA256 dc9367e13cfa942fde19ef68cc7779aa4decfada82225c61dc10655da7d497b0
-EBUILD oxine-0.7.1.ebuild 3148 RMD160 9624621d9022998c16d0158b78fe1178436099ca SHA1 1686c30bb8f5508fa28b69a12437785dfbcf5011 SHA256 16c2a090b8bab881963cb7e3abbfd8d8f489e8d5dc54d775db77e3c5cc29583d
-MISC ChangeLog 4217 RMD160 81aa3d40dd0ca0310bc38b6577577feb07a58f99 SHA1 c4b20604c236c9a45e68fb0ba904d2240431750d SHA256 50cc33a8b0f76681fc386604e4ccf489f76178470254ebe2ddd15d7f31181b2b
+EBUILD oxine-0.7.1-r1.ebuild 3170 RMD160 68bc7dc7632f270a083dd9c135942cf44e5fa634 SHA1 3f4858b25f2bbdf03900178387dde37d983bfdd6 SHA256 1fa2c2b0cb75d4d48b22cb7ad45661d6bf764eb761612ab9653cf2ed13ee027a
+MISC ChangeLog 4398 RMD160 90f8c101bf57b1ab20032b2e573a3a5f94368a99 SHA1 68d4c88579ececd9d232420efc3b9524fc9a8bda SHA256 1e757c4729c3bb2b5a1c569864c847bded8b08c89f2fa25e8be49d8c5482e68b
 MISC metadata.xml 346 RMD160 4153dab4ec76417e10b0d0b47f21813da1028f72 SHA1 36b5c8dd301a160795fd974adaa6f14f0b895afd SHA256 ea3e3f8258d04b9975cf95bd2ecf10dd68e6ad9068522d8c5cb384a3b16469a1
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 )