Do not grep nonexisting file in check for vdr-support.

Package-Manager: portage-2.1

diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index 0dcac25de7be0cf53eeb28bb0f17ecf6ed091ca0..e2671c03d8fa92607b5c032afb98ea3b18441d36 100644 (file)
--- a/media-plugins/vdr-setup/ChangeLog
+++ b/media-plugins/vdr-setup/ChangeLog
@@ -1,6 +1,9 @@
 # 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.6 2006/03/21 14:33:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.7 2006/06/15 13:58:29 zzam Exp $
+
+  15 Jun 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-setup-0.3.1.ebuild:
+  Do not grep nonexisting file in check for vdr-support.
 
   21 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-setup-0.3.1.ebuild:
   changed depend - works with vdr-1.3.36

diff --git a/media-plugins/vdr-setup/files/digest-vdr-setup-0.2.3 b/media-plugins/vdr-setup/files/digest-vdr-setup-0.2.3
index 0b9b9d5f2b3ac84d5e6408ec2645e1573247b211..9e7e1d1d8786237ba8b71148e534f1bf75952d35 100644 (file)
--- a/media-plugins/vdr-setup/files/digest-vdr-setup-0.2.3
+++ b/media-plugins/vdr-setup/files/digest-vdr-setup-0.2.3
@@ -1 +1,3 @@
 MD5 39cd6002b80fcd153bc57a1dc487af23 vdr-setup-0.2.3.tgz 88483
+RMD160 9c5c555fc3c0a37dfa3fb3008d656c213e485062 vdr-setup-0.2.3.tgz 88483
+SHA256 8669c8599f468b768994b3388898048d17d82e9163ac9cc8846e1d99bd3824dc vdr-setup-0.2.3.tgz 88483

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 e7147f139037b2cab70db7ab0fe14cb162c27b60..9d52850015bfe39df76c55092c20468f11cb4d09 100644 (file)
--- 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.4 2006/03/21 14:33:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild,v 1.5 2006/06/15 13:58:29 zzam Exp $
 
 inherit vdr-plugin
 
@@ -22,7 +22,8 @@ PATCHES="${FILESDIR}/${P}-*.diff"
 pkg_setup() {
        vdr-plugin_pkg_setup
 
-       if grep -q cSubMenuNode /usr/include/vdr/submenu.h && [[ -f /usr/share/vdr/setup/menu.c ]]; then
+       local header=/usr/include/vdr/submenu.h
+       if [[ -f ${header} ]] && grep -q cSubMenuNode ${header} && [[ -f /usr/share/vdr/setup/menu.c ]]; then
                einfo "Patched vdr found"
        else
                echo

diff --git a/media-plugins/vdr-submenu/ChangeLog b/media-plugins/vdr-submenu/ChangeLog
index 9eacf211bb1e11d7749139b743f484667ece8fdc..98578109d41d55ce8befb30c2a8af58342521268 100644 (file)
--- a/media-plugins/vdr-submenu/ChangeLog
+++ b/media-plugins/vdr-submenu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-submenu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-submenu/ChangeLog,v 1.1 2006/03/29 21:52:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-submenu/ChangeLog,v 1.2 2006/06/15 13:56:11 zzam Exp $
+
+  15 Jun 2006; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-submenu-0.0.2.ebuild:
+  Do not grep nonexisting file in check for vdr-support.
 
 *vdr-submenu-0.0.2 (29 Mar 2006)
 

diff --git a/media-plugins/vdr-submenu/vdr-submenu-0.0.2.ebuild b/media-plugins/vdr-submenu/vdr-submenu-0.0.2.ebuild
index 903d1ad48fdee2ce5a9d5d71bf7aee9f5bf77ddf..8b4a6363268a833a092391db97ff1ac84cd153f3 100644 (file)
--- a/media-plugins/vdr-submenu/vdr-submenu-0.0.2.ebuild
+++ b/media-plugins/vdr-submenu/vdr-submenu-0.0.2.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-submenu/vdr-submenu-0.0.2.ebuild,v 1.1 2006/03/29 21:52:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-submenu/vdr-submenu-0.0.2.ebuild,v 1.2 2006/06/15 13:56:11 zzam Exp $
 
 inherit vdr-plugin
 
@@ -21,7 +21,8 @@ PATCHES="${FILESDIR}/${P}-asprintf.patch"
 pkg_setup() {
        vdr-plugin_pkg_setup
 
-       if grep -q "class cSubMenuItemInfo" /usr/include/vdr/submenu.h 2>/dev/null; then
+       local header=/usr/include/vdr/submenu.h
+       if [[ -e ${header} ]] && grep -q "class cSubMenuItemInfo" ${header} 2>/dev/null; then
                einfo "Patched vdr found"
        else
                einfo "Unpatched vdr found"