Fix missing deps, misleading comments (see bug #549304).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 34 insertions, 17 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 1f5536ddfe66..53cc7c27ec9c 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.298 2015/03/28 09:38:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.299 2015/05/19 14:10:09 tetromino Exp $
+
+  19 May 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-terminal-3.14.2-r2.ebuild, gnome-terminal-3.14.3.ebuild:
+  Fix missing deps, misleading comments (see bug #549304).
 
 *gnome-terminal-3.14.3 (28 Mar 2015)
 
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 1b9e61ae9d58..a8c7503675da 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -5,14 +5,26 @@ AUX gnome-terminal-3.14.2-fix-crash.patch 832 SHA256 19dbb2ac1cd5ce46106570678cd
 AUX gnome-terminal-3.14.2-title-option.patch 6329 SHA256 0ea6adbf45632b42942f15f58666414ff65c9e9fc85a0293b6cba9d4909c2fd4 SHA512 cbc641c6c3e822e29db2d5b18f979d942f59de279e2453c800ee043eedbc68f4682ca6d53428a2394ef650ac654e5077641fa19b68cd841fb3c68d273198b3f2 WHIRLPOOL e4a415a1d4b0d26f6804f1410952eb55e064bc38981c716b8f55ef54e13890ebfad6501f2fe4a163b0654d02b5d56045267c5093569ea2a3aa6d8d86bb1e321a
 DIST gnome-terminal-3.14.2.tar.xz 1784996 SHA256 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b SHA512 43a81d9f4ff43dd4ffcd023755f765a20ec2d2f922d58bee230386d97d38712dbb8b41d7da62143689fb9ed0d0e5500e849de743ec033494231a804e02969cd9 WHIRLPOOL 1ce5eafb8bd8baa2658413aa9acfcef96bbd2f587052233573d3e540d9389c348d9e94d976be5cffa8c739dd915a4359576bc5cfb2d687db21e362f53794ec6f
 DIST gnome-terminal-3.14.3.tar.xz 1781712 SHA256 db9b7bb8b24f657ea00bdfa0e1de1792a6a3fb0369edbf66496924d63cc37fd3 SHA512 21e1292391d77a658b01be12ca7f2f5a8f2f504ef9c57c587dc699e455fc4e052e65c90111ffd7ceb8c23422b60d75a0dffca699e57a2af245277e25f38f0655 WHIRLPOOL db3870d34d5bffce3493af3c1eff479633553b570d9c462bbe7ed4a5bb2305011b45a912331d5d9649d68918a6c9fd80c11bd5d9fb8599a66437a5fd2105089c
-EBUILD gnome-terminal-3.14.2-r2.ebuild 2125 SHA256 6242661225969784287fcda608b456b0404708665cb430c9bcacec9ea20b6354 SHA512 ae2c8587d32d282cd4be23baac1879ba7e6e7c7e40dae1719b2074f6d6341c52644817ea479e0fef8df67743d9216afd172c056d3910b5f35f06177a650ca9b1 WHIRLPOOL 8927dc1df5147b796ab5177cac1341772f9af370e1f7052f9d9279cdbc5ec0f1f17e43c85a3ce893f4b0764419dfdb4b94efd791857f734582a0749043cf5a8c
-EBUILD gnome-terminal-3.14.3.ebuild 1834 SHA256 0957d92281279c560894811b3e47d75c4d09ff689c690dbb4081213d40df915c SHA512 10c072cc121b8f444f9948d32a49ffe55cf450d79c4f91e86351463ebde4888c64162bc8ea05077cd389d21e34b3c4979beabda5d7fb774a89e7646a54010d1a WHIRLPOOL cabff97ff3fb303d462264b6c167b7316326c71409935a78fa3fbb53e1c12ca4416280af96d157e732f616e009c8e683f8179b4cc6599ac3029874aea1863823
-MISC ChangeLog 44711 SHA256 be6bb1fcca8cb263a0bab87abf0078b261b81d861a2fcdb1a1951bec7811511a SHA512 9670e1d789256524ebeb1b402d3c9227c48934b27d93c8d4d637dfec234fd79fae2096b3e3fc3296d311433510d83261c6f23ac4b7c0f8051d6fdbc24127b1f5 WHIRLPOOL 9e2185ef4818a53e0d08fd4993d7148492b3cfa5dce5d0c0f3228f4e53a961c6205bee63277b4441b0bd669713b3ef2bc005b917f3fe1e89212f1488503579fc
+EBUILD gnome-terminal-3.14.2-r2.ebuild 2202 SHA256 d06270a4382ea5eb97a85556cc62be4b3f299bddcf7ded0566850a030842f44e SHA512 073804969cf4169a6deaad6c23d8955d75c46eb557aed049d940908f25fd483ce521639c63ff8ae50c2cd120aa18d353463fe2ea3a80bd3efdf0a551c74643cf WHIRLPOOL 7c353416d3f3f804679bc16f9bb16f42d69914531699ff537e00ae9bd1a77b2861b5a27c73f0de06194049cc5f3c90cf2a463c61ec8f4e09206d40b61c44564d
+EBUILD gnome-terminal-3.14.3.ebuild 1859 SHA256 9cc8c3202cf5644af0f8bcd4612093c2a546491088ff8eff9466da0f2186edf0 SHA512 969e6763f912a6c2ff42b24b1caf2437ce1586c2556532852406b3d33401aa6837b155f3b90ef06869592f182d442b3b8159b60d2819b3d72e78b9001f15c77a WHIRLPOOL e9b0f23b656f8926578ddacca73fcc05031a5ec3cce8c2fb0e0aeb89f334644ad84b3bc8a36ffb886a3530bb6a01ad37f2c45a60007768cc0707725e743889e0
+MISC ChangeLog 44899 SHA256 bac31717c8275c7431ff656876be5957832ae3981413c3d291dcb46dd5bd00b9 SHA512 63b0eae8e00f2cb1d6aac849cdb5378835f9d5bc19aab5f984a10e12d42afb3f706d38399f2ba024d90c32dbc2d0ff70d541efc8dfe28d008b814f50a621979a WHIRLPOOL 1e9f85c09cd99cddb5aa6307793e5e412f772aec240118dc57be93203db4e78fe41b485db1fe199cc952b96302692bb1c8880a7cc4bfe99ad0d1cb55219cca42
 MISC metadata.xml 326 SHA256 181cdd492d55b5179008e3a36c4b3bc0cdd8ab896e0e54bbbf9e98d7a3362da3 SHA512 f66ce7d9b1e6282bb6922c92c6f09ee343961ad5ce9d52db46c587f5b2c66088797529264b13ff5d6a5fdc7f30e9989ac37101e6b881fef085f571c9b249fc0b WHIRLPOOL b0324d62b86672f0f785279e02f10207fd254b17b71b927a6c86ef1b31ecf9c0fb4144dc45c541dc5e70600164674c52b14bcd09536bb7294cd7b896382081e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUWdo0ACgkQCaWpQKGI+9RNIwCfbCF6USclqJYW6fEGGdtP6/Gp
-+OAAnjhXf4rMUNE0CiSqs7gggTXDD5JI
-=8g9s
+iQJ8BAEBCABmBQJVW0RCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNDIkQAKTINyQZ3FkRP4wsrndbZB05
+j8huLREMii852OycUMsKqgAP3MqrGe97jx3t1OVduJlTYG51eF0IbJtfnrRWGotS
+HSwooou7j730WA5JQFP/hNYNVZf/TZ1cRgryV9y7B7IWqWg8gbwAZjhqTfDw+DcU
+rQ8YXf217GMPwkQjUSCjqQpo/DrtacARs5WHW1I8YMW6TpMcHONMX5OjG/a+pcrN
+kpajk6ln7c/nCZlHHe1z/VpZaXZpMVruj125jUJufB/hEfCuArn1Qq0kRe2VCHUr
+mreQUtFH0vW3ZDTwiEIJH1xmz+ss9ytCVDco1XzgvZg2M/Q68AWYMPP/Cvb08P/Y
+pYMxQRSbM+ZiL8/T9P33v2pUVdY6tFnABd7en+g15prhNWkx6oBWYLwK73ezlwq6
+3Lh4vuMnAS89dWbDcrR/onu154T6z8cNXuEGdyYqhi9LGpALaea8eRcqlQ5rZxyA
+xtFwTP/CCZkG77OBP/eBN7f/XZGpTofMir78S04TlWraZczrTkGOkMvRmKSyLonk
+SJ2arEC1dXALyhgmqztAjm08LY6kKK7reNuf8e1wYANJOEQEPdjDMnJx00Rq2YIh
+MtGtukEoZCHsuwfGL4lcY/XLhscHguAw8HQoSDRF9H9vMdkKmGuf61t2w/3mWz0s
+CyVVqfwqSNyXZcGAyHRn
+=CgUo
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
index f90bb0008730..d4def482f4b7 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild,v 1.3 2015/03/15 13:34:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild,v 1.4 2015/05/19 14:10:09 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -30,11 +30,15 @@ RDEPEND="
 	nautilus? ( >=gnome-base/nautilus-3 )
 "
 # gtk+:2 needed for gtk-builder-convert, bug 356239
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-libs/libxml2
 	dev-util/appdata-tools
 	dev-util/gdbus-codegen
 	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
+	dev-util/itstool
 	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -62,9 +66,6 @@ src_configure() {
 		$(use_enable gnome-shell search-provider) \
 		$(use_with nautilus nautilus-extension) \
 		VALAC=$(type -P true)
-		# Docs are broken in this release.
-		#ITSTOOL=$(type -P true) \
-		#XMLLINT=$(type -P true)
 }
 
 src_install() {
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
index f36a8e691663..a4c91904e5a4 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild,v 1.1 2015/03/28 09:38:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild,v 1.2 2015/05/19 14:10:09 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -29,12 +29,15 @@ RDEPEND="
 	gnome-shell? ( gnome-base/gnome-shell )
 	nautilus? ( >=gnome-base/nautilus-3 )
 "
-# gtk+:2 needed for gtk-builder-convert, bug 356239
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-libs/libxml2
 	dev-util/appdata-tools
 	dev-util/gdbus-codegen
 	dev-util/gtk-builder-convert
+	dev-util/itstool
 	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -52,9 +55,6 @@ src_configure() {
 		$(use_enable gnome-shell search-provider) \
 		$(use_with nautilus nautilus-extension) \
 		VALAC=$(type -P true)
-		# Docs are broken in this release.
-		#ITSTOOL=$(type -P true) \
-		#XMLLINT=$(type -P true)
 }
 
 src_install() {