From d4a920cbf4409491a22ff06c9dadd5fb3912f43e Mon Sep 17 00:00:00 2001
From: hschang <chang@dev3>
Date: Wed, 17 Dec 2014 17:33:59 +0900
Subject: [PATCH] [e2openplugins] apply changes from upstream.

---
 .../enigma2-plugin-extensions-addstreamurl.bb           | 17 ++++++-----------
 .../enigma2-plugin-extensions-openwebif.bb              | 14 ++++++--------
 .../enigma2-plugin-extensions-remotestreamconvert.bb    | 17 ++++++-----------
 .../enigma2-plugin-systemplugins-autoshutdown.bb        | 10 +++++-----
 4 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-addstreamurl.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-addstreamurl.bb
index 8d5fc31..15e6886 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-addstreamurl.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-addstreamurl.bb
@@ -3,18 +3,13 @@ DESCRIPTION = "Add a stream url to your channellist"
 
 PR="r0"
 
-require openplugins.inc
+inherit gitpkgv
+PV = "2.0+git${SRCPV}"
+PKGV = "2.0+git${GITPKGV}"
+PR = "r0"
+
+require openplugins-distutils.inc
 
 require assume-gplv2.inc
 
 SRC_URI += "file://addstreamurl_uifix.patch"
-
-PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
-
-do_install() {
-        install -d ${D}${PLUGINPATH}
-        cp -rp ${S}/plugin/* ${D}${PLUGINPATH}
-}
-
-FILES_${PN} = "${PLUGINPATH}"
-PACKAGES = "${PN}"
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
index 95909d0..09a34c9 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@ -4,14 +4,13 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://README;firstline=10;lastline=12;md5=9c14f792d0aeb54e15490a28c89087f7"
 
 DEPENDS = "python-cheetah-native"
-RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl aio-grab"
+RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl python-shell aio-grab python-compression"
 
-inherit gitpkgv pythonnative
-PV = "0.1+git${SRCPV}"
-PKGV = "0.1+git${GITPKGV}"
-PR = "r0.82"
+inherit gitpkgv
+PV = "1+git${SRCPV}"
+PKGV = "1+git${GITPKGV}"
 
-require openplugins.inc
+require openplugins-distutils.inc
 
 # Just a quick hack to "compile" it
 do_compile() {
@@ -20,7 +19,7 @@ do_compile() {
 }
 
 PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
-do_install() {
+do_install_append() {
 	install -d ${D}${PLUGINPATH}
 	cp -rp ${S}/plugin/* ${D}${PLUGINPATH}
 }
@@ -56,4 +55,3 @@ python do_package_prepend () {
 }
 
 FILES_${PN} = "${PLUGINPATH}"
-PACKAGES = "${PN}"
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb
index c29cbf3..15f298b 100755
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb
@@ -5,16 +5,11 @@ RDEPENDS_${PN} = "python-shell"
 
 PR="r0"
 
-require openplugins.inc
+inherit gitpkgv
+PV = "2.0+git${SRCPV}"
+PKGV = "2.0+git${GITPKGV}"
+PR = "r0"
 
-require assume-gplv2.inc
-
-PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/${MODULE}"
+require openplugins-distutils.inc
 
-do_install() {
-        install -d ${D}${PLUGINPATH}
-        cp -rp ${S}/plugin/* ${D}${PLUGINPATH}
-}
-
-FILES_${PN} = "${PLUGINPATH}"
-PACKAGES = "${PN}"
+require assume-gplv2.inc
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
index f19c45a..adfd130 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
@@ -3,10 +3,10 @@ DESCRIPTION = "automated power off for STB"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit gitpkgv
-SRCREV_pn-${PN} = "406e54cb250fecb5040dba844098140982186668"
-PV = "0.3+git${SRCPV}"
-PKGV = "0.3+git${GITPKGV}"
-PR = "r3"
+SRCREV = ""
+PV = "0.6+git${SRCPV}"
+PKGV = "0.6+git${GITPKGV}"
+PR = "r0"
 
 require openplugins.inc
 
@@ -15,7 +15,7 @@ SRC_URI += " \
         file://autoshutdown-fix-standby_20140407.patch \
 "
 
-inherit autotools-brokensep pkgconfig
+inherit autotools
 
 FILES_${PN} = "/"
 
-- 
2.7.4