Fix python bindings in 0.9.6, closes bug #121873.

(Portage version: 2.0.54)

5 files changed, 101 insertions, 1 deletions

diff --git a/app-text/silvercity/ChangeLog b/app-text/silvercity/ChangeLog
index 940f32ec5fee..873d982c11f3 100644
--- a/app-text/silvercity/ChangeLog
+++ b/app-text/silvercity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/silvercity
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/ChangeLog,v 1.11 2006/02/05 14:08:48 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/ChangeLog,v 1.12 2006/02/07 00:13:04 dju Exp $
+
+*silvercity-0.9.6-r1 (07 Feb 2006)
+
+  07 Feb 2006; Julien Allanos <dju@gentoo.org> +files/0.9.6-api-fix.patch,
+  +silvercity-0.9.6-r1.ebuild:
+  Fix python bindings in 0.9.6, closes bug #121873.
 
 *silvercity-0.9.6 (05 Feb 2006)
 
diff --git a/app-text/silvercity/Manifest b/app-text/silvercity/Manifest
index d18e1b768ba0..3ce946074a32 100644
--- a/app-text/silvercity/Manifest
+++ b/app-text/silvercity/Manifest
@@ -1,6 +1,9 @@
 MD5 831508f7c093e4e8073b63f7e5271c91 ChangeLog 1611
+MD5 473f4dc8a23b6cadb4151a191cbc0768 files/0.9.6-api-fix.patch 1837
 MD5 712defea7eee794d4e5337ce64fe9452 files/digest-silvercity-0.9.5-r1 68
 MD5 e858e8c199ec71a4fdce649cbcf9cf89 files/digest-silvercity-0.9.6 68
+MD5 e858e8c199ec71a4fdce649cbcf9cf89 files/digest-silvercity-0.9.6-r1 68
 MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
 MD5 5ba92c074ce75d51e48c3c7bde0b0456 silvercity-0.9.5-r1.ebuild 889
+MD5 f1268541b21abf7cbd92ec2d6059c440 silvercity-0.9.6-r1.ebuild 941
 MD5 af3a0fdaea75f809ac1b7262d8f4fe84 silvercity-0.9.6.ebuild 956
diff --git a/app-text/silvercity/files/0.9.6-api-fix.patch b/app-text/silvercity/files/0.9.6-api-fix.patch
new file mode 100644
index 000000000000..70d605874098
--- /dev/null
+++ b/app-text/silvercity/files/0.9.6-api-fix.patch
@@ -0,0 +1,50 @@
+=== modified file 'PySilverCity/SilverCity/CSS.py'
+--- PySilverCity/SilverCity/CSS.py	
++++ PySilverCity/SilverCity/CSS.py	
+@@ -11,8 +11,9 @@
+         self._properties = properties

+         self._lexer = find_lexer_module_by_id(SCLEX_CSS)

+         self._keyword_lists = [

+-            WordList(Keywords.css_keywords),

+-            WordList(Keywords.css_keywords_2),

++            WordList(Keywords.css_keywords), # keywords

++            WordList(Keywords.css_keywords_2), # pseudoClasses

++            WordList(), # keywords2

+                                ]

+             

+ class CSSHandler(DispatchHandler):

+
+=== modified file 'PySilverCity/SilverCity/Python.py'
+--- PySilverCity/SilverCity/Python.py	
++++ PySilverCity/SilverCity/Python.py	
+@@ -11,7 +11,8 @@
+         self._properties = properties

+         self._lexer = find_lexer_module_by_id(SCLEX_PYTHON)

+         self._keyword_lists = [

+-            WordList(Keywords.python_keywords)

++            WordList(Keywords.python_keywords),

++            WordList(),

+                             ]

+ 

+ class PythonHandler(DispatchHandler):

+
+=== modified file 'PySilverCity/SilverCity/SQL.py'
+--- PySilverCity/SilverCity/SQL.py	
++++ PySilverCity/SilverCity/SQL.py	
+@@ -11,7 +11,14 @@
+         self._properties = properties

+         self._lexer = find_lexer_module_by_id(SCLEX_SQL)

+         self._keyword_lists = [

+-            WordList(Keywords.sql_keywords),

++            WordList(Keywords.sql_keywords), # keywords1

++            WordList(), # keywords2

++            WordList(), # kw_pldoc

++            WordList(), # kw_sqlplus

++            WordList(), # kw_user1

++            WordList(), # kw_user2

++            WordList(), # kw_user3

++            WordList(), # kw_user4

+                                ]

+             

+ class SQLHandler(DispatchHandler):

+
diff --git a/app-text/silvercity/files/digest-silvercity-0.9.6-r1 b/app-text/silvercity/files/digest-silvercity-0.9.6-r1
new file mode 100644
index 000000000000..fe3b88eb94c3
--- /dev/null
+++ b/app-text/silvercity/files/digest-silvercity-0.9.6-r1
@@ -0,0 +1 @@
+MD5 65f2fba68f25997d46e234e1d40af304 SilverCity-0.9.6.tar.gz 267620
diff --git a/app-text/silvercity/silvercity-0.9.6-r1.ebuild b/app-text/silvercity/silvercity-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..8d1cfd43de20
--- /dev/null
+++ b/app-text/silvercity/silvercity-0.9.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/silvercity-0.9.6-r1.ebuild,v 1.1 2006/02/07 00:13:04 dju Exp $
+
+inherit distutils eutils python
+
+DESCRIPTION="A lexical analyser for many languages."
+HOMEPAGE="http://silvercity.sourceforge.net/"
+
+MY_P=${P/silvercity/SilverCity}
+SRC_URI="mirror://sourceforge/silvercity/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.3"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-api-fix.patch
+}
+
+src_install() {
+	distutils_src_install
+
+	# fix permissions
+	python_version
+	chmod 644 ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/SilverCity/default.css
+
+	# fix CR/LF issue
+	find ${D}/usr/bin -iname "*.py" -exec sed -e 's/\r$//' -i \{\} \;
+
+	# fix path
+	dosed -i 's|#!/usr/home/sweetapp/bin/python|#!/usr/bin/env python|' \
+		/usr/bin/cgi-styler-form.py || die "dosed failed"
+}