Move pidfile directory creation from ebuilds to initscript, wrt bug #448498

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 15 insertions, 7 deletions

diff --git a/net-im/err/ChangeLog b/net-im/err/ChangeLog
index 52935d917c8b..fa72a3850e5f 100644
--- a/net-im/err/ChangeLog
+++ b/net-im/err/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2012/10/06 09:15:59 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.9 2012/12/25 11:31:14 pinkbyte Exp $
+
+  25 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> err-1.3.1.ebuild,
+  err-1.5.1.ebuild, files/errd.initd:
+  Move pidfile directory creation from ebuilds to initscript, wrt bug #448498
 
 *err-1.3.1 (06 Oct 2012)
 
diff --git a/net-im/err/err-1.3.1.ebuild b/net-im/err/err-1.3.1.ebuild
index 30a134c9306b..01d3993e4cd7 100644
--- a/net-im/err/err-1.3.1.ebuild
+++ b/net-im/err/err-1.3.1.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.1 2012/10/06 09:15:59 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.3.1.ebuild,v 1.2 2012/12/25 11:31:14 pinkbyte Exp $
 
 EAPI=4
 
@@ -45,10 +45,8 @@ src_install() {
 	dodir /var/lib/${PN}/plugins
 
 	keepdir /var/log/${PN}
-	keepdir /var/run/${PN}
 	fowners -R err:err /var/lib/${PN}
 	fowners -R err:err /var/log/${PN}
-	fowners -R err:err /var/run/${PN}
 	insinto /etc/${PN}
 	newins errbot/config-template.py config.py
 }
diff --git a/net-im/err/err-1.5.1.ebuild b/net-im/err/err-1.5.1.ebuild
index b2fc27fb1100..8ad5120d6356 100644
--- a/net-im/err/err-1.5.1.ebuild
+++ b/net-im/err/err-1.5.1.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.1 2012/09/16 11:05:25 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.5.1.ebuild,v 1.2 2012/12/25 11:31:14 pinkbyte Exp $
 
 EAPI=4
 
@@ -51,10 +51,8 @@ src_install() {
 	dodir /etc/${PN}
 	dodir /var/lib/${PN}
 	keepdir /var/log/${PN}
-	keepdir /var/run/${PN}
 	fowners -R err:err /var/lib/${PN}
 	fowners -R err:err /var/log/${PN}
-	fowners -R err:err /var/run/${PN}
 	insinto /etc/${PN}
 	newins errbot/config-template.py config.py
 	use qt4 && python_execute_function install_svgs
diff --git a/net-im/err/files/errd.initd b/net-im/err/files/errd.initd
index 55752a5255d1..194624e705dc 100644
--- a/net-im/err/files/errd.initd
+++ b/net-im/err/files/errd.initd
@@ -7,6 +7,14 @@ depend() {
 }
 
 start() {
+	# create piddir if necessary, bug #448498
+	local piddir
+	piddir="/var/run/err"
+	checkpath -q -d -o err:err -m 0770 "${piddir}" || {
+                eend 1
+                return 1
+        }
+
 	ebegin "Starting errd"
 		start-stop-daemon --start --make-pidfile --pidfile ${ERR_PID_FILE} --background --quiet -u ${ERR_USER}:${ERR_GROUP} \
 			--exec /usr/bin/python2 -- /usr/bin/err.py -c ${ERR_CONFIG_PATH}