cvs sometimes is a pain

Package-Manager: portage-2.1_pre5-r2

8 files changed, 94 insertions, 107 deletions

diff --git a/net-im/pymsn-t/ChangeLog b/net-im/pymsn-t/ChangeLog
index da3a1fa915d0..b2775c356766 100644
--- a/net-im/pymsn-t/ChangeLog
+++ b/net-im/pymsn-t/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2005/09/14 21:59:42 humpback Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.5 2006/03/08 00:53:38 humpback Exp $
+
+*pymsn-t-0.11a-r4 (08 Mar 2006)
+
+  08 Mar 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/pymsn-t-0.9.5-arguments.patch, -files/pymsn-t.initd,
+  -pymsn-t-0.9.5-r1.ebuild, +pymsn-t-0.11a-r4.ebuild:
+  Removed older versions and updated to a working version. Closes bug #111224.
+  Thanks to everyone that helped there.
 
 *pymsn-t-0.9.5-r1 (14 Sep 2005)
 
diff --git a/net-im/pymsn-t/Manifest b/net-im/pymsn-t/Manifest
index 0a2de0ed433c..16b07ab183df 100644
--- a/net-im/pymsn-t/Manifest
+++ b/net-im/pymsn-t/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ead305fa3c66bdfeacddef845619bc21 pymsn-t-0.9.5-r1.ebuild 1939
-MD5 1a6b5710ef33fcc74035d3e1ebda3da9 ChangeLog 1375
+MD5 17348ddc5c340ba88bfcf30d0cdcf689 ChangeLog 1701
+RMD160 2f1f0858bd91fd195ec6bb227df90c1042526655 ChangeLog 1701
+SHA256 d6b6f7adf98ddd0ae044f032314113f87ef2a5e57b6daf6b800d31f977068c34 ChangeLog 1701
+MD5 f4024dc267e74f2da2126cf4ec1cfad6 files/digest-pymsn-t-0.11a-r4 238
+RMD160 92366398f8f8885e7357d0c4f28b6c776e620e50 files/digest-pymsn-t-0.11a-r4 238
+SHA256 c21edc7c17248fddea219d2e214bed104b1a0fbabe8de8f59319b7cd2fbfb021 files/digest-pymsn-t-0.11a-r4 238
 MD5 08d64f26d0872c7dfe0f37e7ea6a83c3 metadata.xml 301
-MD5 bb6822e06ee573f7897518abba0db917 files/pymsn-t-0.9.5-arguments.patch 263
-MD5 d06863dd9cbeea1d2bd016de6b27742c files/digest-pymsn-t-0.9.5-r1 63
-MD5 a0581c27b7e350c2d92b331ea1b3a4f2 files/pymsn-t.initd 420
+RMD160 652c5ed7f3a20a68639aabe875700de1b678e34c metadata.xml 301
+SHA256 29338af6dcda7de2a806ed37a597a2850bb70aa856dd41e21eff17769f3fcecb metadata.xml 301
+MD5 eaa0bb302b20fb7673257ceac84d56d0 pymsn-t-0.11a-r4.ebuild 1958
+RMD160 e6b3066a2ec9e2e84766fef7e9547ab1f7d52be1 pymsn-t-0.11a-r4.ebuild 1958
+SHA256 1a12a2db77347406d44221dda547922c962ac4e57817be94150d636a2209079a pymsn-t-0.11a-r4.ebuild 1958
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDKJ0H8zY1VwezZiERAtZcAJ9Dah04ii7JsuhsIBn14SGGu++HBQCdHl+W
-3JiJJr/Iqn3WOToGe/+hS3E=
-=PJZk
+iD8DBQFEDixl8zY1VwezZiERAj/ZAKCiKbru3qCqQ+xgiDmr0I07y4XcrQCcDgjW
+AHdL+4LNvdwg8bMujj0Aq8k=
+=WY88
 -----END PGP SIGNATURE-----
diff --git a/net-im/pymsn-t/files/digest-pymsn-t-0.11a-r4 b/net-im/pymsn-t/files/digest-pymsn-t-0.11a-r4
new file mode 100644
index 000000000000..afc3499b5bb7
--- /dev/null
+++ b/net-im/pymsn-t/files/digest-pymsn-t-0.11a-r4
@@ -0,0 +1,3 @@
+MD5 58afdee2a1e1a9a4aca38c1cd892028d pymsnt-0.11a.tar.gz 257753
+RMD160 2066a93c59e3361626fab7aae56aa706a75ab8fc pymsnt-0.11a.tar.gz 257753
+SHA256 e083a4ca50a074bfd9fd924279b27379e1cf042c90355bb25eb7f40328bdccce pymsnt-0.11a.tar.gz 257753
diff --git a/net-im/pymsn-t/files/digest-pymsn-t-0.9.5-r1 b/net-im/pymsn-t/files/digest-pymsn-t-0.9.5-r1
deleted file mode 100644
index ec36da56fe0a..000000000000
--- a/net-im/pymsn-t/files/digest-pymsn-t-0.9.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f175084a62fd3dc8de2f5b68792b4103 PyMSNt-0.9.5.tar.gz 80571
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
deleted file mode 100644
index 31c4c968ab39..000000000000
--- a/net-im/pymsn-t/files/pymsn-t-0.9.5-arguments.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 92fc8f7eab40..000000000000
--- a/net-im/pymsn-t/files/pymsn-t.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	need jabber-server
-}
-
-start() {
-	ebegin "Starting MSN Jabber Transport"
-	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/jabber/pymsn-t.pid
-	eend $?
-}
diff --git a/net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild b/net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild
new file mode 100644
index 000000000000..f2f20a3d8dd1
--- /dev/null
+++ b/net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild
@@ -0,0 +1,67 @@
+# 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/pymsn-t-0.11a-r4.ebuild,v 1.1 2006/03/08 00:53:38 humpback 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="~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
+
+	exeinto /etc/init.d
+	newexe ${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."
+}
diff --git a/net-im/pymsn-t/pymsn-t-0.9.5-r1.ebuild b/net-im/pymsn-t/pymsn-t-0.9.5-r1.ebuild
deleted file mode 100644
index fe8b5d9ef1ba..000000000000
--- a/net-im/pymsn-t/pymsn-t-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,65 +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.5-r1.ebuild,v 1.1 2005/09/14 21:59:42 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\/<\/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."
-}