Remove mpeg4ip from RDEPEND since it's obsolete; you should install separate application (mp4creator) for this.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 13 insertions, 99 deletions

diff --git a/media-video/undvd/ChangeLog b/media-video/undvd/ChangeLog
index 88b69a078f37..697c023ffff8 100644
--- a/media-video/undvd/ChangeLog
+++ b/media-video/undvd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/undvd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/undvd/ChangeLog,v 1.9 2009/06/27 12:37:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/undvd/ChangeLog,v 1.10 2009/07/10 10:51:09 ssuominen Exp $
+
+  10 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> -undvd-0.6.0.ebuild,
+  undvd-0.7.5.ebuild:
+  Remove mpeg4ip from RDEPEND since it's obsolete; you should install
+  separate application (mp4creator) for this.
 
 *undvd-0.7.5 (27 Jun 2009)
 
diff --git a/media-video/undvd/undvd-0.6.0.ebuild b/media-video/undvd/undvd-0.6.0.ebuild
deleted file mode 100644
index 8419dafa4d9a..000000000000
--- a/media-video/undvd/undvd-0.6.0.ebuild
+++ /dev/null
@@ -1,89 +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/undvd/undvd-0.6.0.ebuild,v 1.3 2008/09/19 23:02:20 coldwind Exp $
-
-inherit eutils
-
-DESCRIPTION="Simple dvd ripping command line app"
-HOMEPAGE="http://sourceforge.net/projects/undvd/"
-SRC_URI="http://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac css ffmpeg matroska mp4 ogm xvid"
-
-DEPEND="sys-apps/coreutils
-	app-shells/bash
-	sys-apps/findutils
-	sys-apps/gawk
-	sys-apps/grep
-	sys-process/procps
-	sys-apps/sed
-	sys-devel/bc
-	sys-apps/util-linux
-	media-video/lsdvd
-	media-video/mplayer
-	css? (
-		media-libs/libdvdcss
-		media-video/vobcopy
-	)
-	ffmpeg? (
-		media-video/ffmpeg
-	)
-	matroska? (
-		media-video/mkvtoolnix
-	)
-	mp4? (
-		media-video/mpeg4ip
-	)
-	ogm? (
-		media-sound/ogmtools
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	einfo "Checking mplayer for USE flags we need..."
-	mplayer_flags="encode dvd x264 mp3"
-	for f in $mplayer_flags; do
-		if ! built_with_use media-video/mplayer $f; then
-			missing_flags="$f"
-			eerror "$f missing"
-		fi
-	done
-
-	if [ "$missing_flags" ]; then
-		eerror
-		eerror "Please re-emerge media-video/mplayer with USE=\"$mplayer_flags\""
-		die "mplayer missing necessary USE flags"
-	fi
-
-	if use aac; then
-		if ! built_with_use media-video/mplayer aac; then
-			eerror
-			eerror "aac missing. This means you cannot encode to aac."
-			eerror "Please re-emerge media-video/mplayer with USE=\"aac\""
-			die "mplayer merged without aac USE flag"
-		fi
-	fi
-
-	if use xvid; then
-		if ! built_with_use media-video/mplayer xvid; then
-			eerror
-			eerror "xvid missing. This means you cannot encode to xvid."
-			eerror "Please re-emerge media-video/mplayer with USE=\"xvid\""
-			die "mplayer merged without xvid USE flag"
-		fi
-	fi
-
-	einfo " everything seems to be in order"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/media-video/undvd/undvd-0.7.5.ebuild b/media-video/undvd/undvd-0.7.5.ebuild
index 49083390494b..0fdc76c7af9b 100644
--- a/media-video/undvd/undvd-0.7.5.ebuild
+++ b/media-video/undvd/undvd-0.7.5.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/undvd/undvd-0.7.5.ebuild,v 1.1 2009/06/27 12:37:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/undvd/undvd-0.7.5.ebuild,v 1.2 2009/07/10 10:51:09 ssuominen Exp $
 
-EAPI="2"
-
-inherit eutils
+EAPI=2
 
 DESCRIPTION="Simple dvd ripping command line app"
 HOMEPAGE="http://sourceforge.net/projects/undvd/"
@@ -13,9 +11,9 @@ SRC_URI="http://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac css ffmpeg matroska mp4 ogm xvid"
+IUSE="aac css ffmpeg matroska ogm xvid"
 
-DEPEND="sys-apps/coreutils
+RDEPEND="sys-apps/coreutils
 	>=dev-lang/perl-5.8.8
 	media-video/lsdvd
 	media-video/mplayer[encode,dvd,mp3,x264,aac?,xvid?]
@@ -23,10 +21,10 @@ DEPEND="sys-apps/coreutils
 		media-video/vobcopy )
 	ffmpeg? ( media-video/ffmpeg )
 	matroska? ( media-video/mkvtoolnix )
-	mp4? ( media-video/mpeg4ip )
 	ogm? ( media-sound/ogmtools )"
-RDEPEND="${DEPEND}"
+DEPEND=""
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" DOC="/usr/share/doc/${PF}" \
+		install || die "emake install failed"
 }