modified check for patched version to not be confused when vdr is patched without setup-plugin but with submenu

(Portage version: 2.1_pre6-r2)

4 files changed, 35 insertions, 16 deletions

diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index 9f0c79c2d21c..064c076afc27 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.4 2006/03/13 14:06:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.5 2006/03/15 08:29:43 zzam Exp $
+
+  15 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-setup-0.3.1.ebuild:
+  modified check for patched version to not be confused when vdr is patched
+  without setup-plugin but with submenu
 
   13 Mar 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/vdr-setup-0.3.1-lang.diff, vdr-setup-0.3.1.ebuild:
diff --git a/media-plugins/vdr-setup/Manifest b/media-plugins/vdr-setup/Manifest
index 9c3ce1b48bbb..ec70b9d224eb 100644
--- a/media-plugins/vdr-setup/Manifest
+++ b/media-plugins/vdr-setup/Manifest
@@ -1,22 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 313f8c5427b001a7a0431d6136bde014 ChangeLog 1046
+RMD160 fd21396e1c657f993afa90fe775cd26c45239eea ChangeLog 1046
+SHA256 5f670e11bc038fba767caed5cc861f886376e04bedff414c820006dd0af4efde ChangeLog 1046
 MD5 7e7798b807c8766b6331d33684ac3b98 files/digest-vdr-setup-0.2.3 63
-MD5 3675ed9249bf7584ce1c4331fa2fbf42 files/digest-vdr-setup-0.3.1 63
+RMD160 2003e3f77eceee591c4b20a469a66a617b98c08b files/digest-vdr-setup-0.2.3 63
+SHA256 3e0a4c1af57f392417c3e5f3eaefaba443b93a46572e013f0da487982b363ff3 files/digest-vdr-setup-0.2.3 63
+MD5 2eb323cfb45d45fce4b23731d6fb2381 files/digest-vdr-setup-0.3.1 235
+RMD160 861af167c79ba63649dee0b6828ae1848f2130d3 files/digest-vdr-setup-0.3.1 235
+SHA256 6abec5c30a9726bafb1e37c26c8223a017291f8c5652be51806624b8b5544782 files/digest-vdr-setup-0.3.1 235
 MD5 4dd1e551d51e11df975e6743ea2ead01 files/vdr-setup-0.2.3-gentoo.diff 6713
+RMD160 7b20f191388b812d5b7f31503c10f4886a19b987 files/vdr-setup-0.2.3-gentoo.diff 6713
+SHA256 f2667ed29477c25a0ca3f32aec1fe49bf64c346de75ffc938674ace566ef700f files/vdr-setup-0.2.3-gentoo.diff 6713
 MD5 41cf39f874c71c97dbe151092e736715 files/vdr-setup-0.3.1-gentoo.diff 6469
+RMD160 98e688df457b440db002de80218002202250fbfb files/vdr-setup-0.3.1-gentoo.diff 6469
+SHA256 d705d996f2375b00e1ddbdc3e56ac5db73310491adbc6657c7760d2e397d81b9 files/vdr-setup-0.3.1-gentoo.diff 6469
 MD5 2dab383f62b554eb038347bed47c18fb files/vdr-setup-0.3.1-lang.diff 6546
+RMD160 07095524e72c9fe2e98bc23ae1d9312e4f0a8316 files/vdr-setup-0.3.1-lang.diff 6546
+SHA256 d0beebd8e3512f453fd54e4acda3a3eeacf2d968c27f2430834bd415489ff151 files/vdr-setup-0.3.1-lang.diff 6546
 MD5 92ddb2fe7e0e61f6cace4ca8ff84dedd files/vdr-setup-0.3.1-timers.diff 312
+RMD160 b2493372fed80b88e3793e56934c55ef09f624ce files/vdr-setup-0.3.1-timers.diff 312
+SHA256 58e98fd4677aaf80d02082cb9353592ffc445a96e71d9e580cbede5943fa78c0 files/vdr-setup-0.3.1-timers.diff 312
 MD5 13134d72f70ed4077f1783e4b9640e0c files/vdr-setup.xml 8338
+RMD160 63bb870b9eb21a207d6e5fca47613359b56e3cea files/vdr-setup.xml 8338
+SHA256 5860b6d6d4a4cc2756bd5fe8fcc02172e39db523d06717f24edb0aeb498dc0cb files/vdr-setup.xml 8338
 MD5 b76f00a750adf92ee7defa4febc4b88d metadata.xml 544
+RMD160 475b57e626bd86becd4ccef18794f844d380f1a4 metadata.xml 544
+SHA256 8a009916c8333e0e9625a9e681243e691d399a4f16d68428dfb781a1c275b48e metadata.xml 544
 MD5 8f022e87ee9ece56950ef705e7780109 vdr-setup-0.2.3.ebuild 1797
-MD5 57a27ab2f5217cb265c5057a026df2ba vdr-setup-0.3.1.ebuild 2018
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-Comment: no further Information
-
-iD8DBQFEFXyLdn07HTTCgIoRAr6yAJ0Zqnlub3OuwZLvvdzT327TmkH2pgCgujmI
-HHW3bpXhgAu1ZaRxcWMth1M=
-=9UIX
------END PGP SIGNATURE-----
+RMD160 fe390f0ad7b862e1e9f9cd392c43980962069064 vdr-setup-0.2.3.ebuild 1797
+SHA256 9c80d31f724467865bde3e61f46a7c0713bdb848f398695dcecfe2a66377f55a vdr-setup-0.2.3.ebuild 1797
+MD5 ae666e3aa131dee890c0df43e0bdee9f vdr-setup-0.3.1.ebuild 2060
+RMD160 bb2b646bd8b02eacd9b3f831ad3dc668045cec22 vdr-setup-0.3.1.ebuild 2060
+SHA256 7bdfb212c8e06b2bc9c2447d2c2bed517d4735f8471bb81e267a562b8f3315f2 vdr-setup-0.3.1.ebuild 2060
diff --git a/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1 b/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1
index 231e3e58ab20..95497116e08e 100644
--- a/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1
+++ b/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1
@@ -1 +1,3 @@
 MD5 3cc4a91219dfb671ba9fd75edadfb56b vdr-setup-0.3.1.tgz 89366
+RMD160 81bc99b57669cff762aed4f452db4ddb67662c22 vdr-setup-0.3.1.tgz 89366
+SHA256 b44457c384a6fcf22baa24ae7cbeca3d8e23c9d93c7be5c1601dbca338828392 vdr-setup-0.3.1.tgz 89366
diff --git a/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild b/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild
index f72c8aa90b3f..7372fa631b60 100644
--- a/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild
+++ b/media-plugins/vdr-setup/vdr-setup-0.3.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-plugins/vdr-setup/vdr-setup-0.3.1.ebuild,v 1.2 2006/03/13 14:06:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild,v 1.3 2006/03/15 08:29:43 zzam Exp $
 
 inherit vdr-plugin
 
@@ -22,7 +22,9 @@ PATCHES="${FILESDIR}/${P}-*.diff"
 pkg_setup() {
 	vdr-plugin_pkg_setup
 
-	if [[ ! -f /usr/include/vdr/submenu.h ]] || [[ ! -f /usr/share/vdr/setup/menu.c ]]; then
+	if grep -q cSubMenuNode /usr/include/vdr/submenu.h && [[ -f /usr/share/vdr/setup/menu.c ]]; then
+		einfo "Patched vdr found"
+	else
 		echo
 		eerror "Patched VDR needed"
 		echo