fixed wrong include path, some minor ebuild fixes

Package-Manager: portage-2.1.9.24/cvs/Linux i686

6 files changed, 27 insertions, 54 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/Manifest b/media-plugins/vdr-remoteosd/Manifest
index 33cd0209b44b..d5c6ac2616bd 100644
--- a/media-plugins/vdr-remoteosd/Manifest
+++ b/media-plugins/vdr-remoteosd/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX vdr-remoteosd-0.0.1-include.patch 422 RMD160 106ff00845a73ccb16a03e89c786dd282dd9c6af SHA1 b18855a1486db150a1c7fb4a5a24a5c5de8af78b SHA256 337189cce7aac145c1a4c8e919e8593923c06957a128b89958867801b7d27f90
 AUX vdr-remoteosd-0.0.2-readconfig.diff 758 RMD160 157962623692448f2af50fc9214fe3e853bfc4a4 SHA1 966b8139915f8635242245d200ae25978a5c2927 SHA256 1e306b6c2c92f72430e0a7feeda19c6c8588a4654bcac2032fddcd115b5e26ab
-DIST vdr-remoteosd-0.0.1.tgz 14453 RMD160 9d24727b4d6af133658467d5ce4bb237ecb8f9f8 SHA1 d66ec9ccb2d9703e4c43c545e47ceac401612e9a SHA256 726e6556149edccab772d86627fe9b7f123a9ffb4f1a804fa18ff317a603d42c
 DIST vdr-remoteosd-0.0.2.tgz 17236 RMD160 23c88c932ff7d1f17ae2ff561302a89c4b0538d2 SHA1 62eed6cd27503c3decedb30b58de6254c58fd3e1 SHA256 52ff8d5fac9c8fa331c85977af75ce36985370cc6a5d02574d8ca0688de52c9a
 DIST vdr-remoteosd-0.1.0.tgz 18768 RMD160 35c1723fd6a96fa8c031b43b6f8a26b2331b1544 SHA1 40bc9d6c3da48ad2a8cca665839a71330661d251 SHA256 d1a01ffe2f208f3e813475a6babf4fb2d72e17611453bea06a76f390d820a26b
-EBUILD vdr-remoteosd-0.0.1.ebuild 556 RMD160 f2636f11cf45c45a61ae950088d3cfa6442dae29 SHA1 3db055b401b36d423eb76bae6aa44d5375478028 SHA256 c8492a1a9c49d420b54987d50117bbdf062756a9db9e2d013d758b9b53fbbb28
-EBUILD vdr-remoteosd-0.0.2.ebuild 742 RMD160 2cfda37bc6e766c627bd1bc9ff14510ba3f9c47d SHA1 dc0a18099029d57d95db18a0fd3b2ad4d509a7f3 SHA256 29b8076c142566eaed1e1e96ed9ae36bd5d7b513e8ec1277c0b85e858fd1056a
-EBUILD vdr-remoteosd-0.1.0.ebuild 652 RMD160 4da1e656819c4811639676a2f0b9aa1fddc46d3c SHA1 859be55e83c88c3585622a2bd6b71bf55926b4b4 SHA256 5d5487d7005d8b6e260ff35e7eaad5bf3dbc0b2359c15a95f482303898abb8b3
-MISC ChangeLog 986 RMD160 ae8b4b663c31996835da229fd6138e0289d79758 SHA1 4b650ca646a231c0c1e849ff1d0da15614b41034 SHA256 4a99c2531bd2267f3c830c517e4d197d3eeb63cd059c86bc66a69fea4a314f78
+EBUILD vdr-remoteosd-0.0.2.ebuild 726 RMD160 89a745e779adc01912a68621585234587ecb6611 SHA1 c1fade48eb42ab27894b3bdca47ab5bf47d21ae0 SHA256 009883358b63aba9622c38b92fcad4bc03ece79133c44a7f9db2dd7cdb5f575c
+EBUILD vdr-remoteosd-0.1.0.ebuild 681 RMD160 653fbae87aaaa68ab5ae281ca84d1c5b867774a6 SHA1 fbeeccf4e4053babc433c24832a69553e8d15cd4 SHA256 70d727272478a990fb5183edbf5eb3ea088a1ad7b59d556c3eb9270661670bda
+MISC ChangeLog 1230 RMD160 c190e1281c8d873d21d203a2187934450698d95d SHA1 2bfc8eb7753258a611afc93eb2d65047b6dd6c89 SHA256 d9b0d8d9d456200dad6aae74cbe91b95c81dfe9cfd53e1fbfe0c3749b0292cc8
 MISC metadata.xml 263 RMD160 ce7af80e59cdab36a4c2c4f22e942a5893bf108c SHA1 1dba53cbe1821e2edc8bd55e223afb62c6a344c4 SHA256 08d4610093d9d54d33c4f62a4886312290016bd2be38ddbc27391eb4b9c8b2be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkrNofoACgkQt2vP6XvVdOcX+QCguonZpEZJy6M+SsvMianzFJTV
-SvYAoLmx+2roI5Gayb7pmSsOkOJqi6N8
-=yx4M
+iD8DBQFNEo92dn07HTTCgIoRAmdoAJ9+cFSfCh2Tzyurhtz3Zaw5vOkLJACgpn3N
+wYuEbo1DwYS41pc9uIE41Gk=
+=lWbw
 -----END PGP SIGNATURE-----
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
 }