gentoo Easter resync : 12.04.2020

3 files changed, 7 insertions, 137 deletions

diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 57fa28517667..a538699e1e17 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -2,8 +2,6 @@ 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.0.9.tar.gz 3642845 BLAKE2B de0a6fdfc59c5c3f1e795a7e0a006e724491d1d084c9fefcc35185a40430e06ed781c94cf9190d394b943064fd87a34a6fffea7f57c3d4b55b591a6aab5a83ad SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304
-DIST Trac-1.2.1.tar.gz 6212917 BLAKE2B 6445ec515b295d0fdd3a75e93da853d136f19083b6e87cbe9c856e2502d217c433bfd7f885d8ff45556882e8c99a7d6e966761027f72e32e675278ee83a67eb6 SHA512 0ee008ce0d890873eb6db7eca60e362760c4a4857dd74bda67c30e566dcb5bd64ccd6d5e7317da904e8dcfb7d4a017004d3bb794dd405936c94803b2fcc4829f
-EBUILD trac-1.0.9-r1.ebuild 2960 BLAKE2B 265020873a4d0e48615176c67b69b5c014bafd64daa1f83015455fc7bd7b772dc1fec63e49a318f6718dd49d857ddd145f611eb32b77143352c333afd03f2b46 SHA512 bc93908766ba71b15df748971a430ea4727147e110a4dca45a8f5ba77346f9fd7a0ac4fb6569b04c3d237b67d3d90738531584d4b5e501dfd9752e1d0d6fcf45
-EBUILD trac-1.2.1-r1.ebuild 2635 BLAKE2B 03e604c12440fc7c8f55d0c2599ce3a361839e599ef672ce7fbac2d2a46580087a9af54c6bbf6dcb00270ea69986c84b85291e6d545ede1382553e39951e225e SHA512 052b5e79aaf4932fc77476715e7962a20d61dc08f10694b216701316e41f4b460984f49b695260d7e9b187fb5ce75f71db194fccab72ed953af5410c2feba487
+DIST Trac-1.2.5.tar.gz 5333965 BLAKE2B 51a58773fc037db66b748abddc4905738f2766c3aef87913cb2acd66cc6fcff14be288322ed1bc92435a7a7ab8de6020259a3363459ef1363518cdacf1ac4c0e SHA512 ee8faa6950f5148fe8adca9381f3228dc9f198457b2c44fad8331ca87a1e3ab15906b25c7b01fa8face4e93a366fdf12c27843198db6a9642481820e7456a76c
+EBUILD trac-1.2.5.ebuild 2673 BLAKE2B 48eccc6077daa1c2d7aa7aec6b9b5f9ddc51c736c7e20b54fabf005196750fb6c1c49e12de2155962c2df529a6e46c84b436b58ad08192703438041b07872af3 SHA512 915a038309ca53e97705d51cdb095bef792aea56f1350c36d44c0ab457d7e93b9b594441815dcd7acd4ba6507a2dd0adeddbfcabcd8dfa23be41042f9edb1775
 MISC metadata.xml 506 BLAKE2B 4b408bc9a05c2bddccf9c733ea9f58c6f2be64f3dc8b04f4a3f3330b3ac21157f3468144a62f6473c253e8e8019c759a3d2bfbd1ad36633c3097bc061b88a8b4 SHA512 06c8b9589b20dfa824822b3129d7f62bc2aaad12f37b16e735604469a94ed51c6c8b57cce53efb1e81d748bae56ae90d74837d60667a4826ac53044e2afdf048
diff --git a/www-apps/trac/trac-1.0.9-r1.ebuild b/www-apps/trac/trac-1.0.9-r1.ebuild
deleted file mode 100644
index 92856efa6ec7..000000000000
--- a/www-apps/trac/trac-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-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"
-
-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[${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_MULTI_USEDEP}] )
-		cgi? ( virtual/httpd-cgi )
-		fastcgi? ( virtual/httpd-fastcgi )
-		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
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# 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
-}
diff --git a/www-apps/trac/trac-1.2.1-r1.ebuild b/www-apps/trac/trac-1.2.5.ebuild
index d80396e3d00d..4ab68e7395e5 100644
--- a/www-apps/trac/trac-1.2.1-r1.ebuild
+++ b/www-apps/trac/trac-1.2.5.ebuild
@@ -1,25 +1,25 @@
 # 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"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"