www-apps/trac: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9-r1.ebuild
similarity index 73%
rename from www-apps/trac/trac-1.0.9.ebuild
rename to www-apps/trac/trac-1.0.9-r1.ebuild
index 4925adedf9188df9424f91defb5b561c914432bc..92856efa6ec70860d342f8f1dcf9a2fff298f338 100644 (file)
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ b/www-apps/trac/trac-1.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,25 +24,27 @@ IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subve
 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}] )
-       cgi? ( virtual/httpd-cgi )
-       fastcgi? ( virtual/httpd-fastcgi )
-       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}] )
+               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}"
 

diff --git a/www-apps/trac/trac-1.2.1.ebuild b/www-apps/trac/trac-1.2.1-r1.ebuild
similarity index 73%
rename from www-apps/trac/trac-1.2.1.ebuild
rename to www-apps/trac/trac-1.2.1-r1.ebuild
index 94523e6929b791343cb54d6ceccf8f582aa7c043..d80396e3d00dba6ad40c4005bca151e52cd7a13f 100644 (file)
--- a/www-apps/trac/trac-1.2.1.ebuild
+++ b/www-apps/trac/trac-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,23 +24,25 @@ IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subve
 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}"