Fix pygments and mime-type issue, bug 382959 by Alon Bar-Lev

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index 04ab4d95d03d6d8e88ed43381282d5524c2e54f8..ba9b44b871f167b4ed529fd7df8abb2c001a814d 100644 (file)
--- 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/Manifest b/www-apps/viewvc/Manifest
index efe473ca049f056ab2ffeb91303aac6bb6b06d8b..27053846983a343fb9189cf540e9f6003c7e85bc 100644 (file)
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,6 +1,6 @@
 DIST viewvc-1.1.11.tar.gz 603863 RMD160 ae2dd6a23d926d947ed09e9ad6ebe3a62e059243 SHA1 222765d9b4d922ec2066ddd8dcad1238ebdad687 SHA256 3230c9de95d0d369adf7ff746489e0b0e7ba009c30d85f4fdad87574f8999701
 DIST viewvc-1.1.12.tar.gz 605380 RMD160 b099d18ebf12aadf005674bb43db66a4ef9bccc3 SHA1 ba5d4d234a2540b8ad55a107bb182989ab7d7d55 SHA256 3abc9ea79dbbba507d99e44e8abf95950543b28f1c68a82e0029df56cb40efce
 EBUILD viewvc-1.1.11.ebuild 2990 RMD160 c39e959a701365fc07fe2bbac6ded7213b930765 SHA1 bee41f72c591a9d6f8da0fce8942dd09dda34f8c SHA256 7abe33f6419fa27d14f448f30addd91c3bf2e2c7c6cbd0b3be4999203c5fd62a
-EBUILD viewvc-1.1.12.ebuild 2993 RMD160 d32b045523d8e5c541f58ec52b1e715534e10bc4 SHA1 f82d2fdf674173223594831ffbba4f9280f1621b SHA256 87c86f0795531112fbbe2d5340605d9d64bc07414f60678de24e0f22c78139f0
-MISC ChangeLog 10330 RMD160 12c9b7c5aef52b22afcd006d60b91f733ef65caa SHA1 24d5d3d086c98ca2d002b7c54247c38521992e5f SHA256 f81078ee0bcb0d517852a7af228f3829ed69f3417ea6686a58fa43fe256e7282
+EBUILD viewvc-1.1.12-r1.ebuild 3075 RMD160 10677278da3a75e36a6ec2cab28537b5e5cb7927 SHA1 17d8dfbcba44019a7116d7fb6e8aea905d589efc SHA256 f3193a28a08d94f8b5db06ac7c07eaa8230ad634aa877a096e06f32d48de5f46
+MISC ChangeLog 10528 RMD160 0b45aa797c037ae15c5765e5c2a546f0a1838bf3 SHA1 f292605bb669263c7036d90053db37ba255dbc97 SHA256 3ee5b217df3572232eaa6c04af7acdd547efe0bc4ae8d3c9f35e2ee910e0e3de
 MISC metadata.xml 548 RMD160 ee15901cda630ea71795e4309b5bb1572758ae5d SHA1 8c80d2999238cc039d7fc3804fdb77dbdc3a56a9 SHA256 6a19b8afa2e811ee5e525127ef3a562e7085167e43df792ba171772516b44540

diff --git a/www-apps/viewvc/viewvc-1.1.12.ebuild b/www-apps/viewvc/viewvc-1.1.12-r1.ebuild
similarity index 92%
rename from www-apps/viewvc/viewvc-1.1.12.ebuild
rename to www-apps/viewvc/viewvc-1.1.12-r1.ebuild
index ac461b912dab07ee0af48e52ada6deb287a914e7..1fff6f2e98f3a8807873dddd831980cc88e9614a 100644 (file)
--- 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}"