fix nls dependency wrt #512280, restrict tests wrt #512280

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 28 insertions, 22 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index 91c19a26a554..53c8d2a78161 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/hexchat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.100 2014/06/02 18:09:33 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.101 2014/06/03 12:19:02 hasufell Exp $
+
+  03 Jun 2014; Julian Ospald <hasufell@gentoo.org> hexchat-2.10.0.ebuild,
+  hexchat-9999.ebuild:
+  fix nls dependency wrt #512280, restrict tests wrt #512280
 
   02 Jun 2014; Julian Ospald <hasufell@gentoo.org> hexchat-2.10.0.ebuild,
   hexchat-9999.ebuild:
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 7c6a51baac6f..65697d729523 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -13,30 +13,30 @@ AUX hexchat-2.9.6.1-xdcc.patch 648 SHA256 2575e0eaac7dd71ec88fcbe2c54688dd1be89f
 DIST hexchat-2.10.0.tar.xz 1607360 SHA256 a0247f1e12379154d0719d9c6861dc22817b588562653bb9d3626863d8eca916 SHA512 1fb15b5ee05c1048c8143b673775d7fa36c1a3a1f5b0895cd4cbe88c98707875eb2cdbbc12a6b7913532b54e4934734fc23c10b0b02d41ff7d41ffd967ea4936 WHIRLPOOL f9a4f382d552875f7f609490dd5673f0a303cb9283a662e2b6fc0f145107e901e2d6cf446fc09a46f53196b9f9b0c66fd1269078d8eb1b3d5881a77070eff751
 DIST hexchat-2.9.5.tar.xz 1309112 SHA256 11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d SHA512 67eee124b6d0b690d3a43b921826af11730f995de5a697bbcac0d9dca13d44df6e33f3f2273ff1f7f86cc7dca34c091e70c4c481de49a83688522648e3252b9e WHIRLPOOL 8c3a402e030466aa79974c38901e2030cd2dc6fba6bff1eb18ecdd614541c43aaf6187e3d99cd931b3d334e671ebbdb9ce36d763a2fb1a23f60f53ac0cc54dab
 DIST hexchat-2.9.6.1.tar.xz 1768392 SHA256 6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470 SHA512 73a7c2818b9d59a62c2471b9010cd04a6a5ac85b22d5158fdc27831d8700f09eb3011aac341866b76d7a4efe483f59de9c7b6d9a983916ccfbf8e61db81ea195 WHIRLPOOL 900995d8add17ce93da6ec284992a5ddf7dbc086d59ca307e362e485a8b00a6f57bdec43ee4a44c7733539ae9146ffd4b7cb51a75e3076e76c4440755d2c01a9
-EBUILD hexchat-2.10.0.ebuild 4501 SHA256 be4c7e1485b4764383f6088b9cd47870401d40dc19cd8319a96dc99c854a2e09 SHA512 b39344d6529e1de5991161d658a639f5d5dc81f8841194fafc5e572af76fde540357fdffdc82cdfaebc682e08f7c08c32f9464dac7198e1303ee0fb173520413 WHIRLPOOL 000695b3b0295e5c8dc03246efd6255ba4d528e25cf8514292c851dfa72ad01e5ccb3340523b607a802ae07a19908c068125482a57d3eb07ff290ebd1a81e1f5
+EBUILD hexchat-2.10.0.ebuild 4517 SHA256 8d707ab19a8fcc3fe3a91a0426bb524d14b7753a119fadc5869c59e9748a5763 SHA512 f6a97000b245fea82c91fa0418e103e55ceba18e1bc912fa6afb5516c3caf423152fb7de46f2358e85a70f9352da5317aeb7f39689bc1c05650f6685e7b38d2e WHIRLPOOL 4873dc2eacc3cdc09899de8cf6f44c845ff4a2e201d923988fb25fa01fd32c557e294375665c4570e2740ccc62574bc03779c96e994dcd9f1870888c6ec95d0c
 EBUILD hexchat-2.9.5-r1.ebuild 4054 SHA256 4040f7e7a6f5c41d8a4168d398ec99d9f85887fa532c919fec0d827087fe1d46 SHA512 8cae41d239571b3070d91bb1a08f2a308a05effda8eb8e2369cbb35b3ca144eeca79c352243129376780c77346deaf03077d38cb3066e48a566ed73abc0c01d0 WHIRLPOOL 299edd135a4c419a864b86a16d78c184a91685f01ccd3a46521b52052436ca3b022cd1230179323cc0bea357fdb325b0ff75a8902e6876888fca54612a783b13
 EBUILD hexchat-2.9.6.1-r1.ebuild 4667 SHA256 be4ee3547ff5e9e89057bd66517f8000d6a15d829d1f70c43240fff54035266f SHA512 b2c9df530c08e77db988e237f877cf71325e96b686e59af150c135a445510f96e51375537c9bf4ffc54278972f43fd0dab34aeba9b49290637f59eb15f465697 WHIRLPOOL c1bb6b230d24d77327b4403c7578389ff66c05ff9fa6b5694e376f207ba53b264678409b4b16e2cae85e3b3bc7a039cd56e13419575ed1398f6856d5f05eebc5
 EBUILD hexchat-2.9.6.1-r2.ebuild 4663 SHA256 f1ee79c491f94d1771927d015e51433f61a7a27a77b5a45e6b6078427f422e10 SHA512 7bd8b6ca1145d69091ee861cb6beb528c810d8b500504cf627f63d447ee15b1cc4ee10b6d96caab4fc575b4701c7a5b21e18ac16ea7c6c9ea18b4c09fc57079f WHIRLPOOL d4f28ea82290a0e0d7c96f5a1277444ffb138d7d46f645cccdeae81882a0887762b76ea770cb743814c33c18247688f18f15a0d0d402c88e4bf255fa89d5269d
 EBUILD hexchat-2.9.6.1.ebuild 4628 SHA256 8259557004b4d2a7c3ef8f43c52de998e0921b2d1687f83ba179dc475b2e09a6 SHA512 d9e921f6c4abe9db0b38a606ef7eb6347d3a0fadde60456bf42b08d0aeb299d9ede8b428823bd93f6eb553aabedf99b139ab9eb27720d66b76edbfab87101fad WHIRLPOOL f311c79970c5b3605d3d31253bcbda7c5a50917d0c23c710cea78e991ab28208fe46c32ed80409f290be2c37cf2a74eecfd3e48676fb97c36fd77dd9fa2b40f0
-EBUILD hexchat-9999.ebuild 4885 SHA256 1ff1b82e383b54bb160c2381fa6558b92acd6ed04a31a19c7f7e877abbaa954a SHA512 f2a728b1d9cafd2ae7639ab29434f35042a75a2995a7680b453f2b1cfecd1c36a78429158ec9cc573e6205928f294726f873df437f2693ae2dce995f1871d8ca WHIRLPOOL c25eef3409f36b0e9d8e4ab612b3a8d022faa71c265128b92ae8c1a22802eea15b8e9dc5ebaf3beb3c489005f609a921685164c581536b1bc3ee4e9621901764
-MISC ChangeLog 13320 SHA256 fe2b8663d4671dc1b4a4e308d9128aba57f3a434d2c44d2261a8829d2514957a SHA512 309069b4836474b83999c20f780de58af5ca5c8f82c56e4fdc3d20ee8203c5ea87d2ef57f5d028e88f2011653a11d955cb9a2c21ca58df328e041507b06a2bc4 WHIRLPOOL 93cfdbe071ba7d627fb340f58ddae94049acd39f96eb2727900d5f12d4cc9089bdb46c4f89a708a66998770378d02737869fc216a7137bed2ee508cdd939fa24
+EBUILD hexchat-9999.ebuild 4901 SHA256 4b89eb0e523beaa6c21d4c26593d9719c70a3064302bf23fbf791d77ea78ace9 SHA512 52e7e9c3c4182c059a84d3d959b33cd4ad8cc1963baad2a164ed5122297144de9426cf89889babca2e4b090616b132e00c971d9ad511f6c94b30cc9ef0719240 WHIRLPOOL 260a8a299c76cd2116ec87c233cb5bad99b4b9526f1c5909b468ca9e8770f03fc096d090a2f325ca95522d6438494ba02b2c0b5dd39703300d7503dfc2d44540
+MISC ChangeLog 13479 SHA256 fa5eb5141df35a28ea5570744b7cc53db2d743cf83d5db83d4a4ac74c262254c SHA512 b3ac0bc08ae5f263a50bf1933eb807aa51ffe582d19303955b617e81c975cc970df06ffbfc52bde39924fabc4caec4c3981addf92110a2b6e904a75f133e584b WHIRLPOOL 6ebd6b6f9590ed2f6c6068b562b0c8a5f17af0ff4746b626ebc088a591bbda5d4147eefd6c4200f1f6ef7458ba05bacdac3700274538232b22a3f4d21982cd04
 MISC metadata.xml 1857 SHA256 bd8a041c30ade7b290d349fc58ee71943e3441a1fe9e67931bc184de24c14e22 SHA512 5159b41ff8b1ee416c34bf73ea0270b304ec1e65519a41d794e12492a0ddd4cc07fca6ce83827c49e50746393c552485ef39ce5992081108127f9e6311505c7f WHIRLPOOL 442064cee2f98013d3b2d7b1f3f326592202872326d2ef6b2380b5e3906ac7db89b3f29fe062c1045a39b18db628505405cf84a777d67ba733b88076139dea4e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTjL3dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTjb04XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgRL4QAJL/2JRiVtSQmXFMRoNeyyj+
-PsQVyVIooVdIaXTJ0Z5/B5Zz89o+myBsaXWK/P44u4MVsPvCyMBH2KvQq5xFynle
-MKgYeMmUKLrKTbx4WFXWn4/TCzky/iIeagZ8FDcu+VRG20ec7nd2n/wrsreG8bjU
-g/3zotX6CStmIQZhQdnZqm33ZZQjoJiFX5+5XKBdLpTtzZe+lPPLIf+nscwThFF8
-sLMKTsLuEuzddyr67sa4sYFJ7AC4r0KX+BxYo0SpYCRTLKpp1r4HPl8zgyPpCRZ4
-w7mmp/6XBqsTvvDeVedZj+2hPDdUTwmD9ybBLoEpQh4tVeBQvxRTSm7Ah5XrNxJb
-g0t0ZUPyRjn1ls8AkHcsxB7CDxqmvi3fA7aqV/yMoenLl4ii2pnj7IdSq14NIWTb
-f2XOL4AoLbMEZNdClZaPRIzM3YWFEsoSwDtTTSRoYYiN3er4r7lFD81+4eXiTJaM
-ewM0mq2kwnvUn4ncTzBhkjZBKFq5EBvzCmhTA0Rs7cIUimLec754i4/nGZG1T3zn
-7Kg13vN8ZSyoO4EajQ/JFRXYic1Lx4TkjMHjl1K071y40IPnx3tzO4nBv7iXLmbA
-SViZ6suMAtdpWbvQzf5MKtd7gpVvh3poCBtLLhQpJvDb0v36sTByYQgI/5gEEjLh
-YNQlAZJgMCzvZCRf2K0p
-=lr3t
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgVdIQAKa7AzILjl68LenxtpZtpBu/
+mnqCqOfSJZo+VZxPigB+6tsFBcMkftpjAz2AakSBsPGrV8jTIOw+rvIKHXZXA6CP
+ck43Znznc4Bo84pXdVY2oNMwhfb+jBy1uZaiCBWKLMb7L1NwtDjzkyg5zH2laK5P
+paixTLeC2RnF0yPn+A/iKZE9rtfoLUyXQPJ7sWsF3YK95Ba49ui8LDKPoN9N5ZDt
+b7ZNtUDEvkFIaZNzcFESkvcvFygOY0YHDSbc9FxC/bKNU8QoNGbXFY/gP834MlFU
+OsvXZdrMnFoAsrPM2fbEt+tljWjah0KPbImNb9d8Lm0LnFxU3iyY6dlc1OWs7845
+fq8gSG9vhdr06MZLsVLf5txQ0hKDmBfNgTXWXm9L/+ugG5PjyIsTSYG8IYoiaMzG
+Cx8MXCulPp3hl4etGdMvh+XhiziVJh7oBQ4AknHsVtv1M5BzpvHD3/6Zs+NyshNq
+JdvRprZd9JQsVmc0htHkl+ugEMqmskaD2ZsPYizZqPj/A+sXg9rrLWGAudxiF89R
+wTYHWxLlDJf/kqOapi+NJakjA3uy9/Naa8EGG5ZzMjqG0V9Y9dcBzsApNy67bMyM
+W7cLjIJfURxTMs5w8HgsTuApw/HYO0NF/hj0fuRVC+StfuvdnPyrPESxZZKofViQ
+no7nfI74RZluCyYMWstE
+=mtEv
 -----END PGP SIGNATURE-----
diff --git a/net-irc/hexchat/hexchat-2.10.0.ebuild b/net-irc/hexchat/hexchat-2.10.0.ebuild
index 7714117e0af8..b865a9a4fe00 100644
--- a/net-irc/hexchat/hexchat-2.10.0.ebuild
+++ b/net-irc/hexchat/hexchat-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.10.0.ebuild,v 1.2 2014/06/02 18:09:33 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.10.0.ebuild,v 1.3 2014/06/03 12:19:02 hasufell Exp $
 
 EAPI=5
 
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="dbus +gtk ipv6 libcanberra libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
 REQUIRED_USE="plugins? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
+RESTRICT="test"
 
 DEPEND="dev-libs/glib:2
 	dbus? ( >=dev-libs/dbus-glib-0.98 )
@@ -38,7 +39,7 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
+	nls? ( dev-util/intltool )
 	theme-manager? ( dev-util/monodevelop )"
 
 pkg_setup() {
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 31ad8a887543..8c2bf604f5ab 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild,v 1.14 2014/06/02 18:09:33 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild,v 1.15 2014/06/03 12:19:02 hasufell Exp $
 
 EAPI=5
 
@@ -17,6 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="dbus +gtk ipv6 libcanberra libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
 REQUIRED_USE="plugins? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
+RESTRICT="test"
 
 DEPEND="dev-libs/glib:2
 	dbus? ( >=dev-libs/dbus-glib-0.98 )
@@ -39,7 +40,7 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
+	nls? ( dev-util/intltool )
 	theme-manager? ( dev-util/monodevelop )"
 
 pkg_setup() {