Update 3.4.2's intltool dep, thanks to Matt Turner. Update license. Drop useless doc USE flag, it only regenerated api documentation. Drop old.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

7 files changed, 44 insertions, 105 deletions

diff --git a/x11-libs/gtksourceview/ChangeLog b/x11-libs/gtksourceview/ChangeLog
index f515c65122a5..a22bc09e64d7 100644
--- a/x11-libs/gtksourceview/ChangeLog
+++ b/x11-libs/gtksourceview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtksourceview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.233 2012/10/14 23:29:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.234 2012/10/14 23:56:51 tetromino Exp $
+
+  14 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtksourceview-2.10.5-r1.ebuild, gtksourceview-2.10.5-r2.ebuild,
+  gtksourceview-3.2.3.ebuild, -gtksourceview-3.4.1.ebuild,
+  gtksourceview-3.4.2.ebuild:
+  Update 3.4.2's intltool dep, thanks to Matt Turner. Update license. Drop
+  useless doc USE flag, it only regenerated api documentation. Drop old.
 
   14 Oct 2012; Matt Turner <mattst88@gentoo.org> gtksourceview-3.4.2.ebuild:
   Stable on alpha, bug 427544.
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 08c5d56f4aeb..f7b889fe2b39 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -6,29 +6,21 @@ AUX gentoo.lang 2607 SHA256 3a51831952ae3661232de4ace1eae5182039d82a6d45c97ccbe9
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 SHA256 3462673c6856a8435dbe970d4fef3716f8743ad56ad0150ee08fa694c0380040 SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546 WHIRLPOOL 96c692461f379ca938c72ac5854ea0dffa14882b532702504b0970dbdd3dda18c794f2ba170bdd1601b8036a2f7e88e261b239933a90e3bb8f5a7169d26109dc
 DIST gtksourceview-2.10.5.tar.bz2 1253321 SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d WHIRLPOOL 4bd2589d4e06bb5e5c4dc8c55af25c52fd2c2c318a1240d7a430c8cb442cc785b7048f0116d9df714f93c6c1cb87628459239a80ae317d8eb73d27e4c021281a
 DIST gtksourceview-3.2.3.tar.xz 1215836 SHA256 73d9c6702ccecd06846132cfb50191092cb50a4bcb3ff810a5605868f0855947 SHA512 f90128affc63a34ee7c51ec8324f5a16d1cc53c18467aaada661413a85af0ee4606b46c38736ea7e12d32f19ac0f42054b50adbeed5a0fd559b6af701acba233 WHIRLPOOL a50b5a1db98aa8edba44918f9f865930c2796a73d76dea38f24209ee26e55384edb470cc96c3fbbae701ba6925e55a7a0d2ae698ec0971ca10d686544d908944
-DIST gtksourceview-3.4.1.tar.xz 1210332 SHA256 8387b33c61efffcafed99ae896aed224a1ea8b3af45677c5d57e0d1842f6ffc1 SHA512 97a0d8740b3d890ace243d28adf809b6d56fc5fd8f666ae47c37930d44066768ad23cd65efb1024a51a755d75408ebeec1806746615a70a1a3ce8b75297a0cb3 WHIRLPOOL fbf47fd8aa4a3f93041898fc4efda4864fb6bfa930e15a0ca44aac6fb19f7b0ce683acae3fdd577e52ae9cbf0bdc089ae2da244ab9c580da1e35db651690c402
 DIST gtksourceview-3.4.2.tar.xz 1213360 SHA256 5a5712591b2b6487818ac4aadd965fc8397af23d8fd7c5bdd1460c6326a8f4ce SHA512 e8339ba8de3ab84d77f940faa12c65277de0a4e4384263a7e9ec8708fbddcbf47a9031c3307ee36a3c9495f2e26a33f8cf43dfd51ce4f68267166371be8c3232 WHIRLPOOL f1ffe06457a4f85f632860223c3e61cb1e4948b25cead699918044e52d5e9389db3aa664e612de7c5895c8325bcc05729eb159b740a9658c05fd395151d6afd6
-EBUILD gtksourceview-2.10.5-r1.ebuild 1768 SHA256 36d007071ebc80169a36042b4bdc52845482cb1bebafa6e34c5e3b2f973031f2 SHA512 61c04210a4b97625de88608675d5ca8ce360f0dc996327991e3808be42dbea16044c9fce263d0f2619f1bae854050a2fe113cf0c59e814503b30a42bda61f124 WHIRLPOOL 1335a8c1b0921bf8b737ad4a0e46c685ba170d13aace913969709577d7d3fc441c9642013531d812a9a086154b713e4867c813ed4b83c330c1361c52b0e6f2e3
-EBUILD gtksourceview-2.10.5-r2.ebuild 1870 SHA256 80bbc691041cee7d8efc15f02b1667dcbaafd23f4ff9381c6f7964fc9459a921 SHA512 b942d0d06cc5bf4979a34ec6045a7f4964949b0d944646cc9ddf6172abebf9e7de58c389ea55fed6a8a586ad24c40b14c4c319355de9a9facf3ea6c1701dda62 WHIRLPOOL d0c20012b9eaa1fe47102585039761d4665830948daf75e6f7540b7dd9aa80ff6da7ebc0194aa93d1f4b09e8a75514ca832ef872749fe908395bc4ed5066e413
-EBUILD gtksourceview-3.2.3.ebuild 1578 SHA256 b690af6b444100bcc6cb7429ae5afd46515ce176db198af37a50c4648ae98fee SHA512 543002b9da57b9d5142d161c22705888ad007cf510b5e29638b3e142df0a8f2d51d66b545c4799a9601f775cbca143b2005c2487c39342af91655e9291c0ed7d WHIRLPOOL df8f7b9454ffb9ebff42f65c4e7b2ad741ca1c457100583d840de84962d176793278505cdfcdbc9908517faa83d2d1d15a6c0ea0327b17857aac07e071808b2f
-EBUILD gtksourceview-3.4.1.ebuild 1656 SHA256 0798b6577a69ef5447c3d7b312ef122598ded5fb5149dcbee27ddc4d10657d30 SHA512 890d753e239f0a9cbcac7c89b905b52b202f27caf9db386afed02402296377b6aa6c4fa9077a87e3f8e175f102dc515aa4d72eed18d48e465dc5c3a366c4c026 WHIRLPOOL e1c5cdea33f01a2cddd6b377f357c3fbb4baaa45aedb6fe53c970a6e8c867f32c9f25849fca91cb10126966a1d628529df3f051098c2bf64e7440a38a5af0c7a
-EBUILD gtksourceview-3.4.2.ebuild 1649 SHA256 b512c8dd3991465e8fc31b762ab299095288a12a257ac6a165ab16195b757974 SHA512 7cf3274675b160bb8999a551674bb896ae63b71da0f00c6f57e9c45687b54fd0439334d5a639436465c9f5357584ed36db547445778e4b4b1380157f45886cba WHIRLPOOL e99f2fadb2e82fa33f37ad5b4018d3aba300261f2dd041cba94867c8900e81c4a33afefa86f5bd9f2297a6f3854625ef55e834074b5e8b73b7b33427505c98bf
-MISC ChangeLog 31772 SHA256 8971693a475e29e710595d2a9ad42b4f903bb378d1d96de6af0e6b52fc512b99 SHA512 8b10cf34ec430ab2f461df0ce55b2b464f89024b6b6e8360703a33d846f7476b8f69d23eaf11cd8f4f8ac31cc2b6c505724b488594ecdf55bf1b6652186276c6 WHIRLPOOL d2b519f20e5957efee1c4691178963bcafedfb8e24ec7c85dd58149b1716312364b11dba4c84a728606723f20076c9a2f7a61c868ca7f0d33a240bdbe7666bb1
+EBUILD gtksourceview-2.10.5-r1.ebuild 1765 SHA256 79cf1c58774c9b89dc82afa8157ce04fc3bbb98f80a9881304b8d254809ff5a7 SHA512 b071723b1915aac9f18a3fa90682aa098e1edfddaafdc976b26a905f5b5cd730d17b8a42a5b6c892881d427d5a7a29357186d50e553fa3c2947e25bfb1aa8633 WHIRLPOOL a6837d2ec6913db6ab05811d5115183cf0f409ba8a894daa9819b619ae1d7254ebb1e5f2342aa873177424cfe93eea1c7bdee48e38f45c9b6d1dffe3dabde9f7
+EBUILD gtksourceview-2.10.5-r2.ebuild 1867 SHA256 4d2893a823261005ef47b1217c7adf72b7fa04adc1afe8a090a55d0fd8a67d94 SHA512 e62cf4c36994f2d2a645ecaf439695aa3f5c678bfc5b4015696742683241da8ae18076a00351d9e45311e04ff87ed9692113b2b8bdf946fa08828d2641f69ab0 WHIRLPOOL c97036c8f603ba1b86060f1f5c3e9145672417d2368cff87000298c56449c6539c84c97f23bd8a1157a36e655f2c6fd5c878aa7d08cbd48b625d0a217bc42ab8
+EBUILD gtksourceview-3.2.3.ebuild 1575 SHA256 a488547d82e7a8daf3b3e0b883385d465c55681050a56b8d27bb567dd3198f34 SHA512 8f8946cb61ac366a5e4242b08ba2900dff9eae8ecfed963fda7594942787d4deb5d4e415046ab0e30f75bedb2124c557aa773e22323ec87e83384fc22bf3201c WHIRLPOOL 02ae03f7f5e4c6b07fcb863dc10c9af83fe1ede1e0fdeed7c510d427797c227faeecf225d6ca54f0ce1b4c2c80c7827fb5e84702ba79d6558429ab770819f670
+EBUILD gtksourceview-3.4.2.ebuild 1644 SHA256 9d71c116cdabd135c3719e4dad060010b9773e9154a4f6b8d64f1f30b172794a SHA512 1980d8e57dd9e665b3640ff03fadc7b482b696cdcf7b2b25f919384ff4e3a36b89862b2b5fb13dde705f7c08f79c4e7eea8fa038e75c1db4683babdff2746d3d WHIRLPOOL 5887e738392b4b5e0fcbedbad20b2e7ef62f162dd37456efa2403d6c8fc2d2b468864721c9c66a7e8249b5935a54cf3c699ca39c905a155f7869697ee61eb3b2
+MISC ChangeLog 32136 SHA256 e6516cc585e0e474347a0e45e123177fb7396538dc50e20f6eb85f14df492e70 SHA512 bd2d28ea284378dfd11ae0ccd83fe92a77a454d95652b8877df59a15b14bad7302e99a5b4f181cdd50290a97c89aa5494021129a344a3fbb5649f493eecf71da WHIRLPOOL 29adcd808001b740a6ca69eb3de5f7e057de4c6115ea8737598bf3a6975c904728fae48a5a663ec825d5334dbaa6621cec85069db2a5942aafa49df31a7402df
 MISC metadata.xml 331 SHA256 579046b73f8ef7347b584cd716724289934c347aa1498fd47c3dba227623c279 SHA512 d165bf5f28510025f7c35ee37d50360cce15e8eb4801b2c93fa979f32de501e6ff437bf375ef25e8a1bf0f34a9dd4e013256e707b995380365f93ede7add8a19 WHIRLPOOL 2a0fc9c51debcca7326867bec8339c18fd383253ad88ec8dfff0754c47b545a094906cbdf57842188328c7b7bede2548426a0066975462ef1aa300672eba2e62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQe0rYAAoJEA/daC2XTKcqOBQP/3CXcDccVQwct/WlPZouecZJ
-Fp+z9bai54LfLtPsOpGUud9pf2UBH1zK6c1tFBLnUfrSIm4khOqG9KUBaKf2/S+5
-FGerRwzct+M0hqflzhGqHdtgZXQaM8CNPuyv4ANkOkDG0YCSYOOS+/0f0f2pxGZo
-JSB58lF5sxBTdqlfj+txFdFaeBbNOVVdAJgwz/fdUKVaa2GoUaYnHjlaLOr06m2P
-D0CaasNIclwucAFDXb6CHRN4+pzCNfz7Ihd9ljHj7g85k2thfXqOvU2n1lKLCsuW
-j40eyWfvKm13cnXSiEZRTzcXzJbsT5T4ROIR7mQaI+7ZzI/AxEm1HdfOhb381J6F
-FT9jiT1u3C11aSAFJm60g7hP17tFw1QxZVBw0a2aRyzLJr8KbQHvr454NFTvT/C2
-MazUUkSur1NOaVzWnaQzgf3Yu/2Sta3ioGSTi7C5ha5TLzRwI61sGr5JvtGjR/q4
-CH9LiFDVgWYggfMntRnwyew8STnvunYfdvFP+8Lk5AqNsuzZ9Y1BunhzRPF/LUZZ
-d/rOHIr/qKu9RnrxWD641NYwWiljFSDuE1Lbtfr9bSNvybzt1HsyNmrvO2Vq5FFf
-WSOUzcvg3bOBUnAhIQCGPWAUNk5qVsO67D7u3PhvkfCu2cJ1h9AXqDVxTYB3Iksh
-IY/VGfm/ViMzy2+alL1G
-=oS+q
+iQEcBAEBCAAGBQJQe1FEAAoJEJ0WA1zPCt1hr4gH/2iSZoXwHgLnPR5ABB/Aj5PM
+ZzmVVpcc171JZ89f4fqSn9DXIsuhBz+Zv0oTrPmo8JKK5yaDbjH92IBkaPnxLLY8
+EzT0fR9g8RFejZpoECxUxZp2LP/YCWg2l9K/nYCECV9hA5L6NnJJ1KpJjM+iMIHs
+2Kr9nHRkro+wyFrDgzqpIAHySaPtnSgsb8tBrt+SfyjGrxNnI3lFpOO1LmuPywSn
+6b6kSTMVTP2Kxmg20xMmzll8AUu7yurdD0UuiJcTOEP0jXuExmZuOMlTjFcMAOwl
+RiWSQaeI09t1yzLbZMNemr5syb5XHpyrD7nF4ZAVR+8RVONvMpYuj6scJk/N4kI=
+=vynU
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
index 65af8539a09e..b7cbd089f1f5 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild,v 1.11 2012/05/05 03:52:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild,v 1.12 2012/10/14 23:56:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,10 +12,10 @@ inherit gnome2 virtualx
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc glade"
+IUSE="glade"
 
 # FIXME: We could avoid the glade conditional and dep completely if upstream
 # would have a --with-glade-catalogdir that would allow to pass the system
@@ -26,10 +26,10 @@ RDEPEND=">=x11-libs/gtk+-2.12:2
 	glade? ( >=dev-util/glade-3.2:3 )
 	kernel_Darwin? ( x11-libs/ige-mac-integration )"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
index 5d4d72ab346d..7d38c1e97a0b 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild,v 1.9 2012/07/15 18:59:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild,v 1.10 2012/10/14 23:56:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,10 +12,10 @@ inherit eutils gnome2 virtualx
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc glade"
+IUSE="glade"
 
 # FIXME: We could avoid the glade conditional and dep completely if upstream
 # would have a --with-glade-catalogdir that would allow to pass the system
@@ -26,10 +26,10 @@ RDEPEND=">=x11-libs/gtk+-2.12:2
 	glade? ( >=dev-util/glade-3.2:3 )
 	kernel_Darwin? ( x11-libs/ige-mac-integration )"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild b/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild
index 792b494dba85..f4acd5038d99 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild,v 1.9 2012/07/15 18:59:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.2.3.ebuild,v 1.10 2012/10/14 23:56:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,9 +11,9 @@ inherit gnome2 virtualx
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="http://projects.gnome.org/gtksourceview/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0"
-IUSE="doc glade +introspection"
+IUSE="glade +introspection"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
@@ -22,10 +22,10 @@ RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
 	glade? ( >=dev-util/glade-3.9:3.10 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/x11-libs/gtksourceview/gtksourceview-3.4.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.4.1.ebuild
deleted file mode 100644
index 266b1d5508a2..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-3.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.4.1.ebuild,v 1.4 2012/05/15 23:27:13 aballier Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="http://projects.gnome.org/gtksourceview/"
-
-LICENSE="GPL-2"
-SLOT="3.0"
-IUSE="doc glade +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-# Note: has native OSX support, prefix teams, attack!
-RDEPEND=">=x11-libs/gtk+-3.3.8:3[introspection?]
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/glib-2.28:2
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-deprecations
-		--enable-providers
-		$(use_enable glade glade-catalog)
-		$(use_enable introspection)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	sed -i -e 's:--warn-all::' gtksourceview/Makefile.in || die
-
-	# Skip broken test until upstream bug #621383 is solved
-	sed -e "/guess-language/d" \
-		-e "/get-language/d" \
-		-i tests/test-languagemanager.c || die
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/${PN}-3.0/language-specs
-	doins "${FILESDIR}"/2.0/gentoo.lang
-}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild
index 4d806c7501ab..c5cb9dd50193 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild,v 1.6 2012/10/14 23:29:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-3.4.2.ebuild,v 1.7 2012/10/14 23:56:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,9 +11,9 @@ inherit gnome2 virtualx
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="http://projects.gnome.org/gtksourceview/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0"
-IUSE="doc glade +introspection"
+IUSE="glade +introspection"
 KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 # Note: has native OSX support, prefix teams, attack!
@@ -23,10 +23,10 @@ RDEPEND=">=x11-libs/gtk+-3.4:3[introspection?]
 	glade? ( >=dev-util/glade-3.9:3.10 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"