Improved error message for unpatched vdr.

Package-Manager: portage-2.1.4_rc9

3 files changed, 24 insertions, 24 deletions

diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index 4586823102e5..94592356fb37 100644
--- a/media-plugins/vdr-setup/ChangeLog
+++ b/media-plugins/vdr-setup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-setup
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.19 2007/10/21 20:53:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.20 2007/12/11 11:13:00 zzam Exp $
+
+  11 Dec 2007; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-setup-0.3.1-r1.ebuild:
+  Improved error message for unpatched vdr.
 
   21 Oct 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-setup-0.3.1-r1.ebuild:
diff --git a/media-plugins/vdr-setup/Manifest b/media-plugins/vdr-setup/Manifest
index 286c88f6ac76..1db0156cc642 100644
--- a/media-plugins/vdr-setup/Manifest
+++ b/media-plugins/vdr-setup/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vdr-menu.de.xml 2882 RMD160 93bf8a0fa03fe2310863d55e960cb758689ec9e5 SHA1 4ae243b53e1b278a0c75766f168de4d36a75d258 SHA256 9cc8d43b97d08d468f5ae583b19c5b1326f930f4fbabacd78f555838e24fe4bd
 MD5 6f3764caa8f2f5dbadc1ab40ba76a3a9 files/vdr-menu.de.xml 2882
 RMD160 93bf8a0fa03fe2310863d55e960cb758689ec9e5 files/vdr-menu.de.xml 2882
@@ -38,18 +35,18 @@ MD5 7ccdea7875b8964e80cd647077d87441 files/vdr-setup.en.xml 8328
 RMD160 15eb50c71817ee93b2e453fa574f1ce8c4205c01 files/vdr-setup.en.xml 8328
 SHA256 496a5ddf8b5f47dd1592cf73f108d7dc7504a8c30c7f0049282572ef5321a0a5 files/vdr-setup.en.xml 8328
 DIST vdr-setup-0.3.1.tgz 89366 RMD160 81bc99b57669cff762aed4f452db4ddb67662c22 SHA1 301967f7876b9ec78326ca48c436a08146093540 SHA256 b44457c384a6fcf22baa24ae7cbeca3d8e23c9d93c7be5c1601dbca338828392
-EBUILD vdr-setup-0.3.1-r1.ebuild 2464 RMD160 3854b5492e2514c0c3b48f45ba7b1ce2d5414cec SHA1 21d3131ecfb393fe674eda30094c1a158a7f4237 SHA256 d03c81933d5400ec36d4ecb2b16ee32ba66810aa37420e9cc4f7d39e6199faad
-MD5 0f651ef558bbd346351c38217ed720c8 vdr-setup-0.3.1-r1.ebuild 2464
-RMD160 3854b5492e2514c0c3b48f45ba7b1ce2d5414cec vdr-setup-0.3.1-r1.ebuild 2464
-SHA256 d03c81933d5400ec36d4ecb2b16ee32ba66810aa37420e9cc4f7d39e6199faad vdr-setup-0.3.1-r1.ebuild 2464
+EBUILD vdr-setup-0.3.1-r1.ebuild 2574 RMD160 dc1da9ebe72a2961601608af4b771f596f60599d SHA1 36269355ca270bcda6fad175437a3b34525f4817 SHA256 7c9c518459fb6656f535054458a41a1cd408e39da9b62b8d3810246c65d391aa
+MD5 9f4f539b87fbf26f4e42440ffae400bd vdr-setup-0.3.1-r1.ebuild 2574
+RMD160 dc1da9ebe72a2961601608af4b771f596f60599d vdr-setup-0.3.1-r1.ebuild 2574
+SHA256 7c9c518459fb6656f535054458a41a1cd408e39da9b62b8d3810246c65d391aa vdr-setup-0.3.1-r1.ebuild 2574
 EBUILD vdr-setup-0.3.1.ebuild 2104 RMD160 a255edd64d8c1f7c3c08aa339f4687a00a205e4e SHA1 dc9968a334940f0cf145e4848a5bc17b192fecbf SHA256 9e2c28049f7e005578a1873f9d943288c1c44a299df4016c39d6f90bd09e90d2
 MD5 5966b7179c91320d444b231ca662e67b vdr-setup-0.3.1.ebuild 2104
 RMD160 a255edd64d8c1f7c3c08aa339f4687a00a205e4e vdr-setup-0.3.1.ebuild 2104
 SHA256 9e2c28049f7e005578a1873f9d943288c1c44a299df4016c39d6f90bd09e90d2 vdr-setup-0.3.1.ebuild 2104
-MISC ChangeLog 3204 RMD160 31e31e48250a7360d354240643eb2302a0208b56 SHA1 a56b54430543b9887046c13a50b42131d900be64 SHA256 67b5f994356f375bdfc18279bda5dd264b8e3eb815a47e0f038b09ce6c60fc8f
-MD5 459c59b03c2c360026017e98813354a2 ChangeLog 3204
-RMD160 31e31e48250a7360d354240643eb2302a0208b56 ChangeLog 3204
-SHA256 67b5f994356f375bdfc18279bda5dd264b8e3eb815a47e0f038b09ce6c60fc8f ChangeLog 3204
+MISC ChangeLog 3326 RMD160 3f6f1ee8c47caa14343857fa666caa12c839df75 SHA1 6dd77d9d6a9b016ebc03b3768a0ef458b1698ac8 SHA256 81e495ad72ac73a2a8a33b9349284c47e82e4e8956db9cad7ee2162ce6d05994
+MD5 f44a11708c938e5679247a7407088bb1 ChangeLog 3326
+RMD160 3f6f1ee8c47caa14343857fa666caa12c839df75 ChangeLog 3326
+SHA256 81e495ad72ac73a2a8a33b9349284c47e82e4e8956db9cad7ee2162ce6d05994 ChangeLog 3326
 MISC metadata.xml 540 RMD160 cca198c4529623f25ab1009757673485c021c7da SHA1 586e6fd714fc530db6d4ca19cee2de28d19d9a38 SHA256 a9aa7b1d1b97ae4d5656042dbddab1cdfc9092b6acb94114a59eba5b44175233
 MD5 e516803e84d1e9932b498f664b21574d metadata.xml 540
 RMD160 cca198c4529623f25ab1009757673485c021c7da metadata.xml 540
@@ -60,11 +57,3 @@ SHA256 6abec5c30a9726bafb1e37c26c8223a017291f8c5652be51806624b8b5544782 files/di
 MD5 2eb323cfb45d45fce4b23731d6fb2381 files/digest-vdr-setup-0.3.1-r1 235
 RMD160 861af167c79ba63649dee0b6828ae1848f2130d3 files/digest-vdr-setup-0.3.1-r1 235
 SHA256 6abec5c30a9726bafb1e37c26c8223a017291f8c5652be51806624b8b5544782 files/digest-vdr-setup-0.3.1-r1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFHG7xEdn07HTTCgIoRAi9cAJ0ZvtcnghvWlX+/gfak3fZTg1UBGgCfaF5U
-auXlRx0njC235+QrqYUBDqo=
-=LkfG
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild b/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild
index 23ac05349227..f342a0999353 100644
--- a/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild
+++ b/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild,v 1.3 2007/10/21 20:53:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild,v 1.4 2007/12/11 11:13:00 zzam Exp $
 
 inherit vdr-plugin
 
@@ -35,11 +35,18 @@ pkg_setup() {
 		echo
 		eerror "Patched VDR needed"
 		echo
+		local flag="setup-plugin"
 		if has_version ">=media-video/vdr-1.4.7" ; then
-			elog "reemerge VDR with USE=\"setup\" " && die "unpack failed, patched VDR needed"
-		else
-			elog "reemerge VDR with USE=\"setup-plugin\" " && die "unpack failed, patched VDR needed"
+			flag="setup"
 		fi
+
+		ewarn "you need to reemerge VDR with USE=\"${flag}\""
+		ewarn
+		ewarn "If you did USE=\"${flag}\" emerge vdr"
+		ewarn 'and it failed with this message, then try'
+		ewarn "\tUSE=\"${flag}\" emerge vdr vdr-setup"
+
+		die "unpack failed, patched VDR needed"
 	fi
 }