Revbump. Fixes bug #164544 and #445910

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

5 files changed, 69 insertions, 17 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/Manifest b/app-admin/localepurge/Manifest
index 599bc1e14c7e..734cd0f0788d 100644
--- a/app-admin/localepurge/Manifest
+++ b/app-admin/localepurge/Manifest
@@ -2,29 +2,31 @@
 Hash: SHA256
 
 AUX localepurge-0.5.3.3-prefix.patch 2585 SHA256 a20574adc1c6cbe1e32bd27bcd0389e0bc4d7d9156a5723389f1ddccf333cc6e SHA512 0522d28e2460fc326f9d6afb1c09ba3d3bb3c64b86ab8631017fbc1a29482e632613d8843013235f56d79e5207360eb036bcbdca28150dde652cc61687c32414 WHIRLPOOL 39821058e2cf46d667ab8014cfdbbf090b206437008b28797ca21a04d74989fff6df7472ca81c689ef1ec9b769e70e435b6e677bd2a01a90ba9bd8cfe61b49ea
+AUX localepurge-0.5.4-directorysum.patch 799 SHA256 5b0ef49c52debca8a66a79087902b3beeafa91116d5e4eca5f87a4db54380593 SHA512 a7ccb8b1a6963e45ebde2ff72c0612eeaae62cd248b8b5c675d0e0d5d0c91d7d5db34edc6e09ceebab83016f62e233a62a71562537d5dc2ead20274f1bfead2b WHIRLPOOL 5939fbb8f623099f3c912e2fa9bfe698b4de217722286d7e9eb1cce729756c9510e7db400a3545fb5206ec1f7d95f98bb17154e41964aff8583d376c00532f13
+AUX localepurge-0.5.4-parentdir.patch 730 SHA256 6c3418108a8e34202fe72ad03a673c088bda49667556ca374b98f6549cd0e592 SHA512 f46501a92fb37645c49d7ed50265cb739b7f0ca0f88be0586aae25f4672caf097ce60d6808c545b2dda31e295e596f58fba501f4470b7ea96c8fe11a1de0f0cb WHIRLPOOL 2bd35c43308b63d85b5a651220b813c0d9579621398b68f5fe8ef298658f132b6f3e49e3346d0c23d42e31378f403a525b7a9d76091ee44283b47a56f1c1e37d
 AUX localepurge-0.5.4-prefix.patch 2872 SHA256 ebc8a9ed23e968edc182777c7e32a86169550b81dc13b6d78f5ebe919ce1f1ad SHA512 994050265349b6fd91d6759368250a25122d207ec3356dc5d7902a4d897012dadf2fead83d7aa36f98191ed309ce0019d8f21a445c7d56139355a9bd471e1ad6 WHIRLPOOL 0320e8dede7929b4db8cfc340aba8d96f69eee6e38d9c8b99b4ad10d34b5b5b0c973536e12cd79948179482c909fc04b1826ec517b35fc26bccd5251d0de8eda
 DIST localepurge-0.5.2.tbz2 4729 SHA256 c58083aabbd0892594d74b464b4ac063857d14a5c3173f45b1debb77980f31bc SHA512 e0c98b3498d5a5972a6b72c8cf619e70a3ca150ad77c6147800ef821212e432db9792de252a251e0977c43f001159f93875c7cbbe8e5821763a09abf53c9d1ba WHIRLPOOL a16aff3e2bdc340cfed1efc6a2a03c0987c2d93d170c70e1fd03075aa231721ff0a2b01dad9fa7fe98e24db5cfb746ff0c0ecea7c8486408f1a3f8e437da4c73
 DIST localepurge-0.5.3.3.tbz2 4925 SHA256 55ea160eaea257a45200aa236680204bfc6eeb77235985fc6d0a1fb11392eb4d SHA512 1314503276956e404cab0224d3e5c15b60fd8722a063281459ca149da46c6704757763c1647ff7a28a964cf0f3c80fe633f969712ce85faecf41963d5b0cc03c WHIRLPOOL bdd12825dcea7d184a67a1feb4fe7ee2ffad29c816d82ebe76e5dd9c35e120c42a4cc4d1164137e458b478d9e52b8bebe69826da6b6e7b98190f041e950c2063
 DIST localepurge-0.5.4.tbz2 5038 SHA256 7aca13f6b44af74480c611c0dd63b6fe05c6084bfd3f08bfd347e7914af2ffaa SHA512 246acb8ef497a2f607ee8545c4d46fd5a1957189eb0b705bf6bcd1cd35ba5b48c7e090db480519c8e3a7427b5ad5a2c020b40232a8fbd0840f9677a6c7af600e WHIRLPOOL d1da9a6a4d5fca92e7353e6ed0e6b916b8529ad7f003a0af02b2403ceb33bdd71769b3bd1a3c37095167a0e8b3811a5b6774a089f96eedd76edb4ebf46a992d4
 EBUILD localepurge-0.5.2.ebuild 916 SHA256 65feedfd4f16cac78a44be5754e3cede3c25d6ed5f80bd300803f335d66a4f81 SHA512 c741329ae6b99742efad8392837efdd03e4edeb5086be87a98a659c3619d050c24799c78fb716d646c1a73e3b0d6bec9a847f0d1428bf69fba2036cec1151736 WHIRLPOOL c181243a992ecd97c7ab4681f249724dc637b242f85a68ff145b705924babb4687b412706671ed5318ba4fc431192c888839bd76053206148e6e2ad2ae22cc25
 EBUILD localepurge-0.5.3.3-r1.ebuild 1013 SHA256 80c09fabfe515286115958cf49c658dfb124dbe21905601fc3f4ac2a9a5c2d63 SHA512 9140f3798c3855585c4e2d156f99b53e7fbb315e9b133cb57fde79682b6a3ac1b1c4fbb4d630a1308dc89c6e743b92bbe46e8b28402ecb07d22976495f09b9ca WHIRLPOOL 45569c7483e3b792e1b2d58e65b19758da3b710f9bcdb17deb283da221d412ebbab63a11a3e088002ebb6915735fe7e81b02cc8e9e38435783c1f73c045812de
-EBUILD localepurge-0.5.4.ebuild 1027 SHA256 aafb0d414b923ff942399db9f8fdac3cd69b288ba9176e0b29f823c4c96b292b SHA512 c2abbb099599beae83e5987d98dadccb1d4f041f5910ae059f4ec6a81c5ba12119e16ee78958f6e4e286638a95f566959a0bef52dd48761d8efdf65c2673d4d7 WHIRLPOOL 7f951958105ec870c157139b02c59e8392b75f6a5d185af18ad422921b7945edaff9df5747614b2658385314800f7db2d9f3180643730f8bde731d959058ec66
-MISC ChangeLog 5470 SHA256 80438245ca574a6df8be635323ba62123d6a6420d889c5deb742057a975bfe39 SHA512 a7ecaec43ada329aa857e78a7afe720ddc21c3d8aacad27426f04dc8cf4569cd50204d81d9cf71427f6509498937863441ec76d56c7c2dca834e27e2849a28af WHIRLPOOL 43a00448c2e79e510ba6d0f1c8e49ec403ca8dab9f73e524005afcd09f51aa83848d9e5a1509eeb985c3d8f4d0e0ecb320dd0ae4dbd61d508a9080676ecc7cb4
+EBUILD localepurge-0.5.4-r1.ebuild 1139 SHA256 dd4bdeedbe7298027c0827fd122bb28bbaf998339f93ab98c69af3b80898e256 SHA512 b00fdd2d7beb46c5084c5d21b774f00944fe69eb3339b1f6ae0436ddc0626ec0ccdd730664c93f3efb9cbeb90fde7d1500a1af7ea3a5a31f2d714968e75c6e5f WHIRLPOOL c7872b38c2e79bfc25855bc0d169b2d3f39a77fad5fa1bc829338ec137f4d6c51728e13c9b483fc3ec15d9338f6d76134816689e7b3316cc113a1204554e445e
+MISC ChangeLog 5752 SHA256 442daf962321b002eb56a9a625e08a9fc14d643905451cd7caeef8a2d3edb62f SHA512 bcf7f5a49dce898af25228fe90dea370fd2f2108fb05dd2a0cfe60def74e13f70c46538aa839c3f1920597b6e19e0e362ffe654d85bf7b5ba7afb9c77e94f507 WHIRLPOOL 65590ea3283bffd61507c2229914aba605e3c845d8d428c4dbeed8a156a8c0029ee208c1b1f31a74184f4aca86a106f11ed15db7d9a256dd8d8b32264df2b6bc
 MISC metadata.xml 390 SHA256 fdd522819e9ca9140a24787bacf10cd54b0e6fb9f58a72aa8bbdc4c161ef60bf SHA512 665accecec788733edb2ca7d78893910c91c035642d042b10e8aa7def415761de6895de56fa7a7a6a34e3178014af871d7b5acd4ea29e6195d3c6808450caf7a WHIRLPOOL b7c112b966b4a9abceff6e6559d25591b50fa512dc7cc646a7472adb20f2286de95034286224c51f97e63398f4c4e7a8ad1d2d805f8c60549ec85f7c735c3a6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQvP0KAAoJEPqDWhW0r/LCxNkP+wXnws9gxDSffu8HeByTnh7m
-3fLf99HLTNz5lrd8BokPRpnogoHtVnrlyoQ041oaQtAq+/++pRLvZiNh2h6LwZIo
-5hYbHLJnHouKEQCUCrpDOaph3+DOiW/adgBXmsAkKwIySLrwdZFAozBf/zUOu5hJ
-VUkS3MrhZm/Ww3VU1F9t3atqOuLfWUYMs7r67rVCB98zaGWBJvuGYCPJKy1cs386
-sCGBKxZ+tqpT4S58JopPqt6H7uYOUNYU+UobfWkVWWqf9PQkhYWlVcr32UmNM4lp
-GpNEvm9Kc1aOFGcvQ3lSayiy5XUnDzAHVPuU4tCx2Y7BnhMTgYG4/nLisOKRoY9h
-QuHvFd+iA2pyIeGj0vyjotTDNWASn7MHj8Bzm59S7nWjXy3vR91dL5iA4CUQUvmC
-0tA9WYrFpGDE7Ne+LKc81ZOcTUBcyGPZ8Jbru/xrQXxXIArzWHQlP3nJk56gQL4k
-FepQDKTGZcHFM/jgiQx/ZFQZeK70m4H8T4gUWNmZR3p2VhsxYDyYlREvHzTJm4le
-t02ZEKpOxl3a1Rq0aAulbGGRzVudIozt+IxKo9cu+IUkpzjqpyCP5C+CmxhrO8o8
-qOKVL7clZ7muNuMGsXuwz27UsrekieIeOFA9mrBgZhRk0HfN1yUupBcSygNq7NVC
-WdqaWpXqV51dUbNpCSMW
-=r+SR
+iQIcBAEBCAAGBQJQvnsCAAoJEPqDWhW0r/LCOaUQAKsRriFRYX2+BDnbuormm9tQ
+/zlMi4JxsRfG4RCys9GS9g3hNGnmj+IWfjyk2W6E8HqxXrWD9KA58OnDh6GNMXZF
+u6gzWXLfk/bPDnkhrDVvMeRf9j/cpWFb8izfbmq6FObuYcALIy4EtMc52Z/NuZs3
+lZzFcoquyhhMj0Hck4/W2QNFXKF3eHLdoQzYE4TRRBKE01liZe/FoS8RNkAemMPV
+/GuqBg25rQx1Kr1AJuOdHplFe+wQEp4k4nt9sLuyQSK0DepJRGkzhgKjRr9NClra
+CngVk/0KWxevHJ7QB9XujylM3zUny44UuLTJFpowFAaZoKEbF6YBjVcjnnwWef/+
+RGdQpGi+LoGI08BGYNdo3wykIn9zHf+A+gUE5Z0/QvMhgfcjVFYNX8rCt6+AWY33
+kYGcjiu2K2hTwKJ14nnl2ZoNh1rsQgN/LUkd8wwpjJzH2AF7eB1gHE1Fl5vqC054
+RBG7dynYXYbZKoGDVzltfYAQMcdHiKhQL77finlglWDeraOsqhnoL3Mq26WfSYwJ
+brqolIF6kz1smIZsbcF4XI56Ynt7caCNwVz+i3E9YyVRQoqX+At1ERZ0XxxLcsX/
+8xshcC7pZyhri26Mr5DGdumHx80kzvlkhA1OfmZdVYIEnKmHrZ52+h3Rn24oWTS+
+DO2P9LJ80Mgv5CsnC7gP
+=0XNi
 -----END PGP SIGNATURE-----
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}
 }