update to 0.9.5 and deleted older versions

(Portage version: 2.0.51.22-r2)

10 files changed, 96 insertions, 123 deletions

diff --git a/net-im/pymsn-t/ChangeLog b/net-im/pymsn-t/ChangeLog
index 1ff187cc36b9..0e87279df8c3 100644
--- a/net-im/pymsn-t/ChangeLog
+++ b/net-im/pymsn-t/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/pymsn-t
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.2 2005/08/23 21:58:36 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.3 2005/08/28 16:13:36 humpback Exp $
+
+*pymsn-t-0.9.5 (28 Aug 2005)
+
+  28 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/pymsn-t-0.9.3-arguments.patch, -files/pymsn-t-0.9.3-config.patch,
+  +files/pymsn-t-0.9.5-arguments.patch, files/pymsn-t.initd,
+  -pymsn-t-0.9.3.ebuild, +pymsn-t-0.9.5.ebuild:
+  Updated to 0.9.5 and changed the ebuild to use the new jabber-base package.
+  This will make it easyer to maintain jabber packages.
 
 *pymsn-t-0.9.3 (23 Aug 2005)
 
diff --git a/net-im/pymsn-t/Manifest b/net-im/pymsn-t/Manifest
index 3d8ce28693fd..4995bc8b5b16 100644
--- a/net-im/pymsn-t/Manifest
+++ b/net-im/pymsn-t/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 11bcb83c95b22b24bc3ab9fc1efcc4a5 pymsn-t-0.9.3.ebuild 1799
+MD5 0881eb0aa4ae73f751938483e813e95b attachment.cgi?id=64675 1780
+MD5 ba5843a0fa48977baf10766b248db1cc pymsn-t-0.9.5.ebuild 2017
 MD5 70973c84d0c0842216a5dda75381f01c ChangeLog 740
 MD5 08d64f26d0872c7dfe0f37e7ea6a83c3 metadata.xml 301
+MD5 bb6822e06ee573f7897518abba0db917 files/pymsn-t-0.9.5-arguments.patch 263
 MD5 0bda0fd24a1c22f02fd4cdc790263cbd files/pymsn-t-0.9.3-config.patch 818
 MD5 3c853ee1b4448f47ca75529ac5a2e955 files/digest-pymsn-t-0.9.3 63
-MD5 786423ba715473aa0fa09fc54b0725d0 files/pymsn-t.initd 405
-MD5 eccf7d429ba0a26d05d96e04376d203e files/pymsn-t-0.9.3-arguments.patch 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC5wY8zY1VwezZiERAuUUAJsEyCNtmKx9DZSjhqzBrVgfCY+d/QCeJqWW
-mKvAtcHzhYXQ2nMtKZc3YOc=
-=67sP
------END PGP SIGNATURE-----
+MD5 d06863dd9cbeea1d2bd016de6b27742c files/digest-pymsn-t-0.9.5 63
+MD5 24390d3274bb3d341e29cabbc27444fd files/pymsn-t.initd 419
diff --git a/net-im/pymsn-t/files/digest-pymsn-t-0.9.3 b/net-im/pymsn-t/files/digest-pymsn-t-0.9.3
deleted file mode 100644
index 0e0499e332a6..000000000000
--- a/net-im/pymsn-t/files/digest-pymsn-t-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a98ecc23688e76f7841060e4fb0b7de9 PyMSNt-0.9.3.tar.gz 77414
diff --git a/net-im/pymsn-t/files/digest-pymsn-t-0.9.5 b/net-im/pymsn-t/files/digest-pymsn-t-0.9.5
new file mode 100644
index 000000000000..ec36da56fe0a
--- /dev/null
+++ b/net-im/pymsn-t/files/digest-pymsn-t-0.9.5
@@ -0,0 +1 @@
+MD5 f175084a62fd3dc8de2f5b68792b4103 PyMSNt-0.9.5.tar.gz 80571
diff --git a/net-im/pymsn-t/files/pymsn-t-0.9.3-arguments.patch b/net-im/pymsn-t/files/pymsn-t-0.9.3-arguments.patch
deleted file mode 100644
index 8f388c6509e3..000000000000
--- a/net-im/pymsn-t/files/pymsn-t-0.9.3-arguments.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- PyMSNt-0.9.2/PyMSNt	2005-04-10 12:32:29.646079867 +0200
-+++ PyMSNt-0.9.2/PyMSNt	2005-04-10 11:51:39.130483794 +0200
-@@ -1,6 +1,6 @@
- #!/bin/bash
- 
- cd `dirname $0`/src
--exec -a PyMSNt python main.py
-+exec -a PyMSNt python main.py $*
- cd `dirname $0`
- 
diff --git a/net-im/pymsn-t/files/pymsn-t-0.9.3-config.patch b/net-im/pymsn-t/files/pymsn-t-0.9.3-config.patch
deleted file mode 100644
index 29bfdc2307cb..000000000000
--- a/net-im/pymsn-t/files/pymsn-t-0.9.3-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- config.xml.ori	2005-06-12 18:39:21.007989736 +0100
-+++ config.xml	2005-06-12 18:41:56.621332912 +0100
-@@ -8,10 +8,10 @@
- 
- <!-- The location of the spool directory.. if relative, relative to the PyMSNt dir.
- Do not include the jid of the transport -->
--<!-- <spooldir>/path/to/data</spooldir> -->
-+<spooldir>/var/spool/pymsn-t</spooldir>
- 
- <!-- The location of the PID file (if relative, relative to the PyMSNt dir) -->
--<pid>PyMSNt.pid</pid>
-+<pid>/var/run/PyMSNt.pid</pid>
- 
- 
- <!-- The IP address of the main Jabber server to connect to -->
-@@ -51,7 +51,7 @@
- <debugSmart/>
- <!-- Set the debug log file location here, (comment out to output to the screen) -->
- <!-- (if relative, relative to the PyMSNt dir) -->
--<debugLog>debug.log</debugLog>
-+<debugLog>/var/spool/pymsn-t/debug.log</debugLog>
- 
- 
- </pymsnt>
diff --git a/net-im/pymsn-t/files/pymsn-t-0.9.5-arguments.patch b/net-im/pymsn-t/files/pymsn-t-0.9.5-arguments.patch
new file mode 100644
index 000000000000..31c4c968ab39
--- /dev/null
+++ b/net-im/pymsn-t/files/pymsn-t-0.9.5-arguments.patch
@@ -0,0 +1,11 @@
+--- PyMSNt-ori	2005-08-28 16:38:26.000000000 +0100
++++ PyMSNt	2005-08-28 16:39:06.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ 
+-cd `dirname $0`/src
+-exec -a PyMSNt python main.py
++cd `dirname $0`/pymsn-t/src
++exec -a PyMSNt python main.py $*
+ cd `dirname $0`
+ 
diff --git a/net-im/pymsn-t/files/pymsn-t.initd b/net-im/pymsn-t/files/pymsn-t.initd
index 9fb448a38616..92fc8f7eab40 100644
--- a/net-im/pymsn-t/files/pymsn-t.initd
+++ b/net-im/pymsn-t/files/pymsn-t.initd
@@ -7,14 +7,14 @@ depend() {
 
 start() {
 	ebegin "Starting MSN Jabber Transport"
-	cd /var/run/pymsn-t
-	start-stop-daemon --start --quiet --background --chuid pymsn-t:jabber \
-		--exec /usr/lib/pymsn-t/pymsn-t -- /etc/pymsn-t.xml
+	cd /var/run/jabber
+	start-stop-daemon --start --quiet --background --chuid jabber:jabber \
+		--exec /usr/lib/PATH/site-packages/PyMSNt -- /etc/jabber/pymsn-t.xml
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping MSN Jabber Transport"
-	start-stop-daemon --stop --quiet --pidfile /var/run/pymsn-t/PyMSNt.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pymsn-t.pid
 	eend $?
 }
diff --git a/net-im/pymsn-t/pymsn-t-0.9.3.ebuild b/net-im/pymsn-t/pymsn-t-0.9.3.ebuild
deleted file mode 100644
index 83f06e660135..000000000000
--- a/net-im/pymsn-t/pymsn-t-0.9.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 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.9.3.ebuild,v 1.1 2005/08/23 21:58:36 humpback Exp $
-
-# Based on net-im/pyicq-t ebuild by Karl-Johan Karlsson
-inherit eutils
-
-MY_PN="PyMSNt"
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="MSN transport for Jabber"
-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="~x86"
-
-DEPEND=">=dev-lang/python-2.3"
-RDEPEND="virtual/jabber-server
-		>=dev-python/twisted-2
-		dev-python/twisted-words
-		dev-python/twisted-xish"
-IUSE=""
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-arguments.patch
-	cp config-example.xml config.xml
-	epatch ${FILESDIR}/${P}-config.patch
-	rm -rf src/CVS
-	rm -rf src/baseproto/CVS
-	rm -rf src/legacy/CVS
-	rm -rf src/tlib/CVS
-}
-
-src_install()
-{
-	enewgroup jabber
-	enewuser pymsn-t -1 -1 /var/run/pymsn-t jabber
-
-	#Dont like this, have to find way to do recursive copy with doins
-	dodir /usr/lib/${PN}/src
-	cp -r src/* ${D}usr/lib/${PN}/src/
-
-	exeinto /usr/lib/${PN}
-	newexe PyMSNt pymsn-t
-
-	insinto /etc
-	newins config.xml pymsn-t.xml
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pymsn-t.initd pymsn-t
-
-	dodir /var/spool/${PN}
-	fowners pymsn-t:jabber /var/spool/${PN}
-
-	dodir /var/log/${PN}
-	fowners pymsn-t:jabber /var/log/${PN}
-
-	dodir /var/run/${PN}
-	fowners pymsn-t:jabber /var/run/${PN}
-}
-
-pkg_postinst() {
-	einfo "A sample configuration file has been installed in /etc/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/pymsn-t/ and chown it to pymsn-t:jabber."
-}
diff --git a/net-im/pymsn-t/pymsn-t-0.9.5.ebuild b/net-im/pymsn-t/pymsn-t-0.9.5.ebuild
new file mode 100644
index 000000000000..3e75f8880648
--- /dev/null
+++ b/net-im/pymsn-t/pymsn-t-0.9.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 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.9.5.ebuild,v 1.1 2005/08/28 16:13:36 humpback Exp $
+
+inherit eutils python
+
+MY_PN="PyMSNt"
+S=${WORKDIR}/${MY_PN}-${PV}
+DESCRIPTION="MSN transport for Jabber"
+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="~x86 ~amd64"
+
+DEPEND=">=net-im/jabber-base-0.0
+		>=dev-lang/python-2.3"
+RDEPEND="virtual/jabber-server
+		>=dev-python/twisted-2
+		dev-python/twisted-words
+		dev-python/twisted-xish
+		dev-python/twisted-web"
+IUSE=""
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.9.5-arguments.patch
+	rm -rf src/CVS
+	rm -rf src/baseproto/CVS
+	rm -rf src/legacy/CVS
+	rm -rf src/tlib/CVS
+	rm -rf src/tlib/jabber/CVS
+}
+
+src_install()
+{
+	python_version
+	#Dont like this, have to find way to do recursive copy with doins
+	dodir /usr/lib/python${PYVER}/site-packages/${PN}/src
+	cp -r src/* ${D}/usr/lib/python${PYVER}/site-packages/${PN}/src
+
+
+	exeinto /usr/lib/python${PYVER}/site-packages/
+	doexe PyMSNt
+	sed -i \
+		-e "s/.*<spooldir>.*/<spooldir>\/var\/spool\/jabber\/${PN}<\/spooldir>/"                                \
+		-e "s/.*<pid>.*/<pid>\/var\/run\/jabber\/pymsn-t.pid<\/pid>/"                                    \
+		-e "s/.*<debugLog>.*/<debugLog>\/var\/log\/jabber\/${PN}-debug.log<\/debugLog>/"       \
+			config-example.xml
+	insinto /etc/jabber
+	newins config-example.xml pymsn-t.xml
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/pymsn-t.initd pymsn-t
+	sed -i -e "s/PATH/python${PYVER}/" ${D}/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."
+}