added test for multiple menu manipulation ; bug 201601

Package-Manager: portage-2.1.3.19

3 files changed, 34 insertions, 4 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index b2b81bbe5a91..7b9c71787aa6 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.101 2008/01/08 11:18:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.102 2008/02/10 18:34:15 hd_brummy Exp $
+
+  10 Feb 2008; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.4.7-r10.ebuild:
+  added test for multiple menu manipulation ; bug 201601
 
 *vdr-1.4.7-r10 (08 Jan 2008)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index f087873ba241..162a5fb36a4c 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX extensions-patch-32-plugin-link-error.diff 736 RMD160 b6d6b47ed63eff1d3ed73b32953d16cfea12e685 SHA1 37f7e514befa0db291610133f91daa2170c1550c SHA256 c28dc63ecb981a6bc21402c59011920ab139be85380e660e400ba1e3716af3fd
 AUX vdr-1.2.6-gentoo.diff 1995 RMD160 e166ae3db608588fbc3b753764d1e5819a5c4549 SHA1 f64c3f672ecf90e31d4251421503e9e3391cd6bf SHA256 5c7380e402a1a835e91c5b13aeea6f5dbe589d7ed35b7b28753120d69998515c
 AUX vdr-1.2.6_CAN-2005-0071.patch 893 RMD160 c4d69f1dd47366cfb4677b68fb20e304d8e54b23 SHA1 ac9dc591089cfd657f12145becf7f2ffdbe38d40 SHA256 71e3a77382b3da544f3c623263dcf6fa0df5c4ad0126da9d2ef558542dd3cec5
@@ -34,12 +37,20 @@ EBUILD vdr-1.4.4.ebuild 4971 RMD160 298e291914cc5cc18e291b416b67d7a576b11f51 SHA
 EBUILD vdr-1.4.4_p3.ebuild 5302 RMD160 b676a429126a3642147101124a1c04e43e149a77 SHA1 e259fad8773ebff123f4205be6fa2ed9b5387b26 SHA256 5d84c46b5b8438412f0afcf142104f7c74aba2442ba119409be271e592983b92
 EBUILD vdr-1.4.5.ebuild 5298 RMD160 b1b3c293b3ef8c043642e773ff6a441dc1267d75 SHA1 9044ff13aa3eaa6d71d66ab4ecdf85e1830ae29f SHA256 7320f1b91ae33faeac01d0162b07001cd089f5911e7f57fabbd9183ff7ef5623
 EBUILD vdr-1.4.6.ebuild 5652 RMD160 7ff1ac174567addba81e261c15d1b4d7b21559cb SHA1 ebbd9ddeac7ad9234c512fbebfc2cfb9e7959a2f SHA256 a6eb0ac715f391f2738d29ba9eb1c123939831747fba2ec7f33ef4799542ae98
-EBUILD vdr-1.4.7-r10.ebuild 8735 RMD160 b8cf93a7e52dccb680be61d7ac10a0704c5dc047 SHA1 9ea0398ed909a141c191f2fafbcc50981aacb610 SHA256 a710a5455ce0b7bb16ef9ff9ab261d5f6c55b0620a485bbd311a9eb266fd1dc6
+EBUILD vdr-1.4.7-r10.ebuild 9021 RMD160 239e7ae212bb0eaeaea1e61fbbd3dbe34c509dc8 SHA1 dd11ffa49e1c8c908e6e2c63e5972e7b25a4f5e5 SHA256 64575146b95aa839317496292d389e17d6ad67a4f7e456335a6398dd0cf35114
 EBUILD vdr-1.4.7-r4.ebuild 8780 RMD160 a3a4b11269b3adfe6909e9602b7e10b216d11d41 SHA1 c8a51b26c3ee947dfa880f3e6dd05749afd8d0b1 SHA256 8f52cb28020c2a2da9662e83f6733db6d5c4169eba11aa724603d9333389f63f
 EBUILD vdr-1.4.7-r5.ebuild 8477 RMD160 74c755c0bfc588f90e560ca2f0cee428fed77319 SHA1 d7164ea0851023260f984dad30f2b97f6fdc78b1 SHA256 0e06c75080b6d6bef0bb5d477b4c11f93cf53f5ce6b182617fd71d9aec4cc5fb
 EBUILD vdr-1.4.7-r6.ebuild 8546 RMD160 8f69201593c66026943178447081da7bcfd406dc SHA1 980d8773646743a24bf4c0679c652fbcc70240ba SHA256 5db740d87f893af23469d640953b9448cf30e5bbb67f2c426c3be7469b4ba0ad
 EBUILD vdr-1.4.7-r7.ebuild 8607 RMD160 843525e547d0c3abe89d8a86c531acc91c93b856 SHA1 963a4426231366fb652a4390524f64812a23d5af SHA256 1274858f6aaef5cdc87f1a81044ea2d85db1c5441e757ee46ca52d9bc6ce5cdb
 EBUILD vdr-1.4.7-r8.ebuild 8565 RMD160 53a1c162dda8a181f7f795a539d327dc0924a2d6 SHA1 227671135204804959d6fe448273d2aefc2370ca SHA256 a0cb841fb4b8ffa6db749022f41098f631c2de62ee47a0fc594070373dda90c1
 EBUILD vdr-1.4.7-r9.ebuild 8734 RMD160 62a2ea2eb18b9d5c960fc1f7a5e964e41c328756 SHA1 ec616fe814da5e74a17d5e60ef5a57ab22ad6311 SHA256 1a87415c53d4dbec54efa8066af9e029c6282f632b77b38d0b695830ba8bf261
-MISC ChangeLog 17063 RMD160 8905c69ed6302a824c6d442e2c971018551ab262 SHA1 c730b5ae23c87c07cfc750758e1a467866fe34af SHA256 97a7f93634c00bb11df9750e54f56592e59fd7d1fd7c188bcf90aaadf793d7d0
+MISC ChangeLog 17203 RMD160 282596597f25731865f408a73918cdbd8a66317c SHA1 174292439b3f6768ecfc28b3ed2d54afd66a75de SHA256 b66ecca2ad335b713a7f116c33377ba5073f0b9f8e669e0a964d684ca3ca3fce
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFHr0Oydn07HTTCgIoRAkWJAKCUk8NN1B4OrD/qvXhyxN0hEDnMPQCeIypJ
+0FU+eBhLXnJGqn6zvVVKHM4=
+=RGZn
+-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index fc07cde5093c..897198687f92 100644
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.1 2008/01/08 11:18:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.2 2008/02/10 18:34:15 hd_brummy Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -52,10 +52,26 @@ CAP_FILE="${S}"/capabilities.sh
 CAPS="# Capabilities of the vdr-executable for use by startscript etc."
 
 pkg_setup() {
+	check_menu_flags
+
 	use debug && append-flags -g
 	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
 }
 
+check_menu_flags () {
+
+	for flag in menuorg setup submenu; do
+		use $flag && count=$((count+1))
+	done
+
+	if [ $count -gt 1 ] ; then
+		echo
+		eerror "Please use only one of this USE-Flags"
+		eerror "submenu setup menuorg"
+		die "multiple menu manipulation"
+	fi
+}
+
 add_cap() {
 	local arg
 	for arg; do