diff --git a/net-im/palaver/Manifest b/net-im/palaver/Manifest
index 21ce28a..9ef4089 100644
--- a/net-im/palaver/Manifest
+++ b/net-im/palaver/Manifest
@@ -3,4 +3,5 @@ DIST palaver-0.5.tar.bz2 72495 RMD160 b831f5f0fd05982d420b7d2e4d5c47c2927b4e17 S
DIST palaver-0.6.tar.bz2 71431 RMD160 d1eac261b4ea9263d6992d17d5498f27b054643b SHA1 6e33a77322a432f5c20e6b05dea93ee10d6e4d5d SHA256 437a32250f7ba2a7b07e1dae894893ae4bf32e8a7d8d8e97a4803c9fee4dde26
EBUILD palaver-0.5.ebuild 1412 RMD160 c1044dbcc0d0a3f36960a65e4ba0cedec54b8305 SHA1 973e07e9c938234773ecd86b1ea6c6bea6fa94c9 SHA256 b7003bf855eee6c02285baf356ceca8c895a0a604104b792be60c610b12888cf
EBUILD palaver-0.6-r1.ebuild 1429 RMD160 ecf996431024fa7b0c8577f8dbe74690fc97d223 SHA1 25e3643d2903ceaea2fd51b025f1422eab3b51ee SHA256 aa89dcff2673eca5665bc4344aab11163f0b7f64c918f5d99294acade2b0e54f
+EBUILD palaver-0.6-r2.ebuild 1431 RMD160 3db00f969fd7ff8bee583b6d1fa28b09bd0ddbfb SHA1 fc63c22eb0ddbca19d87e4ab4f90c17dcf32677e SHA256 30e6a2102b72f0221efaab0342d0871a89c4c4bffff60c87b8b305b8e93eacf4
EBUILD palaver-0.6.ebuild 1412 RMD160 c1044dbcc0d0a3f36960a65e4ba0cedec54b8305 SHA1 973e07e9c938234773ecd86b1ea6c6bea6fa94c9 SHA256 b7003bf855eee6c02285baf356ceca8c895a0a604104b792be60c610b12888cf
diff --git a/net-im/palaver/palaver-0.6-r2.ebuild b/net-im/palaver/palaver-0.6-r2.ebuild
new file mode 100644
index 0000000..0359fd1
--- /dev/null
+++ b/net-im/palaver/palaver-0.6-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+PYTHON_DEPEND="2"
+
+inherit eutils python distutils
+DESCRIPTION="Multi-user chat component for jabber implemented in python"
+HOMEPAGE="http://code.stanziq.com/palaver"
+SRC_URI="http://code.stanziq.com/cgit/${PN}/${PN}/snapshot/${P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="net-im/jabber-base"
+RDEPEND=">=dev-python/twisted-2.4.0
+>=dev-python/twisted-words-0.5
+${DEPEND}"
+
+src_unpack() {
+ unpack ${A} && cd "${S}" || die "unpack failed"
+}
+
+src_compile() {
+ # nothing to be done here?
+ distutils_src_compile
+}
+
+src_install() {
+ distutils_src_install
+
+ insinto /etc/jabber
+ newins example-config.xml ${PN}.xml
+ fperms 600 /etc/jabber/${PN}.xml
+ fowners jabber:jabber /etc/jabber/${PN}.xml
+ dosed \
+ "s:[^\<]*:/var/spool/jabber:" \
+ /etc/jabber/${PN}.xml
+
+# dosed \
+# "s:[^\<]*:/var/run/jabber/${PN}.pid:" \
+# /etc/jabber/${PN}.xml
+
+ newinitd "${FILESDIR}/${PN}-initd" ${PN}
+# dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
+
+}
+
+pkg_postinst() {
+ einfo "A sample config file has been installed into /etc/jabber/${PN}.xml."
+ einfo "Please adjust the settings as needed."
+ einfo "After that, you MUST create a TAP-file for twisted in order to start Palaver, like this:"
+ einfo "# cd /etc/jabber"
+ einfo "# mktap palaver -c palaver.xml"
+}
diff --git a/net-im/pymsn-t/Manifest b/net-im/pymsn-t/Manifest
index 00a2d16..a47a350 100644
--- a/net-im/pymsn-t/Manifest
+++ b/net-im/pymsn-t/Manifest
@@ -5,5 +5,4 @@ AUX pymsn-t-0.11.3-protocol-version.patch 609 RMD160 f7cc7e2f6829861f11016db35a9
AUX pymsn-t-0.11.3-remove-pid.patch 1173 RMD160 53c9e2cfc63cd86fd5680059e47caa268802cfc0 SHA1 a6dac3945731183f4821e7f09852f17de3aa850a SHA256 b4a09f2af01f752a2703d14204cb954a0641afedb1be391f1b9f6f980b234845
AUX pymsn-t-0.11.3-unexpected-xfr.patch 1984 RMD160 b4439b435857a4bd4eb0ff4a7b75572ef4413f7b SHA1 abccc3a11a7571e6f17de91c001f8f07e300c20e SHA256 0407e9e69684275b11d404e77e9b70e694e461d4c9891ee3c7d79717999a84e9
DIST pymsnt-0.11.3.tar.gz 162549 RMD160 59e2af9eee9aa1d5b7a408b05fd520f0355556e1 SHA1 093ce984446f9edeec9d9d35a07a3958f5f656b1 SHA256 777195feb6a70b683d691c54269099d319747fad7195cca36d86df366360ce2c
-EBUILD pymsn-t-0.11.3-r3.ebuild 2172 RMD160 64bcd8d754bf1e1881b7893b2669721756998053 SHA1 81e0a9766d6b24b41b5ab2f7f3a362e5cd730686 SHA256 095f17f1d0ed4f4d591cd2ff70694100379f846cf309919bbfe56c32e19ef912
EBUILD pymsn-t-0.11.3-r4.ebuild 2071 RMD160 3180b606a2e037ff1a01fae8546cf4ddb928b312 SHA1 ecc13da767ee7be4e45639368d9028e872dac134 SHA256 aa7c38c4f9130fd9961ad9f335bbf7e83749214651e25b828a97b3db64d88348
diff --git a/net-im/pymsn-t/pymsn-t-0.11.3-r3.ebuild b/net-im/pymsn-t/pymsn-t-0.11.3-r3.ebuild
deleted file mode 100644
index e9f064c..0000000
--- a/net-im/pymsn-t/pymsn-t-0.11.3-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 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.3-r2.ebuild,v 1.3 2009/03/09 14:12:04 armin76 Exp $
-
-NEED_PYTHON=2.6
-
-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 ~ppc x86"
-IUSE=""
-
-DEPEND="net-im/jabber-base"
-RDEPEND="${DEPEND}
- >=dev-python/twisted-9.0.0
- >=dev-python/twisted-words-9.0.0
- >=dev-python/twisted-web-9.0.0
- >=dev-python/imaging-1.1"
-
-src_unpack() {
- unpack ${A} && cd "${S}" || die "unpack failed"
- epatch "${FILESDIR}/${P}-protocol-version.patch"
- epatch "${FILESDIR}/${P}-unexpected-xfr.patch"
- epatch "${FILESDIR}/${P}-remove-pid.patch"
- epatch "${FILESDIR}/${P}-delete-reactor.patch"
- epatch "${FILESDIR}/${P}-hashlib.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::/var/spool/jabber:" \
- /etc/jabber/${PN}.xml
- dosed \
- "s:[^\<]*:/var/run/jabber/${PN}.pid:" \
- /etc/jabber/${PN}.xml
- dosed \
- "s:[^\<]*:example.org:" \
- /etc/jabber/${PN}.xml
- dosed \
- "s:msn:msn.example.org:" \
- /etc/jabber/${PN}.xml
-
- newinitd "${FILESDIR}/${P}-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}
-}