diff --git a/www-apps/trac-spam-filter-captcha/ChangeLog b/www-apps/trac-spam-filter-captcha/ChangeLog
new file mode 100644
index 00000000..97caabe0
--- /dev/null
+++ b/www-apps/trac-spam-filter-captcha/ChangeLog
@@ -0,0 +1,36 @@
+# ChangeLog for www-apps/trac-spam-filter
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  03 Mar 2010; Mario Fetka <mario.fetka@gmail.com>
+  trac-spam-filter-0.2.1c.ebuild:
+  correct svn source repo
+
+  26 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
+  trac-spam-filter-0.1.ebuild, trac-spam-filter-0.2.1.ebuild,
+  trac-spam-filter-0.2.1c.ebuild:
+  add arm keyword
+
+  26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +trac-spam-filter-0.2.1c.ebuild:
+  add 0.12 branch
+
+  23 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  trac-spam-filter-0.2.1.ebuild:
+  New location for plugin
+
+  23 Jul 2008; Mario Fetka <mario-fetka@gmx.at>
+  -trac-spam-filter-0.2.ebuild:
+  Delete old
+
+  23 Jul 2008; Mario Fetka <mario-fetka@gmx.at>
+  +trac-spam-filter-0.2.1.ebuild:
+  Bump to 0.11
+
+  23 Jul 2008; Mario Fetka <mario-fetka@gmx.at>
+  +trac-spam-filter-0.2.ebuild:
+  Bump to 0.11
+
+  16 Feb 2008; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
+  Initial checkin
+
diff --git a/www-apps/trac-spam-filter-captcha/Manifest b/www-apps/trac-spam-filter-captcha/Manifest
new file mode 100644
index 00000000..d002198c
--- /dev/null
+++ b/www-apps/trac-spam-filter-captcha/Manifest
@@ -0,0 +1,5 @@
+EBUILD trac-spam-filter-0.1.ebuild 1213 RMD160 6961df01fcb566b00b42e258f884ab7381fb2634 SHA1 2004819cff2eac5f53c26b3315f3d23dcd1c4157 SHA256 19359f032741f8a34f7569039260e3794f78a555635edf2dd1b4bf153dc82367
+EBUILD trac-spam-filter-0.2.1.ebuild 1218 RMD160 09ee43c6df1024f0fde4dffc634472cc9739823a SHA1 5b21bd810182a5f9e4b1251bb33b3822e5ed4dce SHA256 fb780a590f4d1b209b797bf7ab7263e70db5a05d8d87a450849954681eb7e0ea
+EBUILD trac-spam-filter-0.2.1c.ebuild 1226 RMD160 cf0ddef833eedd90ec23670285c39780e27416f5 SHA1 7c8309e9ef81653cf403220bf50ff37f4201c955 SHA256 52e1210674f6340767184427564e378588b6784f270fc2a6c5bbfb59c9210284
+MISC ChangeLog 986 RMD160 a1a86b731d05716478cda8ec5e3894a202fb8337 SHA1 d9760b27a50a204b352c2ffef2fa4d2eb11f1224 SHA256 3866cdc7cb7b1b73601e0306d6e094faa5dd1f7f4a6c4f1ec65d9041f0901e7d
+MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/www-apps/trac-spam-filter-captcha/metadata.xml b/www-apps/trac-spam-filter-captcha/metadata.xml
new file mode 100644
index 00000000..7e328698
--- /dev/null
+++ b/www-apps/trac-spam-filter-captcha/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+</pkgmetadata>
diff --git a/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.1.ebuild b/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.1.ebuild
new file mode 100644
index 00000000..dee89344
--- /dev/null
+++ b/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
+
+inherit distutils subversion
+
+ESVN_REPO_URI="http://svn.edgewall.com/repos/trac/sandbox/spam-filter"
+DESCRIPTION="A Trac plugin for reject contributions that contain spam."
+HOMEPAGE="http://trac.edgewall.org/wiki/SpamFilter"
+# SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="trac"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+SLOT="0"
+
+DEPEND=">=www-apps/trac-0.10
+	>=dev-python/setuptools-0.6_rc1"
+
+# from marienz's setuptools.eclass:
+src_install() {
+	"${python}" setup.py install --root=${D} --no-compile \
+		--single-version-externally-managed "$@" || die "install failed"
+}
+
+src_test() {
+	"${python}" setup.py test || die "tests failed"
+}
+
+pkg_postinst() {
+	elog "To enable the SpamFilter plugin in your Trac environments, you have to add:"
+	elog "	[components]"
+	elog "	tracspamfilter.* = enabled"
+	elog "to your trac.ini files."
+	elog
+	elog "Since version 0.2, the SpamFilter plugin provides integration with WebAdmin"
+	elog "for configuration, monitoring, and training."
+}
diff --git a/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.2.1.ebuild b/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.2.1.ebuild
new file mode 100644
index 00000000..bc0da114
--- /dev/null
+++ b/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
+
+inherit distutils subversion
+
+ESVN_REPO_URI="http://svn.edgewall.org/repos/trac/plugins/0.11/spam-filter"
+DESCRIPTION="A Trac plugin for reject contributions that contain spam."
+HOMEPAGE="http://trac.edgewall.org/wiki/SpamFilter"
+# SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="trac"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+SLOT="0"
+
+DEPEND=">=www-apps/trac-0.10
+	>=dev-python/setuptools-0.6_rc1"
+
+# from marienz's setuptools.eclass:
+src_install() {
+	"${python}" setup.py install --root=${D} --no-compile \
+		--single-version-externally-managed "$@" || die "install failed"
+}
+
+src_test() {
+	"${python}" setup.py test || die "tests failed"
+}
+
+pkg_postinst() {
+	elog "To enable the SpamFilter plugin in your Trac environments, you have to add:"
+	elog "	[components]"
+	elog "	tracspamfilter.* = enabled"
+	elog "to your trac.ini files."
+	elog
+	elog "Since version 0.2, the SpamFilter plugin provides integration with WebAdmin"
+	elog "for configuration, monitoring, and training."
+}
diff --git a/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.2.1c.ebuild b/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.2.1c.ebuild
new file mode 100644
index 00000000..60dce4e5
--- /dev/null
+++ b/www-apps/trac-spam-filter-captcha/trac-spam-filter-0.2.1c.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
+
+inherit distutils subversion
+
+ESVN_REPO_URI="http://svn.edgewall.org/repos/trac/plugins/0.12/spam-filter-captcha"
+DESCRIPTION="A Trac plugin for reject contributions that contain spam."
+HOMEPAGE="http://trac.edgewall.org/wiki/SpamFilter"
+# SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="trac"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+SLOT="0"
+
+DEPEND=">=www-apps/trac-0.10
+	>=dev-python/setuptools-0.6_rc1"
+
+# from marienz's setuptools.eclass:
+src_install() {
+	"${python}" setup.py install --root=${D} --no-compile \
+		--single-version-externally-managed "$@" || die "install failed"
+}
+
+src_test() {
+	"${python}" setup.py test || die "tests failed"
+}
+
+pkg_postinst() {
+	elog "To enable the SpamFilter plugin in your Trac environments, you have to add:"
+	elog "	[components]"
+	elog "	tracspamfilter.* = enabled"
+	elog "to your trac.ini files."
+	elog
+	elog "Since version 0.2, the SpamFilter plugin provides integration with WebAdmin"
+	elog "for configuration, monitoring, and training."
+}