Update USE flag deps error messages wrt bug 151024, remove nptl patch

(Portage version: 2.1.1-r1)

4 files changed, 41 insertions, 21 deletions

diff --git a/media-video/dvdrip/ChangeLog b/media-video/dvdrip/ChangeLog
index 4eeb857424ce..ebd213799338 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.86 2006/10/23 04:49:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.87 2006/10/23 05:42:46 beandog Exp $
+
+  23 Oct 2006; Steve Dibb <beandog@gentoo.org> -files/nptl-amd64.patch,
+  dvdrip-0.52.7.ebuild, dvdrip-0.52.7-r1.ebuild, dvdrip-0.98.1.ebuild:
+  Update USE flag deps error messages wrt bug 151024, remove nptl patch
 
   23 Oct 2006; Steve Dibb <beandog@gentoo.org> dvdrip-0.52.7.ebuild,
   dvdrip-0.52.7-r1.ebuild:
diff --git a/media-video/dvdrip/dvdrip-0.52.7-r1.ebuild b/media-video/dvdrip/dvdrip-0.52.7-r1.ebuild
index ad4a21dee32c..ff328d4ccc5d 100644
--- a/media-video/dvdrip/dvdrip-0.52.7-r1.ebuild
+++ b/media-video/dvdrip/dvdrip-0.52.7-r1.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.7-r1.ebuild,v 1.6 2006/10/23 04:49:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.7-r1.ebuild,v 1.7 2006/10/23 05:42:46 beandog Exp $
 
 inherit perl-module eutils flag-o-matic
 
@@ -41,12 +41,18 @@ 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 extrafilters \
-		&& die  "Please remerge transcode with -extrafilters in USE=, " \
-				"you have filters installed not compatible with dvdrip."
+	if ! built_with_use media-video/transcode dvdread; then
+		eerror "Please re-emerge media-video/transcode with the dvdread"
+		eerror "USE flag."
+	fi
+	if built_with_use media-video/transcode extrafilters; then
+		eerror "Please re-emerge media-video/transcode without the"
+		eerror "extrafilters USE flag."
+	fi
+	if ! built_with_use media-video/transcode dvdread || \
+		built_with_use media-video/transcode extrafilters; then
+		die "Fix media-video/transcode USE flags and re-emerge."
+	fi
 }
 
 src_unpack() {
diff --git a/media-video/dvdrip/dvdrip-0.52.7.ebuild b/media-video/dvdrip/dvdrip-0.52.7.ebuild
index b760beec987f..851306d0c63b 100644
--- a/media-video/dvdrip/dvdrip-0.52.7.ebuild
+++ b/media-video/dvdrip/dvdrip-0.52.7.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.7.ebuild,v 1.4 2006/10/23 04:49:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.7.ebuild,v 1.5 2006/10/23 05:42:46 beandog Exp $
 
 inherit perl-module eutils flag-o-matic
 
@@ -41,12 +41,18 @@ 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 extrafilters \
-		&& die  "Please remerge transcode with -extrafilters in USE=, " \
-				"you have filters installed not compatible with dvdrip."
+	if ! built_with_use media-video/transcode dvdread; then
+		eerror "Please re-emerge media-video/transcode with the dvdread"
+		eerror "USE flag."
+	fi
+	if built_with_use media-video/transcode extrafilters; then
+		eerror "Please re-emerge media-video/transcode without the"
+		eerror "extrafilters USE flag."
+	fi
+	if ! built_with_use media-video/transcode dvdread || \
+		built_with_use media-video/transcode extrafilters; then
+		die "Fix media-video/transcode USE flags and re-emerge."
+	fi
 }
 
 src_unpack() {
diff --git a/media-video/dvdrip/dvdrip-0.98.1.ebuild b/media-video/dvdrip/dvdrip-0.98.1.ebuild
index 7a6c9a4aa0c9..c638e2a096bd 100644
--- a/media-video/dvdrip/dvdrip-0.98.1.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.1.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.98.1.ebuild,v 1.4 2006/10/06 03:35:34 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.98.1.ebuild,v 1.5 2006/10/23 05:42:46 beandog Exp $
 
 inherit eutils flag-o-matic perl-module
 
@@ -33,13 +33,17 @@ RDEPEND="${DEPEND}
 	>=media-video/lsdvd-0.15"
 
 pkg_setup() {
+	if ! built_with_use media-video/transcode dvdread; then
+		eerror "Please re-emerge media-video/transcode with the dvdread"
+		eerror "USE flag."
+	fi
+	if built_with_use media-video/transcode extrafilters; then
+		eerror "Please re-emerge media-video/transcode without the"
+		eerror "extrafilters USE flag."
+	fi
 	if ! built_with_use media-video/transcode dvdread || \
 		built_with_use media-video/transcode extrafilters; then
-			eerror "transcode needs dvdread support builtin."
-			eerror "Please re-emerge transcode with the dvdread USE flag."
-			eerror "Please remerge transcode with -extrafilters in USE=,"
-			eerror "you have filters installed not compatible with dvdrip."
-		die "Fix transcode USE flags and re-emerge."
+		die "Fix media-video/transcode USE flags and re-emerge."
 	fi
 }