Missing media-video/mplayer rdepend wrt #269068

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 10 insertions, 63 deletions

diff --git a/app-cdr/dvd95/ChangeLog b/app-cdr/dvd95/ChangeLog
index 0f150956bf1e..3992c9b18b1e 100644
--- a/app-cdr/dvd95/ChangeLog
+++ b/app-cdr/dvd95/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/dvd95
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/ChangeLog,v 1.6 2009/05/07 20:25:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/ChangeLog,v 1.7 2009/05/08 22:26:51 ssuominen Exp $
+
+  08 May 2009; Samuli Suominen <ssuominen@gentoo.org> -dvd95-1.3_p2.ebuild,
+  dvd95-1.5_p0.ebuild:
+  Missing media-video/mplayer rdepend wrt #269068
 
 *dvd95-1.5_p0 (07 May 2009)
 
diff --git a/app-cdr/dvd95/dvd95-1.3_p2.ebuild b/app-cdr/dvd95/dvd95-1.3_p2.ebuild
deleted file mode 100644
index 4eb9333c8bcb..000000000000
--- a/app-cdr/dvd95/dvd95-1.3_p2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/dvd95-1.3_p2.ebuild,v 1.1 2008/06/06 20:32:37 drac Exp $
-
-inherit eutils
-
-DESCRIPTION="DVD95 is a Gnome application to convert DVD9 to DVD5."
-HOMEPAGE="http://dvd95.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dvd95/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE_LINGUAS="linguas_de linguas_nl linguas_hu linguas_el linguas_cs
-linguas_pt_BR linguas_et_EE linguas_es"
-IUSE="${IUSE_LINGUAS} mmx 3dnow sse sse2 mpeg"
-
-RDEPEND="gnome-base/libgnomeui
-	media-libs/libdvdread
-	mpeg? ( media-libs/libmpeg2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${P/_}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s#prefix = /usr/local#prefix = /usr#" \
-		po/Makefile.in || die "sed failed."
-
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
-}
-
-src_compile() {
-	# Default language is French, but switch to English if no LINGUAS is set.
-	if [[ -z ${LINGUAS} ]]; then
-		export LINGUAS="en"
-	fi
-
-	econf --disable-dependency-tracking \
-		$(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
-		$(use_enable mpeg libmpeg2)
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog TODO
-
-	for lang in de nl hu el cs pt_BR es et_EE; do
-		use linguas_${lang} || rm -rf "${D}"/usr/share/locale/${lang}
-	done
-}
diff --git a/app-cdr/dvd95/dvd95-1.5_p0.ebuild b/app-cdr/dvd95/dvd95-1.5_p0.ebuild
index 3460083718fa..904340dfecae 100644
--- a/app-cdr/dvd95/dvd95-1.5_p0.ebuild
+++ b/app-cdr/dvd95/dvd95-1.5_p0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/dvd95-1.5_p0.ebuild,v 1.1 2009/05/07 20:25:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/dvd95-1.5_p0.ebuild,v 1.2 2009/05/08 22:26:51 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -14,11 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="3dnow nls mmx mpeg sse sse2"
 
-RDEPEND=">=gnome-base/libgnomeui-2
+COMMON_DEPEND=">=gnome-base/libgnomeui-2
 	dev-libs/libxml2
 	media-libs/libdvdread
 	mpeg? ( media-libs/libmpeg2 )"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	media-video/mplayer"
+DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext
 		dev-util/intltool )