fix syntax highlighting wrt #460710

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 87 insertions, 16 deletions

diff --git a/dev-util/ninja-ide/ChangeLog b/dev-util/ninja-ide/ChangeLog
index 611533a5f5af..c649bde91eda 100644
--- a/dev-util/ninja-ide/ChangeLog
+++ b/dev-util/ninja-ide/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/ninja-ide
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja-ide/ChangeLog,v 1.8 2013/01/22 19:24:19 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja-ide/ChangeLog,v 1.9 2013/03/12 18:35:41 hasufell Exp $
+
+*ninja-ide-2.1.1-r4 (12 Mar 2013)
+
+  12 Mar 2013; Julian Ospald <hasufell@gentoo.org> +ninja-ide-2.1.1-r4.ebuild,
+  +files/ninja-ide-2.1.1-syntaxhighlighting.patch:
+  fix syntax highlighting wrt #460710
 
 *ninja-ide-2.1.1-r3 (22 Jan 2013)
 
diff --git a/dev-util/ninja-ide/Manifest b/dev-util/ninja-ide/Manifest
index 06243128d4d1..3bfa987fd57b 100644
--- a/dev-util/ninja-ide/Manifest
+++ b/dev-util/ninja-ide/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ninja-ide-2.1.1-lang.patch 769 SHA256 0e35d5b10cb4d92633f8fa9ce46f08fd1a97c55abec5448d94729145f2e53b0e SHA512 d614061df4598878c6c9f802c0ca4b41b9ddb9b7cd6bb448030ba370dfcca4cb99b54a76d5c617298cdd8c35c05d7ac57927ba6b65409ce57676ee07c56e9f1c WHIRLPOOL a7cf5b1a7fd2fefe18b3e9440d8b2a14827daf5b1c7cbf0eee20a98feeb170f8316845ffd48548e8cfcfd6cf2cf1b5549890ce46621bcc25e42eb53ec9e3792c
+AUX ninja-ide-2.1.1-syntaxhighlighting.patch 1012 SHA256 0a13ee766e777a8fb42ba7445ece3d60a7b1f8b4076b5d33417572867df22719 SHA512 437884f1896244beb862581322185d0b897e923deb9be8a6e9314f4dcf3bf235ecceee3a2aa4e332310a3c47c0e2b6bb0ecf841baad08a5a95e4ca7aaf4de367 WHIRLPOOL 27d983dab3370325162bbbc0ce57c29cd1bdc04d2239ebd18ebcc79bf34c19aa23a588a216df187653db0e9a422280646fa1ec71e57123163650f9ebf529a0ef
 DIST ninja-ide-2.1.1.tar.gz 737456 SHA256 534a891dfdaa262fd6465d2d72672eb29e494401968ba31c483f9eab31f3d5a8 SHA512 4ecc9e09ce9e68fa3a883f326a59d6c5fc2c52e2b8e936da0d3c57974b76ce11d1c171bcbce29ab676818efedab10bf282d28e2d43eed4c00d1b9d1d1807e48c WHIRLPOOL 7b42097df4725b3747e6c774c1ff206dae0344f860ffea1ac8bc2212a2042cfb66b8f33a799c395ed58bbbd8348f5045e09720f549b0974b65ba80509980d1af
 EBUILD ninja-ide-2.1.1-r3.ebuild 1017 SHA256 8b3924c44298e6769334a6ae54fdd76a716cb5330279f297b083f1264c16ef41 SHA512 e759e7b7764a6cc1e7e19316aecfb025d32a688ab5a3576cefe80ef637c14173a66491833a99e8b6082f4fb9235417b2aea4c500f80212b8185928d6c735c8eb WHIRLPOOL e31365068e0609d1c81e71e8b6e94aebaf56901b76856bf7fe917ef675640921455b3bd2e3132bc984e911e259b436e1d8db8013eaf753c9f3e0bd00d8b20ec1
-MISC ChangeLog 1412 SHA256 fbb6ecc0921f0c4d8f9493fec1bf4cc49a80337826c9f8f67c742795697d2d74 SHA512 4c7537a11f2ef6c01651fcfc1485624bbd7c8cac481a52f440039616f30e61cf31e1583bfe2c0058dfdcd1514f57a263950158c34cd1483cc83903ae9cec49a8 WHIRLPOOL eeb00beb848fe3a8cc37d876d0685b90ec79edd286a465283a2dde8c6e09a7a5b2f649e7ec9acf7b74035813cb046b762d9f8aa5870dc72445adc2578114b1e3
+EBUILD ninja-ide-2.1.1-r4.ebuild 1064 SHA256 ce6471cd9624a693fed9012af45ace967871196dd90f150dbb442967d4167089 SHA512 c24d95f64d513ee7b0d02d03d352684edd6fd382f1cb64e44fec3da6b84e873f1e66717d006889d7e2c42cb09a8560217838baa2214a0219e63a1e187553244c WHIRLPOOL ea959d00e84f0c45d912358b1e8c37c8bb62a69047a59476581486e765237349a5535fc62c0b7ccd01dc73e7c1449cc4f3d271f71591884995f0885586485b60
+MISC ChangeLog 1616 SHA256 e2099c61987566dbcd7cb08ae481481f860cb2481d3f8ccd6bc0eccb36555610 SHA512 534719251fb11c61e9c7c10c947ba559a05fb2f3e8ccdea175c74c739d2d8dbef1f54c104c2c6e237f99dd028f3f81d391d91de641cd872f433012ea9af24ac8 WHIRLPOOL 78b702563fd096a26f8e161ad584c18806cd9eb0b4bb68a9c836b87ec4ff1f1bc8741c3fd9929db78cfc35663176e5ccde8547cb8c4a915453fab345b88e089b
 MISC metadata.xml 1156 SHA256 103b713789d642faa1575649d615c9c521064471b28d643265d3669b6b9cb6bc SHA512 15c020963f8ef3896813fc3a0d2d56feb0246f1d63be138ccc1ae6e491bf6ca383c771bc83e7afee8be51bedfd3ad1f68d2b9afeb9f2b145fe90b9331da2af11 WHIRLPOOL 081d20f84f5f4e0d6e79e9078dd70f7f7e93c2a56fece08fdc4faab0739ac90afb8106b51daea523127f768634a73a982107b1896231cb1a8e6ef8b48417cf93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQ/udlAAoJEFpvPKfnPDWzbcQH/2p/8HTfYBBsIJNgsNzccNec
-Sa2AlO5UpsN1mj0l7yuLuvyrCZDuVs/pg68XTXKQFsQQaCf5z6nWz2smVPVjFJVO
-OoB9MlUWwruflRDwH9TG5zID8uAWvh7dgcKZ1ar2gwNXaDFQPYd6WkD0/Thq46uf
-BOXXHINWJa4At6/BsqrIgSbDnZ+vTSXnnnThwTWZJgrIVdZfDxIH5V/meyS8ldUV
-XWcZL87UTbEx2AZB8aXUGLzIuJSQ58Sr13dFTa+CcE/LJHmBXhBn7wrGFJbRuavS
-qoRIm33JzbMComk8MZfStopS4008DBVIAjwhRXe9uZNXcLlzM9NlsTUpOE5d8R4=
-=RNV9
------END PGP SIGNATURE-----
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch b/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch
new file mode 100644
index 000000000000..cfeb8149d327
--- /dev/null
+++ b/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch
@@ -0,0 +1,27 @@
+From c722e86c4e497efac56de674c47d5e094ea4c5c5 Mon Sep 17 00:00:00 2001
+From: Diego Sarmentero <diego.sarmentero@ninja-ide.org>
+Date: Tue, 12 Mar 2013 14:04:56 -0300
+Subject: [PATCH] Fixed Issue #1106
+
+backported by hasufell@gentoo.org for 2.1.1
+
+--- ninja_ide/gui/editor/highlighter.py
++++ ninja_ide/gui/editor/highlighter.py
+@@ -276,7 +276,7 @@
+         hls = []
+         block = self.currentBlock()
+         user_data = block.userData()
+-        if user_data is None:
++        if user_data is None or not isinstance(user_data, SyntaxUserData):
+             user_data = SyntaxUserData(False)
+         user_data.clear_data()
+         block_number = block.blockNumber()
+@@ -321,7 +321,7 @@
+         hls = []
+         block = self.currentBlock()
+         user_data = block.userData()
+-        if user_data is None:
++        if user_data is None or not isinstance(user_data, SyntaxUserData):
+             user_data = SyntaxUserData(False)
+         user_data.clear_data()
+         block_number = block.blockNumber()
diff --git a/dev-util/ninja-ide/ninja-ide-2.1.1-r4.ebuild b/dev-util/ninja-ide/ninja-ide-2.1.1-r4.ebuild
new file mode 100644
index 000000000000..bd787907b768
--- /dev/null
+++ b/dev-util/ninja-ide/ninja-ide-2.1.1-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja-ide/ninja-ide-2.1.1-r4.ebuild,v 1.1 2013/03/12 18:35:41 hasufell Exp $
+
+# XXX: tests
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit eutils gnome2-utils distutils-r1 vcs-snapshot
+
+DESCRIPTION="Ninja-IDE Is Not Just Another IDE"
+HOMEPAGE="http://www.ninja-ide.org"
+SRC_URI="https://github.com/ninja-ide/ninja-ide/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/PyQt4[webkit]
+	dev-python/simplejson
+	dev-python/pyinotify
+	virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-lang.patch
+	"${FILESDIR}"/${P}-syntaxhighlighting.patch
+	)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 256 icon.png ${PN}.png
+	make_desktop_entry ${PN} "NINJA-IDE"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}