version bump wrt #512130, update live ebuild

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

5 files changed, 268 insertions, 44 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index a11876c63897..6b57553416f7 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,12 @@
 # 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.98 2014/05/17 14:05:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.99 2014/06/02 18:06:05 hasufell Exp $
+
+*hexchat-2.10.0 (02 Jun 2014)
+
+  02 Jun 2014; Julian Ospald <hasufell@gentoo.org> +hexchat-2.10.0.ebuild,
+  hexchat-9999.ebuild, +files/hexchat-2.10.0-plugins.patch:
+  version bump wrt #512130, update live ebuild
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> hexchat-2.9.6.1-r2.ebuild:
   Stable for alpha, wrt bug #499844
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 7293c70845e2..fe55d7153a00 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX hexchat-2.10.0-plugins.patch 538 SHA256 17964a557db089a0ef5af265d24171677bad1d59ac32dfbdb5d7bdbdaa84435b SHA512 7a2bb535aba931e7a4eb650eaf7a39b3f9622509c938b2b03c0c791ae4efec8680c5f1e18024516ce1f713630a3cf6198120b2c0818a3efde0cf0ddb63639c77 WHIRLPOOL 6e6ecbd0adfdabecd7d88e5496856c18a470738008c32800bff7196951b5723edb0a6546c6a83c9453f1cb3891ef05c3ebda017ae8e56c8bbbdf68409310b2d4
 AUX hexchat-2.9.1-input-box.patch 1084 SHA256 eccf4a35b64fb429c171e5c77e62dae9ac5d58c1a7bc50e97d7c68fd0913fcaa SHA512 bedbbc7362d119b6b2064d0016447423621573502c19364a1539a1b682294c334d24eab12e806cd5339f4c30b979a5d6cf7b605f855028051f40277e5e654901 WHIRLPOOL 5d8e3f088391b18bfa57e2062c161f85b1bdf9edf0f53847bb12da60e97d876c29022a9f1e2f9c58fc952d6a1143dbeb8abc2efbf2d9c6b2b7ed2e1701cdea69
 AUX hexchat-2.9.5-autoconf-missing-macros.patch 8067 SHA256 73bbf3cb74794f9510fd5012b0ea68703e6462ccc021acbb4a4d476562aa7f73 SHA512 35caef042c4636401a3f038430ce1ec5f7aed2abd9cb67cf9264324088f79e44c1695eeb88c73b2a8e61cf6eb4c02ca275a2e3504e1d4c468946c2d5f36cc048 WHIRLPOOL a5e06764e98113e2775c3b58c1a77fe0f5aaa6e50bc58b1d8e758846b0c3ba5651a14445d9330e791e45e287c9138cdd505cfe85979cc1c0021cacadeace4173
 AUX hexchat-2.9.5-cflags.patch 625 SHA256 c593fed46c78ecf21984d765483f26b2ff2b4bdd78574569f561dbe4c52f3a05 SHA512 4ac52cabe611d959aea9fc9041c222adf90ebbb9ecb85493d66e3f910f530215ca5eea9b59d035653c654baf89d3f9822ce0fd1cbebd67a48cbc4d34008d3afc WHIRLPOOL f10118436585741bd511d269108a46a5ede2090247af988df2948495080bc3d4c2aec33d0ef3c279208ef9de2b7982432b2b0d3797afb413945f6c2fcef1e5ac
@@ -9,29 +10,33 @@ AUX hexchat-2.9.5-gettextize.patch 604 SHA256 b2ec1dafd439c8661aacebee78b4ea52d1
 AUX hexchat-2.9.5-gobject.patch 906 SHA256 53a810d814893455f81cb0777fce5f0f6f2e47b944677a5ffd5deb4dff676cca SHA512 1b34cb76373fbd9874a0666c37edae60e6b9a39b6cdff4e71b31f62ebaa1afb410b3d0246be38c2984352c4d020c5c7a3b699019cb8363e6e9b685c62372cadd WHIRLPOOL 44d8564c27e3b09bb85535e76ecc1aa9d801bcf05f913cd1db8359d7b0903b4d8862667aac6394c7f54086bd4229bd4b36d762a08317b7a20e195a50367352ca
 AUX hexchat-2.9.6.1-sasl.patch 2246 SHA256 9bd072f00169362cf488af6bb3474666a2c413b39736da2358a089546ff19b1c SHA512 4f0dc0537fa2a9ac2edaa5e569d9089e37af19a3c9173b080410df177d470a2b6770b7c49fc35702d1d6b5703598532b214332e854d917d0ac5e7537fcd3bbab WHIRLPOOL 2f76bd9b3474c93259d399e6c00b9ee73032ce949166d5d7e5373f94d08914a925e573e2d6a6b084ade68ecf05c315a7a17fe5a08edefd69515806b855c43bca
 AUX hexchat-2.9.6.1-xdcc.patch 648 SHA256 2575e0eaac7dd71ec88fcbe2c54688dd1be89fd041b25e9925f6909b2567e5cf SHA512 aa5189fb538fa699cac2d45a1a895f35cc84f5dbb90ccb1e0b4335e752a8d5b53a9da8146af6336516fc70118c53be88b8957a70288c9c856a6bad290a46939d WHIRLPOOL 3b58c662465015025b2c63fcf48fcad52a5f06f4e695d0fdcd8c8f706c2437b1b4cfecfa26952180f3553b509999c9078d30ee5c44a0ae6765cfacd86ee27774
+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 4461 SHA256 0695bc7f3bf81bca3d7f2cb2b885cdde3c9989a55ff1d066a3d30f5dfc2771f9 SHA512 b58f150c71488dbc7441df2765eb8f5cb017ed9a600d3213d5ba3f7c65489151925f631f479cd276749718de3a7defcc805492041fbf4ab4c68427bd4db80083 WHIRLPOOL da730a0db645c1fcb34d3555b0b6de5883a94efe00cdd06c41e13eba342236f8073aca714acbe2ee191b67199771a53e08bab97f76844ae48e63fea9b4a12e13
 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 4501 SHA256 f128e9c30fb116ecc7bac214618375db524b74280f227583157b6d489f75278e SHA512 9f48cb75c3c8ecf091ba9af394b4db2b4d636f162503efe1a40e3522b6fe7e43c7960a3fe4e1834cf02f54f57496fdd7c20efeb04317049854980f8d65e809c2 WHIRLPOOL 3481117aac4c502278cfc1636e2caa76107e573d102e1f1aa4845b867da9b79662a050d0492deec4edc80563a9678087c961fd1f3b05e28f3f19f29495617c3e
-MISC ChangeLog 12954 SHA256 a1722fb602e027f591fdf4e964ca571391957c477fa9db3a96f0d1bdf1078fcf SHA512 d1a297f57d9ecdda5b0a6502beaafa40836b32577162df22dcf4e9e79c9b50636758c579623d269212d6606dacd733bde257b21754839bd63ec0521c87e103dc WHIRLPOOL 771ea3ad6f8e00fd44a2028baf487b2cba9c3b1ac8d160f22203ec7aa2ce8c5e98bdab8bbc251b894e67aa5c7cae9c6550ce7cc1658a3ac06fbd2c1b9f5f0d2a
+EBUILD hexchat-9999.ebuild 4845 SHA256 c013bbdae03d1fc135def25e5b4f4a47636477027aa74e97f5265d6c2ee24881 SHA512 71b92dd4ac912d8a574c6e381126ed3baaf9f63514fd434aff0804026503409aec22549e60289df1ca0a88bf3f04b196958abfa699950c9824025ce581549e88 WHIRLPOOL af3f3a5073535033c5ce33fa2e84da88543a1b0c68c5b358d5bf4b5dd8d7d238e2248c90a3343a61de5b629991069a17eb76d71d4a59c78a80b27a7b84f89879
+MISC ChangeLog 13173 SHA256 9865c30276c005a27a74f10e2636db96651e99bff685d7ead703e84c0b36fa36 SHA512 1ac3ce00d4dfe1d1f777db637b6629ed553439933594df6f29119b541ae7d71f5b4cd29d6c04005caab4d2dd6d916295b90b2903f4fe39bb1967c6a5fe00fbec WHIRLPOOL f8758e16755ee3f42560178e485a738ed20fb3ee8059de189ad065c078597ec96cf240a55fa670e9a47822dc4e60df55e2de4d60ec18d6976b350a864e98156f
 MISC metadata.xml 1857 SHA256 bd8a041c30ade7b290d349fc58ee71943e3441a1fe9e67931bc184de24c14e22 SHA512 5159b41ff8b1ee416c34bf73ea0270b304ec1e65519a41d794e12492a0ddd4cc07fca6ce83827c49e50746393c552485ef39ce5992081108127f9e6311505c7f WHIRLPOOL 442064cee2f98013d3b2d7b1f3f326592202872326d2ef6b2380b5e3906ac7db89b3f29fe062c1045a39b18db628505405cf84a777d67ba733b88076139dea4e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTd2yfAAoJELp701BxlEWfMicQAMORKxJUPYhANL+go4Yvzehl
-fDwypeo4wfzZTF8B9dv9hNVStKIl8TcP6FkfZA3/7e7Lrd2ytq6OBRWP4vyxC9Co
-zyRdhE11dfGb+OVtAnPwxvKUJYWI2AoezWFI6BBmjubcEuMJVaeut9lDsMfkocaG
-rlOzBnSab95qM81A20zz9SLsrqE83u7tY6IeHXBCT2XV139OUj07D1WpxjI3AP7/
-6ZOwjW1nYw6iRwwQWVTg+3xbO2yS6TycZWRsm/U1Ob+MBXri2sIiKNXP8j3T21MV
-yDSt6GfYO8du2dOknt1cHdPWdhtnrgonmxnI13M1XmzqV4jB1CJrMV9oMTB0qP7t
-GhRdizCa8KqgMQTRaK1KtIaEPf4rmW05iSofRrSLsjIuXITEMid4Rw6p5gQ1+Z0F
-BfwgzUjLQiFntf9sJgJBbnFaM+a6nzymSfnCCH9+6bIawozZZF9lwebPYEL/g6YY
-+8pitFKNRQyNWOGbAHMYPRCprwMyiI+HnRM8/p8nY6pJATU515mbfRkBeq0VWbAi
-8n5ehd1ec92V59e3cnLam7TukeQE62GdAIDyMD7ON1M3rU8dfk9Dr5j/G6ep3dp5
-3OCyO9sM/ED+9JQV+QoyB3c1+0Js557/BGgBTjdYtD64aYDsTlveZoQ02DF0ssUP
-A/fAFhT5BvohUZ3X47nY
-=DVAn
+iQJ8BAEBCABmBQJTjL0SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAglREP/3izvVC3dwc+dkxqLyrTjcKt
+R23b3FYmKbYvn0wDKtKCra665ImHX5bZEuSssJDuzmtaPZPJdYuCpZ2Qgg+qv4/o
+QwHd5VcwemLxNRYxJ2eLu7a2Xq6pJ//+6+ISQvJcd/0RREMk1vZ3yfrfMFYiOdph
+va7WeyYHxZYj05/TDOPJG7CgOMkNVxNX+YZwxHN5tfwkYV5TL3d376keiDTOotaD
+PxdQaKkqOFd2plnvaJvykMDbrxKwNvfiyVNhxStx4WEjxEA6gHv7ubhhYicEs+oQ
+mWc9UWTxwIwWkymiE+ouqS/jU9I7EelUwtlwyEfsRn/ilzRVpDwaJDSx/Aqyo+/A
+HAHXSJ79Bl/KiLxYkEKVVIUL8Zfw5ZZ77mXdcSxgrDlonx5C27uHQlMLGRhE5Ijl
+h2GU6ucnWxykbfiFVsv2nEYGOYVNeqvETW8KPYQjarq8KkC6lTRjAit6NFPhoXlT
++Elur8Dentf6NFgp/k1ao4RBxJ4dijHiE8VewoxnmuTJtkehAJNd5MARVQuvtlOQ
+GjvAqqhhHvsfEAgL+vRNAgMqhF1VjirBM2d18q6aCsOKu779AKaMFvY5dQL+EXeU
+yTbGex1M2tKu5gFe3uLQLH0I7vuPTKkoJ8n/9h7U0BgdMYhBwi3L/86bDLpSlA0f
+JTqY/Nrdj1db9L+zTmHL
+=U5cg
 -----END PGP SIGNATURE-----
diff --git a/net-irc/hexchat/files/hexchat-2.10.0-plugins.patch b/net-irc/hexchat/files/hexchat-2.10.0-plugins.patch
new file mode 100644
index 000000000000..ddfdc9afa504
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.10.0-plugins.patch
@@ -0,0 +1,20 @@
+Date: Mon Jun  2 17:21:25 UTC 2014
+Subject: Fix build with plugins enabled
+
+backported from
+https://github.com/hexchat/hexchat/commit/8578a9d52d993f4425259462c01854ea7784c57f#diff-d21d749e7b97744b9c653a6846da8ce5R1128
+
+--- a/src/common/plugin.c
++++ b/src/common/plugin.c
+@@ -1180,7 +1180,11 @@ hexchat_get_info (hexchat_plugin *ph, co
+ 	switch (hash)
+ 	{
+ 		case 0x325acab5:	/* libdirfs */
++#ifdef USE_PLUGIN
+ 			return plugin_get_libdir ();
++#else
++			return NULL;
++#endif
+ 
+ 		case 0x14f51cd8: /* version */
+ 			return PACKAGE_VERSION;
diff --git a/net-irc/hexchat/hexchat-2.10.0.ebuild b/net-irc/hexchat/hexchat-2.10.0.ebuild
new file mode 100644
index 000000000000..0701f0cac33c
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.10.0.ebuild
@@ -0,0 +1,170 @@
+# 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.1 2014/06/02 18:06:05 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+inherit eutils fdo-mime gnome2-utils mono-env multilib python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="http://hexchat.github.io/"
+SRC_URI="http://dl.hexchat.org/hexchat/${P}.tar.xz"
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+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} ) )"
+
+DEPEND="dev-libs/glib:2
+	dbus? ( >=dev-libs/dbus-glib-0.98 )
+	gtk? ( x11-libs/gtk+:2 )
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	plugins? (
+		perl? ( >=dev-lang/perl-5.8.0 )
+		plugin-sysinfo? ( sys-apps/pciutils )
+		python? ( ${PYTHON_DEPS} )
+	)
+	spell? ( app-text/iso-codes )
+	ssl? ( dev-libs/openssl:0 )
+	theme-manager? ( dev-lang/mono )"
+RDEPEND="${DEPEND}
+	spell? ( app-text/enchant )"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	theme-manager? ( dev-util/monodevelop )"
+
+pkg_setup() {
+	use plugins && use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+
+	if use !plugins ; then
+		local myplugins
+
+		use perl && myplugins+="perl\n"
+		use python && myplugins+="python\n"
+		use plugin-checksum && myplugins+="plugin-checksum\n"
+		use plugin-doat && myplugins+="plugin-doat\n"
+		use plugin-fishlim && myplugins+="plugin-fishlim\n"
+		use plugin-sysinfo && myplugins+="plugin-sysinfo\n"
+
+		ewarn "The following plugins/interfaces have been disabled, because"
+		ewarn "\"plugins\" USE flag is disabled. Check metadata.xml"
+		ewarn "to get more information or run \"equery u hexchat\"."
+		ewarn "\n${myplugins}"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-plugins.patch
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable libproxy socks) \
+		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(usex plugins \
+			"$(usex python "--enable-python=${EPYTHON}" "--disable-python")" \
+			"--disable-python" \
+			) \
+		$(usex plugins \
+			"$(use_enable perl)" \
+			"--disable-perl" \
+			) \
+		$(use_enable plugins plugin) \
+		$(usex plugins \
+			"$(use_enable plugin-checksum checksum)" \
+			"--disable-checksum" \
+			) \
+		$(usex plugins \
+			"$(use_enable plugin-doat doat)" \
+			"--disable-doat" \
+			) \
+		$(usex plugins \
+			"$(use_enable plugin-fishlim fishlim)" \
+			"--disable-fishlim" \
+			) \
+		$(usex plugins \
+			"$(use_enable plugin-sysinfo sysinfo)" \
+			"--disable-sysinfo" \
+			) \
+		$(use_enable dbus) \
+		$(use_enable libnotify) \
+		$(use_enable libcanberra) \
+		$(use_enable ntlm) \
+		$(use_enable libproxy) \
+		$(use_enable spell isocodes) \
+		--enable-minimal-flags \
+		$(use_with theme-manager)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		UPDATE_ICON_CACHE=true \
+		UPDATE_MIME_DATABASE=true \
+		UPDATE_DESKTOP_DATABASE=true \
+		install
+	dodoc readme.md
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+		einfo
+	else
+		einfo
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+		elog
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		elog "Themes are available at:"
+		elog "  http://hexchat.org/themes.html"
+		elog
+	fi
+
+	einfo
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+	einfo
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+	fi
+}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 8ab4c3aa10ff..f00d407d2f26 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.12 2014/02/03 02:25:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild,v 1.13 2014/06/02 18:06:05 hasufell Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 inherit autotools eutils fdo-mime gnome2-utils mono-env multilib python-single-r1 git-2
 
 DESCRIPTION="Graphical IRC client based on XChat"
@@ -12,15 +12,11 @@ HOMEPAGE="http://hexchat.github.io/"
 SRC_URI=""
 EGIT_REPO_URI="git://github.com/hexchat/hexchat.git"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
 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="plugin-checksum? ( plugins )
-	plugin-doat? ( plugins )
-	plugin-fishlim? ( plugins )
-	plugin-sysinfo? ( plugins )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="plugins? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
 
 DEPEND="dev-libs/glib:2
 	dbus? ( >=dev-libs/dbus-glib-0.98 )
@@ -30,25 +26,44 @@ DEPEND="dev-libs/glib:2
 	libnotify? ( x11-libs/libnotify )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
-	perl? ( >=dev-lang/perl-5.8.0 )
-	plugin-sysinfo? ( sys-apps/pciutils )
-	python? ( ${PYTHON_DEPS} )
+	plugins? (
+		perl? ( >=dev-lang/perl-5.8.0 )
+		plugin-sysinfo? ( sys-apps/pciutils )
+		python? ( ${PYTHON_DEPS} )
+	)
 	spell? ( app-text/iso-codes )
 	ssl? ( dev-libs/openssl:0 )
 	theme-manager? ( dev-lang/mono )"
 RDEPEND="${DEPEND}
 	spell? ( app-text/enchant )"
 DEPEND="${DEPEND}
+	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	theme-manager? ( dev-util/monodevelop )"
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	use plugins && use python && python-single-r1_pkg_setup
 	if use theme-manager ; then
 		mono-env_pkg_setup
 		export XDG_CACHE_HOME="${T}/.cache"
 	fi
+
+	if use !plugins ; then
+		local myplugins
+
+		use perl && myplugins+="perl\n"
+		use python && myplugins+="python\n"
+		use plugin-checksum && myplugins+="plugin-checksum\n"
+		use plugin-doat && myplugins+="plugin-doat\n"
+		use plugin-fishlim && myplugins+="plugin-fishlim\n"
+		use plugin-sysinfo && myplugins+="plugin-sysinfo\n"
+
+		ewarn "The following plugins/interfaces have been disabled, because"
+		ewarn "\"plugins\" USE flag is disabled. Check metadata.xml"
+		ewarn "to get more information or run \"equery u hexchat\"."
+		ewarn "\n${myplugins}"
+	fi
 }
 
 src_prepare() {
@@ -75,17 +90,34 @@ src_configure() {
 		$(use_enable ssl openssl) \
 		$(use_enable gtk gtkfe) \
 		$(use_enable !gtk textfe) \
-		$(usex python "--enable-python=${EPYTHON}" "--disable-python") \
-		$(use_enable perl) \
+		$(usex plugins \
+			"$(usex python "--enable-python=${EPYTHON}" "--disable-python")" \
+			"--disable-python" \
+			) \
+		$(usex plugins \
+			"$(use_enable perl)" \
+			"--disable-perl" \
+			) \
 		$(use_enable plugins plugin) \
-		$(use_enable plugin-checksum checksum) \
-		$(use_enable plugin-doat doat) \
-		$(use_enable plugin-fishlim fishlim) \
-		$(use_enable plugin-sysinfo sysinfo) \
+		$(usex plugins \
+			"$(use_enable plugin-checksum checksum)" \
+			"--disable-checksum" \
+			) \
+		$(usex plugins \
+			"$(use_enable plugin-doat doat)" \
+			"--disable-doat" \
+			) \
+		$(usex plugins \
+			"$(use_enable plugin-fishlim fishlim)" \
+			"--disable-fishlim" \
+			) \
+		$(usex plugins \
+			"$(use_enable plugin-sysinfo sysinfo)" \
+			"--disable-sysinfo" \
+			) \
 		$(use_enable dbus) \
 		$(use_enable libnotify) \
 		$(use_enable libcanberra) \
-		${myspellconf} \
 		$(use_enable ntlm) \
 		$(use_enable libproxy) \
 		$(use_enable spell isocodes) \
@@ -128,15 +160,6 @@ pkg_postinst() {
 		elog
 	fi
 
-	elog "If you're upgrading from hexchat <=2.9.3 remember to rename"
-	elog "the xchat.conf file found in ~/.config/hexchat/ to hexchat.conf"
-	elog
-	elog "If you're upgrading from hexchat <=2.9.5 you will have to fix"
-	elog "your auto-join channel settings, see:"
-	elog "  https://bugs.gentoo.org/show_bug.cgi?id=473514#c1"
-	elog "Also, some internal hotkeys such as \"Ctrl+l\" (clear screen)"
-	elog "have been removed, but you can add them yourself via:"
-	elog "  Settings -> Keyboard Shortcuts"
 	einfo
 	elog "optional dependencies:"
 	elog "  media-sound/sox (sound playback if you don't have libcanberra"