summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorGustavo Felisberto <humpback@gentoo.org>2004-06-19 20:38:58 +0000
committerGustavo Felisberto <humpback@gentoo.org>2004-06-19 20:38:58 +0000
commit5ab3b5e84851c11271c9cdb164dc066585bfd376 (patch)
treed79684167e6634c8f7dde87f6842ef092397c616 /net-im
parentMarked as ~ppc (Manifest recommit) (diff)
downloadgentoo-2-5ab3b5e84851c11271c9cdb164dc066585bfd376.tar.gz
gentoo-2-5ab3b5e84851c11271c9cdb164dc066585bfd376.tar.bz2
gentoo-2-5ab3b5e84851c11271c9cdb164dc066585bfd376.zip
stable on x86
Diffstat (limited to 'net-im')
-rw-r--r--net-im/aim-transport/ChangeLog6
-rw-r--r--net-im/aim-transport/aim-transport-20040131-r1.ebuild4
-rw-r--r--net-im/yahoo-transport/ChangeLog6
-rw-r--r--net-im/yahoo-transport/files/yahoo-transport.init20
-rw-r--r--net-im/yahoo-transport/yahoo-transport-2.3.1.ebuild4
5 files changed, 23 insertions, 17 deletions
diff --git a/net-im/aim-transport/ChangeLog b/net-im/aim-transport/ChangeLog
index dd70feb44c81..f86e93431010 100644
--- a/net-im/aim-transport/ChangeLog
+++ b/net-im/aim-transport/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/aim-transport
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/aim-transport/ChangeLog,v 1.13 2004/06/08 12:56:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/aim-transport/ChangeLog,v 1.14 2004/06/19 20:38:58 humpback Exp $
+
+ 19 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>;
+ aim-transport-20040131-r1.ebuild:
+ Marking stable on x86
08 Jun 2004; Guy Martin <gmsoft@gentoo.org>
aim-transport-20040131-r1.ebuild, aim-transport-20040131.ebuild:
diff --git a/net-im/aim-transport/aim-transport-20040131-r1.ebuild b/net-im/aim-transport/aim-transport-20040131-r1.ebuild
index 1d32c799420f..207c56d0e366 100644
--- a/net-im/aim-transport/aim-transport-20040131-r1.ebuild
+++ b/net-im/aim-transport/aim-transport-20040131-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/aim-transport/aim-transport-20040131-r1.ebuild,v 1.5 2004/06/08 12:50:51 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/aim-transport/aim-transport-20040131-r1.ebuild,v 1.6 2004/06/19 20:38:58 humpback Exp $
inherit eutils
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~ppc hppa"
+KEYWORDS="x86 ~ppc hppa"
IUSE=""
diff --git a/net-im/yahoo-transport/ChangeLog b/net-im/yahoo-transport/ChangeLog
index e6bb6c91a56c..e3f0049d9796 100644
--- a/net-im/yahoo-transport/ChangeLog
+++ b/net-im/yahoo-transport/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/yahoo-transport
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/yahoo-transport/ChangeLog,v 1.10 2004/06/08 13:00:27 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/yahoo-transport/ChangeLog,v 1.11 2004/06/19 20:37:22 humpback Exp $
+
+ 19 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>;
+ yahoo-transport-2.3.1.ebuild, files/yahoo-transport.init:
+ Marking stable on x86
08 Jun 2004; Guy Martin <gmsoft@gentoo.org> yahoo-transport-2.3.1.ebuild:
Marked stable on hppa.
diff --git a/net-im/yahoo-transport/files/yahoo-transport.init b/net-im/yahoo-transport/files/yahoo-transport.init
index 10609438a7fe..0c7ba7cefd78 100644
--- a/net-im/yahoo-transport/files/yahoo-transport.init
+++ b/net-im/yahoo-transport/files/yahoo-transport.init
@@ -7,21 +7,19 @@ depend() {
start() {
ebegin "Starting Yahoo Jabber Transport"
- #Yahoo transport does not creat a valid pid file
- #and i was unable to start it with start-stop-daemon
- # /sbin/start-stop-daemon --make-pidfile /var/log/jabber/yahootrans.pid --exec \
- # --startas jabberd -B -c /etc/jabber/yahootrans.xml -H /var/spool/jabber >/dev/null 2>&1
- jabberd -B -c /etc/jabber/yahootrans.xml -H /var/spool/jabber >/dev/null 2>&1
+ start-stop-daemon --start --pidfile /var/run/yahoo-transport.pid \
+ --make-pidfile --background --startas /usr/sbin/jabberd \
+ -- -B -c /etc/jabber/yahootrans.xml -H /var/spool/jabber
eend $?
}
stop() {
ebegin "Stoping Yahoo Jabber Transport"
- kill `cat /var/log/jabber/yahootrans.pid`
- sleep 2
- if [ -f /var/log/jabber/yahootrans.pid ]; then
- kill -9 `cat /var/log/jabber/yahootrans.pid`
- rm -f /var/log/jabber/yahootrans.pid
- fi
+ #Yahoo transport does not creat a pid file
+ #And after starting it forks so the pid generated by start-stop-daemon is
+ #no good
+ #So we use this very ugly hack
+ PIDFILE=`ps aux |grep jabberd |grep yahoo|cut -c 9-15`
+ kill ${PIDFILE}
eend $?
}
diff --git a/net-im/yahoo-transport/yahoo-transport-2.3.1.ebuild b/net-im/yahoo-transport/yahoo-transport-2.3.1.ebuild
index f6d95a308383..1241219723ea 100644
--- a/net-im/yahoo-transport/yahoo-transport-2.3.1.ebuild
+++ b/net-im/yahoo-transport/yahoo-transport-2.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/yahoo-transport/yahoo-transport-2.3.1.ebuild,v 1.4 2004/06/08 13:00:27 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/yahoo-transport/yahoo-transport-2.3.1.ebuild,v 1.5 2004/06/19 20:37:22 humpback Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="http://www.jabberstudio.org/files/yahoo-transport-2/${P}.tar.gz
http://dev.gentoo.org/~humpback/yahoo-transport+newauth.diff"
LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc hppa"
+KEYWORDS="x86 ~ppc hppa"
SLOT="0"
DEPEND=">=net-im/jabberd-1.4.3-r3"