diff options
author | Jeremy Olexa <darkside@gentoo.org> | 2011-11-29 13:18:09 +0000 |
---|---|---|
committer | Jeremy Olexa <darkside@gentoo.org> | 2011-11-29 13:18:09 +0000 |
commit | d94d3ebd5032c43f20c05ea2de4494677115949e (patch) | |
tree | 54464691461bf7d029f198aa4d0a6fb5a7a65693 /www-apps/viewvc | |
parent | www-servers/tomcat: version bump (diff) | |
download | gentoo-2-d94d3ebd5032c43f20c05ea2de4494677115949e.tar.gz gentoo-2-d94d3ebd5032c43f20c05ea2de4494677115949e.tar.bz2 gentoo-2-d94d3ebd5032c43f20c05ea2de4494677115949e.zip |
Fix pygments and mime-type issue, bug 382959 by Alon Bar-Lev
(Portage version: 2.1.10.34/cvs/Linux x86_64)
Diffstat (limited to 'www-apps/viewvc')
-rw-r--r-- | www-apps/viewvc/ChangeLog | 8 | ||||
-rw-r--r-- | www-apps/viewvc/viewvc-1.1.12-r1.ebuild (renamed from www-apps/viewvc/viewvc-1.1.12.ebuild) | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog index 04ab4d95d03d..ba9b44b871f1 100644 --- a/www-apps/viewvc/ChangeLog +++ b/www-apps/viewvc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apps/viewvc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.81 2011/11/28 21:40:04 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.82 2011/11/29 13:18:09 darkside Exp $ + +*viewvc-1.1.12-r1 (29 Nov 2011) + + 29 Nov 2011; Jeremy Olexa <darkside@gentoo.org> -viewvc-1.1.12.ebuild, + +viewvc-1.1.12-r1.ebuild: + Fix pygments and mime-type issue, bug 382959 by Alon Bar-Lev *viewvc-1.1.12 (28 Nov 2011) diff --git a/www-apps/viewvc/viewvc-1.1.12.ebuild b/www-apps/viewvc/viewvc-1.1.12-r1.ebuild index ac461b912dab..1fff6f2e98f3 100644 --- a/www-apps/viewvc/viewvc-1.1.12.ebuild +++ b/www-apps/viewvc/viewvc-1.1.12-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.12.ebuild,v 1.1 2011/11/28 21:40:04 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.12-r1.ebuild,v 1.1 2011/11/29 13:18:09 darkside Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -32,7 +32,10 @@ RDEPEND=" cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 ) mysql? ( >=dev-python/mysql-python-0.9.0 ) - pygments? ( dev-python/pygments ) + pygments? ( + dev-python/pygments + app-misc/mime-types + ) " pkg_setup() { @@ -51,9 +54,9 @@ src_prepare() { lib/config.py 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,} - mv conf/mimetypes.conf{.dist,} python_convert_shebangs -r 2 . } @@ -81,7 +84,7 @@ src_install() { fi insinto "${MY_HOSTROOTDIR}/conf" - doins conf/{viewvc,cvsgraph,mimetypes}.conf + doins conf/{viewvc,cvsgraph}.conf if use mod_python; then insinto "${MY_HTDOCSDIR}" |