diff options
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/pymsn-t/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/pymsn-t/files/pymsn-t-0.11.2-twisted-2.5.patch | 15 | ||||
| -rw-r--r-- | net-im/pymsn-t/files/pymsn-t.initd | 23 | ||||
| -rw-r--r-- | net-im/pymsn-t/pymsn-t-0.11.2.ebuild | 72 | ||||
| -rw-r--r-- | net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild | 65 |
5 files changed, 6 insertions, 176 deletions
diff --git a/net-im/pymsn-t/ChangeLog b/net-im/pymsn-t/ChangeLog index 6d4255ca5472..63384c45f3a0 100644 --- a/net-im/pymsn-t/ChangeLog +++ b/net-im/pymsn-t/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/pymsn-t # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.13 2008/08/07 17:25:41 griffon26 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.14 2008/08/11 18:01:14 griffon26 Exp $ + + 11 Aug 2008; Maurice van der Pot <griffon26@gentoo.org> + -files/pymsn-t-0.11.2-twisted-2.5.patch, -files/pymsn-t.initd, + -pymsn-t-0.11.2.ebuild, -pymsn-t-0.11a-r4.ebuild: + Removed old ebuilds, one of which had a dep on twisted-xish (bug #231675). *pymsn-t-0.11.3-r1 (07 Aug 2008) diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.2-twisted-2.5.patch b/net-im/pymsn-t/files/pymsn-t-0.11.2-twisted-2.5.patch deleted file mode 100644 index 76fbac8340bf..000000000000 --- a/net-im/pymsn-t/files/pymsn-t-0.11.2-twisted-2.5.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN pymsnt-0.11.2/src/main.py pymsnt-0.11.2-fixed/src/main.py ---- pymsnt-0.11.2/src/main.py 2006-10-18 06:40:55.000000000 +0200 -+++ pymsnt-0.11.2-fixed/src/main.py 2007-04-28 16:07:49.000000000 +0200 -@@ -390,7 +390,10 @@ - # Set SIGHUP to reload the config file & close & open debug file - signal.signal(signal.SIGHUP, SIGHUPstuff) - # Load some scripts for PID and daemonising -- from twisted.scripts import twistd -+ try: -+ from twisted.scripts import _twistd_unix as twistd -+ except: -+ from twisted.scripts import twistd - - - def main(): diff --git a/net-im/pymsn-t/files/pymsn-t.initd b/net-im/pymsn-t/files/pymsn-t.initd deleted file mode 100644 index 6210e96308f0..000000000000 --- a/net-im/pymsn-t/files/pymsn-t.initd +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/files/pymsn-t.initd,v 1.5 2006/03/08 16:49:33 humpback Exp $ - -depend() { - need net - use jabber-server -} - -start() { - ebegin "Starting MSN Jabber Transport" - start-stop-daemon --start --name "pymsn-t" --background --chuid jabber:jabber \ - --exec /usr/bin/python /usr/lib/PATH/site-packages/pymsn-t/pymsn-t.py -- \ - -c /etc/jabber/pymsn-t.xml -l /var/log/jabber/pymsn-t.log - eend $? -} - -stop() { - ebegin "Stopping MSN Jabber Transport" - start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pymsn-t.pid - eend $? -} diff --git a/net-im/pymsn-t/pymsn-t-0.11.2.ebuild b/net-im/pymsn-t/pymsn-t-0.11.2.ebuild deleted file mode 100644 index 37cdc089fcf6..000000000000 --- a/net-im/pymsn-t/pymsn-t-0.11.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11.2.ebuild,v 1.2 2008/05/29 17:41:37 hawking Exp $ - -NEED_PYTHON=2.3 - -inherit eutils multilib python - -MY_PN="pymsnt" -S=${WORKDIR}/${MY_PN}-${PV} -DESCRIPTION="Python based jabber transport for MSN" -HOMEPAGE="http://msn-transport.jabberstudio.org/" -SRC_URI="http://msn-transport.jabberstudio.org/tarballs/${MY_PN}-${PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc" -IUSE="" - -DEPEND="net-im/jabber-base" -RDEPEND="${DEPEND} - >=dev-python/twisted-2.2.0 - >=dev-python/twisted-words-0.1.0 - >=dev-python/twisted-web-0.5.0 - >=dev-python/imaging-1.1" - -src_unpack() { - unpack ${A} && cd "${S}" || die "unpack failed" - find -name ".svn" -type d -exec rm -rf {} \; &> /dev/null - epatch "${FILESDIR}/${P}-twisted-2.5.patch" -} - -src_install() { - local inspath - - python_version - inspath=/usr/$(get_libdir)/python${PYVER}/site-packages/${PN} - insinto ${inspath} - doins -r data src - newins PyMSNt.py ${PN}.py - - insinto /etc/jabber - newins config-example.xml ${PN}.xml - fperms 600 /etc/jabber/${PN}.xml - fowners jabber:jabber /etc/jabber/${PN}.xml - dosed \ - "s:<!-- <spooldir>[^\<]*</spooldir> -->:<spooldir>/var/spool/jabber</spooldir>:" \ - /etc/jabber/${PN}.xml - dosed \ - "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \ - /etc/jabber/${PN}.xml - dosed \ - "s:<host>[^\<]*</host>:<host>example.org</host>:" \ - /etc/jabber/${PN}.xml - dosed \ - "s:<jid>[^\<]*</jid>:<jid>msn.example.org</jid>:" \ - /etc/jabber/${PN}.xml - - newinitd "${FILESDIR}/${PN}-0.11.2-initd" ${PN} - dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN} -} - -pkg_postinst() { - python_version - python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN} - - elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml." - elog "Please edit it and the configuration of your Jabber server to match." -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN} -} diff --git a/net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild b/net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild deleted file mode 100644 index 1f8a89797e33..000000000000 --- a/net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild,v 1.5 2008/05/29 17:41:37 hawking Exp $ - -inherit eutils python - -MY_PN="pymsnt" -S=${WORKDIR}/${MY_PN}-${PV/a/} -DESCRIPTION="New Python based jabber transport for MSN" -HOMEPAGE="http://msn-transport.jabberstudio.org/" -SRC_URI="http://msn-transport.jabberstudio.org/tarballs/${MY_PN}-${PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=">=net-im/jabber-base-0.0 - >=dev-lang/python-2.3" - -RDEPEND=">=dev-python/twisted-1.3.0 - >=dev-python/twisted-words-0.1.0 - >=dev-python/twisted-xish-0.1.0 - >=dev-python/twisted-web-0.5.0 - >=dev-python/nevow-0.4.1 - >=dev-python/imaging-1.1" -IUSE="" - -src_unpack() { - unpack ${A} - find -name ".svn" -type d -exec rm -rf {} \; &> /dev/null -} - -src_install() { - python_version - einfo ${PWD} - insinto /usr/lib/python${PYVER}/site-packages/${PN} - doins -r data src - newins PyMSNt.py pymsn-t.py - - insinto /etc/jabber - newins config-example.xml ${PN}.xml - fperms 600 /etc/jabber/${PN}.xml - fowners jabber:jabber /etc/jabber/${PN}.xml - dosed \ - "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber/</spooldir>:" \ - /etc/jabber/${PN}.xml - dosed \ - "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \ - /etc/jabber/${PN}.xml - dosed \ - "s:<host>[^\<]*</host>:<host>example.org</host>:" \ - /etc/jabber/${PN}.xml - dosed \ - "s:<jid>[^\<]*</jid>:<jid>msn.example.org</jid>:" \ - /etc/jabber/${PN}.xml - - newinitd "${FILESDIR}"/pymsn-t.initd pymsn-t - dosed "s/PATH/python${PYVER}/" /etc/init.d/pymsn-t -} - -pkg_postinst() { - einfo "A sample configuration file has been installed in /etc/jabber/pymsn-t.xml." - einfo "Please edit it, and the configuration of you Jabber server to match." - einfo "You also need to create a directory msn.yourdomain.com in" - einfo "/var/spool/jabber/ and chown it to jabber:jabber." -} |