fixed wrong include path, some minor ebuild fixes

(Portage version: 2.1.9.24/cvs/Linux i686)

5 files changed, 19 insertions, 44 deletions

diff --git a/media-plugins/vdr-remoteosd/ChangeLog b/media-plugins/vdr-remoteosd/ChangeLog
index 439d9677cfe5..4d7155b4549a 100644
--- a/media-plugins/vdr-remoteosd/ChangeLog
+++ b/media-plugins/vdr-remoteosd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-remoteosd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remoteosd/ChangeLog,v 1.4 2009/10/08 08:25:23 zzam Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remoteosd/ChangeLog,v 1.5 2010/12/22 23:52:41 hd_brummy Exp $
+
+  22 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-remoteosd-0.0.1.ebuild, -files/vdr-remoteosd-0.0.1-include.patch,
+  vdr-remoteosd-0.0.2.ebuild, vdr-remoteosd-0.1.0.ebuild:
+  fixed wrong include path, some minor ebuild fixes
 
 *vdr-remoteosd-0.1.0 (08 Oct 2009)
 
diff --git a/media-plugins/vdr-remoteosd/files/vdr-remoteosd-0.0.1-include.patch b/media-plugins/vdr-remoteosd/files/vdr-remoteosd-0.0.1-include.patch
deleted file mode 100644
index 1ffbc52f78a8..000000000000
--- a/media-plugins/vdr-remoteosd/files/vdr-remoteosd-0.0.1-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr remoteosd-0.0.1.orig/menu.h remoteosd-0.0.1/menu.h
---- remoteosd-0.0.1.orig/menu.h	2006-05-29 01:02:35.000000000 +0200
-+++ remoteosd-0.0.1/menu.h	2006-07-25 19:45:32.325726750 +0200
-@@ -10,7 +10,7 @@
- #include <vdr/tools.h>
- #include <vdr/osdbase.h>
- #include <vdr/plugin.h>
--#include "../svdrpservice/svdrpservice.h"
-+#include "svdrpservice/svdrpservice.h"
- 
- class cRemoteOsdMenu: public cOsdMenu {
- 	private:
diff --git a/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.1.ebuild b/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.1.ebuild
deleted file mode 100644
index b847f16ab5ec..000000000000
--- a/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.1.ebuild,v 1.3 2009/10/08 08:25:23 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR: remoteosd PlugIn"
-HOMEPAGE="http://vdr.schmirler.de/"
-SRC_URI="http://vdr.schmirler.de/remoteosd/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.0
-		>=media-plugins/vdr-svdrpservice-0.0.2"
-
-PATCHES=("${FILESDIR}/${P}-include.patch")
diff --git a/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.2.ebuild b/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.2.ebuild
index 699d9592034c..c51a75fb1004 100644
--- a/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.2.ebuild
+++ b/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.2.ebuild,v 1.4 2009/10/08 08:25:23 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remoteosd/vdr-remoteosd-0.0.2.ebuild,v 1.5 2010/12/22 23:52:41 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin
 
@@ -15,15 +17,13 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.0
 		>=media-plugins/vdr-svdrpservice-0.0.2"
+RDEPEND="${DEPEND}"
 
 PATCHES=("${FILESDIR}/${P}-readconfig.diff")
 
-src_unpack() {
-	vdr-plugin_src_unpack unpack
-
-	cd "${S}"
+src_prepare() {
 	sed -i menu.h \
-		-e 's-../svdrpservice/svdrpservice.h-svdrpservice/svdrpservice.h-'
+		-e 's-"../svdrpservice/svdrpservice.h"-<svdrpservice/svdrpservice.h>-'
 
-	vdr-plugin_src_unpack all_but_unpack
+	vdr-plugin_src_prepare
 }
diff --git a/media-plugins/vdr-remoteosd/vdr-remoteosd-0.1.0.ebuild b/media-plugins/vdr-remoteosd/vdr-remoteosd-0.1.0.ebuild
index 6a981fa2eb0c..9f4e48ad90d5 100644
--- a/media-plugins/vdr-remoteosd/vdr-remoteosd-0.1.0.ebuild
+++ b/media-plugins/vdr-remoteosd/vdr-remoteosd-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remoteosd/vdr-remoteosd-0.1.0.ebuild,v 1.1 2009/10/08 08:25:23 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remoteosd/vdr-remoteosd-0.1.0.ebuild,v 1.2 2010/12/22 23:52:41 hd_brummy Exp $
 
 EAPI="2"
 
@@ -17,10 +17,11 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.0
 		>=media-plugins/vdr-svdrpservice-0.0.2"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -i menu.h \
-		-e 's-../svdrpservice/svdrpservice.h-svdrpservice/svdrpservice.h-'
+		-e 's-"../svdrpservice/svdrpservice.h"-<svdrpservice/svdrpservice.h>-'
 
 	vdr-plugin_src_prepare
 }