Adjusted some hard depends per bug #48548. Added a built_with_use check for transcode dvd support.

Package-Manager: portage-2.0.51.19

4 files changed, 40 insertions, 25 deletions

diff --git a/media-video/dvdrip/ChangeLog b/media-video/dvdrip/ChangeLog
index 1d45fa74c4ed..c42beed9d1c5 100644
--- a/media-video/dvdrip/ChangeLog
+++ b/media-video/dvdrip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvdrip
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.33 2005/03/16 19:22:49 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.34 2005/03/28 07:10:00 chriswhite Exp $
+
+  28 Mar 2005; Chris White <chriswhite@gentoo.org> dvdrip-0.50.18.ebuild,
+  dvdrip-0.52.3.ebuild:
+  Adjusted some hard depends per bug #48548. Added a built_with_use check for
+  transcode dvd support.
 
 *dvdrip-0.52.3 (16 Mar 2005)
 
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index 71607fc4afc1..ca5efa807389 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9772b9e66c1b976f985685f2d27638a9 dvdrip-0.50.18.ebuild 1501
-MD5 bc6c7d991bf8f478f8674ba41a76d403 dvdrip-0.52.3.ebuild 1519
-MD5 fa539af95792d152081dc6fb507acf2d dvdrip-0.52.0.ebuild 1517
-MD5 6b825b583f97f2ee966adf36ce122dc2 dvdrip-0.50.17.ebuild 1405
+MD5 9bf5ccb34afe8a26b88e2e3a13cda4de ChangeLog 6100
 MD5 494eae51ecbded11b6cae0580a2ffe3c dvdrip-0.50.16-r1.ebuild 1406
-MD5 aa53a4320d1231d61d868c30badafe64 ChangeLog 5897
 MD5 0639511ba7249963a72e6a83e6fdeaef dvdrip-0.50.16.ebuild 1392
+MD5 6b825b583f97f2ee966adf36ce122dc2 dvdrip-0.50.17.ebuild 1405
+MD5 661aea3f862aff2e2a6700a239a046b5 dvdrip-0.50.18.ebuild 1663
+MD5 fa539af95792d152081dc6fb507acf2d dvdrip-0.52.0.ebuild 1517
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 818c85254ed8afb5190356fc6c9a36dc files/digest-dvdrip-0.50.16-r1 72
-MD5 748c8776c847405991432e3a345432fd files/digest-dvdrip-0.52.0 71
-MD5 2754107db18d3dea07e9d0a57e8bab32 files/digest-dvdrip-0.52.3 71
+MD5 b29cb3803172fc72200a77045d2c8584 dvdrip-0.52.3.ebuild 1787
 MD5 818c85254ed8afb5190356fc6c9a36dc files/digest-dvdrip-0.50.16 72
+MD5 818c85254ed8afb5190356fc6c9a36dc files/digest-dvdrip-0.50.16-r1 72
 MD5 f20273260806a39847e31fa217a2de68 files/digest-dvdrip-0.50.17 72
 MD5 f20badcd06b0ee448f1d754a254b2f9a files/digest-dvdrip-0.50.18 72
+MD5 748c8776c847405991432e3a345432fd files/digest-dvdrip-0.52.0 71
+MD5 2754107db18d3dea07e9d0a57e8bab32 files/digest-dvdrip-0.52.3 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCOIeV06ebR+OMO78RAjZlAJ4hO27US1HnpUmBoQESkDshwttA/gCghGbZ
-dwCCQi90iLSJxVpiWEHJK6Y=
-=hc0R
+iD8DBQFCR6YvFdQwWVoAgN4RAmZMAKDEpEwqjRf671XyIXZ4Xn8T9DqFjACfX5bA
+iNRWUoTls9+JBdohDW0qv9U=
+=QEvO
 -----END PGP SIGNATURE-----
diff --git a/media-video/dvdrip/dvdrip-0.50.18.ebuild b/media-video/dvdrip/dvdrip-0.50.18.ebuild
index c64a2da1eb5a..203674863a16 100644
--- a/media-video/dvdrip/dvdrip-0.50.18.ebuild
+++ b/media-video/dvdrip/dvdrip-0.50.18.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.50.18.ebuild,v 1.8 2005/03/03 17:11:08 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.50.18.ebuild,v 1.9 2005/03/28 07:10:00 chriswhite Exp $
 
-inherit perl-module
+inherit perl-module eutils
 
 MY_P=${P/dvdr/Video-DVDR}
 # Next three lines are to handle PRE versions
@@ -36,6 +36,10 @@ RDEPEND="${DEPEND}
 	>=media-video/mjpegtools-1.6.0
 	sys-apps/eject"
 
+pkg_setup() {
+	built_with_use transcode dvdread || die "transcode requires dvdread support builtin.  Re-emerge transcode with the dvdread USE flag."
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/media-video/dvdrip/dvdrip-0.52.3.ebuild b/media-video/dvdrip/dvdrip-0.52.3.ebuild
index 857b521c4937..e71555908312 100644
--- a/media-video/dvdrip/dvdrip-0.52.3.ebuild
+++ b/media-video/dvdrip/dvdrip-0.52.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.3.ebuild,v 1.1 2005/03/16 19:22:49 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.3.ebuild,v 1.2 2005/03/28 07:10:00 chriswhite Exp $
 
-inherit perl-module
+inherit perl-module eutils
 
 MY_P=${P/dvdr/Video-DVDR}
 # Next three lines are to handle PRE versions
@@ -18,25 +18,31 @@ SRC_URI="http://www.exit1.org/${PN}/${MY_URL}/${MY_P}.tar.gz"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="cdr gnome"
+IUSE="cdr gnome xvid rar mplayer ogg fping"
 
-DEPEND=" gnome? ( gnome-extra/gtkhtml )
-	cdr? ( >=media-video/vcdimager-0.7.19
+DEPEND=" gnome? (gnome-extra/gtkhtml)
+	cdr? (>=media-video/vcdimager-0.7.19
 		>=app-cdr/cdrdao-1.1.7
-		virtual/cdrtools )
+		virtual/cdrtools
+		>=media-video/mjpegtools-1.6.0)
+	xvid? (media-video/xvid4conf)
+	rar? (app-arch/rar)
+	mplayer? (media-video/mplayer)
 	>=media-video/transcode-0.6.14
-	>=media-gfx/imagemagick-5.5.7
-	sys-process/procps
+	>=media-gfx/imagemagick-5.5.3
 	dev-perl/gtk-perl
 	dev-perl/Storable
 	dev-perl/Event"
 RDEPEND="${DEPEND}
-	>=net-analyzer/fping-2.3
-	>=media-sound/ogmtools-1.000
-	>=media-video/mjpegtools-1.6.0
+	fping? (>=net-analyzer/fping-2.3)
+	ogg? (>=media-sound/ogmtools-1.000)
 	sys-apps/eject
 	dev-perl/libintl-perl"
 
+pkg_setup() {
+	built_with_use transcode dvdread || die "transcode needs dvdread support builtin.  Please re-emerge transcode with the dvdread USE flag."
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}