Fix various deps and use switches wrt bug#469188. Thanks to tomboy64 for the patch.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 51 insertions, 29 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index e771b4ee38bc..394ae4de5d79 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.130 2013/04/11 09:37:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.131 2013/05/14 09:33:56 scarabeus Exp $
+
+  14 May 2013; Tomáš Chvátal <scarabeus@gentoo.org> weechat-9999.ebuild:
+  Fix various deps and use switches wrt bug#469188. Thanks to tomboy64 for the
+  patch.
 
   11 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> files/weechat-icon.patch,
   weechat-9999.ebuild:
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index d28023f7718d..bbc9006d8624 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 AUX weechat-icon.patch 1063 SHA256 520c06905af1f29eb1e77be6b12198cde0de502d58a1906426d537b6aa9fe617 SHA512 568496a36438398b6b1a21ef5ce927c9ebba5732c584ad7fd6dd3a51d82c569cadf8a23cf28f460306c2b93b03876e0281ff556dbe5ca442a220738a31bf5d78 WHIRLPOOL 76c57a8d841c0e0c20040f3c3a85988f36759ee5ee1d0de17fe8420fbae2cd2100d4b11a08052beb85eabbb95089bc39c4aaf5ea0f1f12b2da9834b0f14d9a64
 DIST weechat-0.4.0.tar.bz2 1740361 SHA256 1df12201d8b0ac25f62ddbfb675e8f3d978e52bc5b644d55ccf4c755956fa60d SHA512 41e8a6d0714c6b821b5fd1e9feb0b95be7f142c081ccdcd0e107ce817a5630598c0a91ab0393d8243c3ef41c6f54b62d2ee056924272b389076af20ec99de495 WHIRLPOOL 95a2d5a87d5d27a96c24f2346c4c34d2cc8a0ec45672df3ca7889dfaa6d8fed8b0fe436c2f6c24b011cc8fd9795e59b84215d27852e34566b6d4c0f7b8fb36c8
 EBUILD weechat-0.4.0.ebuild 2961 SHA256 38ae4b31fef2234988484171df4a9954d35dd823cfc82819a559687e46a23cd8 SHA512 87c21424c24425903b455e55b677b0590cca822ddc81dbbcdfec37a141bbfe4830c7416e3b7d3e65d3a4317015ee6bf55f60e066216def389a67d5e6b9f2e3c7 WHIRLPOOL 634c72679335dccbf42fceebe1f298c11b0a66f905396f2c7ccaa24edc10b5145fed148d42d474bdfdd1559e50a63dbed6bab3fb866bdd4cbbb41e1ad2b4df5c
-EBUILD weechat-9999.ebuild 2924 SHA256 3324802bca50f1d7b99b68a8c5c272d8eec663247b4d942eee40c1f2a68c044d SHA512 96d7c278cc6d3eaa9830a9eb8539f1fff3f9b7dba9400b465642ebc00d3bc32fa9815483b9c10a12438bdc9b25e55979307cd20ad403c0c45533dbeb24c24487 WHIRLPOOL 373a5f3b776ed4670fb8b150fba5905a0e3d89e3f2139bd89d08e354c29cd8bb5e45ee75548b889a9a96f1cf0105160d253443aa3543a846d9676abd04a69c21
-MISC ChangeLog 17951 SHA256 454c4ace3caa8ee2dee19630fd19c2e6ba5a2f191631f9047c03a1390fd8dd68 SHA512 205cb78df53bb74d8ae464d8fa2d302f46482b80cce06f5b30e937a74359d19696607352b0102275b93bac910bde65ac89d8aa76dcc9fdc87584d7270ff28e61 WHIRLPOOL 5a4eba3b36102c6f663830985684f6d684eea514dc947fe232c7ace92b07ff2d410dd28294c5e5c3eccda1a54951087e93b9f8b7ae0037d5a328b99bfdc016ba
+EBUILD weechat-9999.ebuild 3384 SHA256 2a1aa3e353d27acfeaeecd23e5b94a63c131abb4f92fd7a30e09a2bd0e371a8f SHA512 9e38892cefa4fbbd303670fb867796bf44188b0cd8aa12368d289b8a4b85be08af7974ef2ae5764b5ceee34a14ab16a269eaabf9131b4366c260be48943aacbe WHIRLPOOL 3c5e368d51a322ac40c36dd34feaa4149ff03bd75e6625f25c1e9de87c2a8b5a3dcb5d8c10a5d3a94229027e6d05534a0442827034d453d09e9aadc8b867c1e2
+MISC ChangeLog 18116 SHA256 068833c6bf1daac2944d85b7b1282598712e1ecf0b4f03e2607db728df8394ba SHA512 bce029e6b66b319a63172873176bee4dcfbffd1c3e4598dee0a1ad42b02d25b9f985ab344ae1606f095a301bc3c9325b96eb1ca88f54b9af8c60c5a1759fe1cc WHIRLPOOL 752dceebb91fa053437740eb6c06dc8aecab5aeaa7e91107c2a7f7190ebc20d36550f997c2d7c60664547c0d3e3a78649243d70a1acb993a76cdc42929596eda
 MISC metadata.xml 775 SHA256 baddf6a8f9e77502d45119a96455031b564e19a864c8540e5c44500aeb1ddc54 SHA512 2aad4ad5d7b4634bf06078f62e8bb6a53e19df95257b150b43e82b2fe8487ed37c5311dc15d364cb1f5d5fc3eb04ae933e54cc9e44fcf06a471348021feb4d4e WHIRLPOOL 0a21b77e3c62b2e3e2ce4ee935a7212aee8517ef83445710855823e5a5c146255dc15e369f049ca20503205afac611957394494a857ea2f40371ebc50c87d25a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRZoYYAAoJEOSiRoyO7jvonysP/23eiohfNHu2nE6HIXITOUKL
-/yGnx4x/2sUbxmZfGvogeg+I3FCMnOZdplyTpJ67toICOlHmc/3wk9/1edpkZR6V
-vS0lXQB1k327aBZ724kWsh9JK2fGfbKj+FaTSewx601uq0yW5d6r1OYJahRmKjb6
-bx+rBD4gP2cQ7ro7gUq56/S304UAvQaMbYFgdDHaQ8f26YFBKx6QhIHROc4/anzz
-g3u7+tfJvPloza457pzcSqSewQXAmHE9VJLE6oJ5jLe3YN+9Ryq6sYeePjIMmz35
-fR8/9jxnKKeo+OE8pv11IeVHEVSwpQ4jCKJFb+7CGuaTAflC/CgftYSVLRSYCTD0
-e0ATPRpvbIsuBwqtj9EsJwVtktd1syLV3mL9jtInjvCWH0W9HhtjGbw1w9FQN7v8
-Ifp3Yy1KqlUbXazqyVxMhH1dp7gwLivP+KKR6NGREyk9UEe8INjy3eOc8VARjuQC
-Q/JZonYX9S2MetZVsefMph/c2I00A7+oVRufzd4PFDPb9XaNDea9iwIAx7jGx7fm
-A5376jpz1n5SRnu2QUZqlGCvjLEC9hJCaQtna9J0sMqZqp/LnuSPuHp4YUF4ysc6
-ynzGj4n7hwkF3Xse8Ni8YlbIjd08QhwY/3nH11CFyjsc8I8s32FThy9VYp4w3Q+t
-lJOr03O7D11qW0VViu8k
-=ny06
+iQIcBAEBCAAGBQJRkgUJAAoJEOSiRoyO7jvoSsYP/00eTvLe+ykyztQ7hhI2MKbn
+3ZssrzMyqTLocuIqi+76/CIsS18dBG9tCl5R79AnXY0Mls4458vS/eU49zCPCyff
+eRhqqDqyyNtVO91MM/FMJEHsHCAF2UhqCwWhgV23KfeqK9zimV6TlsgvtAJARM5v
+NXAKV5ckJZFZZ5yp7skgtFpk4vr/Zcy9gTIZmPRUk76wFyrULtbj27cSpoSbqV4B
+hMu4XEWSZK5C2AnyjLO3FIly7iwmsZYZhE+X4joI1wTXl3oR04hLdlfm5+BmueHe
+QwOyY28EgIU2f+/0TS0xkJa9ZGZsIbyaxOJfdWgMJ0M7vZHDPzK74Chh6BXdjzut
+z8ChCnTOMokjyOAg6VQJ4dq5ua8PVy6Mp/lNkw29sHfTzrP72Cp6z9j5oF05o5nK
+i5TVyWbD5ZCkHVL6EbDJo3GIgFEHu08P9K/pS4MFgr6JF/k56j28VMS3Xw+FCX0V
+uXMJYo3HDNFqpIp76lLhv3kp8zsYDyDSXfFFBrhpPXNJDwGdtTRdKRmldMahLUNs
+oNqWd6AP2CEmAjvc4cfBdw9Bi/kNy7pXklFWXSykpEPH40nr1Gwn+1wfoFZvHVos
+vPCUAAU9OjNaW6zSHssIBy2eTLF6xBBM0hqHvOze6xuo/wZ9FSH+vlzRFUGWUvou
+L1HvCmnygcDgkoPJHUxZ
+=QRW0
 -----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index f71949377392..44a0cb39384c 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.27 2013/04/11 09:37:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.28 2013/05/14 09:33:56 scarabeus Exp $
 
 EAPI=5
 
@@ -26,15 +26,17 @@ NETWORKS="+irc"
 PLUGINS="+alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer"
 #INTERFACES="+ncurses gtk"
 SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} +crypt doc nls +ssl"
+IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} doc nls +ssl"
 
 RDEPEND="
+	dev-libs/libgcrypt
 	net-misc/curl[ssl]
 	sys-libs/ncurses
+	sys-libs/zlib
 	charset? ( virtual/libiconv )
 	guile? ( dev-scheme/guile )
-	irc? ( dev-libs/libgcrypt )
 	lua? ( dev-lang/lua[deprecated] )
+	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( >=dev-lang/ruby-1.9 )
@@ -45,6 +47,10 @@ RDEPEND="
 #	ncurses? ( sys-libs/ncurses )
 #	gtk? ( x11-libs/gtk+:2 )
 DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		dev-util/source-highlight
+	)
 	nls? ( >=sys-devel/gettext-0.15 )
 "
 
@@ -78,9 +84,18 @@ src_prepare() {
 				po/CMakeLists.txt || die
 		fi
 	done
+
+	# install only required documentation ; en always
+	for i in `grep ADD_SUBDIRECTORY doc/CMakeLists.txt \
+			| sed -e 's/.*ADD_SUBDIRECTORY( \(..\) ).*/\1/' -e '/en/d'`; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e '/ADD_SUBDIRECTORY( '${i}' )/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
 }
 
-# alias, rmodifier, xfer
 src_configure() {
 	# $(cmake-utils_use_enable gtk)
 	# $(cmake-utils_use_enable ncurses)
@@ -90,23 +105,26 @@ src_configure() {
 		"-DENABLE_DEMO=OFF"
 		"-DENABLE_GTK=OFF"
 		"-DPYTHON_EXECUTABLE=${PYTHON}"
-		$(cmake-utils_use_enable nls)
-		$(cmake-utils_use_enable crypt GCRYPT)
-		$(cmake-utils_use_enable spell ASPELL)
+		$(cmake-utils_use_enable alias)
+		$(cmake-utils_use_enable doc)
 		$(cmake-utils_use_enable charset)
 		$(cmake-utils_use_enable fifo)
+		$(cmake-utils_use_enable guile)
 		$(cmake-utils_use_enable irc)
 		$(cmake-utils_use_enable logger)
-		$(cmake-utils_use_enable relay)
-		$(cmake-utils_use_enable scripts)
-		$(cmake-utils_use_enable scripts script)
+		$(cmake-utils_use_enable lua)
+		$(cmake-utils_use_enable nls)
 		$(cmake-utils_use_enable perl)
 		$(cmake-utils_use_enable python)
+		$(cmake-utils_use_enable relay)
+		$(cmake-utils_use_enable rmodifier)
 		$(cmake-utils_use_enable ruby)
-		$(cmake-utils_use_enable lua)
+		$(cmake-utils_use_enable scripts)
+		$(cmake-utils_use_enable scripts script)
+		$(cmake-utils_use_enable spell ASPELL)
+		$(cmake-utils_use_enable ssl GNUTLS)
 		$(cmake-utils_use_enable tcl)
-		$(cmake-utils_use_enable guile)
-		$(cmake-utils_use_enable doc)
+		$(cmake-utils_use_enable xfer)
 	)
 
 	cmake-utils_src_configure