gentoo resync : 04.12.2017

10 files changed, 218 insertions, 86 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e3c5884609cf..a7a046548a49 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 5430bfa545fa..36c23eb44ab1 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -3,8 +3,8 @@ AUX iroffer-dinoex-Werror.patch 498 BLAKE2B 85fe030eaa77f9691a8b5000b7ffc9ede2b1
 AUX iroffer-dinoex.conf 378 BLAKE2B 802cb152669d41a081d3400bad38da39fc73f083dc0ea5528861cb15581a2f62341fe1085c247b04f70e82943226895d8677013ae0900b6f50129702552468e2 SHA512 6dee05c4fdc5d8e62c9ac76406a7e85f1e944bb2b1f82237422f01002c6adceaf4f05073c3e378e3f61000652814292639640e1dcc2a0dbcd2bd68a76687d634
 AUX iroffer-dinoex.init 1130 BLAKE2B ccd6615cd7c5c61532ccad49f5b69d5d6049d01af958b76a1c2e4f0588939d59b24fec040a6f74f961fb1f7d2b8c4a4adf5898fcb2137f741bfb9c27c1d7cfc7 SHA512 5fdae78dac704cfc8594fff417e0d223069d2a3f33536043550aef4f7143a3cdb69e6ae102d21cd14b97e3ccf61c6d1c11fbb3a87c3e1a1096fa40e36a1c772a
 AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9f9f29d45fe948b88b9798baf81a5832e8a89cc477826c6c51d7dde0459ab3d97249eb91d434f5b4c0686c0720 SHA512 6eb9a7f1949720a7d1544b90a22a190ad868b77d3ed604c5ec3acdc62e5711353d84a8e10dbfa332c4ceab13fedc3fa06d1679ce95d4612443a055f04f310015
-DIST iroffer-dinoex-3.29.tar.gz 537027 SHA256 d96c307062552878d7594e280eef3a8669b4af955f1efe1d6e3e7ad660f9a6fb SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0 WHIRLPOOL 2917244bfc2c0d05f5660b767dfa39da6099e5388dedea5c2578a483fc52747959c296f65a71cd3a8a24740afca1c3fab8e7825052fec4ac5eadce558917fcd7
+DIST iroffer-dinoex-3.29.tar.gz 537027 BLAKE2B f6dddd60b5e4e837cfb56c450ee32249607375a386f9215a9a4eb34e7696c066b6c817ae956c044bbc208f69a73967df5aee9835b2a94ca70a849045ff11f37d SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0
 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
 EBUILD iroffer-dinoex-3.29.ebuild 2646 BLAKE2B b3db2502ebb186836894b1c8bf2083792623c0f6d2009241e432bb33ac0fc3716e684e44dcd4a7c9012989576d9667a14e4ef3631142a65a79af6bd5d602d76f SHA512 d47ffa947ae63147ce8939ce99f63114f9593b32f23d3a34d0ba3567bee14bb3d2ebcd14ae608fc0c841cc88d38abe7c2e57a06a54da0fbb3befd38af32b859e
-EBUILD iroffer-dinoex-3.30.ebuild 2648 BLAKE2B d880209f7e4bc2e5d20934e6830eea8a4073006df0e2985636615dc5f43f3a3df8aece75c37506720b032ddb28c7908057de09d935fa4a9df91cee11fef24919 SHA512 fab31e35c82ed99d975c464b5a36e8cb1735c4886f9a525a0fe5c842043098c048f3da01480721007c410e979c09ceb89717ab39922dd1fd69f5d29c2ceb4f2d
+EBUILD iroffer-dinoex-3.30.ebuild 2654 BLAKE2B 0d00c4f5ef9339ffb88729313ed2c2522ae06c56e74cc9e0962f793e0a32c21223064e4f5ed4d8c8b5469cef67632cf19171c9e8f3adcc43269867d05131bbe7 SHA512 5101cf63561a1b87763568f94d06efd192e25ca4176d2a8ef31774f796f9c4f092b321c3d8f31bfa671c69bc98fccd15e750c0fe361f025ed4a8cc179f1184ad
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
index 1c2432e193f8..f9ffa93b3675 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
@@ -42,7 +42,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-config.patch"\
+	epatch "${FILESDIR}/${PN}-3.29-config.patch"\
 	       "${FILESDIR}/${PN}-Werror.patch"
 	epatch_user
 	l10n_find_plocales_changes "" 'help-admin-' '.txt'
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 44ac065dcc4d..49645ef72e66 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,7 +4,7 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
 AUX quasselcore.init 1742 BLAKE2B c9449f721df267ce826cadd52e21341762324e8ee9826c64f8d31af0e0edd28fda5b26ae06c0b667038a3b88e98b4694ce13dbc3a9b43844e0cbcd437f52e8e1 SHA512 eddd620b43439becc3f714854b7d1c9f9a65b4784325b11298c94c9f15b6e1fe2547f566f8ae2ebf1134d6361228bdb047964df3ae439d540d57d8864cdecd6d
 AUX quasselcore.init-r1 490 BLAKE2B 66ac809f427009bf9841d23a12d10f87563f970919a61737c96582c89ca97cbdf93aa89baa59e77dc6cfd377b634ddde3a6d5d5862e9246e4b984c5f35abb66f SHA512 71b2381e834d86a29269516270fe2463adfe59de16d9916d9cc496959e6931719262bf980763662bfb309acb79c6508ae33c61ceacd53be912d3161105ba0c69
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
-DIST quassel-0.12.4.tar.bz2 3742639 SHA256 93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92 WHIRLPOOL 13a6078aa8f0a3d039e9c240c870a13744b3eb3324f45508f62a37aa8da13c0b00f94f53fe2602762503459a1110e3796673c104397b37297390cc406f2eaa66
-EBUILD quassel-0.12.4.ebuild 5569 BLAKE2B 0027cd1b74df4be64a07e5850a75a709e1bd2bb454d043cf4340235a443b1bbacd268a9edaaa31b28a24a893747e5a9d1cf2a72a8b9be1060c54a5255f2363dd SHA512 5ccaeb6cb5f237d2fdd3b03102b410d71b029333c73938acc8a07edba21abbb521d7b01568a5c118c2176f65e5116f2bea3b1716841aeec262e76b1672ad56a7
-EBUILD quassel-9999.ebuild 4677 BLAKE2B 87e9fc3a5daffa954a96901e1e6f41bccdad1671f52bcc9f4065bda9a3ba8e6b48a942d7177379702ffde90569eb6ca359a729a9345a61a1ee1a921ef09f689b SHA512 bb9cba8ce7b1389e51ab42c76e14419ec8b5adce5716cff68c4faec7343580099a24a8af5f38f8d4efa4931a224b8924a32bf88bce9cd1ca4d075cbe8fc7359f
+DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2 SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
+EBUILD quassel-0.12.4.ebuild 4724 BLAKE2B 2b5be22d3e552e9a94925c4e67cf50be43003fb5bcccfa988e4b0ea5dafa3374d3702222ceb467dece1ae87599c7886c210556739be0067351e3acbcdafa69cc SHA512 1612344383ea25f8cdb45464d87cfb594f1685adcf26e48582772e1e2a8464ed0194ad37ff00368483df47d37377f4c01100c32533f8c6590e2f924452d00a96
+EBUILD quassel-9999.ebuild 4680 BLAKE2B 65d7071a43218d38d24cade3ea698de0b889f4d8d06e946c3dfcac3a520f8f8f8551e301f97e8dd1a73ddb528670498686898f6eb81bb7667fa96f789f97baff SHA512 0cd29bee4dd56a7131a4f7c1ab30017c8aac833f635fce9c720516c98011ab425de3fb24a9e43b5af46523842023cce111333e1518bf43d699a4df249920e603
 MISC metadata.xml 1942 BLAKE2B 1a23788288146f7149de03e99463403ae7d365df1fd421fc85af9c3bee4ebc5a2575c94958b570f32bb8fb056461a879cf4e80d65063ef0f2ba124d2305f4f10 SHA512 abf82cf9fe2bd552c1b26591e20da212cc3a118f6fb4ac92df8340d6ad5c7b6757e9290f8c6e8175dd95384b385dfd0399d6693d7fe6dc480b5a6d6f9b851d05
diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild
index 4b8e4eb39bec..fea12b014b0b 100644
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -15,69 +15,43 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
 snorenotify +ssl syslog webkit X"
 
 SERVER_RDEPEND="
-	qt5? (
-		dev-qt/qtscript:5
-		crypt? ( app-crypt/qca:2[qt5,ssl] )
-		postgres? ( dev-qt/qtsql:5[postgres] )
-		!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	)
-	!qt5? (
-		dev-qt/qtscript:4
-		crypt? ( app-crypt/qca:2[qt4,ssl] )
-		postgres? ( dev-qt/qtsql:4[postgres] )
-		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	)
+	dev-qt/qtscript:5
+	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+	postgres? ( dev-qt/qtsql:5[postgres] )
+	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dbus? (
-			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-			dev-qt/qtdbus:5
-		)
-		kde? (
-			kde-frameworks/kconfigwidgets:5
-			kde-frameworks/kcoreaddons:5
-			kde-frameworks/knotifications:5
-			kde-frameworks/knotifyconfig:5
-			kde-frameworks/ktextwidgets:5
-			kde-frameworks/kwidgetsaddons:5
-			kde-frameworks/kxmlgui:5
-			kde-frameworks/sonnet:5
-		)
-		phonon? ( media-libs/phonon[qt5(+)] )
-		snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-		webkit? ( dev-qt/qtwebkit:5 )
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dbus? (
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+		dev-qt/qtdbus:5
 	)
-	!qt5? (
-		dev-qt/qtgui:4
-		ayatana? ( dev-libs/libindicate-qt )
-		dbus? (
-			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4]
-			dev-qt/qtdbus:4
-			kde? (
-				kde-frameworks/kdelibs:4
-				kde-frameworks/oxygen-icons:*
-			)
-		)
-		phonon? ( media-libs/phonon[qt4] )
+	kde? (
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/ktextwidgets:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+		kde-frameworks/sonnet:5
 	)
+	phonon? ( media-libs/phonon[qt5(+)] )
+	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	webkit? ( dev-qt/qtwebkit:5 )
 "
 
 RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl?]
 	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5[ssl?]
-	)
-	!qt5? ( dev-qt/qtcore:4[ssl?] )
 	monolithic? (
 		${SERVER_RDEPEND}
 		${GUI_RDEPEND}
@@ -88,26 +62,22 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	qt5? (
-		dev-qt/linguist-tools:5
-		kde-frameworks/extra-cmake-modules
-	)
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
 "
 
 DOCS=( AUTHORS ChangeLog README )
 
 REQUIRED_USE="
 	|| ( X server monolithic )
-	ayatana? ( || ( X monolithic ) )
 	crypt? ( || ( server monolithic ) )
 	dbus? ( || ( X monolithic ) )
 	kde? ( || ( X monolithic ) phonon )
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
-	qt5? ( !ayatana )
-	snorenotify? ( qt5 || ( X monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )
-	webkit? ( qt5 || ( X monolithic ) )
+	webkit? ( || ( X monolithic ) )
 "
 
 pkg_setup() {
@@ -122,17 +92,13 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package ayatana IndicateQt)
-		$(cmake-utils_use_find_package crypt QCA2)
 		$(cmake-utils_use_find_package crypt QCA2-QT5)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
 		-DWITH_KDE=$(usex kde)
 		-DWITH_OXYGEN=$(usex !kde)
 		-DWANT_MONO=$(usex monolithic)
-		$(cmake-utils_use_find_package phonon Phonon)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		-DUSE_QT5=$(usex qt5)
+		-DUSE_QT5=ON
 		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
 		-DWITH_WEBKIT=$(usex webkit)
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 7bf54b67a40a..dc4527b4df87 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -19,7 +19,7 @@ IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server snorenoti
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:5
-	crypt? ( app-crypt/qca:2[qt5,ssl] )
+	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
 	postgres? ( dev-qt/qtsql:5[postgres] )
 	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
@@ -50,9 +50,9 @@ GUI_RDEPEND="
 "
 
 RDEPEND="
-	sys-libs/zlib
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl?]
+	sys-libs/zlib
 	monolithic? (
 		${SERVER_RDEPEND}
 		${GUI_RDEPEND}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 6c0327c50046..ab79b259d9aa 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,5 +1,7 @@
 AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
 DIST weechat-1.9.1.tar.xz 1877428 SHA256 c2991fc616a9b1ac155e7f2591922421b49924ea45e4e5b64622dcb7f38522fd SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa WHIRLPOOL 01513b276a77cf6849c6dd96945ecc069e00094be6d00d83f8884943bb7dc29b66938b6a3c5d42ed338e31633c397e6ce0fd875d5365e6a2748ecb72c490fa79
+DIST weechat-2.0.tar.xz 1967636 BLAKE2B b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4 SHA512 771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951
 EBUILD weechat-1.9.1.ebuild 3917 BLAKE2B d1c8ab83d7ef18b1dd6458b240926dfa1499d0ee495c3fe90303490a69cc74755250bf4f4493e8a621eb892876c03b1ba15843879377b1de9851993046cc8594 SHA512 279b30076a4b16256f3c0fd96b1b3a1a61b0c6a50e5a0ca41aed001ff76142d6ead95e60a2cb16548e38d7959aab3ec7b5a8b70739baa0f7f20c8f3c66305a47
-EBUILD weechat-9999.ebuild 3630 BLAKE2B 25049de2e1d7955b53e544216dda502e70e95fc39d1ed355055146e4104b148b45996f8ab640c1b0ce782f9e578a713433951b64b7e0e0603a98b5b201895d4a SHA512 53cdd729444cf0273904093e931d45ba9d91181c576e06a2017998279136931041b246317d570a0cbc5d50d35082ee4aa592b15c561338372b228717576c800c
-MISC metadata.xml 863 BLAKE2B 2f3e69da4310adecbced76f256911604a77f0330c00d1097d6329a688839c1238af0c82e9af9c2734871d82d5916f0474d118f0b07bd6fae2c09dcff5566b8a4 SHA512 6cf4ee3adf9c431508b28da64aeac1679eb30a16ce20cae401b84696b2d39715f2daaf7f6e9df7d505f32e9231cdf6243b8afd5c6e834603fbb36c482c05f603
+EBUILD weechat-2.0.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
+EBUILD weechat-9999.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
+MISC metadata.xml 903 BLAKE2B 74f1e6930fb209c9d74ca9ff7a8c0b82900c8aac369612ef4c16cc4393fabe24770bc1734d20b261dfcfc021259e1df9e555e1d53605296e0847939d3ce41c40 SHA512 26d85549cc0b0e61cb576a50740cd289432dca90ff92e0d0162a430ff89959233aa002dee0018780e51607cdae85a866ac6db77fe22d2c8631590a33a05ff5d5
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index e04464bc80b1..39474809b461 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -5,16 +5,17 @@
 		<email>radhermit@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="alias">Enable plugin for alias control.</flag>
-		<flag name="buflist">Enable buflist plugin.</flag>
-		<flag name="charset">Enable encoding conversions.</flag>
-		<flag name="exec">Enable exec plugin.</flag>
-		<flag name="fifo">Enable FIFO support (sh pipes).</flag>
-		<flag name="logger">Enable support for logging.</flag>
+		<flag name="alias">Enable plugin for alias control</flag>
+		<flag name="buflist">Enable buflist plugin</flag>
+		<flag name="charset">Enable encoding conversions</flag>
+		<flag name="exec">Enable exec plugin</flag>
+		<flag name="fset">Enable fast set plugin</flag>
+		<flag name="fifo">Enable FIFO support (sh pipes)</flag>
+		<flag name="logger">Enable support for logging</flag>
 		<flag name="relay">Enable relay plugin (experimental)</flag>
-		<flag name="scripts">Build infrastructure for scripting.</flag>
-		<flag name="trigger">Enable trigger plugin.</flag>
-		<flag name="xfer">Enable xfer plugin support.</flag>
-		<flag name="irc">Enable IRC protocol support.</flag>
+		<flag name="scripts">Build infrastructure for scripting</flag>
+		<flag name="trigger">Enable trigger plugin</flag>
+		<flag name="xfer">Enable xfer plugin support</flag>
+		<flag name="irc">Enable IRC protocol support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/weechat/weechat-2.0.ebuild b/net-irc/weechat/weechat-2.0.ebuild
new file mode 100644
index 000000000000..59575ed9f9d6
--- /dev/null
+++ b/net-irc/weechat/weechat-2.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit python-single-r1 cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
+IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( dev-lang/lua:0[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:* )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-ruby/asciidoctor-1.5.4
+		dev-util/source-highlight
+	)
+	nls? ( >=sys-devel/gettext-0.15 )
+	test? ( dev-util/cpputest )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# fix libdir placement
+	sed -i \
+		-e "s:lib/:$(get_libdir)/:g" \
+		-e "s:lib\":$(get_libdir)\":g" \
+		CMakeLists.txt || die "sed failed"
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				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
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NCURSES=ON
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_ASPELL=$(usex spell)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	if use python; then
+		python_export PYTHON_LIBPATH
+		mycmakeargs+=(
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 674f4cb5e57f..59575ed9f9d6 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -21,9 +21,9 @@ LICENSE="GPL-3"
 SLOT="0"
 
 NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
+PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
 IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -38,6 +38,7 @@ RDEPEND="
 	lua? ( dev-lang/lua:0[deprecated] )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:* )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
 	ssl? ( net-libs/gnutls )
@@ -95,6 +96,15 @@ src_prepare() {
 
 	# install docs in correct directory
 	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
 }
 
 src_configure() {
@@ -108,6 +118,7 @@ src_configure() {
 		-DENABLE_BUFLIST=$(usex buflist)
 		-DENABLE_CHARSET=$(usex charset)
 		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FSET=$(usex fset)
 		-DENABLE_FIFO=$(usex fifo)
 		-DENABLE_IRC=$(usex irc)
 		-DENABLE_LOGGER=$(usex logger)
@@ -115,6 +126,7 @@ src_configure() {
 		-DENABLE_SCRIPT=$(usex scripts)
 		-DENABLE_SCRIPTS=$(usex scripts)
 		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_RUBY=$(usex ruby)
 		-DENABLE_LUA=$(usex lua)