From 5929c2458ab676063257c1845b5364bfc27c880d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 13 Dec 2014 09:42:11 +0100
Subject: [PATCH] xbps-src: remove pkg statedir unless -C is set.

---
 common/xbps-src/shutils/pkgtarget.sh | 7 +++++++
 xbps-src                             | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index 3a229cdc26..3dfba91968 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -91,6 +91,7 @@ install_pkg() {
         remove_pkg_wrksrc
         setup_pkg $sourcepkg $cross
         remove_pkg $cross
+        remove_pkg_statedir
     fi
 
     # If base-chroot not installed, install "base-files" into masterdir
@@ -151,6 +152,12 @@ remove_pkg_wrksrc() {
     fi
 }
 
+remove_pkg_statedir() {
+    if [ -d "$XBPS_STATEDIR" ]; then
+        rm -rf "$XBPS_STATEDIR"
+    fi
+}
+
 remove_pkg() {
     local cross="$1" _destdir f
 
diff --git a/xbps-src b/xbps-src
index b90f037632..6401021a29 100755
--- a/xbps-src
+++ b/xbps-src
@@ -559,8 +559,8 @@ case "$XBPS_TARGET" in
             if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
                 chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG || exit $?
             else
-                [ -d $XBPS_STATEDIR ] && rm -rf $XBPS_STATEDIR
                 remove_pkg_wrksrc $wrksrc
+                remove_pkg_statedir
                 if declare -f do_clean >/dev/null; then
                     run_func do_clean
                 fi