summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-02-21 16:07:30 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-02-21 16:07:30 +0000
commit4584d27c08fd2f8837a59faab4e306f02ee31789 (patch)
tree79085d2aab37df671e7bae6aa8e0c80471f76aa6 /app-text/silvercity
parentUpdate maintainers in metadata.xml (diff)
downloadgentoo-2-4584d27c08fd2f8837a59faab4e306f02ee31789.tar.gz
gentoo-2-4584d27c08fd2f8837a59faab4e306f02ee31789.tar.bz2
gentoo-2-4584d27c08fd2f8837a59faab4e306f02ee31789.zip
Restrict Jython ABIs. Fix installation (bug #355837).
(Portage version: 2.2.0_alpha24_p17/cvs/Linux x86_64)
Diffstat (limited to 'app-text/silvercity')
-rw-r--r--app-text/silvercity/ChangeLog8
-rw-r--r--app-text/silvercity/silvercity-0.9.7.ebuild26
2 files changed, 18 insertions, 16 deletions
diff --git a/app-text/silvercity/ChangeLog b/app-text/silvercity/ChangeLog
index 49d73eeea0a1..f676b13da6ee 100644
--- a/app-text/silvercity/ChangeLog
+++ b/app-text/silvercity/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/silvercity
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/ChangeLog,v 1.25 2009/10/03 05:09:11 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/ChangeLog,v 1.26 2011/02/21 16:07:30 arfrever Exp $
+
+ 21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ silvercity-0.9.7.ebuild:
+ Restrict Jython ABIs. Fix installation (bug #355837).
03 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
silvercity-0.9.7.ebuild:
diff --git a/app-text/silvercity/silvercity-0.9.7.ebuild b/app-text/silvercity/silvercity-0.9.7.ebuild
index bce990e0c82a..30545d19718f 100644
--- a/app-text/silvercity/silvercity-0.9.7.ebuild
+++ b/app-text/silvercity/silvercity-0.9.7.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/silvercity-0.9.7.ebuild,v 1.9 2011/02/21 13:21:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/silvercity-0.9.7.ebuild,v 1.10 2011/02/21 16:07:30 arfrever Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
-inherit distutils eutils python
+inherit distutils
MY_PN="SilverCity"
MY_P="${MY_PN}-${PV}"
@@ -26,21 +26,19 @@ RDEPEND=""
S="${WORKDIR}/${MY_P}"
+PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/source2html.py")
+
PYTHON_MODNAME="${MY_PN}"
-src_install() {
- distutils_src_install
+src_prepare() {
+ distutils_src_prepare
- # Remove useless documentation.
- rm "${D}usr/share/doc/${P}/PKG-INFO"*
+ # Fix line endings.
+ find -type f -exec sed -e 's/\r$//' -i \{\} \; || die "sed failed"
# Fix permissions.
- chmod 644 "${D}"usr/$(get_libdir)/python*/site-packages/SilverCity/default.css
-
- # Fix CR/LF issue.
- find "${D}usr/bin" -iname "*.py" -exec sed -e 's/\r$//' -i \{\} \;
+ chmod -x CSS/default.css || die "chmod failed"
- # Fix path.
- dosed -i 's|#!/usr/home/sweetapp/bin/python|#!/usr/bin/env python|' \
- /usr/bin/cgi-styler-form.py || die "dosed failed"
+ # Fix shebang.
+ sed -e 's:#!/usr/home/sweetapp/bin/python:#!/usr/bin/env python:' -i PySilverCity/Scripts/cgi-styler-form.py || die "sed failed"
}