From 8c6667b5fb0e3b08d8e0f4d5109ecf968249067b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 5 Dec 2013 01:02:48 +0100
Subject: [PATCH] scripts/unpack: move $BUILD/.stamps/unpack to
 $PKG_BUILD/.openelec-unpack. Add support for PKG_SOURCE_DIR: if set this
 automatically rename extracted sourcefolders to the $PKG_NAME-$PKG_VERSION
 format. Remove support for the already deprecated and not more used
 $PKG_DIR/rename scripts. Deprecate post_unpack() function. Cleanup.

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 scripts/unpack | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/scripts/unpack b/scripts/unpack
index 13caa3f883..e26e57e06b 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -29,13 +29,13 @@ fi
 
 $SCRIPTS/get $1
 
+PKG_BUILD="$BUILD/$PKG_NAME-$PKG_VERSION"
+STAMP=$PKG_BUILD/.openelec-unpack
+
 mkdir -p $BUILD
 
 [ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0
 
-mkdir -p $STAMPS/$1
-STAMP=$STAMPS/$1/unpack
-
 [ -f "$STAMP" -a -f "$PKG_DIR/need_unpack" ] && $PKG_DIR/need_unpack $@
 
 # trigger unpack / full rebuild on any package.mk change
@@ -57,11 +57,7 @@ done
 printf "%${BUILD_INDENT}c UNPACK   $1\n" ' '>&$SILENT_OUT
 export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
-rm -rf $BUILD/$1[-_][0-9]*
-rm -rf $BUILD/$1[-_]r[0-9]*
-rm -rf $BUILD/$1[-_]cvs*
-rm -rf $BUILD/$1[-_]svn*
-rm -rf $BUILD/$1[-_]git*
+rm -rf $BUILD/$PKG_NAME-$PKG_VERSION
 
 if [ -n "$PKG_URL" ]; then
   $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
@@ -73,37 +69,28 @@ if [ -n "$PKG_URL" ]; then
   $SCRIPTS/extract $1 "$1*.7z"      $BUILD
 fi
 
+if [ -n "$PKG_SOURCE_DIR" ]; then
+  mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
+fi
+
+# post_unpack() : Formerly used to replace $PKG_DIR/rename, now replaced by
+# $PKG_SOURCE_DIR . Keep this here for other usage or remove later
 if [ -f $PKG_DIR/package.mk ]; then
   # unset functions
   unset -f post_unpack
 
   . $PKG_DIR/package.mk
 
-  # post_unpack (replaces PKG_DIR/rename)
   if [ "$(type -t post_unpack)" = "function" ]; then
     post_unpack
   fi
 fi
 
-[ -f "$PKG_DIR/rename" ] && $PKG_DIR/rename $@ >&$VERBOSE_OUT
-
 if [ -d "$PKG_DIR/sources" ]; then
   [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
   cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
 fi
 
-if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
-  PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
-elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
-  PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
-elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
-  PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
-elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
-  PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
-elif [ -d "$BUILD/${PKG_NAME}" ]; then
-  PKG_BUILD="$BUILD/${PKG_NAME}"
-fi
-
 for i in $PKG_DIR/patches/$PKG_NAME-*.patch ; do
   if [ -f "$i" ]; then
     PATCH=`basename $i`