From 80fc91da52b2343d6073908dde2868e67785e92c Mon Sep 17 00:00:00 2001 From: Gustavo Felisberto Date: Sat, 19 Jun 2004 20:38:58 +0000 Subject: stable on x86 --- net-im/aim-transport/ChangeLog | 6 +++++- .../aim-transport/aim-transport-20040131-r1.ebuild | 4 ++-- net-im/jabberd/ChangeLog | 6 +++++- net-im/jabberd/jabberd-1.4.3-r3.ebuild | 4 ++-- net-im/jit/ChangeLog | 5 ++++- net-im/jit/jit-1.1.6-r3.ebuild | 6 +++--- net-im/msn-transport/ChangeLog | 6 +++++- net-im/msn-transport/msn-transport-20040531.ebuild | 4 ++-- net-im/yahoo-transport/ChangeLog | 6 +++++- net-im/yahoo-transport/files/yahoo-transport.init | 20 +++++++++----------- net-im/yahoo-transport/yahoo-transport-2.3.1.ebuild | 4 ++-- 11 files changed, 44 insertions(+), 27 deletions(-) (limited to 'net-im') 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 ; + aim-transport-20040131-r1.ebuild: + Marking stable on x86 08 Jun 2004; Guy Martin 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/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index 19066392a50c..c820962d9f77 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/jabberd # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.26 2004/06/19 03:08:56 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.27 2004/06/19 20:31:06 humpback Exp $ + + 19 Jun 2004; Gustavo Felisberto ; + jabberd-1.4.3-r3.ebuild: + Marking stable on x86 18 Jun 2004; Jason Wever jabberd-1.4.3-r3.ebuild, jabberd-2.0.ebuild: diff --git a/net-im/jabberd/jabberd-1.4.3-r3.ebuild b/net-im/jabberd/jabberd-1.4.3-r3.ebuild index 364b117b8140..da1bbdd556be 100644 --- a/net-im/jabberd/jabberd-1.4.3-r3.ebuild +++ b/net-im/jabberd/jabberd-1.4.3-r3.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/jabberd/jabberd-1.4.3-r3.ebuild,v 1.6 2004/06/19 03:08:56 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r3.ebuild,v 1.7 2004/06/19 20:31:06 humpback Exp $ inherit eutils @@ -12,7 +12,7 @@ SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc hppa ~sparc" +KEYWORDS="x86 ~ppc hppa ~sparc" IUSE="ssl ldap ipv6 msn oscar yahoo" DEPEND="!net-im/jabber-server diff --git a/net-im/jit/ChangeLog b/net-im/jit/ChangeLog index 95e5fa3fcc89..34fbf0c51c9d 100644 --- a/net-im/jit/ChangeLog +++ b/net-im/jit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/jit # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.11 2004/06/10 19:24:46 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.12 2004/06/19 20:33:46 humpback Exp $ + + 19 Jun 2004; Gustavo Felisberto ; jit-1.1.6-r3.ebuild: + Marking stable on x86 10 Jun 2004; Aron Griffis jit-1.1.6-r2.ebuild, jit-1.1.6-r3.ebuild: diff --git a/net-im/jit/jit-1.1.6-r3.ebuild b/net-im/jit/jit-1.1.6-r3.ebuild index bee7136fbd09..03ce05d17c9e 100644 --- a/net-im/jit/jit-1.1.6-r3.ebuild +++ b/net-im/jit/jit-1.1.6-r3.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/jit/jit-1.1.6-r3.ebuild,v 1.8 2004/06/10 19:24:46 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6-r3.ebuild,v 1.9 2004/06/19 20:33:46 humpback Exp $ inherit flag-o-matic eutils @@ -13,10 +13,10 @@ SLOT="0" IUSE="" -KEYWORDS="~x86 ~sparc ~ppc hppa" +KEYWORDS="x86 ~sparc ~ppc hppa" DEPEND="" -RDEPEND=">=net-im/jabberd-1.4.3" +RDEPEND=">=net-im/jabberd-1.4.3-r3" src_compile() { diff --git a/net-im/msn-transport/ChangeLog b/net-im/msn-transport/ChangeLog index ab1cf726b702..1ab4d94b861f 100644 --- a/net-im/msn-transport/ChangeLog +++ b/net-im/msn-transport/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/msn-transport # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/ChangeLog,v 1.8 2004/06/08 13:32:41 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/ChangeLog,v 1.9 2004/06/19 20:32:17 humpback Exp $ + + 19 Jun 2004; Gustavo Felisberto ; + msn-transport-20040531.ebuild: + Marking stable on x86 08 Jun 2004; Guy Martin msn-transport-20040531.ebuild: Marked stable on hppa. diff --git a/net-im/msn-transport/msn-transport-20040531.ebuild b/net-im/msn-transport/msn-transport-20040531.ebuild index 5fdc0ac16319..551f9693990b 100644 --- a/net-im/msn-transport/msn-transport-20040531.ebuild +++ b/net-im/msn-transport/msn-transport-20040531.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/msn-transport/msn-transport-20040531.ebuild,v 1.3 2004/06/08 13:32:41 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/msn-transport-20040531.ebuild,v 1.4 2004/06/19 20:32:17 humpback Exp $ MY_PV="2004-05-31" #Ugly, msn-transport weired version numbers @@ -11,7 +11,7 @@ HOMEPAGE="http://msn-transport.jabberstudio.org/" SRC_URI="http://msn-transport.jabberstudio.org/${PN}-${MY_PV}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc hppa" +KEYWORDS="x86 ~ppc hppa" IUSE="" SLOT="0" 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 ; + yahoo-transport-2.3.1.ebuild, files/yahoo-transport.init: + Marking stable on x86 08 Jun 2004; Guy Martin 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" -- cgit v1.2.3-65-gdbad