Fix pid directory detection, revision bump, drop old revisions wrt bug #448498

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

5 files changed, 17 insertions, 9 deletions

diff --git a/net-im/err/ChangeLog b/net-im/err/ChangeLog
index fa72a3850e5f..9ea9bae452c8 100644
--- a/net-im/err/ChangeLog
+++ b/net-im/err/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/err
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.9 2012/12/25 11:31:14 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.10 2012/12/25 20:39:53 pinkbyte Exp $
+
+*err-1.5.1-r1 (25 Dec 2012)
+*err-1.3.1-r1 (25 Dec 2012)
+
+  25 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> -err-1.3.1.ebuild,
+  +err-1.3.1-r1.ebuild, -err-1.5.1.ebuild, +err-1.5.1-r1.ebuild,
+  files/errd.initd:
+  Fix pid directory detection, revision bump, drop old revisions wrt bug
+  #448498
 
   25 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> err-1.3.1.ebuild,
   err-1.5.1.ebuild, files/errd.initd:
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 7b010a05b883..1cf38802983f 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,8 +1,8 @@
 AUX errd.confd 86 SHA256 2ce2d0233670c1a6077274ff84f9e8f7b65075a5dc8682efadd43f9476437962 SHA512 880006134b7432bdf60c89b8c930b87aae0450330d936a41db5148d2fa94508e6dfe1930733d59d1effdf217d0f9e0b4b79fa1faed5d0bc7cc2ad4951865bf66 WHIRLPOOL 1bf955480a32b0585f3ec1ee1c8f557e19a2cb547189e02e898ba8c74723844e3d5f00cf251ab44002784d0d8a2639082053455823287fb002643b8d3de60503
-AUX errd.initd 673 SHA256 d95213f7e5dc5399e4e9712d55f73398387b61fcc83b574d1d6c576cf3c7bbff SHA512 54a6dfea8e2adc8b2148de24367a82dc31c4afc8f734f5ac92cd62f6804cda5f7d309f5ffd2ef67a414da1f970e34a19ec63ad3ac840926663655edc1a92e951 WHIRLPOOL 138994a0682019e776139e72d87182edd865b3fc0b76c3f8e9088a93a1c1afe84b1ff2cd6e03ce6c9e57616880433b60c830e9ac52d3226635186d9992121944
+AUX errd.initd 677 SHA256 3d8f4f2ec5db9c9e3ad0673a52e63905b70c856165b96477cfd8e3a2a8cb2912 SHA512 d9ba4bc36f667f4816e0dff87a214e95dcd5d39810e6080fe0951923b4fa2b7f88237342c060de75b390cb28bc35ec201c6f6110567e5dcbd95177050f1f5e39 WHIRLPOOL 0ffa61dee66243b1cefa04a467de4f840c371bebeb9207ca8c0bd08bc1a17359734ebea7b18238ee764f543e18b94d3dd2ceb4078a9df10ebc67afcfcf9ed222
 DIST err-1.3.1.tar.gz 29373 SHA256 4d51be3973cd0e638f03b9f7813f480bb06685eb431aeddf8eb89dfc955c9c33 SHA512 6bb24b7607c660e54efae5c2d34e5660ac0c9a0677bc16d529c218b28692b296056bb309d0d87f706b86e1ee5822fcb34f7a64a15381b09b5762ab1379dde9be WHIRLPOOL d30788ee1ff2ffd8c94539ce55ff443d79d8fc28da8a4f9960f89ecdd89daa3e7cfe76a7b8d4d319553d1c566199bbf6ca3c9caa2fec24ad9ac5e0aaed29caed
 DIST err-1.5.1.tar.gz 47129 SHA256 3744b804d06086c7decf200626744b47cba8f4aa05cfc6026c2bf1caf0b86d93 SHA512 f990d9e5663b3c79f85d598e419827387b997bf7e1ce3b62811be56e8a48f94182bee57bb29f776f4464dee3419073fa1e245bcfd7c28f6ac73f35f81985aeef WHIRLPOOL 464df53c9f0953ad59a490b17f4171ffffcdcb864a1efb4bd7e2b9ce45b8bb8517f85660de63074dbf462007994f1b5ec9ae2a69f852f295ebff2dce98a8998e
-EBUILD err-1.3.1.ebuild 1302 SHA256 650fd76244b1aa87212ca8dd5a5b9ec3cddea2732e095882317c1c69c66e27ee SHA512 de2d496942d49ee859c87ea539f993e2eaf59350a1a304a426d5d3e0cfcf5f800faffed79715fd185b976f315c949fd07f743c6116547787bb437c19245b2f3c WHIRLPOOL 170c9c0706d2ea2042b89359b9c7a0ace5dd83bf05511cee5c4aa5abb4e3bef2e925ce833b7affd099758c44944e3e8b6c1a786cb76c6887f61d0a3d34e37264
-EBUILD err-1.5.1.ebuild 1500 SHA256 2a9cf8dd451818fb3aa6cfd9ab0d6d35ec33516995675dd69f62d38b2bdd70e3 SHA512 21b8111394fd1531aec4f537f3db5c40f297e03dbf80bc479108fb1d72bfd8e32db01321f6037accc7510b46fee211d4a31c744e4301822394b2ea8469309ba8 WHIRLPOOL e1f0f0f6bd3bdf2a9c866413080cb6e186c22d07461dfa59f778c3c58b61cb73b6cd89ac9935a86e9a2d7c7928fe1ca40070ea3120581ea420128f352729e5a1
-MISC ChangeLog 1816 SHA256 14076e99e960c9a2f1266435f5d5b396b15112e7fb20a1ab5191033d013dbd80 SHA512 53beea7712274ed87c3385caa72996e13e6df25cdb55c5c2ea667330f6781dcedfd42d68265325b03caa4561ee15bfb8bb7ffa46cfef277925f67edd35b8ebb0 WHIRLPOOL 9c3ea9edde01aeabe8c3f736981162d5ec43bd5c88ae9064fb5153cd01607a5bf8c5046f8e9a857a82b4f637b1bcc5af4b6dda2279526fcc283fb23c896aae47
+EBUILD err-1.3.1-r1.ebuild 1305 SHA256 aedcbede5409ec0e4db70886827cc034ae831cdab3c1cab26cd82d3082ae6f4e SHA512 16afe02c8596df1c79f29f7cffc08bd9700c3512f0a0e44efacf02de36e7b5068162146031c5f664f3826c58b7170f2124653222ab4c00967bab1b52f3315fc7 WHIRLPOOL d07cfa8fa737a044f94949c3193219bec0a7d3787e20f910073f0d43bd47034f88417ef946ac6ff7ee846f422550c0a256a97d95b1c681ce7daa190f2b9c5001
+EBUILD err-1.5.1-r1.ebuild 1503 SHA256 d792b51145d02c6c5386a929294ef4af80b7b400c5a7fb777e94b4c47b3e4f81 SHA512 c7eb9fa16b13fae19b4e55a1397aaf1a4dca906232233199757320c3bef46181659fed36befa85d96d42e8463e90ed627c375b287022c2a8d655a01caf5f231a WHIRLPOOL b4022284f7d03535cfaa9f9d8f037f421f1cc3ef38f73909c3397bcb6968f3b3b2fdd3d84e596dff5df2dd5c9e2d0060b1161b5540ca697bee8d50fa240bf79f
+MISC ChangeLog 2112 SHA256 cab7dabc4364875a1abfb390020c2b34a83384fb0ac4670a859eb347ab022623 SHA512 e05024b6026c6b05820c6a81ba14c7e13c5d7205d1e99004d1e0176f81879079912677b8901c36e5b72b3705d7f2f6e0da41a8c6529af86ea885be6cf5b3d9ac WHIRLPOOL 0b888f12863f1e50afbcd250cb9c9ceca158b49930b63efccb5711adf9c31379165e3668e6689299a7f02a13018cd000dc0a301d9a77d741a21df06d727c6fe1
 MISC metadata.xml 344 SHA256 388fbb3ff322390f625ba1df28374cb50a8250cb5daaa9e5eea0cc949b703c5f SHA512 540ceb7369bf4b95e214bec22598c49d9fb909bf83c12cb4bb8539ef4076fb17c85d43bf239bfedcd71b1d97fa3b7d3b26ae1e353a54f6e2a542d9892120db6f WHIRLPOOL b225bc9240c96a6deb207aee6f754f19b3a80c660c81fb46800e818fc6bdd825181cbea5db833eaa325dd20e0c193f1b6038ba66840f303a59264a939b4d1b11
diff --git a/net-im/err/err-1.3.1.ebuild b/net-im/err/err-1.3.1-r1.ebuild
index 01d3993e4cd7..83e80b5cfd12 100644
--- a/net-im/err/err-1.3.1.ebuild
+++ b/net-im/err/err-1.3.1-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/net-im/err/err-1.3.1.ebuild,v 1.2 2012/12/25 11:31:14 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.3.1-r1.ebuild,v 1.1 2012/12/25 20:39:53 pinkbyte Exp $
 
 EAPI=4
 
diff --git a/net-im/err/err-1.5.1.ebuild b/net-im/err/err-1.5.1-r1.ebuild
index 8ad5120d6356..e6349525c238 100644
--- a/net-im/err/err-1.5.1.ebuild
+++ b/net-im/err/err-1.5.1-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/net-im/err/err-1.5.1.ebuild,v 1.2 2012/12/25 11:31:14 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.5.1-r1.ebuild,v 1.1 2012/12/25 20:39:53 pinkbyte Exp $
 
 EAPI=4
 
diff --git a/net-im/err/files/errd.initd b/net-im/err/files/errd.initd
index 194624e705dc..053f92fd16ed 100644
--- a/net-im/err/files/errd.initd
+++ b/net-im/err/files/errd.initd
@@ -8,8 +8,7 @@ depend() {
 
 start() {
 	# create piddir if necessary, bug #448498
-	local piddir
-	piddir="/var/run/err"
+	local piddir=$(dirname ${ERR_PID_FILE})
 	checkpath -q -d -o err:err -m 0770 "${piddir}" || {
                 eend 1
                 return 1