diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index ba4968c..c83f4dd 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -2,5 +2,5 @@ AUX postinst-en.txt 1331 BLAKE2B 45313107abc05238160eeda67db0aab4917d18ee0e4d788
 AUX postupgrade-en.txt 665 BLAKE2B a504090cabc4d8645c31d1aecc7419059b84b8ba9a7b42331f53fe1953d3e5bb44ed0327411acbc711eb31a06e4bc83b7577d6d7d054ee74bfbccfadb58685ea SHA512 bc4684dff491d6140d7d97a1de6cc2773d5f834054bc3d8c122c5d6777f543a08f93e4142c50dcbda862d75ba5c19ffd49ca37876e57df4ee19869099a346a4f
 AUX tracd.confd 359 BLAKE2B 5bf14f9828f3eb22c39a27dd20da219032cc3157d45b16a54a0a6530923c694f7a424c08c09458fdf9e422a3819a7e30619a1c82966ac5aafa2355528e666e3f SHA512 38a961fe59b690eb91e20143aaea6aa1becda8c2afa103599d14ff86c7aae88f06b57b342302de1f067dac5d99024b9cc72896a84349e09b3ff40c9a20f97bb1
 AUX tracd.initd 823 BLAKE2B 4325de1322cda7885539859c2b2ea3d27acaf636bde728c50fcc4c769acec308e6b56d3449109171ce9bdd2bdda9f9364f93c7069debd0a0ecb1009ce0bbf29b SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6
-DIST Trac-1.2.3.tar.gz 6297767 BLAKE2B 22681c091dc3275f6f0ee91922ee23e80862d179929297f039a03ea8f6d623c318f52a89402bac004f2c249bc4550ad32045d10542df0704cd048f968d39e511 SHA512 988aa8c42f4f2e9b657b9fd9070328dc123f56954645def1e17ccffc6ec6da9d2a898ec58dae3045478df0e3c8f7b946dc723b46aec10627b31169eda0a08bad
-EBUILD trac-1.2.3-r1.ebuild 2723 BLAKE2B ce89ef648f9ceb6a99429e572bfbec73b42c69c2ca559ef329535b36fd9f54cef461d19cfc6c4a610f542305b02151694ebc9c442b359c52e262071da1009b61 SHA512 84b01f0b94240be8f87462e9c3bdb636f0c60208ae2b08226c66f68d300ff6eeb1f0b015ed04be9e25f304e515d80f144ed358ffe050977921560fe3c6e5ba8b
+DIST Trac-1.2.5.tar.gz 5333965 BLAKE2B 51a58773fc037db66b748abddc4905738f2766c3aef87913cb2acd66cc6fcff14be288322ed1bc92435a7a7ab8de6020259a3363459ef1363518cdacf1ac4c0e SHA512 ee8faa6950f5148fe8adca9381f3228dc9f198457b2c44fad8331ca87a1e3ab15906b25c7b01fa8face4e93a366fdf12c27843198db6a9642481820e7456a76c
+EBUILD trac-1.2.5.ebuild 2673 BLAKE2B 48eccc6077daa1c2d7aa7aec6b9b5f9ddc51c736c7e20b54fabf005196750fb6c1c49e12de2155962c2df529a6e46c84b436b58ad08192703438041b07872af3 SHA512 915a038309ca53e97705d51cdb095bef792aea56f1350c36d44c0ab457d7e93b9b594441815dcd7acd4ba6507a2dd0adeddbfcabcd8dfa23be41042f9edb1775
diff --git a/www-apps/trac/trac-1.2.3-r1.ebuild b/www-apps/trac/trac-1.2.5.ebuild
similarity index 64%
rename from www-apps/trac/trac-1.2.3-r1.ebuild
rename to www-apps/trac/trac-1.2.5.ebuild
index a1ab6a9..4ab68e7 100644
--- a/www-apps/trac/trac-1.2.3-r1.ebuild
+++ b/www-apps/trac/trac-1.2.5.ebuild
@@ -1,46 +1,48 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+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 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/genshi[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytz[${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_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+		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}"
 
@@ -51,13 +53,6 @@ RESTRICT="test"
 
 WEBAPP_MANUAL_SLOT="yes"
 
-src_prepare() {
-	sed -i -e 's!^#, fuzzy!!g' \
-		trac/locale/de/LC_MESSAGES/messages.po \
-		trac/locale/de/LC_MESSAGES/messages-js.po \
-		trac/locale/de/LC_MESSAGES/tracini.po
-}
-
 pkg_setup() {
 	python-single-r1_pkg_setup
 	webapp_pkg_setup