[gentoo-commits] gentoo-x86 commit in app-text/silvercity: silvercity-0.9.7.ebuild ChangeLog

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    11/02/21 16:07:30

  Modified:             silvercity-0.9.7.ebuild ChangeLog
  Log:
  Restrict Jython ABIs. Fix installation (bug #355837).
  
  (Portage version: 2.2.0_alpha24_p17/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 app-text/silvercity/silvercity-0.9.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/silvercity/silvercity-0.9.7.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/silvercity/silvercity-0.9.7.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/silvercity/silvercity-0.9.7.ebuild?r1=1.9&r2=1.10

Index: silvercity-0.9.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/silvercity/silvercity-0.9.7.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- silvercity-0.9.7.ebuild	21 Feb 2011 13:21:53 -0000	1.9
+++ silvercity-0.9.7.ebuild	21 Feb 2011 16:07:30 -0000	1.10
@@ -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 @@
 
 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"
 }



1.26                 app-text/silvercity/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/silvercity/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/silvercity/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/silvercity/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/silvercity/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	3 Oct 2009 05:09:11 -0000	1.25
+++ ChangeLog	21 Feb 2011 16:07:30 -0000	1.26
@@ -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@g.o>
+  silvercity-0.9.7.ebuild:
+  Restrict Jython ABIs. Fix installation (bug #355837).
 
   03 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
   silvercity-0.9.7.ebuild: