1 files changed, 43 insertions, 27 deletions

diff --git a/irc/py-gozerbot/pkg-plist b/irc/py-gozerbot/pkg-plist
index f704ad701660..fdbecd2a8329 100644
--- a/irc/py-gozerbot/pkg-plist
+++ b/irc/py-gozerbot/pkg-plist
@@ -3,15 +3,16 @@ bin/gozerbot-start
 bin/gozerbot-stop
 bin/gozerinit
 bin/gozerupgrade06
+bin/gozerbot-merc
 %%PYTHON_SITELIBDIR%%/gozerbot/__init__.py
 %%PYTHON_SITELIBDIR%%/gozerbot/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gozerbot/addon.py
+%%PYTHON_SITELIBDIR%%/gozerbot/addon.pyc
+%%PYTHON_SITELIBDIR%%/gozerbot/addon.pyo
 %%PYTHON_SITELIBDIR%%/gozerbot/aliases.py
 %%PYTHON_SITELIBDIR%%/gozerbot/aliases.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/aliases.pyo
-%%PYTHON_SITELIBDIR%%/gozerbot/backup.py
-%%PYTHON_SITELIBDIR%%/gozerbot/backup.pyc
-%%PYTHON_SITELIBDIR%%/gozerbot/backup.pyo
 %%PYTHON_SITELIBDIR%%/gozerbot/bot.py
 %%PYTHON_SITELIBDIR%%/gozerbot/bot.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/bot.pyo
@@ -48,6 +49,9 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerbot/exit.py
 %%PYTHON_SITELIBDIR%%/gozerbot/exit.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/exit.pyo
+%%PYTHON_SITELIBDIR%%/gozerbot/fileutils.py
+%%PYTHON_SITELIBDIR%%/gozerbot/fileutils.pyc
+%%PYTHON_SITELIBDIR%%/gozerbot/fileutils.pyo
 %%PYTHON_SITELIBDIR%%/gozerbot/fleet.py
 %%PYTHON_SITELIBDIR%%/gozerbot/fleet.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/fleet.pyo
@@ -75,9 +79,6 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerbot/less.py
 %%PYTHON_SITELIBDIR%%/gozerbot/less.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/less.pyo
-%%PYTHON_SITELIBDIR%%/gozerbot/limiter.py
-%%PYTHON_SITELIBDIR%%/gozerbot/limiter.pyc
-%%PYTHON_SITELIBDIR%%/gozerbot/limiter.pyo
 %%PYTHON_SITELIBDIR%%/gozerbot/limlist.py
 %%PYTHON_SITELIBDIR%%/gozerbot/limlist.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/limlist.pyo
@@ -129,9 +130,15 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerbot/rsslist.py
 %%PYTHON_SITELIBDIR%%/gozerbot/rsslist.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/rsslist.pyo
+%%PYTHON_SITELIBDIR%%/gozerbot/runner.py
+%%PYTHON_SITELIBDIR%%/gozerbot/runner.pyc
+%%PYTHON_SITELIBDIR%%/gozerbot/runner.pyo
 %%PYTHON_SITELIBDIR%%/gozerbot/statdict.py
 %%PYTHON_SITELIBDIR%%/gozerbot/statdict.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/statdict.pyo
+%%PYTHON_SITELIBDIR%%/gozerbot/textutils.py
+%%PYTHON_SITELIBDIR%%/gozerbot/textutils.pyc
+%%PYTHON_SITELIBDIR%%/gozerbot/textutils.pyo
 %%PYTHON_SITELIBDIR%%/gozerbot/thr.py
 %%PYTHON_SITELIBDIR%%/gozerbot/thr.pyc
 %%PYTHON_SITELIBDIR%%/gozerbot/thr.pyo
@@ -156,21 +163,9 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/birthday.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/birthday.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/birthday.pyo
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/infoitem.py
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/infoitem.pyc
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/infoitem.pyo
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/karma.py
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/karma.pyc
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/karma.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/lists.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/lists.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/lists.pyo
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/quote.py
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/quote.pyc
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/quote.pyo
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/todo.py
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/todo.pyc
-%%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/todo.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/user.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/user.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs/user.pyo
@@ -183,6 +178,9 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/alias.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/alias.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/alias.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/at.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/at.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/at.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/autoreply.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/autoreply.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/autoreply.pyo
@@ -192,6 +190,9 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/away.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/away.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/away.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/backup.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/backup.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/backup.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/birthday.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/birthday.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/birthday.pyo
@@ -222,6 +223,9 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/country.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/country.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/country.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/debug.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/debug.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/debug.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/dig.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/dig.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/dig.pyo
@@ -234,9 +238,15 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/fleet.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/fleet.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/fleet.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/gcollect.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/gcollect.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/gcollect.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/googletalk.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/googletalk.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/googletalk.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/grab.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/grab.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/grab.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/greeting.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/greeting.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/greeting.pyo
@@ -279,9 +289,6 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/lag.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/lag.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/lag.pyo
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/limiter.py
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/limiter.pyc
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/limiter.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/links.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/links.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/links.pyo
@@ -303,9 +310,6 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/misc.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/misc.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/misc.pyo
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/mono.py
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/mono.pyc
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/mono.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/nickcapture.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/nickcapture.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/nickcapture.pyo
@@ -351,15 +355,21 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/search.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/search.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/search.pyo
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/snarf.py
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/snarf.pyc
-%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/snarf.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/seen.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/seen.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/seen.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/shop.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/shop.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/shop.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/simplelog.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/simplelog.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/simplelog.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/size.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/size.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/size.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/snarf.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/snarf.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/snarf.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/tail.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/tail.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/tail.pyo
@@ -387,12 +397,18 @@ bin/gozerupgrade06
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/umode.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/umode.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/umode.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/underauth.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/underauth.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/underauth.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/update.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/update.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/update.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/upgrade.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/upgrade.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/upgrade.pyo
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/url.py
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/url.pyc
+%%PYTHON_SITELIBDIR%%/gozerplugs/plugs/url.pyo
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/user.py
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/user.pyc
 %%PYTHON_SITELIBDIR%%/gozerplugs/plugs/user.pyo