diff --git a/www-apps/searx/Manifest b/www-apps/searx/Manifest
deleted file mode 100644
index a54e274..0000000
--- a/www-apps/searx/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST searx-0.15.0.tar.gz 1818927 BLAKE2B bb15ec89e410a96a984ba88c98131493fbfbe9b6ad9e9048376be806f931e451d7be01adc5b662695725aabe66c11b8ff8ff94f7425a4af3068edbe5f450c8e0 SHA512 9d605ca08adc91fab27b4fd5311c9585620a9152e9f3e8b4f41f6ec7231af3efe3effdd3f8c0e6d08898c2116ef429455ec8525dad35e17329bd1e509828ba4b
-EBUILD searx-0.15.0.ebuild 1177 BLAKE2B fa3e33c02312e5677b3c98f8771d74fc3985e068fb329e353d2681f2898718772bb454781ccc459b38d2c0e9983af669e4fb4e5592a131b0c48f039b9e81882d SHA512 2303180db769119f472fb066909ba6c5d58dde6922bd5bc14587793088e016be088c6220ad13830e23b1307c4ffef86e19b3f8ef867fe21489273475769434e1
diff --git a/www-apps/searx/searx-0.15.0.ebuild b/www-apps/searx/searx-0.15.0.ebuild
deleted file mode 100644
index 362cb44..0000000
--- a/www-apps/searx/searx-0.15.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit user distutils-r1 #webapp
-
-DESCRIPTION="Searx is a free internet metasearch engine which aggregates results."
-HOMEPAGE="https://asciimoo.github.io/searx/index.html"
-GITHUB_USER="asciimoo"
-GITHUB_TAG="${PV}"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${GITHUB_TAG}.tar.gz -> ${P}.tar.gz"
-
-
-LICENSE="AGPL3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-WEBAPP_MANUAL_SLOT="yes"
-
-DEPEND="
-		dev-python/Babel
-		virtual/libffi
-
-		dev-python/certifi
-		dev-python/flask
-		dev-python/flask-babel
-		dev-python/lxml
-		dev-python/idna
-		dev-python/pygments
-		dev-python/pyopenssl
-		dev-python/python-dateutil
-		dev-python/pyyaml
-		dev-python/requests[socks5]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	sed -i -e "s!'tests/.*\$!!g" \
-		-e "s!^dev_requirements.*\$!!g" \
-		-e "s!'test': dev_requirements!!g" \
-		setup.py
-	sed -i -e "s/ultrasecretkey/`openssl rand -hex 16`/g" searx/settings.yml
-	rm -rf tests
-	rm requirements-dev.txt
-	eapply_user
-}
-
-pkg_setup() {
-	enewgroup searx
-	enewuser searx -1 -1 -1 searx
-}
diff --git a/www-apps/trac-piwik/Manifest b/www-apps/trac-piwik/Manifest
deleted file mode 100644
index 1084452..0000000
--- a/www-apps/trac-piwik/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD trac-piwik-0.1.1.ebuild 706 SHA256 1e9f270ec09148d1ace765ef71c0045ef69d823e72834c549e08a9810d4f239b SHA512 4234b2e22214e210f18dc1a27a9f43e20de54dd232a483d409bdceb895d347c66f26c11429e14c88c65ee373c59dff9b6d1467ade82caddb76e751a2ee3e4600 WHIRLPOOL 0e567b4db581fa759d7f08f85238b0a21ab28a0eea99e411de59537c39d486b636cfd7c0cda5432a1f5ff2dfbe29c115540f8bd4770f558f7b2ffadb5b47ef0e
diff --git a/www-apps/trac-piwik/trac-piwik-0.1.1.ebuild b/www-apps/trac-piwik/trac-piwik-0.1.1.ebuild
deleted file mode 100644
index bb9ea96..0000000
--- a/www-apps/trac-piwik/trac-piwik-0.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit mercurial distutils-r1
-
-DESCRIPTION="Piwik Statistics Plugin for Trac"
-HOMEPAGE="https://bitbucket.org/piquadrat/tracpiwik"
-EHG_REPO_URI="https://bitbucket.org/piquadrat/tracpiwik"
-EHG_REVISION="3ad1491b8c11"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare_all() {
-	# Req'd to avoid file collisions
-	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-# Tests attempt to import an abandonned module
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index c83f4dd..c399cbe 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -3,4 +3,6 @@ AUX postupgrade-en.txt 665 BLAKE2B a504090cabc4d8645c31d1aecc7419059b84b8ba9a7b4
 AUX tracd.confd 359 BLAKE2B 5bf14f9828f3eb22c39a27dd20da219032cc3157d45b16a54a0a6530923c694f7a424c08c09458fdf9e422a3819a7e30619a1c82966ac5aafa2355528e666e3f SHA512 38a961fe59b690eb91e20143aaea6aa1becda8c2afa103599d14ff86c7aae88f06b57b342302de1f067dac5d99024b9cc72896a84349e09b3ff40c9a20f97bb1
 AUX tracd.initd 823 BLAKE2B 4325de1322cda7885539859c2b2ea3d27acaf636bde728c50fcc4c769acec308e6b56d3449109171ce9bdd2bdda9f9364f93c7069debd0a0ecb1009ce0bbf29b SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6
 DIST Trac-1.2.5.tar.gz 5333965 BLAKE2B 51a58773fc037db66b748abddc4905738f2766c3aef87913cb2acd66cc6fcff14be288322ed1bc92435a7a7ab8de6020259a3363459ef1363518cdacf1ac4c0e SHA512 ee8faa6950f5148fe8adca9381f3228dc9f198457b2c44fad8331ca87a1e3ab15906b25c7b01fa8face4e93a366fdf12c27843198db6a9642481820e7456a76c
+DIST Trac-1.4.1.tar.gz 5553601 BLAKE2B 4d9d74f13ac5c80829dbab5f5f4aef381f85a4e6320d8bbae16c89ecbda2b68cba848c10a312ef4cb4bc87295ed00afc76fc94fbb1da95521f517124ca11eb24 SHA512 5a031578f7b5cf16cc5cab46a8dc16c43183d70ac5f96394bfc0fa6f46400ba4feff03f1cf1f1fa44f7cc7be0c190bdb8d4d3a4fd078272352162f7169652101
 EBUILD trac-1.2.5.ebuild 2673 BLAKE2B 48eccc6077daa1c2d7aa7aec6b9b5f9ddc51c736c7e20b54fabf005196750fb6c1c49e12de2155962c2df529a6e46c84b436b58ad08192703438041b07872af3 SHA512 915a038309ca53e97705d51cdb095bef792aea56f1350c36d44c0ab457d7e93b9b594441815dcd7acd4ba6507a2dd0adeddbfcabcd8dfa23be41042f9edb1775
+EBUILD trac-1.4.1.ebuild 2734 BLAKE2B 01a2738b0123a9bbefcdaa83f944bc59c84b2054e69c54615703c86655bef1504c2a44cfa29afdf79656548a25e4f0a04926242f115dc220b9384a7eace793c5 SHA512 8022b9ab454cd4d89e0d90a492441101561cbf07346250670cb23db30f955eccf6a43788e438c151d712cf633f9c6a950372b2759e2cbb4c17400cdc36bf0578
diff --git a/www-apps/trac/trac-1.4.1.ebuild b/www-apps/trac/trac-1.4.1.ebuild
new file mode 100644
index 0000000..3bcd8e5
--- /dev/null
+++ b/www-apps/trac/trac-1.4.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
+HOMEPAGE="https://trac.edgewall.com/ https://pypi.org/project/Trac/"
+SRC_URI="https://download.edgewall.org/trac/Trac-${MY_PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/genshi-0.7[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja2-2.9.3[${PYTHON_MULTI_USEDEP}]
+		i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_MULTI_USEDEP}] )
+		highlight? (
+			|| (
+				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+				app-text/silvercity
+				app-text/pytextile
+				app-text/enscript
+			)
+		)
+		restructuredtext? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
+		postgres? ( >=dev-python/psycopg-2[${PYTHON_MULTI_USEDEP}] )
+		sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+		subversion? ( dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}] )
+	')
+	"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Tests depend on twill, a broken package
+RESTRICT="test"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}