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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 15 insertions, 103 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/Manifest b/media-video/undvd/Manifest
index 9dd8f0c4ee67..d71053fbd40f 100644
--- a/media-video/undvd/Manifest
+++ b/media-video/undvd/Manifest
@@ -1,6 +1,4 @@
-DIST undvd-0.6.0.tar.gz 33010 RMD160 1965419b259627a38a4eee11d18ae5da45278dfd SHA1 b789c1e818fc470d890776c68e6c54b7b97dbf20 SHA256 0c528ba55d2b348179efcd814cceeb3268076facdf595b73b08ecdb8fba7249f
 DIST undvd-0.7.5.tar.gz 52662 RMD160 bf5f69c1ee3628e723fc9cd50c10aa2723eacb74 SHA1 893aad5a8dc0d0d4f03580ac3dc95cdeef45b94d SHA256 53c4543b0de559de69e6b24ad6b665e85c607f01f887e8e55d810946fbc6497d
-EBUILD undvd-0.6.0.ebuild 2017 RMD160 5cc4a140569b7c15aba82719c2cf83d9f935f434 SHA1 6194d279ef29d405f35a30c4a80aab95303f5dd4 SHA256 22c6293c52967a74f0d1e4fe23de537319406f231f78bb1d4ee02983e2b528b2
-EBUILD undvd-0.7.5.ebuild 907 RMD160 db67f8211bdbae65ad623d25b65c0a164e12b4f2 SHA1 56e08b65b9d0bce3f3dda881048aa8ab4655a034 SHA256 86d549e756bc09d9ae7cf7be00b81139918bfc82a03da674b3097ff091ba9569
-MISC ChangeLog 1326 RMD160 98356417d1ee6120ff2400f6d813b2ead8bb8a46 SHA1 3650047449241f57b78a9f4c691ee7f13977a239 SHA256 13c7105723013539fc55ef93004532aba486cfcf5a08b026db0f13a682e048f9
+EBUILD undvd-0.7.5.ebuild 879 RMD160 64a7c23e81a57726407f17390e07483152070d9e SHA1 2267d57ae58502a9559c4904a8996f84dbf11081 SHA256 7e2dbfe55ccfa7dd14f55e984747847f8a400d0be1a827d52bba93a7e518a0d5
+MISC ChangeLog 1543 RMD160 21656f90a6c332307f87135a52ef88a1214b9a29 SHA1 4f94370c1e87860d72abe737a25810d58e6796ca SHA256 ad6cc061c4f507e5910b586af949edb909b4e8762b19fb212f5bd24e77df87dc
 MISC metadata.xml 387 RMD160 3c0bee23065ac45f5ef355098445a6879f868db4 SHA1 64b244be60b61b87b4f0d932a66bacc202c9ea04 SHA256 a27f857b3302b9f708cdad8040c0247b2b35b1bb3cf6fc011b2c7bb353baa698
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"
 }