Added twsited-web and twisted-conch as deps. Closes bugs #266340 and #266339.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 89 insertions, 2 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/Manifest b/net-irc/supybot-plugins/Manifest
index bdce56ff6a12..308262696070 100644
--- a/net-irc/supybot-plugins/Manifest
+++ b/net-irc/supybot-plugins/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX supybot-plugins_credentials.patch 573 RMD160 65866623fbb395f58fa989f297e39e15a22608f0 SHA1 216af43b8764b8b86935c7fcedb35cb24c2e09b3 SHA256 b1a1884027b5ac7cec77c59f375b87aba3b17cd3d726667ff208af9391a4df24
 DIST Supybot-plugins-20060723.tar.bz2 197391 RMD160 7e098cba23d366b79e5f75087250c70ca81436a0 SHA1 086dcefe3d814ec63788d08e93f2b9610ed24b11 SHA256 e933d844b226f172329b9e9d5fc5f40ac357934b7819f6aca44261417e1d896d
 EBUILD supybot-plugins-20060723-r1.ebuild 1172 RMD160 361cd70ce5693111f1894d9026a42b8df414fb55 SHA1 83d7cbdfdbe7d46e39dd63cd93e10496a5b401f3 SHA256 00941fa6fef34f867da498accc7a2d5821217447ec79b297cadb5c8e2c9b33eb
+EBUILD supybot-plugins-20060723-r2.ebuild 1325 RMD160 0ccd298042e4403c8fcf7457216e2157e71bd82e SHA1 7078d627c97fd8286592cbe8c1774a2a1deeb8b6 SHA256 ed3b1ce286ca7921a191f98d4f6cb4a5cb406842388a020acf2995378a65a0dd
 EBUILD supybot-plugins-20060723.ebuild 1002 RMD160 0c2e4f799bc7b5635c5926352750582036cc2339 SHA1 eaed133a5e90eb3aad7a6b3103a84cbab50db292 SHA256 97e7c6f30d947cf2f4e7569ed87e7ac7d4dfe4b6c863da9c1eaac6fb63e6f0a7
-MISC ChangeLog 759 RMD160 53747a4a7c72a2513f3f86c89f0158d4606ced7d SHA1 16ff96e87232d9ad4a195a002a3c2c4daa556808 SHA256 a4c2acdb78e7f86fe70c664934fdad9e5ff5bee112d2b99f0194f4299f987649
+MISC ChangeLog 1025 RMD160 d85f45e82cf910c008061a149990ee83fdabb200 SHA1 fb9d26c9f860a17630b95a4313c1995ce7f451d2 SHA256 93f53fbc78a2de35d5e29ee5e72aa1592785b1da314a80f2f8c2c83b61e37586
 MISC metadata.xml 248 RMD160 bc367c67ea92b8e5c174dcd39ed323620624f838 SHA1 5c491e191d85dfb7307a69dd91841d2239ee0427 SHA256 5abc3333184d546c8347da9a2e03bcea30177f0831d6347f378df0439c311fec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkq4FB8ACgkQdIssYB9vBoNY1QCeLDvyy5KtCoa8/uE8UGOWWupz
+WZoAn3a2oWaPWmuEu/FFv5VfDGqRhvtq
+=vPi3
+-----END PGP SIGNATURE-----
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
+}