Revbump. Fixes bug #164544 and #445910

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)

4 files changed, 52 insertions, 2 deletions

diff --git a/app-admin/localepurge/ChangeLog b/app-admin/localepurge/ChangeLog
index 6d48fbadff1d..029e795a8ac9 100644
--- a/app-admin/localepurge/ChangeLog
+++ b/app-admin/localepurge/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/localepurge
 # Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/ChangeLog,v 1.39 2012/12/03 19:27:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/ChangeLog,v 1.40 2012/12/04 22:36:49 hwoarang Exp $
+
+*localepurge-0.5.4-r1 (04 Dec 2012)
+
+  04 Dec 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/localepurge-0.5.4-directorysum.patch,
+  +files/localepurge-0.5.4-parentdir.patch, +localepurge-0.5.4-r1.ebuild,
+  -localepurge-0.5.4.ebuild:
+  Revbump. Fixes bug #164544 and #445910
 
 *localepurge-0.5.4 (03 Dec 2012)
 
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
new file mode 100644
index 000000000000..f837d2845d54
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
@@ -0,0 +1,20 @@
+--- localepurge.orig	2012-12-04 23:15:29.422756767 +0100
++++ localepurge	2012-12-04 23:16:13.313756491 +0100
+@@ -198,7 +198,7 @@
+ 
+         if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+            if test $SPACETMP -gt 0 ; then
+-               LOCALETOTAL=$SPACETMP
++               LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP))
+                einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
+            fi
+            SPACETMP=0
+@@ -230,7 +230,7 @@
+ 
+         if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+            if test $SPACETMP -gt 0 ; then
+-               MANTOTAL=$SPACETMP
++               MANTOTAL=$(($MANTOTAL + $SPACETMP))
+                einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
+            fi
+            SPACETMP=0
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
new file mode 100644
index 000000000000..2b052ddf4d99
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
@@ -0,0 +1,18 @@
+--- localepurge.orig	2012-12-04 23:08:17.754765708 +0100
++++ localepurge	2012-12-04 23:09:02.397765264 +0100
+@@ -165,7 +165,14 @@
+     ${ACTION} `find ${REMOVEPATH} -type f -o -type l`
+ 
+     if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+-        SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
++        # if symlink, REMOVEPATH could be removed
++        # check from parentdir then
++        if [ -d ${REMOVEPATH} ]; then
++            SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
++        else
++            SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}')
++        fi
++
+         SPACESUM=$(($SPACEBEFORE - $SPACEAFTER))
+ 
+         if test $SPACESUM -gt 0 ; then
diff --git a/app-admin/localepurge/localepurge-0.5.4.ebuild b/app-admin/localepurge/localepurge-0.5.4-r1.ebuild
index 566db004ec7f..e696a1b531c4 100644
--- a/app-admin/localepurge/localepurge-0.5.4.ebuild
+++ b/app-admin/localepurge/localepurge-0.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.4.ebuild,v 1.1 2012/12/03 19:27:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.4-r1.ebuild,v 1.1 2012/12/04 22:36:49 hwoarang Exp $
 
 EAPI=4
 
@@ -23,6 +23,10 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-prefix.patch
+	# 164544
+	epatch "${FILESDIR}"/${P}-directorysum.patch
+	# 445910
+	epatch "${FILESDIR}"/${P}-parentdir.patch
 	eprefixify ${PN}
 }