summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-im/bitlbee/ChangeLog6
-rw-r--r--net-im/bitlbee/bitlbee-3.0.5-r1.ebuild7
-rw-r--r--net-im/bitlbee/bitlbee-3.0.6.ebuild7
-rw-r--r--net-im/bitlbee/bitlbee-3.2.ebuild5
-rw-r--r--net-im/bitlbee/files/bitlbee.initd5
5 files changed, 13 insertions, 17 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 87250af143fc..b13aed5e1933 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/bitlbee
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.162 2013/01/07 23:50:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.163 2013/01/08 14:25:21 cedk Exp $
+
+ 08 Jan 2013; Cédric Krier <cedk@gentoo.org> bitlbee-3.0.5-r1.ebuild,
+ bitlbee-3.0.6.ebuild, bitlbee-3.2.ebuild, files/bitlbee.initd:
+ Remove /var/run keepdir statements for bug #450882
*bitlbee-3.2 (07 Jan 2013)
diff --git a/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild b/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
index 87ea54ed9c3e..93789ca01eb3 100644
--- a/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild,v 1.7 2012/07/20 01:33:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild,v 1.8 2013/01/08 14:25:21 cedk Exp $
EAPI="4"
PYTHON_DEPEND="skype? 2:2.5"
@@ -164,9 +164,6 @@ src_install() {
newinitd "${FILESDIR}"/bitlbee.initd bitlbee
newconfd "${FILESDIR}"/bitlbee.confd bitlbee
- keepdir /var/run/bitlbee
- fowners bitlbee:bitlbee /var/run/bitlbee
-
exeinto /usr/share/bitlbee
cd utils
doexe convert_purple.py bitlbee-ctl.pl
diff --git a/net-im/bitlbee/bitlbee-3.0.6.ebuild b/net-im/bitlbee/bitlbee-3.0.6.ebuild
index 733fef6594fe..32b64ccc5a21 100644
--- a/net-im/bitlbee/bitlbee-3.0.6.ebuild
+++ b/net-im/bitlbee/bitlbee-3.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.6.ebuild,v 1.1 2012/10/19 09:20:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.6.ebuild,v 1.2 2013/01/08 14:25:21 cedk Exp $
EAPI="4"
PYTHON_DEPEND="skype? 2:2.5"
@@ -164,9 +164,6 @@ src_install() {
newinitd "${FILESDIR}"/bitlbee.initd bitlbee
newconfd "${FILESDIR}"/bitlbee.confd bitlbee
- keepdir /var/run/bitlbee
- fowners bitlbee:bitlbee /var/run/bitlbee
-
exeinto /usr/share/bitlbee
cd utils
doexe convert_purple.py bitlbee-ctl.pl
diff --git a/net-im/bitlbee/bitlbee-3.2.ebuild b/net-im/bitlbee/bitlbee-3.2.ebuild
index af609822285a..97e7cca97ec5 100644
--- a/net-im/bitlbee/bitlbee-3.2.ebuild
+++ b/net-im/bitlbee/bitlbee-3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.ebuild,v 1.1 2013/01/07 23:50:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.ebuild,v 1.2 2013/01/08 14:25:21 cedk Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -161,9 +161,6 @@ src_install() {
newinitd "${FILESDIR}"/bitlbee.initd bitlbee
newconfd "${FILESDIR}"/bitlbee.confd bitlbee
- keepdir /var/run/bitlbee
- fowners bitlbee:bitlbee /var/run/bitlbee
-
exeinto /usr/share/bitlbee
cd utils
doexe convert_purple.py bitlbee-ctl.pl
diff --git a/net-im/bitlbee/files/bitlbee.initd b/net-im/bitlbee/files/bitlbee.initd
index e703c028dff0..235b3744eef0 100644
--- a/net-im/bitlbee/files/bitlbee.initd
+++ b/net-im/bitlbee/files/bitlbee.initd
@@ -1,8 +1,8 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or
# later
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd,v 1.3 2011/12/04 21:18:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd,v 1.4 2013/01/08 14:25:21 cedk Exp $
DAEMON=/usr/sbin/bitlbee
PIDFILE=/var/run/bitlbee/bitlbee.pid
@@ -13,6 +13,7 @@ depend() {
start () {
ebegin "Starting bitlbee"
+ checkpath -d -m 0755 -o bitlbee:bitlbee `dirname ${PIDFILE}`
start-stop-daemon --start --quiet \
-u bitlbee:bitlbee --exec ${DAEMON} -- -P ${PIDFILE} \
${BITLBEE_OPTS}