* [gentoo-commits] repo/gentoo:master commit in: www-apps/viewvc/
@ 2017-02-19 23:02 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-02-19 23:02 UTC (permalink / raw
To: gentoo-commits
commit: ae3ce150147db89f124274ae961d5c37a87a0040
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 22:17:05 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 23:02:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae3ce150
www-apps/viewvc: python-single-r1, EAPI=6
...iewvc-1.1.20.ebuild => viewvc-1.1.20-r1.ebuild} | 54 ++++++++++------------
1 file changed, 24 insertions(+), 30 deletions(-)
diff --git a/www-apps/viewvc/viewvc-1.1.20.ebuild b/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
similarity index 69%
rename from www-apps/viewvc/viewvc-1.1.20.ebuild
rename to www-apps/viewvc/viewvc-1.1.20-r1.ebuild
index a72a8da786..f1e18653d5 100644
--- a/www-apps/viewvc/viewvc-1.1.20.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
-inherit confutils eutils python webapp
+inherit confutils eutils python-single-r1 webapp
WEBAPP_MANUAL_SLOT="yes"
@@ -22,42 +20,46 @@ KEYWORDS="amd64 ~ppc x86"
IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
DEPEND=""
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
cvs? ( dev-vcs/rcs )
- subversion? ( >=dev-vcs/subversion-1.3.1[python] )
+ subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_USEDEP}] )
- mod_wsgi? ( www-apache/mod_wsgi )
+ mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_USEDEP}] )
!mod_wsgi? ( virtual/httpd-cgi )
cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
- mysql? ( >=dev-python/mysql-python-0.9.0 )
+ mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_USEDEP}] )
pygments? (
- dev-python/pygments
+ dev-python/pygments[${PYTHON_USEDEP}]
app-misc/mime-types
)
"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
pkg_setup() {
- python_pkg_setup
+ python-single-r1_pkg_setup
webapp_pkg_setup
confutils_require_any cvs subversion
}
src_prepare() {
+ eapply_user
+
find bin/ -type f -print0 | xargs -0 sed -i \
- -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir -f)/${PN}\"|g" \
- -e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g"
+ -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
+ -e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" || die
sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
- lib/config.py
+ lib/config.py || die
- sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist
- sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist
- mv conf/viewvc.conf{.dist,}
- mv conf/cvsgraph.conf{.dist,}
+ sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist || die
+ sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist || die
+ mv conf/viewvc.conf{.dist,} || die
+ mv conf/cvsgraph.conf{.dist,} || die
- python_convert_shebangs -r 2 .
+ python_fix_shebang .
}
src_install() {
@@ -67,11 +69,8 @@ src_install() {
dodoc CHANGES COMMITTERS INSTALL README
- installation() {
- insinto $(python_get_sitedir)/${PN}
- doins -r lib/*
- }
- python_execute_function installation
+ python_moduleinto viewvc
+ python_domodule lib/.
insinto "${MY_APPDIR}"
doins -r templates/ || die "doins failed"
@@ -110,11 +109,6 @@ src_install() {
}
pkg_postinst() {
- python_mod_optimize viewvc
webapp_pkg_postinst
elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
}
-
-pkg_postrm() {
- python_mod_cleanup viewvc
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/viewvc/
@ 2017-03-12 9:05 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-03-12 9:05 UTC (permalink / raw
To: gentoo-commits
commit: cb37794e3a4e8205ff54ad5676aad0ed437c6ba6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 08:05:34 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 09:05:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb37794e
www-apps/viewvc: confutils -> REQUIRED_USE, #612394
www-apps/viewvc/viewvc-1.1.20-r1.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/www-apps/viewvc/viewvc-1.1.20-r1.ebuild b/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
index 66484dfb27f..3a8caa2fa09 100644
--- a/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit confutils eutils python-single-r1 webapp
+inherit eutils python-single-r1 webapp
WEBAPP_MANUAL_SLOT="yes"
@@ -34,13 +34,12 @@ RDEPEND="${PYTHON_DEPS}
)
"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( cvs subversion )"
pkg_setup() {
python-single-r1_pkg_setup
webapp_pkg_setup
-
- confutils_require_any cvs subversion
}
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/viewvc/
@ 2017-06-04 11:33 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2017-06-04 11:33 UTC (permalink / raw
To: gentoo-commits
commit: bbb634585b0c2ff3658e8a46d2d2ab0f6546db3a
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 11:33:23 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 11:33:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb63458
www-apps/viewvc: Security bump to v1.1.26 (bug #608738)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-apps/viewvc/Manifest | 1 +
www-apps/viewvc/viewvc-1.1.26.ebuild | 111 +++++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+)
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index e5da4a72ef5..a58658d633f 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1 +1,2 @@
DIST viewvc-1.1.20.tar.gz 616561 SHA256 ecd9b77ddcdc33594edce34751b0feae64338580c177804e2a8395874cb31ff2 SHA512 1c0129be983e6832f12cf4850ee6fe03c6a4f694d9e7643f0efe65bd3e8c7d820fdaf3bb16fd3bb3628ea133b58b1e03196f2eb439cfb6ab4727d6178516d8d1 WHIRLPOOL 5746826abcdc061b7c7fc2de49bb3034c54b8fd889038334a2b55ae5523796710b7e1f83bdddfe1127f3d795d12275939dd43c38ceb29110cf6d3a4ab1a11cd4
+DIST viewvc-1.1.26.tar.gz 616103 SHA256 9d718237df7fc04d511302812c0bec0363cf6b8334ab796953a764c2de426e43 SHA512 af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e WHIRLPOOL d8d6348d9d4c48176ff71af6aec74c4d3d73a58217b7b6b23f27d47503548df66cb0121b7d17d89c2a9a0524280b22960fcbf3a7b11a35c8411626f8759c2d50
diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26.ebuild
new file mode 100644
index 00000000000..2c5d23c4ed5
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.1.26.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 webapp
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
+HOMEPAGE="http://viewvc.org/"
+SRC_URI="http://viewvc.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+ cvs? ( dev-vcs/rcs )
+ subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_USEDEP}] )
+
+ mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_USEDEP}] )
+ !mod_wsgi? ( virtual/httpd-cgi )
+
+ cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
+ mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_USEDEP}] )
+ pygments? (
+ dev-python/pygments[${PYTHON_USEDEP}]
+ app-misc/mime-types
+ )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( cvs subversion )"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ webapp_pkg_setup
+}
+
+src_prepare() {
+ eapply_user
+
+ find bin/ -type f -print0 | xargs -0 sed -i \
+ -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
+ -e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" || die
+
+ sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
+ lib/config.py || die
+
+ sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist || die
+ sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist || die
+ mv conf/viewvc.conf{.dist,} || die
+ mv conf/cvsgraph.conf{.dist,} || die
+
+ python_fix_shebang .
+}
+
+src_install() {
+ webapp_src_preinst
+
+ newbin bin/standalone.py viewvc-standalone-server
+
+ dodoc CHANGES COMMITTERS INSTALL README
+
+ python_moduleinto viewvc
+ python_domodule lib/.
+
+ insinto "${MY_APPDIR}"
+ doins -r templates/ || die "doins failed"
+ doins -r templates-contrib/
+
+ if use mysql; then
+ exeinto "${MY_HOSTROOTDIR}/bin"
+ doexe bin/{*dbadmin,make-database,loginfo-handler}
+ fi
+
+ insinto "${MY_HOSTROOTDIR}/conf"
+ doins conf/{viewvc,cvsgraph}.conf
+
+ exeinto "${MY_CGIBINDIR}"
+ doexe bin/cgi/viewvc.cgi
+ if use mysql; then
+ doexe bin/cgi/query.cgi
+ fi
+
+ exeinto "${MY_CGIBINDIR}"
+ if use mod_wsgi; then
+ doexe bin/wsgi/viewvc.wsgi
+ if use mysql; then
+ doexe bin/wsgi/query.wsgi
+ fi
+ else
+ doexe bin/wsgi/viewvc.fcgi
+ if use mysql; then
+ doexe bin/wsgi/query.fcgi
+ fi
+ fi
+
+ webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf
+
+ webapp_src_install
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+ elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/viewvc/
@ 2017-06-18 14:01 Agostino Sarubbo
0 siblings, 0 replies; 6+ messages in thread
From: Agostino Sarubbo @ 2017-06-18 14:01 UTC (permalink / raw
To: gentoo-commits
commit: d6a017180fd5faf2a3ea9669493f0eeb93dbc4da
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 14:00:21 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 14:00:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a01718
www-apps/viewvc: amd64 stable wrt bug #608738
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
www-apps/viewvc/viewvc-1.1.26.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26.ebuild
index 25ff93413da..d0627301f12 100644
--- a/www-apps/viewvc/viewvc-1.1.26.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.26.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://viewvc.org/downloads/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
DEPEND=""
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/viewvc/
@ 2017-06-28 11:24 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2017-06-28 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 4a06816c6d0740c2659d2041bf40db8403681c5c
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 11:23:45 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 11:24:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a06816c
www-apps/viewvc: Security cleanup (bug #608738)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-apps/viewvc/Manifest | 1 -
www-apps/viewvc/viewvc-1.1.20-r1.ebuild | 112 --------------------------------
2 files changed, 113 deletions(-)
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index a58658d633f..dff6fce03c1 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,2 +1 @@
-DIST viewvc-1.1.20.tar.gz 616561 SHA256 ecd9b77ddcdc33594edce34751b0feae64338580c177804e2a8395874cb31ff2 SHA512 1c0129be983e6832f12cf4850ee6fe03c6a4f694d9e7643f0efe65bd3e8c7d820fdaf3bb16fd3bb3628ea133b58b1e03196f2eb439cfb6ab4727d6178516d8d1 WHIRLPOOL 5746826abcdc061b7c7fc2de49bb3034c54b8fd889038334a2b55ae5523796710b7e1f83bdddfe1127f3d795d12275939dd43c38ceb29110cf6d3a4ab1a11cd4
DIST viewvc-1.1.26.tar.gz 616103 SHA256 9d718237df7fc04d511302812c0bec0363cf6b8334ab796953a764c2de426e43 SHA512 af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e WHIRLPOOL d8d6348d9d4c48176ff71af6aec74c4d3d73a58217b7b6b23f27d47503548df66cb0121b7d17d89c2a9a0524280b22960fcbf3a7b11a35c8411626f8759c2d50
diff --git a/www-apps/viewvc/viewvc-1.1.20-r1.ebuild b/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
deleted file mode 100644
index 3a8caa2fa09..00000000000
--- a/www-apps/viewvc/viewvc-1.1.20-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
-HOMEPAGE="http://viewvc.org/"
-DOWNLOAD_NUMBER="49275"
-SRC_URI="http://viewvc.tigris.org/files/documents/3330/${DOWNLOAD_NUMBER}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
- cvs? ( dev-vcs/rcs )
- subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_USEDEP}] )
-
- mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_USEDEP}] )
- !mod_wsgi? ( virtual/httpd-cgi )
-
- cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
- mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_USEDEP}] )
- pygments? (
- dev-python/pygments[${PYTHON_USEDEP}]
- app-misc/mime-types
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( cvs subversion )"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- webapp_pkg_setup
-}
-
-src_prepare() {
- eapply_user
-
- find bin/ -type f -print0 | xargs -0 sed -i \
- -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
- -e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" || die
-
- sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
- lib/config.py || die
-
- sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist || die
- sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist || die
- mv conf/viewvc.conf{.dist,} || die
- mv conf/cvsgraph.conf{.dist,} || die
-
- python_fix_shebang .
-}
-
-src_install() {
- webapp_src_preinst
-
- newbin bin/standalone.py viewvc-standalone-server
-
- dodoc CHANGES COMMITTERS INSTALL README
-
- python_moduleinto viewvc
- python_domodule lib/.
-
- insinto "${MY_APPDIR}"
- doins -r templates/ || die "doins failed"
- doins -r templates-contrib/
-
- if use mysql; then
- exeinto "${MY_HOSTROOTDIR}/bin"
- doexe bin/{*dbadmin,make-database,loginfo-handler}
- fi
-
- insinto "${MY_HOSTROOTDIR}/conf"
- doins conf/{viewvc,cvsgraph}.conf
-
- exeinto "${MY_CGIBINDIR}"
- doexe bin/cgi/viewvc.cgi
- if use mysql; then
- doexe bin/cgi/query.cgi
- fi
-
- exeinto "${MY_CGIBINDIR}"
- if use mod_wsgi; then
- doexe bin/wsgi/viewvc.wsgi
- if use mysql; then
- doexe bin/wsgi/query.wsgi
- fi
- else
- doexe bin/wsgi/viewvc.fcgi
- if use mysql; then
- doexe bin/wsgi/query.fcgi
- fi
- fi
-
- webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf
-
- webapp_src_install
-}
-
-pkg_postinst() {
- webapp_pkg_postinst
- elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/viewvc/
@ 2020-02-09 16:42 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-02-09 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 64c891e286c063d18fb402e3fcb2100ba1b38db5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 20:28:41 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:37:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c891e2
www-apps/viewvc: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...{viewvc-1.1.26.ebuild => viewvc-1.1.26-r1.ebuild} | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26-r1.ebuild
similarity index 86%
rename from www-apps/viewvc/viewvc-1.1.26.ebuild
rename to www-apps/viewvc/viewvc-1.1.26-r1.ebuild
index 787b46c0365..fa7bfd6b69c 100644
--- a/www-apps/viewvc/viewvc-1.1.26.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,17 +20,21 @@ IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
DEPEND=""
RDEPEND="${PYTHON_DEPS}
cvs? ( dev-vcs/rcs )
- subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_USEDEP}] )
- mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_USEDEP}] )
+ mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_SINGLE_USEDEP}] )
!mod_wsgi? ( virtual/httpd-cgi )
cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
- mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_USEDEP}] )
- pygments? (
- dev-python/pygments[${PYTHON_USEDEP}]
- app-misc/mime-types
- )
+
+ $(python_gen_cond_dep '
+ subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_MULTI_USEDEP}] )
+
+ mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_MULTI_USEDEP}] )
+ pygments? (
+ dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+ app-misc/mime-types
+ )
+ ')
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-02-09 16:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-04 11:33 [gentoo-commits] repo/gentoo:master commit in: www-apps/viewvc/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2020-02-09 16:42 Michał Górny
2017-06-28 11:24 Thomas Deutschmann
2017-06-18 14:01 Agostino Sarubbo
2017-03-12 9:05 Michał Górny
2017-02-19 23:02 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox