From a6111a6d0ba427db21ce0fc9ce25be4c0e4794a2 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Wed, 4 Dec 2019 10:24:21 +0100
Subject: [PATCH] kodi: don't wipe themes, move them for the theme packages

---
 packages/addons/skin/estouchy/package.mk           |  4 ++--
 packages/mediacenter/kodi-theme-Estuary/package.mk |  5 ++---
 packages/mediacenter/kodi/package.mk               | 10 ++++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/addons/skin/estouchy/package.mk b/packages/addons/skin/estouchy/package.mk
index 6c1ded5f52..c8e38a70fd 100644
--- a/packages/addons/skin/estouchy/package.mk
+++ b/packages/addons/skin/estouchy/package.mk
@@ -8,7 +8,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain kodi"
+PKG_DEPENDS_TARGET="kodi"
 PKG_SECTION="skin"
 PKG_SHORTDESC="Kodi skin Estouchy"
 PKG_LONGDESC="Kodi skin Estouchy"
@@ -20,5 +20,5 @@ PKG_ADDON_TYPE="xbmc.gui.skin"
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp -a $(get_build_dir kodi)/.$TARGET_NAME/addons/skin.estouchy/* $ADDON_BUILD/$PKG_ADDON_ID
+    cp -a $(get_install_dir kodi)/.noinstall/skin.estouchy/* $ADDON_BUILD/$PKG_ADDON_ID
 }
diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk
index c20c36a583..e467a1e595 100644
--- a/packages/mediacenter/kodi-theme-Estuary/package.mk
+++ b/packages/mediacenter/kodi-theme-Estuary/package.mk
@@ -6,12 +6,11 @@ PKG_VERSION="1.0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain kodi"
-PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
+PKG_DEPENDS_TARGET="kodi"
 PKG_LONGDESC="Kodi Mediacenter default theme."
 PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/share/kodi/addons/
-    cp -a $(get_build_dir kodi)/.$TARGET_NAME/addons/skin.estuary $INSTALL/usr/share/kodi/addons/
+    cp -a $(get_install_dir kodi)/.noinstall/skin.estuary $INSTALL/usr/share/kodi/addons/
 }
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 2939fa7e3b..468e44b157 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -251,6 +251,12 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
+  mkdir -p $INSTALL/.noinstall
+    mv $INSTALL/usr/share/kodi/addons/skin.estouchy \
+       $INSTALL/usr/share/kodi/addons/skin.estuary \
+       $INSTALL/usr/share/kodi/addons/service.xbmc.versioncheck \
+       $INSTALL/.noinstall
+
   rm -rf $INSTALL/usr/bin/kodi
   rm -rf $INSTALL/usr/bin/kodi-standalone
   rm -rf $INSTALL/usr/bin/xbmc
@@ -259,10 +265,6 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/share/applications
   rm -rf $INSTALL/usr/share/icons
   rm -rf $INSTALL/usr/share/pixmaps
-  rm -rf $INSTALL/usr/share/kodi/addons/skin.estouchy
-  rm -rf $INSTALL/usr/share/kodi/addons/skin.estuary
-  rm -rf $INSTALL/usr/share/kodi/addons/service.xbmc.versioncheck
-  rm -rf $INSTALL/usr/share/kodi/addons/visualization.vortex
   rm -rf $INSTALL/usr/share/xsessions
 
   mkdir -p $INSTALL/usr/lib/kodi