diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-01-15 14:54:15 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-01-15 14:54:15 +0000 |
| commit | dc1facc6754c8e50f7c38e671a5818664436b581 (patch) | |
| tree | d7a5a87180874491c3de4c33cb430b27154c9cc2 /www-apps | |
| parent | Version bump (diff) | |
| download | gentoo-2-dc1facc6754c8e50f7c38e671a5818664436b581.tar.gz gentoo-2-dc1facc6754c8e50f7c38e671a5818664436b581.tar.bz2 gentoo-2-dc1facc6754c8e50f7c38e671a5818664436b581.zip | |
Use `python_get_sitedir -f` instead of `python_get_sitedir` in src_prepare() (bug #300946).
(Portage version: 15200-svn/cvs/Linux x86_64)
Diffstat (limited to 'www-apps')
| -rw-r--r-- | www-apps/viewvc/ChangeLog | 7 | ||||
| -rw-r--r-- | www-apps/viewvc/viewvc-1.1.2.ebuild | 11 | ||||
| -rw-r--r-- | www-apps/viewvc/viewvc-1.1.3.ebuild | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog index 5ae7d3309e49..587bde662d24 100644 --- a/www-apps/viewvc/ChangeLog +++ b/www-apps/viewvc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-apps/viewvc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.42 2010/01/07 15:59:50 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.43 2010/01/15 14:54:15 arfrever Exp $ + + 15 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + viewvc-1.1.2.ebuild, viewvc-1.1.3.ebuild: + Use `python_get_sitedir -f` instead of `python_get_sitedir` in src_prepare() + (bug #300946). 07 Jan 2010; Joseph Jezak <josejx@gentoo.org> viewvc-1.1.3.ebuild: Marked ppc stable for bug #298127. diff --git a/www-apps/viewvc/viewvc-1.1.2.ebuild b/www-apps/viewvc/viewvc-1.1.2.ebuild index afdf99c95450..45f0bbd08e5d 100644 --- a/www-apps/viewvc/viewvc-1.1.2.ebuild +++ b/www-apps/viewvc/viewvc-1.1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.2.ebuild,v 1.5 2009/09/24 18:55:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.2.ebuild,v 1.6 2010/01/15 14:54:15 arfrever Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -37,8 +37,7 @@ RDEPEND=" mysql? ( >=dev-python/mysql-python-0.9.0 ) pygments? ( dev-python/pygments ) " - -RESTRICT_PYTHON_ABIS="3*" +RESTRICT_PYTHON_ABIS="3.*" pkg_setup() { webapp_pkg_setup @@ -48,7 +47,7 @@ pkg_setup() { src_prepare() { find bin/ -type f -print0 | xargs -0 sed -i \ - -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \ + -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir -f)/${PN}\"|g" \ -e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \ @@ -107,5 +106,5 @@ pkg_postinst() { } pkg_postrm() { - python_mod_cleanup + python_mod_cleanup viewvc } diff --git a/www-apps/viewvc/viewvc-1.1.3.ebuild b/www-apps/viewvc/viewvc-1.1.3.ebuild index abe732818723..9854f0bcbee9 100644 --- a/www-apps/viewvc/viewvc-1.1.3.ebuild +++ b/www-apps/viewvc/viewvc-1.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.3.ebuild,v 1.4 2010/01/07 15:59:50 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.3.ebuild,v 1.5 2010/01/15 14:54:15 arfrever Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -47,7 +47,7 @@ pkg_setup() { src_prepare() { find bin/ -type f -print0 | xargs -0 sed -i \ - -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \ + -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir -f)/${PN}\"|g" \ -e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \ |