we shouldn't install dvdrip-master if we do not ask for fping

Package-Manager: portage-2.1_pre5-r2

4 files changed, 61 insertions, 8 deletions

diff --git a/media-video/dvdrip/ChangeLog b/media-video/dvdrip/ChangeLog
index ed17ef4adb75..430bb10eef30 100644
--- a/media-video/dvdrip/ChangeLog
+++ b/media-video/dvdrip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvdrip
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.61 2006/03/15 16:56:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.62 2006/03/25 03:36:19 morfic Exp $
+
+  25 Mar 2006; Daniel Goller <morfic@gentoo.org> dvdrip-0.52.6.ebuild,
+  dvdrip-0.97.6.ebuild:
+  we shouldn't install dvdrip-master if we do not ask for fping
 
   15 Mar 2006; Markus Rothe <corsair@gentoo.org> dvdrip-0.97.6.ebuild:
   Added ~ppc64; bug #126189
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index 7bf267705563..b2382f105c30 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,16 +1,58 @@
-MD5 1d889f16b3fc6f112279f72f635e5bf4 ChangeLog 10515
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f6337c86e1acf18ea6d7a6c9620a641c ChangeLog 10674
+RMD160 ca473e32da30f5c82c9751a955b21e9b016852a0 ChangeLog 10674
+SHA256 2d0d5b17bd803d60cc98584e89ae18fd67a3c54cdcb19d09d2894f8a01805e2f ChangeLog 10674
 MD5 61280c21350839fd2f2ee8f4fc446c4c dvdrip-0.52.0.ebuild 1525
+RMD160 00c3a5fcc36b2ff7a7f3440d0deaba622173b536 dvdrip-0.52.0.ebuild 1525
+SHA256 8b6de3a23a4b8635d7174de35a9b00f8cd9eb69e21363e6fec0cbe63e1a762dd dvdrip-0.52.0.ebuild 1525
 MD5 e700d86bf880b98374e90aad2cf11e3f dvdrip-0.52.3-r1.ebuild 1904
+RMD160 df31613fb01c7f80ef61fc715ba2f7c69e201b5e dvdrip-0.52.3-r1.ebuild 1904
+SHA256 61c9f785d9ef5749605841be9a508d9739ead75e71c0821372aeb89e203656f0 dvdrip-0.52.3-r1.ebuild 1904
 MD5 c05142c32a80911e33eddc1d71cb85b0 dvdrip-0.52.3.ebuild 1821
+RMD160 9513e9109c4b44a77868f4914824d9e8a5ef6a93 dvdrip-0.52.3.ebuild 1821
+SHA256 4911436f32e005bf400ac6a385704bde3c71ec6b7534e9a0f8cf877c4cb76d49 dvdrip-0.52.3.ebuild 1821
 MD5 634a0177a550933438d38b1587f0ec2b dvdrip-0.52.5.ebuild 2153
-MD5 193e0fedb639b8c5578133dd87863b13 dvdrip-0.52.6.ebuild 1726
-MD5 4db64f82fdb1c3aa73be7ce514ea92bf dvdrip-0.97.6.ebuild 1965
+RMD160 70f1991b53787e1b3f35c5cfca6c15f411f86801 dvdrip-0.52.5.ebuild 2153
+SHA256 0b88e8b0e6785092a0de8c9831733f9772d24064b9ea85a998c4017d01071274 dvdrip-0.52.5.ebuild 2153
+MD5 7ba173d314c53ace7c67d35286e690b4 dvdrip-0.52.6.ebuild 1957
+RMD160 69bb8bd8945eaab121e2cc335bdf3bb7784ad48f dvdrip-0.52.6.ebuild 1957
+SHA256 f62124b206d3d2c80399cd831c780a9be2a2b1bf39876026cfa355501487bf82 dvdrip-0.52.6.ebuild 1957
+MD5 f3208745f89ae285d86e0422aa4bc031 dvdrip-0.97.6.ebuild 2007
+RMD160 b6078cec9b2cb7114b154562cf615cd555ff1350 dvdrip-0.97.6.ebuild 2007
+SHA256 479dfc8c60cfce161e80cf993163eec3db482078d752d6569bf3f33e7ae7b9de dvdrip-0.97.6.ebuild 2007
 MD5 748c8776c847405991432e3a345432fd files/digest-dvdrip-0.52.0 71
+RMD160 a32ed0fc88fa7e04305f98e1c82cd29e33aeca84 files/digest-dvdrip-0.52.0 71
+SHA256 f5844858eaab2e2c28f34c644b52ddb18e478ad93c49902d9fb7bc45a7119a7c files/digest-dvdrip-0.52.0 71
 MD5 2754107db18d3dea07e9d0a57e8bab32 files/digest-dvdrip-0.52.3 71
+RMD160 6814167128a7aa3ab3d1f2e3a1b9568268776dc8 files/digest-dvdrip-0.52.3 71
+SHA256 55329b8f2734c034939e3eaa8c716e834439e7c9b90e37063a837c870d92c08a files/digest-dvdrip-0.52.3 71
 MD5 2754107db18d3dea07e9d0a57e8bab32 files/digest-dvdrip-0.52.3-r1 71
+RMD160 6814167128a7aa3ab3d1f2e3a1b9568268776dc8 files/digest-dvdrip-0.52.3-r1 71
+SHA256 55329b8f2734c034939e3eaa8c716e834439e7c9b90e37063a837c870d92c08a files/digest-dvdrip-0.52.3-r1 71
 MD5 14587c2ff6ca6a5d6b84323f64de11d0 files/digest-dvdrip-0.52.5 71
+RMD160 c412f9a78e77f5032f5d22f09cf28e015b64c1d7 files/digest-dvdrip-0.52.5 71
+SHA256 a7ce8ebce54aa3688f72543d5a77e3f1b433951e65336358800d5bc8870c866e files/digest-dvdrip-0.52.5 71
 MD5 9812540f0a1dfcc0cdb68a8e2dbc737d files/digest-dvdrip-0.52.6 71
+RMD160 b242579ffb0aff587f7086d2f6c0815139aa307c files/digest-dvdrip-0.52.6 71
+SHA256 b80042497cc025e86feab57a3a857c6af2cc1f64f146295acab88fbe14957b6e files/digest-dvdrip-0.52.6 71
 MD5 766f489d01572bf50a6a31a0c1b49bcc files/digest-dvdrip-0.97.6 71
+RMD160 ccda5bbad2de6fc169b71ed81c61cf0d40a84c40 files/digest-dvdrip-0.97.6 71
+SHA256 16cf75951256eabb27f10ff9a60a35ca1bd14598b6e962ee5b7bee78ed022270 files/digest-dvdrip-0.97.6 71
 MD5 889de67168579e889b441c8b6892b429 files/dvdrip-0.97.5-fix_nptl_workaround.patch 293
+RMD160 c0d41b079e4d3df9ba3625d5610fed2e800b985e files/dvdrip-0.97.5-fix_nptl_workaround.patch 293
+SHA256 3a5f1073b0548b8bc53ddbb61f8533d7248de98041d616c57155c5bfa2e876a1 files/dvdrip-0.97.5-fix_nptl_workaround.patch 293
 MD5 889de67168579e889b441c8b6892b429 files/dvdrip-0.97.6-fix_nptl_workaround.patch 293
+RMD160 c0d41b079e4d3df9ba3625d5610fed2e800b985e files/dvdrip-0.97.6-fix_nptl_workaround.patch 293
+SHA256 3a5f1073b0548b8bc53ddbb61f8533d7248de98041d616c57155c5bfa2e876a1 files/dvdrip-0.97.6-fix_nptl_workaround.patch 293
 MD5 6f041773f1239601a17e6201405f82ac metadata.xml 218
+RMD160 0c2523650ec2f9a9695776a42ef16b2f4af167f2 metadata.xml 218
+SHA256 74c9891ed16db7f87d1b57d7df7f9b71c7acba33112ac40bc631360b64517949 metadata.xml 218
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEJLq8/aM9DdBw91cRAk/rAKCbi7OOWtbhbSjs/jdjB8OriAqKZgCfZYm9
+jADx3M0Oi2oZeeTbucfbGXI=
+=6Z2U
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdrip/dvdrip-0.52.6.ebuild b/media-video/dvdrip/dvdrip-0.52.6.ebuild
index 111161ac5c22..243b5e2ea11a 100644
--- a/media-video/dvdrip/dvdrip-0.52.6.ebuild
+++ b/media-video/dvdrip/dvdrip-0.52.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.6.ebuild,v 1.3 2006/02/15 06:21:47 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.6.ebuild,v 1.4 2006/03/25 03:36:19 morfic Exp $
 
 inherit perl-module eutils flag-o-matic
 
@@ -29,7 +29,7 @@ DEPEND="gnome? ( gnome-extra/gtkhtml )
 	xvid? ( media-video/xvid4conf )
 	rar? ( app-arch/rar )
 	mplayer? ( media-video/mplayer )
-	=media-video/transcode-0.6.14*
+	>=media-video/transcode-0.6.14*
 	>=media-gfx/imagemagick-5.5.3
 	dev-perl/gtk-perl
 	perl-core/Storable
@@ -42,7 +42,12 @@ RDEPEND="${DEPEND}
 	dev-perl/libintl-perl"
 
 pkg_setup() {
-	built_with_use media-video/transcode dvdread || die "transcode needs dvdread support builtin.  Please re-emerge transcode with the dvdread USE flag."
+	built_with_use media-video/transcode dvdread \
+		|| die "transcode needs dvdread support builtin.  Please re-emerge transcode with the dvdread USE flag."
+
+	built_with_use media-video/transcode extrafilters \
+		&& die  "Please remerge transcode with -extrafilters in USE=, " \
+				"you have filters installed not compatible with dvdrip."
 }
 
 src_unpack() {
@@ -57,4 +62,5 @@ src_install() {
 	make_desktop_entry dvdrip dvd::rip dvdrip.xpm Video
 
 	perl-module_src_install
+	! fping? && rm ${D}/usr/bin/dvdrip-master
 }
diff --git a/media-video/dvdrip/dvdrip-0.97.6.ebuild b/media-video/dvdrip/dvdrip-0.97.6.ebuild
index 5a60716b6c28..076bfb187e9e 100644
--- a/media-video/dvdrip/dvdrip-0.97.6.ebuild
+++ b/media-video/dvdrip/dvdrip-0.97.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.97.6.ebuild,v 1.6 2006/03/15 16:56:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.97.6.ebuild,v 1.7 2006/03/25 03:36:19 morfic Exp $
 
 
 inherit perl-module eutils flag-o-matic
@@ -64,4 +64,5 @@ src_install() {
 	make_desktop_entry dvdrip dvd::rip dvdrip.xpm Video
 
 	perl-module_src_install
+	! fping? && rm ${D}/usr/bin/dvdrip-master
 }