3 files changed, 76 insertions, 1 deletions
diff --git a/net-irc/supybot-plugins/ChangeLog b/net-irc/supybot-plugins/ChangeLog
index 85390fec5f70..444a8d97166a 100644
--- a/net-irc/supybot-plugins/ChangeLog
+++ b/net-irc/supybot-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/supybot-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot-plugins/ChangeLog,v 1.3 2009/05/22 19:45:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot-plugins/ChangeLog,v 1.4 2009/09/22 00:02:21 neurogeek Exp $
+
+*supybot-plugins-20060723-r2 (22 Sep 2009)
+
+  22 Sep 2009; Jesus Rivero <neurogeek@gentoo.org>
+  +supybot-plugins-20060723-r2.ebuild,
+  +files/supybot-plugins_credentials.patch:
+  Added twsited-web and twisted-conch as deps. Closes bugs #266340 and
+  #266339.
 
 *supybot-plugins-20060723-r1 (22 May 2009)
 
diff --git a/net-irc/supybot-plugins/files/supybot-plugins_credentials.patch b/net-irc/supybot-plugins/files/supybot-plugins_credentials.patch
new file mode 100644
index 000000000000..9a186ad8d47d
--- /dev/null
+++ b/net-irc/supybot-plugins/files/supybot-plugins_credentials.patch
@@ -0,0 +1,12 @@
+diff -uNr Supybot-plugins-20060723.orig/Sshd/plugin.py Supybot-plugins-20060723/Sshd/plugin.py
+--- Supybot-plugins-20060723.orig/Sshd/plugin.py	2009-09-21 23:43:08.000000000 +0000
++++ Supybot-plugins-20060723/Sshd/plugin.py	2009-09-21 23:43:28.000000000 +0000
+@@ -66,7 +66,7 @@
+ import twisted.conch.checkers as conchcheckers
+ import twisted.cred.credentials as credentials
+ import twisted.conch.ssh.connection as connection
+-import twisted.conch.credentials as conchcredentials
++import twisted.cred.credentials as conchcredentials
+ 
+ # Standard library imports
+ import os
diff --git a/net-irc/supybot-plugins/supybot-plugins-20060723-r2.ebuild b/net-irc/supybot-plugins/supybot-plugins-20060723-r2.ebuild
new file mode 100644
index 000000000000..c33120013514
--- /dev/null
+++ b/net-irc/supybot-plugins/supybot-plugins-20060723-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot-plugins/supybot-plugins-20060723-r2.ebuild,v 1.1 2009/09/22 00:02:21 neurogeek Exp $
+
+EAPI="2"
+inherit eutils python multilib
+
+MY_PNAME="Supybot-plugins"
+MY_P="${MY_PNAME}-${PV}"
+
+DESCRIPTION="Official set of extra plugins for Supybot"
+HOMEPAGE="http://supybot.com"
+SRC_URI="mirror://sourceforge/supybot/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-irc/supybot-0.83.4
+		 >=dev-python/twisted-conch-8.1.0
+		 >=dev-python/twisted-web-1.0"
+
+src_prepare(){
+	epatch "${FILESDIR}/${PN}_credentials.patch"
+}
+
+src_install() {
+	cd "${WORKDIR}"/${MY_P}
+	python_version
+	PLUGIN_BASE="/usr/$(get_libdir)/python${PYVER}/site-packages/supybot/plugins"
+	for plugin in *; do
+		case $plugin in
+			BadWords|Dunno|Success)
+				# These plugins are part of supybot-0.83.4 now, so skip them
+				# here.
+				continue
+				;;
+			*)
+			;;
+		esac
+		insinto ${PLUGIN_BASE}/${plugin}
+		doins $plugin/* || die "Install failed"
+	done
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize	/usr/$(get_libdir)/python${PYVER}/site-packages/supybot/plugins
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/supybot/plugins
+}