From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in www-apps/viewvc: viewvc-1.1.3.ebuild ChangeLog viewvc-1.1.2.ebuild
Date: Fri, 15 Jan 2010 14:54:16 +0000 [thread overview]
Message-ID: <E1NVnZ2-000733-1y@stork.gentoo.org> (raw)
arfrever 10/01/15 14:54:16
Modified: viewvc-1.1.3.ebuild ChangeLog viewvc-1.1.2.ebuild
Log:
Use `python_get_sitedir -f` instead of `python_get_sitedir` in src_prepare() (bug #300946).
(Portage version: 15200-svn/cvs/Linux x86_64)
Revision Changes Path
1.5 www-apps/viewvc/viewvc-1.1.3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/viewvc-1.1.3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/viewvc-1.1.3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/viewvc-1.1.3.ebuild?r1=1.4&r2=1.5
Index: viewvc-1.1.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- viewvc-1.1.3.ebuild 7 Jan 2010 15:59:50 -0000 1.4
+++ viewvc-1.1.3.ebuild 15 Jan 2010 14:54:15 -0000 1.5
@@ -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 @@
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\"|" \
1.43 www-apps/viewvc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/ChangeLog?r1=1.42&r2=1.43
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog 7 Jan 2010 15:59:50 -0000 1.42
+++ ChangeLog 15 Jan 2010 14:54:15 -0000 1.43
@@ -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.
1.6 www-apps/viewvc/viewvc-1.1.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/viewvc-1.1.2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/viewvc-1.1.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/viewvc/viewvc-1.1.2.ebuild?r1=1.5&r2=1.6
Index: viewvc-1.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- viewvc-1.1.2.ebuild 24 Sep 2009 18:55:41 -0000 1.5
+++ viewvc-1.1.2.ebuild 15 Jan 2010 14:54:15 -0000 1.6
@@ -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 @@
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 @@
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_postrm() {
- python_mod_cleanup
+ python_mod_cleanup viewvc
}
next reply other threads:[~2010-01-15 14:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-15 14:54 Arfrever Frehtes Taifersar Arahesis (arfrever) [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-01-21 16:55 [gentoo-commits] gentoo-x86 commit in www-apps/viewvc: viewvc-1.1.3.ebuild ChangeLog viewvc-1.1.2.ebuild Peter Volkov (pva)
2010-03-05 7:34 Ulrich Mueller (ulm)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1NVnZ2-000733-1y@stork.gentoo.org \
--to=arfrever@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox