Bump to 2.2.0

* Misc bugfixes
* Updated translations
Package-Manager: portage-2.1.4.4

4 files changed, 19 insertions, 12 deletions

diff --git a/x11-libs/gtksourceview/ChangeLog b/x11-libs/gtksourceview/ChangeLog
index 41899d04dcee..a321c28a8718 100644
--- a/x11-libs/gtksourceview/ChangeLog
+++ b/x11-libs/gtksourceview/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtksourceview
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.127 2008/02/05 10:44:13 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.128 2008/03/10 19:55:21 dang Exp $
+
+*gtksourceview-2.2.0 (10 Mar 2008)
+
+  10 Mar 2008; Daniel Gryniewicz <dang@gentoo.org>
+  -gtksourceview-2.1.2.ebuild, +gtksourceview-2.2.0.ebuild:
+  Bump to 2.2.0
+  * Misc bugfixes
+  * Updated translations
 
 *gtksourceview-2.1.2 (05 Feb 2008)
 
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index efc2ed636a3e..58a6bec3ac4f 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,12 +1,12 @@
-AUX 2.0/gentoo.lang 3990 RMD160 8d180ec48bcd8efe3366c52746022a1c5ffedda5 SHA1 71a45150252fe9c0f0ed94455de39b983b82e799 SHA256 d07316aa088cac6f6d52630a293b5fbb510834d4a6c43f75742b72bc431a4eb1
+AUX 2.0/gentoo.lang 3961 RMD160 fcfc40b8508fb1735c3eb1d54ec146d9a61eb5e2 SHA1 b727837ca0ea1cc2539a364e97a410c931ac87f8 SHA256 483a34dd8f418b75b0b408d8cb0d0d4c50aa499c3f962652c93a78b248679183
 AUX gentoo.lang 2593 RMD160 c9ada6c01020af1e76dba1e66985ef14c23c82ad SHA1 6245622ae1a4229ffc32c8b4d987619e9fdbe4c5 SHA256 518bcc10cfb067b777b378ac55b5be6608114d8861183bbb8b6d64d3b47a0a59
 DIST gtksourceview-1.8.5.tar.bz2 785000 RMD160 978c59d5f99baeb5d8b9c3c14246ffc48ce150f8 SHA1 4e61b6cda043c44dc918edecd2bd9ccfc5438d2c SHA256 19c6575457fb99764f3e71197503e4c275bd03e35245afe1cf3b584e70bf0f8d
 DIST gtksourceview-2.0.1.tar.bz2 1017189 RMD160 ebe4b4704f34703a3333794df2444ad8e40ade89 SHA1 cab4a2fd722a740d947767a319f55ef076f7701f SHA256 818bd8c6559fd4f4dd5cba219b9ec88dfb3ca989f8ba82c8ddf06ee8fe25dfa6
 DIST gtksourceview-2.0.2.tar.bz2 1020145 RMD160 01cd574a70ec684217e5a95458b33aa3c8b31a6d SHA1 df728a822b55dc6c3370e011c8904a5be5c357a8 SHA256 bd775a331aec8fe682e123773a0609fd673256437c950ced8415ab56eb292e39
-DIST gtksourceview-2.1.2.tar.bz2 1087872 RMD160 ddb9a496fdd770e27ce0fc7b0be908e4de8d9f5c SHA1 5ba5d5eeb2e88da43aa9e0fc7229b09e1fd6247f SHA256 2f82076740d7d44a35d89021be5dea438dcfb16194e3f3b460cc68292db0a9d2
+DIST gtksourceview-2.2.0.tar.bz2 1127301 RMD160 0db43738279692250b6dcf5ba368a219f20c5636 SHA1 2f5c42268859d6cdac9a6c56a63b54d926a2aabe SHA256 05c53f6fe640a07c6f42f3c6fa5a0d6591b659764baaf3292430987f1a558857
 EBUILD gtksourceview-1.8.5-r1.ebuild 1012 RMD160 d5b55f5798b59d372f1ba11c5c8c84a906ce6536 SHA1 5aa5852c469bb51b9a9d4f4507ce7d84a16ae368 SHA256 59398b99b7c6e63b350d102a0aaa559d3f37cce383e5863584d236abce5a6705
 EBUILD gtksourceview-2.0.1-r1.ebuild 1002 RMD160 5d015838029b1683f744d224e8f96fb641985ab8 SHA1 088234e83f66b2e20fa24615916c1b0251e0bb80 SHA256 22a6c5deb027bd4a90bffefdf3753a425f4910d430db6657d2cdea294ea6390c
 EBUILD gtksourceview-2.0.2.ebuild 993 RMD160 265e873e4ce1cc8a768dac978c3917fd0fc7d1b9 SHA1 e7986abbdf9c71e74c0c0561d14bbf7d2e272028 SHA256 a78249a6f64fa334701a51c0fdbb551060bf7ec104ce69ce3e127ae404fe7cc8
-EBUILD gtksourceview-2.1.2.ebuild 997 RMD160 aad176ec4859e21ca1307a85bf57d6f4ff651212 SHA1 5e22ac03d04acfd1ce75c61a9a0d8b3f9b375220 SHA256 c8e317515746ded6e4db49acd35eb108e4c5fef537b5257fd4caa4ed36ea7426
-MISC ChangeLog 16095 RMD160 dfeaa92fc1c094ff35cf0e3f0ef42fa2d1011b6a SHA1 61620a9e171ee0641558cdc3847fe59013e55107 SHA256 bd7eb82869c8eefd90cb96f5bb0b9832f6025dcdc4e892317ab245dbdc1536af
+EBUILD gtksourceview-2.2.0.ebuild 998 RMD160 8989c798983bd6e628ab6c2ca91e43dcf3400182 SHA1 69f0f6d1a5086ab4babe52688e0643b6500e2433 SHA256 8a3257c291fb61fb8b41e69252c2e2a4c209b275597e158f36e758acac57d44b
+MISC ChangeLog 16302 RMD160 1ed56ab66847a5eb2ecf757e4d0286363c17f7da SHA1 6e1255bd86137c0d21ef1b23509912475666313a SHA256 e249941b5ed99743f9d3a0854daf01fc17143e477bd5dea75ca657b4a494cd20
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/x11-libs/gtksourceview/files/2.0/gentoo.lang b/x11-libs/gtksourceview/files/2.0/gentoo.lang
index 76ae66f25840..3aa3a332faa0 100644
--- a/x11-libs/gtksourceview/files/2.0/gentoo.lang
+++ b/x11-libs/gtksourceview/files/2.0/gentoo.lang
@@ -27,6 +27,7 @@
 		<style id="variable" _name="Portage variables" map-to="def:builtin" />
 		<style id="command" _name="Portage command" map-to="def:type" />
 		<style id="function" _name="Portage function" map-to="def:function" />
+		<style id="string" _name="String" map-to="def:string" />
 	</styles>
 
 	<definitions>
@@ -38,7 +39,7 @@
 			<include>
 				<context ref="def:escape"/>
 				<context ref="def:line-continue"/>
-				<context ref="sh:variable1"/>
+				<context ref="sh:variable"/>
 			</include>
 		</context>
 
@@ -48,7 +49,7 @@
 			<include>
 				<context ref="def:escape"/>
 				<context ref="def:line-continue"/>
-				<context ref="sh:variable1"/>
+				<context ref="sh:variable"/>
 			</include>
 		</context>
 
@@ -99,10 +100,8 @@
 		</context>
 
 		<!-- gentoo is just a shell with the replacements -->
-		<replace id="sh:string" ref="string" />
-		<replace id="sh:string-2" ref="string-2" />
 		<replace id="sh:built-in-command" ref="built-in-command" />
-		<replace id="sh:backtick-string" ref="subprogram-2" />
+		<replace id="sh:backtick-subshell" ref="subprogram-2" />
 		<context id="gentoo">
 			<include>
 				<context ref="subprogram"/>
diff --git a/x11-libs/gtksourceview/gtksourceview-2.1.2.ebuild b/x11-libs/gtksourceview/gtksourceview-2.2.0.ebuild
index d324cea4df33..331f6402fe6b 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.1.2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.1.2.ebuild,v 1.1 2008/02/05 10:44:13 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.2.0.ebuild,v 1.1 2008/03/10 19:55:21 dang Exp $
 
 inherit gnome2 eutils
 
@@ -12,7 +12,7 @@ SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND=">=x11-libs/gtk+-2.8
+RDEPEND=">=x11-libs/gtk+-2.12
 	>=dev-libs/libxml2-2.5
 	>=dev-libs/glib-2
 	>=dev-libs/libpcre-7.4"