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
commit59dc5bcb73c3c717a2b1ba5f65cfa76b314fc16c (patch)
tree7ed3039becf627b82fab257b1bb77073b5134c34 /app-text/silvercity
parentUpdate maintainers in metadata.xml (diff)
downloadhistorical-59dc5bcb73c3c717a2b1ba5f65cfa76b314fc16c.tar.gz
historical-59dc5bcb73c3c717a2b1ba5f65cfa76b314fc16c.tar.bz2
historical-59dc5bcb73c3c717a2b1ba5f65cfa76b314fc16c.zip
Restrict Jython ABIs. Fix installation (bug #355837).
Package-Manager: portage-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/Manifest4
-rw-r--r--app-text/silvercity/silvercity-0.9.7.ebuild26
3 files changed, 20 insertions, 18 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/Manifest b/app-text/silvercity/Manifest
index 7cefe5e11c97..740f8def5837 100644
--- a/app-text/silvercity/Manifest
+++ b/app-text/silvercity/Manifest
@@ -1,4 +1,4 @@
DIST SilverCity-0.9.7.tar.gz 278396 RMD160 1eb73b8af32cf3d89838950f1a659391040177bb SHA1 c07d417009be800ab656fcd051ae8051c5fa96f9 SHA256 5b226e71d75c0afc4434c6fbfb44214e8728fd69703045b2134802f71ef049bd
-EBUILD silvercity-0.9.7.ebuild 1146 RMD160 d515fa49408398e9fcd00cb972c6bebe7f8e3afc SHA1 7acc2b6d31a91428cd04cba9c4342b22e56c1d7c SHA256 f08f55e5763088d4cd245f043745d8234f0796cfe58dd1a4ee34a6fc7576fb4c
-MISC ChangeLog 3379 RMD160 7f2154fb56759e2b8217c3f2f6f4d96a3fb40594 SHA1 6cb6372077503973a26791bc521b739389c2adf0 SHA256 9ff0b6c6ce1e69e3551bf2e4c969670cfa3b9c85a2251bf55ae753e3a38550f8
+EBUILD silvercity-0.9.7.ebuild 1109 RMD160 77b72a743007c00b110d2502c76aae699aa09a1c SHA1 f60b74ec4cfee57c48665f9ac1f6e45691d59a32 SHA256 078e43fb7b55486a71cb262da80ee42df152cb91a8d0a3e46e8b55f4ff649fe3
+MISC ChangeLog 3536 RMD160 8c686b5d79ab306811cf493794407394cfab5b2b SHA1 3564a25dedf96c7e6c013db1ec47d1937eb27b28 SHA256 b901e86c8ec9ff2dbab8e5dafc5e0cd193a19c6bbae08da7f0532e900e31a54c
MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
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"
}