reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-im
293 files changed, 13490 insertions, 0 deletions
diff --git a/net-im/ayttm/Manifest b/net-im/ayttm/Manifest
new file mode 100644
index 000000000000..43cccc1780c6
--- /dev/null
+++ b/net-im/ayttm/Manifest
@@ -0,0 +1,7 @@
+AUX ayttm-0.6.3-opt-webcam.patch 887 SHA256 ed12015c4b71a16ae47969195066f0dadc2d2725149dfc4eb36d0d7ffebe7a7d SHA512 6d56796d124450554f929c0a8b6a447a86c978dda2aa7e815d9e512c7c62de7c7e8e9a2b3e26a900ca1cda7f17c017292f2afb3791bcc922447b6e4bf5665170 WHIRLPOOL b83e99f16c373153978570d85f5cec75f789754003551d6d1e0b6247c98987481e45240032569c1291258d8d365d47c257906b411ca81a35a81907bd2e03f8c4
+AUX ayttm-0.6.3-opt-xscreensaver.patch 409 SHA256 396cf3f223a9db93fe512c8792395290d3acdcb5022fdb4babd84ab523a6e649 SHA512 67a81ddfab8aeddac8d4fe0cdc8f9fdfee7e5ea2d206a374e480949c8ed738c147dc2ef679e7984d26b4ecbaa78152c9ba53eaa5ed2cd6c4836aded5fad5f14d WHIRLPOOL cc0788a48ac9b97962032c2b467c2ee264d20b87d1ea94c3ba3862cd2762d4e8ca72f5b552adb022aebb511d59efaf57b884c4bddca99794fa32cfb314041704
+DIST ayttm-0.6.3.tar.bz2 1377010 SHA256 2c48d3b8183139e7657c03dab9d17c997077624fd97a177d932f80ee6c596157 SHA512 8480b9e6b6e1c45a3cdd16d991ebf7e12c400d282243f5f44715ba20d4db4523a0343fe49016f7dba3e1a23d963eef52fbb0823c27aedec0db33457319138270 WHIRLPOOL f0a49a588d1aacc5e9d0338f18a32078933cd15f841fa87c33377ab2173bbf6c70eb5758dcd3e499fe5756da4968e4e7f669a62e008b5a3e8f4c0be746ae2b75
+EBUILD ayttm-0.6.3-r1.ebuild 1446 SHA256 8004cce76623ea389950281f728389aa7ee3cde184d65ce862db6b50f8954a97 SHA512 6dce1c964527f4aa8799d16cac1f51986ee2c9d9d6464ed8f5bc32c30743009d2bc341c0ca55ed0666f76322bb5cf9933852157803945fdbac75cb44f3494d4c WHIRLPOOL 2a4bcc21c42d641c7a9faf06781adf7ecccb8923c2767f1cd68a446fdd0865786ba0d371f500bab7eeae7e8abb35f44e4f74b069686175002a141d3438debc9c
+MISC ChangeLog 2944 SHA256 0e341fff1ea5631e536a3b8e463b2da280b4beaac5681c9dc997c91a299af038 SHA512 9da5ef841fa5827da9c9dfdf0fd6d3ef88bee2fdbfd3612547320361943e9cc1eeff4ec389b492ccb7d78e44f0abfff76cc36745ea06d0f416367fcd1d317fe6 WHIRLPOOL a8ddf60236f7a1ba873d9b24bf50a1d7688d080687e364bc2e1fe9b5c855078bd1854704984f810bae0811200c01333ea95e231f438308d2fbb4cc5ae7c36c0e
+MISC ChangeLog-2015 923 SHA256 4cb5b9bb82d94d40d7f1a7d43edd2551acd568b8f808c2fb9550c8120b8d126f SHA512 a05af7ba08cb3303d97457324d8d97c6a867ec6b6398fc752eb53d548d32faf7163474d259ae1f1b07fdabdb7f446eb2bdae37f8c3e2decae4e5e981cc4ed872 WHIRLPOOL 16520c45e331d4b4afa1ab0115ab018b5af1659e8378d52cf34a8334d1e676b55f03a3e3a02e826ef9baab486e8d577f27937735ec4590d7a9ec52c22d13bace
+MISC metadata.xml 690 SHA256 bf3cda39529e57db7f6dd8b0a62cbe9e4b34a738477e18ab0d27398acfa5b445 SHA512 31080f5067a4b51de6cb03133b3be833515d9572aaa62dbd7045f2a929d7e5c73f32bb1fbee54d36abc6bc809a18d1d653d7a7b2a855802b9590d39f1e716970 WHIRLPOOL 13b695f6c8b868ead1ec7aaff46666077ec5a3249179fb44c76cb22a8dc15dba65d42028ef7be22a4e052a34127e86483d3e1ffe39b6dbf7b3c1d43dcc47705f
diff --git a/net-im/ayttm/ayttm-0.6.3-r1.ebuild b/net-im/ayttm/ayttm-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..2f183105a741
--- /dev/null
+++ b/net-im/ayttm/ayttm-0.6.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="A multi-protocol instant messaging client"
+HOMEPAGE="http://ayttm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ayttm/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt icq irc xmpp lj msn nls oscar smtp xscreensaver yahoo"
+
+RDEPEND="app-text/enchant
+	dev-libs/glib:2
+	dev-libs/openssl:0=
+	virtual/libiconv
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/pango
+	crypt? ( app-crypt/gpgme )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	yahoo? ( net-libs/libyahoo2 )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-opt-xscreensaver.patch \
+		"${FILESDIR}"/${P}-opt-webcam.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable crypt aycryption) \
+		--disable-esd \
+		$(use_enable icq) \
+		$(use_enable irc) \
+		$(use_enable xmpp jabber) \
+		$(use_enable lj) \
+		$(use_enable msn) \
+		$(use_enable nls) \
+		$(use_enable oscar) \
+		$(use_enable smtp) \
+		$(use_enable xscreensaver) \
+		$(use_enable yahoo) \
+		--disable-webcam \
+		--disable-arts \
+		--enable-posix-dlopen \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README README.LINUX TODO
+	rm -f "${D}"/usr/$(get_libdir)/${PN}/*.la
+}
diff --git a/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch b/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch
new file mode 100644
index 000000000000..e805d90746d6
--- /dev/null
+++ b/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch
@@ -0,0 +1,28 @@
+Make the building of the webcam-related plugins optional.
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.ac
++++ configure.ac
+@@ -436,6 +439,10 @@
+ 		AC_MSG_WARN(You need gpgme to compile the aycryption module))
+ fi
+ 
++if test "$enable_webcam" != no; then
++	OPTIONAL_PLUG_DIR="$OPTIONAL_PLUG_DIR image_filter"
++fi
++
+ ###########################################################################
+ # End Optional Modules
+ ###########################################################################
+--- modules/Makefile.am
++++ modules/Makefile.am
+@@ -1,7 +1,7 @@
+ DIST_SUBDIRS = aim-oscar irc jabber msn2 yahoo2 smtp importers \
+ livejournal utility aycryption smileys image_filter
+ 
+-SUBDIRS = @OPTIONAL_PLUG_DIR@ importers utility smileys image_filter
++SUBDIRS = @OPTIONAL_PLUG_DIR@ importers utility smileys
+ 
+ # Gets rid of the datarootdir warning
+ datarootdir=@datarootdir@
diff --git a/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch b/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch
new file mode 100644
index 000000000000..7c6f09f5117e
--- /dev/null
+++ b/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch
@@ -0,0 +1,16 @@
+Add --enable-xscreensaver to configure for USE flag support
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.ac
++++ configure.ac
+@@ -316,6 +316,9 @@
+ 	 #endif
+ 	])
+ 
++AC_ARG_ENABLE(xscreensaver, AC_HELP_STRING([--enable-xscreensaver],
++        [compile with X Screensaver]), [have_xss=$enableval], [have_xss=no] )
++
+ if test "$have_xss" = yes; then
+ 	# Let's figure out what library it's in...
+ 	
diff --git a/net-im/ayttm/metadata.xml b/net-im/ayttm/metadata.xml
new file mode 100644
index 000000000000..5cbaca7524d5
--- /dev/null
+++ b/net-im/ayttm/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Ayttm is a multi-protocol instant messaging client with some novel features
+		such as the ability to connect to livejournal.com and the ability to send
+		short messages via RFC2821 SMTP.
+	</longdescription>
+	<use>
+		<flag name="irc">Enable Internet Relay Chat support</flag>
+		<flag name="lj">Enable livejournal.com support</flag>
+		<flag name="smtp">Adds support for sending messages via RFC2821 SMTP</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ayttm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/bitlbee-steam/Manifest b/net-im/bitlbee-steam/Manifest
new file mode 100644
index 000000000000..3073797106bd
--- /dev/null
+++ b/net-im/bitlbee-steam/Manifest
@@ -0,0 +1,7 @@
+DIST bitlbee-steam-1.2.0.tar.gz 40277 SHA256 ffcfbaf4aef55e78470fc8102554dc190a43d3a5cf6c055188f26036c8fb3a11 SHA512 706f22193d7a22dcbcaa6a07d2dcd4707b666d9a831a9864949ce9a6f2a1db33d3a07f94b3cde9a8d6042fd53caa07b1f87749f87b146d88793578cca997adee WHIRLPOOL e8b69dbbdcc07a82fc75e270bb431611f4de0b1e96ef0756adff4d20cc0656828b159b8973ea9b1d735ae9a641882e1fcb68a8ce9513cb605be3e26eca22a5da
+DIST bitlbee-steam-1.4.2.tar.gz 43003 SHA256 fced6878906e14d96f899d362620de17c41a7fb84c2460068a9c08fc6904de38 SHA512 c8acf584052246112b76c433e26805ade204802173147b9f1b73778f1300557df41ab97562a1cfbc20ad1bb0288718d62c03f90b7d11a9faf4d647938009ee48 WHIRLPOOL 37f6070dc9d6dc9a81cc4791ce0333162a75dc582a5113a0e7040437a600cf6dc6dafa972b71c4883e9ebc5737b11ab7a1cac187e6cf860191a7635619780be8
+EBUILD bitlbee-steam-1.2.0.ebuild 693 SHA256 45a68ce218b6bca308b7f54515ccfc4c09c031454cd8e63797cf336aea1c1a7b SHA512 672393b2657d2335b1b9247c399782477a95d542112bc4f16637d55fb72cd45a2b0ae064a558aa12f83a6d2918ef45cc78083bba716a8ba780c75d2e704b002c WHIRLPOOL c15ae41f20e1f334b0f514e4b1d3bad943475a9dfef063b5ebf18016dd19b93eb2d1e1386abbb0efaad17c0ee4562797c86a77b49a391c4fe31aef5778a9675a
+EBUILD bitlbee-steam-1.4.2.ebuild 724 SHA256 c846167924d7cbf014ae5307139aff30d49de2529eaebcd9f8ecfea9c19ab5b1 SHA512 f3be5373d7341d3f91f3ef95ae7584bbf9ed0cea266c54d8f2fefab9ecc9de629835d6e8172ad1e0a35e800ade338a1e9506c9482515ab519f0c9d03f14905f2 WHIRLPOOL ff8a4a43bfa6a9599a4b8c28f7db555d4adfa3e4af88a925281b7546bdd61aeae7406661ee70ca235b95f21b6e0a3e42896826f2a95e76c29fcf60fd20291f89
+EBUILD bitlbee-steam-9999.ebuild 724 SHA256 c846167924d7cbf014ae5307139aff30d49de2529eaebcd9f8ecfea9c19ab5b1 SHA512 f3be5373d7341d3f91f3ef95ae7584bbf9ed0cea266c54d8f2fefab9ecc9de629835d6e8172ad1e0a35e800ade338a1e9506c9482515ab519f0c9d03f14905f2 WHIRLPOOL ff8a4a43bfa6a9599a4b8c28f7db555d4adfa3e4af88a925281b7546bdd61aeae7406661ee70ca235b95f21b6e0a3e42896826f2a95e76c29fcf60fd20291f89
+MISC ChangeLog 1316 SHA256 d8651a388288b52d3405feddfe598be7e5d05c91950d29770265b3085402b472 SHA512 e75b5f69dce4f69392632d249a810d764918f7d269ec326d1e4ad04ae177a6673c16c8dee3e6c083676e98cd564ad4545a0ce141ec8bc35c4075bae8d09b6b4d WHIRLPOOL 1f6149805abba575fb87928ba3418f95f1ab90c74e3ea66df5ca333207e0fa65ec8d160333a03a3bcd152dd84f124b6cc9d8326395bf06dd536a5c3889d16b68
+MISC metadata.xml 687 SHA256 9aa9363fe2d238bb5244381dcf8c12cf7916b5ea49e36028c02d90a0abad4a31 SHA512 12eebf75573551e840c30b4736ac4bdcba3a1898961f60500289b56fab795f1573759fa7945d9abb6287fdb2dbb4fb58177a3f84858afb262aacdc58cf3f6882 WHIRLPOOL da685f8fb59f1229939f2fcaa30959fbb472eb7e4672784abe24f391fa9b749297d23dcd98f982bb2e1d30b0f3f52ca94f580dee644d610912a8fd1908d0d821
diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.2.0.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.2.0.ebuild
new file mode 100644
index 000000000000..c1a67487c02f
--- /dev/null
+++ b/net-im/bitlbee-steam/bitlbee-steam-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Steam protocol plugin for BitlBee"
+HOMEPAGE="https://github.com/jgeboski/bitlbee-steam"
+SRC_URI="https://github.com/jgeboski/bitlbee-steam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgpg-error
+	>=net-im/bitlbee-3.2.1[plugins]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--enable-minimal-flags
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild
new file mode 100644
index 000000000000..c0ec7c0ca9c8
--- /dev/null
+++ b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune autotools
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-steam.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/bitlbee/bitlbee-steam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Steam protocol plugin for BitlBee"
+HOMEPAGE="https://github.com/bitlbee/bitlbee-steam"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgcrypt:0=
+	>=net-im/bitlbee-3.4[plugins]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild b/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild
new file mode 100644
index 000000000000..c0ec7c0ca9c8
--- /dev/null
+++ b/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune autotools
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-steam.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/bitlbee/bitlbee-steam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Steam protocol plugin for BitlBee"
+HOMEPAGE="https://github.com/bitlbee/bitlbee-steam"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgcrypt:0=
+	>=net-im/bitlbee-3.4[plugins]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/net-im/bitlbee-steam/metadata.xml b/net-im/bitlbee-steam/metadata.xml
new file mode 100644
index 000000000000..6b674f5fd99f
--- /dev/null
+++ b/net-im/bitlbee-steam/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		The Steam protocol plugin for bitlbee. This plugin uses the Steam
+		Mobile API allowing it to run alongside the main Steam client.
+		It is worth noting that the Steam Mobile API is HTTP based, which
+		does lead to mild latency.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>jgeboski@gmail.com</email>
+			<name>James Geboski</name>
+		</maintainer>
+		<bugs-to>https://github.com/bitlbee/bitlbee-steam/issues</bugs-to>
+		<remote-id type="github">bitlbee/bitlbee-steam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
new file mode 100644
index 000000000000..c5b054b3121b
--- /dev/null
+++ b/net-im/bitlbee/Manifest
@@ -0,0 +1,10 @@
+AUX bitlbee-3.5-systemd-user.patch 188 SHA256 015495c7cd30f4788833759c681d2aa84f5155964a4dc2b728acfa0e10442a88 SHA512 1775b5dce7bdd4fbe52a46e361d8a9b0127be2dc32a3e8b438fca8fce9139903feb91c968847f002e099553eb8d4a110914cfb19121ae79a3f6c9eb100846edd WHIRLPOOL 11d2a3cb1f140988c147989a4851275cff74226824a3f3bd88aedf6c60f2524ef1d5f51ef5dd7b74e265861ed7ffb37a3731b16a71798d9367b5398bb8b103bd
+AUX bitlbee-3.5-verbose-build.patch 5790 SHA256 6315e18459cea44774391898a5e6f109505953aee1d9380b4da4757a96583062 SHA512 0bb4d1e4d954ca4812f1968a3c83ae6d7ea1d812066e963b00471aa516b1ac0ca041c8574bfb4a1e91236b2e1ad3c9edf3041b7467a84bf22cc120b4e7e69faa WHIRLPOOL 70ae3c8a293e93add3eabdf2299e92097b50786a7ccaf45351cf5fb12b5b9a9c9fd6563026639db98210ac74a47386599ddd50fcebf035fb3704c0a2d8376128
+AUX bitlbee.confd-r1 291 SHA256 cab8b8cb8709f27a5fa9f1cfce4b58db24f5cd38b8e6badb91dac0809e6ca8de SHA512 e5dcb6bdfd382b28011c5fc93273d45bfd9af0c652e4f8db1c0d11615b38c5dbb7042d9b33fa5bdce844593e85a5776f2b19f75e9a67a2c46dc88b90f260e11e WHIRLPOOL aaaa218138aee18301c36ef6a59c344e313159d19472971aa95d0809c2ae81ea61df03129ff625270c9e426d9d79b843fad4212bb102cee7b98e387cd31eb1bd
+AUX bitlbee.initd-r1 675 SHA256 4b8654dffd57243079223a1cc236edf5e47309515270fde2d18123e41cd3c29f SHA512 5c65b85e72a2013454becceaab0d08e5e69bb9072c6081f1c4cd3cef87104b2413bcc432a1db0a761e91e42cf72df2344101fb0f886b88fe60882e26d597f921 WHIRLPOOL fb0cfba5d7ef328e0ec16e9fe35de05daa9f83b03118beb6aa0f71144d56fce10a983596cdc9b52f3dacf7e4004206bde96a3dd643e0b205aa202372acc182ae
+DIST bitlbee-3.5.1.tar.gz 680351 SHA256 9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69 SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3 WHIRLPOOL fd8645bb72e2cae336a5d627de0631f5858ffaf4d4d43e7efc5656605068179d86d0deff2810f56e5154995ffdd58ee8be90bc459ff9766dacd5e74d08aaefc7
+EBUILD bitlbee-3.5.1.ebuild 3850 SHA256 2d8375472f599a7b49989950dc25318655497104f37323e539d15cba2cbf6139 SHA512 42f274030a1766cfb03ebf02a2d2099adf04b85b53788e59ecb9428c1c253cc01a431de03083810d30b1ab6f0d3ea531c75468dd34639a97f673b5b7989c6332 WHIRLPOOL cef2d7811b267d7e092d1689c84366ca6db2a7b2d6e686c72c36e8099cbf8bdee6ab760be38a23a7ca4e694e8e89604c483c33b594761767f5f35be37e85c6c3
+EBUILD bitlbee-9999.ebuild 3843 SHA256 72c6414e411504d1e0cf5709d4d57995f10be622bb74a041b0ef27f117d09f26 SHA512 fa22f93306ced1b557eb27e9bcd890c9d4e5daae616a488d0c3c88277dfb62f0653348177f58040d62a9f8f96f77c6139204ffc34323c5e5efca3166e25f4d8a WHIRLPOOL 8680f5e75479b3ecdccde55e851cd22485a5d534747ee7a26f567a92c3528316855018acb60a294b6efb5a37b6aba90c0bb0e2dc6fb43923653cdd1eabb01b6a
+MISC ChangeLog 5166 SHA256 f1cd5c2507045e71705c795b76e5c04ad9a8e6f63d4b36c54bec7b6ffaf06c1f SHA512 478244fb6fc7baae033a90b58a7d87eeb26fa90a968169ac3e51fcba85d821f43bfbce7c048c16fee9bb1b26d093eb94dae3ae586de42b0dbe4d7fadedda53d7 WHIRLPOOL a410c106b0542f4d2e61bf16dc6cc4d6b245af9bee91791fb8d6af64df2bdd505945b5e90c4e6799e733ed685bf967099bd5ffee14f14e37c64061622e44fbb1
+MISC ChangeLog-2015 28276 SHA256 161b732da5da4a11fe8f95a5b6f1e5402bf64e27db6ee5473156a43592154a9f SHA512 48a1e7747383acba844d18b72e05b2163121844c8253f93a522259d059213b24e0d9c61228a13ef0ef7be6ab7253ceffb58827209cc1ea320ea7dfbcfa18816d WHIRLPOOL ea169a87e98b9be976e78b16f3940bcc535f2d53acc67a621789d1b2bc5dc7ac9a3481a7ea0cac920917ee24f32bda938186e34a4c481e072d436b8e17905fc5
+MISC metadata.xml 885 SHA256 37efaf96b7fa292cdcc9b5fdd64597f3df726c876944c1906b37938c9fc8a0d0 SHA512 1a4d426b0b76a7e33d80c6d6ff1563f8477f2bfbe1e0cd9e0371310d84b057ca3f46e621a8af18c7421977461205efd076777063a1f2892043515bef1d4fa038 WHIRLPOOL 9ff5ab14bf7698321b84d549b1cdd223656453399932ed97a8f73b499209eb8227e7997fd11ef368f25c3c4cec49b13f061795440bed9f991060e0d49ac1eccd
diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild
new file mode 100644
index 000000000000..e1536d6244b4
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
+	inherit git-r3
+else
+	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
+	KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="https://www.bitlbee.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd
+	${IUSE_PROTOCOLS}"
+
+REQUIRED_USE="
+	|| ( purple xmpp msn oscar )
+	xmpp? ( !nss )
+	test? ( plugins )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16
+	purple? ( net-im/pidgin )
+	libevent? ( dev-libs/libevent:= )
+	otr? ( >=net-libs/libotr-4 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!nss? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( dev-libs/openssl:0= )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	selinux? ( sec-policy/selinux-bitlbee )
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	xinetd? ( sys-apps/xinetd )"
+
+pkg_setup() {
+	enewgroup bitlbee
+	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_prepare() {
+	if [[ ${PV} != "9999" ]]; then
+		eapply \
+			"${FILESDIR}"/${PN}-3.5-systemd-user.patch \
+			"${FILESDIR}"/${PN}-3.5-verbose-build.patch
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# setup plugins, protocol, ipv6 and debug
+	myconf+=( --jabber=$(usex xmpp 1 0) )
+	for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do
+		myconf+=( --${flag}=$(usex ${flag} 1 0) )
+	done
+
+	# set otr
+	if use otr && use plugins ; then
+		myconf+=( --otr=plugin )
+	else
+		if use otr ; then
+			ewarn "OTR support has been disabled automatically because it"
+			ewarn "requires the plugins USE flag."
+		fi
+		myconf+=( --otr=0 )
+	fi
+
+	# setup ssl use flags
+	if use gnutls ; then
+		myconf+=( --ssl=gnutls )
+		einfo "Using gnutls for SSL support"
+	else
+		ewarn "Only gnutls is officially supported by upstream."
+		if use nss ; then
+			myconf+=( --ssl=nss )
+			einfo "Using nss for SSL support"
+		else
+			myconf+=( --ssl=openssl )
+			einfo "Using openssl for SSL support"
+		fi
+	fi
+
+	# set event handler
+	if use libevent ; then
+		myconf+=( --events=libevent )
+	else
+		myconf+=( --events=glib )
+	fi
+
+	# not autotools-based
+	./configure \
+		--prefix=/usr \
+		--datadir=/usr/share/bitlbee \
+		--etcdir=/etc/bitlbee \
+		--plugindir=/usr/$(get_libdir)/bitlbee \
+		--systemdsystemunitdir=$(systemd_get_systemunitdir) \
+		--doc=1 \
+		--strip=0 \
+		--verbose=1 \
+		"${myconf[@]}" || die
+
+	sed -i \
+		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+		Makefile.settings || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd
+
+	keepdir /var/lib/bitlbee
+	fperms 700 /var/lib/bitlbee
+	fowners bitlbee:bitlbee /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins doc/bitlbee.xinetd bitlbee
+	fi
+
+	newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee
+	newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee
+
+	exeinto /usr/share/bitlbee
+	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
+}
+
+pkg_postinst() {
+	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+	[[ -d "${ROOT}"/var/run/bitlbee ]] &&
+		chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo
+		elog "The bitlbee init script will now attempt to stop all processes owned by the"
+		elog "bitlbee user, including per-client forks."
+		elog
+		elog "Tell the init script not to touch anything besides the main bitlbee process"
+		elog "by changing the BITLBEE_STOP_ALL variable in"
+		elog "	/etc/conf.d/bitlbee"
+		einfo
+	fi
+}
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
new file mode 100644
index 000000000000..ba55773394df
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
+	inherit git-r3
+else
+	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="https://www.bitlbee.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd
+	${IUSE_PROTOCOLS}"
+
+REQUIRED_USE="
+	|| ( purple xmpp msn oscar )
+	xmpp? ( !nss )
+	test? ( plugins )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16
+	purple? ( net-im/pidgin )
+	libevent? ( dev-libs/libevent:= )
+	otr? ( >=net-libs/libotr-4 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!nss? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( dev-libs/openssl:0= )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	selinux? ( sec-policy/selinux-bitlbee )
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	xinetd? ( sys-apps/xinetd )"
+
+pkg_setup() {
+	enewgroup bitlbee
+	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_prepare() {
+	if [[ ${PV} != "9999" ]]; then
+		eapply \
+			"${FILESDIR}"/${P}-systemd-user.patch \
+			"${FILESDIR}"/${P}-verbose-build.patch
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# setup plugins, protocol, ipv6 and debug
+	myconf+=( --jabber=$(usex xmpp 1 0) )
+	for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do
+		myconf+=( --${flag}=$(usex ${flag} 1 0) )
+	done
+
+	# set otr
+	if use otr && use plugins ; then
+		myconf+=( --otr=plugin )
+	else
+		if use otr ; then
+			ewarn "OTR support has been disabled automatically because it"
+			ewarn "requires the plugins USE flag."
+		fi
+		myconf+=( --otr=0 )
+	fi
+
+	# setup ssl use flags
+	if use gnutls ; then
+		myconf+=( --ssl=gnutls )
+		einfo "Using gnutls for SSL support"
+	else
+		ewarn "Only gnutls is officially supported by upstream."
+		if use nss ; then
+			myconf+=( --ssl=nss )
+			einfo "Using nss for SSL support"
+		else
+			myconf+=( --ssl=openssl )
+			einfo "Using openssl for SSL support"
+		fi
+	fi
+
+	# set event handler
+	if use libevent ; then
+		myconf+=( --events=libevent )
+	else
+		myconf+=( --events=glib )
+	fi
+
+	# not autotools-based
+	./configure \
+		--prefix=/usr \
+		--datadir=/usr/share/bitlbee \
+		--etcdir=/etc/bitlbee \
+		--plugindir=/usr/$(get_libdir)/bitlbee \
+		--systemdsystemunitdir=$(systemd_get_systemunitdir) \
+		--doc=1 \
+		--strip=0 \
+		--verbose=1 \
+		"${myconf[@]}" || die
+
+	sed -i \
+		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+		Makefile.settings || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd
+
+	keepdir /var/lib/bitlbee
+	fperms 700 /var/lib/bitlbee
+	fowners bitlbee:bitlbee /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins doc/bitlbee.xinetd bitlbee
+	fi
+
+	newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee
+	newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee
+
+	exeinto /usr/share/bitlbee
+	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
+}
+
+pkg_postinst() {
+	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+	[[ -d "${ROOT}"/var/run/bitlbee ]] &&
+		chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo
+		elog "The bitlbee init script will now attempt to stop all processes owned by the"
+		elog "bitlbee user, including per-client forks."
+		elog
+		elog "Tell the init script not to touch anything besides the main bitlbee process"
+		elog "by changing the BITLBEE_STOP_ALL variable in"
+		elog "	/etc/conf.d/bitlbee"
+		einfo
+	fi
+}
diff --git a/net-im/bitlbee/files/bitlbee-3.5-systemd-user.patch b/net-im/bitlbee/files/bitlbee-3.5-systemd-user.patch
new file mode 100644
index 000000000000..63fcaea00913
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.5-systemd-user.patch
@@ -0,0 +1,10 @@
+--- bitlbee-3.5/init/bitlbee.service.in
++++ bitlbee-3.5/init/bitlbee.service.in
+@@ -3,6 +3,7 @@
+ 
+ [Service]
+ ExecStart=@sbindir@bitlbee -F -n
++User=bitlbee
+ KillMode=process
+ 
+ [Install]
diff --git a/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch b/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch
new file mode 100644
index 000000000000..7501963cb5de
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch
@@ -0,0 +1,200 @@
+Add a --verbose configure flag to enable verbose build output.
+
+--- bitlbee-3.5/configure
++++ bitlbee-3.5/configure
+@@ -38,6 +38,7 @@
+ twitter=1
+ purple=0
+ 
++verbose=0
+ doc=1
+ debug=0
+ strip=0
+@@ -125,6 +126,8 @@
+ --pidfile=...						$pidfile
+ --config=...						$config
+ 
++--verbose=0/1	Disable/enable verbose build	$verbose
++
+ --msn=0/1	Disable/enable MSN part			$msn
+ --jabber=0/1	Disable/enable Jabber part		$jabber
+ --oscar=0/1	Disable/enable Oscar part (ICQ, AIM)	$oscar
+@@ -282,6 +285,12 @@
+ 	debug=1
+ fi
+ 
++if [ "$verbose" = "0" ]; then
++	echo 'VERBOSE=@' >> Makefile.settings
++else
++	echo 'VERBOSE=' >> Makefile.settings
++fi
++
+ if [ "$debug" = "1" ]; then
+ 	echo 'DEBUG=1' >> Makefile.settings
+ 	CFLAGS="$CFLAGS -g3 -DDEBUG -O0"
+--- bitlbee-3.5/lib/Makefile
++++ bitlbee-3.5/lib/Makefile
+@@ -35,12 +35,12 @@
+ 
+ lib.o: $(objects) $(subdirs)
+ 	@echo '*' Linking lib.o
+-	@$(LD) $(LFLAGS) $(objects) -o lib.o
++	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o
+ 
+ $(objects): ../Makefile.settings Makefile
+ 
+ $(objects): %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+ 
+ -include .depend/*.d
+--- bitlbee-3.5/Makefile
++++ bitlbee-3.5/Makefile
+@@ -162,28 +162,28 @@
+ 	tar czf $$x.tar.gz --exclude=debian --exclude=.git* --exclude=.depend $$x
+ 
+ $(subdirs):
+-	@$(MAKE) -C $@ $(MAKECMDGOALS)
++	$(MAKE) -C $@ $(MAKECMDGOALS)
+ 
+ $(OTR_PI): %.so: $(_SRCDIR_)%.c
+ 	@echo '*' Building plugin $@
+-	@$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
++	$(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
+ 
+ $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
+ 	@echo '*' Building plugin skype
+-	@$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
++	$(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
+ 
+ $(objects): %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+ 
+ $(objects): Makefile Makefile.settings config.h
+ 
+ $(OUTFILE): $(objects) $(subdirs)
+ 	@echo '*' Linking $(OUTFILE)
+-	@$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
++	$(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
+ ifneq ($(firstword $(STRIP)), \#)
+ 	@echo '*' Stripping $(OUTFILE)
+-	@-$(STRIP) $(OUTFILE)
++	$(VERBOSE) -$(STRIP) $(OUTFILE)
+ endif
+ 
+ ctags: 
+--- bitlbee-3.5/protocols/jabber/Makefile
++++ bitlbee-3.5/protocols/jabber/Makefile
+@@ -37,10 +37,10 @@
+ 
+ $(objects): %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+ 
+ jabber_mod.o: $(objects)
+ 	@echo '*' Linking jabber_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
++	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
+ 
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/Makefile
++++ bitlbee-3.5/protocols/Makefile
+@@ -42,18 +42,18 @@
+ 	rm -rf .depend
+ 
+ $(subdirs):
+-	@$(MAKE) -C $@ $(MAKECMDGOALS)
++	$(MAKE) -C $@ $(MAKECMDGOALS)
+ 
+ ### MAIN PROGRAM
+ 
+ protocols.o: $(objects) $(subdirs)
+ 	@echo '*' Linking protocols.o
+-	@$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
++	$(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
+ 
+ $(objects): ../Makefile.settings Makefile
+ 
+ $(objects): %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+ 
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/msn/Makefile
++++ bitlbee-3.5/protocols/msn/Makefile
+@@ -37,10 +37,10 @@
+ 
+ $(objects): %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+ 
+ msn_mod.o: $(objects)
+ 	@echo '*' Linking msn_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o msn_mod.o
++	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o msn_mod.o
+ 
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/oscar/Makefile
++++ bitlbee-3.5/protocols/oscar/Makefile
+@@ -38,10 +38,10 @@
+ 
+ $(objects): %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+ 
+ oscar_mod.o: $(objects)
+ 	@echo '*' Linking oscar_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
++	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o oscar_mod.o
+ 
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/purple/Makefile
++++ bitlbee-3.5/protocols/purple/Makefile
+@@ -38,10 +38,10 @@
+ 
+ $(objects): %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+ 
+ purple_mod.o: $(objects)
+ 	@echo '*' Linking purple_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o purple_mod.o
++	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o purple_mod.o
+ 
+ -include .depend/*.d
+--- bitlbee-3.5/protocols/twitter/Makefile
++++ bitlbee-3.5/protocols/twitter/Makefile
+@@ -37,10 +37,10 @@
+ 
+ $(objects): %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+ 
+ twitter_mod.o: $(objects)
+ 	@echo '*' Linking twitter_mod.o
+-	@$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
++	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
+ 	
+ -include .depend/*.d
+--- bitlbee-3.5/tests/Makefile
++++ bitlbee-3.5/tests/Makefile
+@@ -20,8 +20,8 @@
+ 
+ check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o
+ 	@echo '*' Linking $@
+-	@$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
++	$(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
+ 
+ %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $< -o $@
++	$(VERBOSE) $(CC) -c $(CFLAGS) $< -o $@
diff --git a/net-im/bitlbee/files/bitlbee.confd-r1 b/net-im/bitlbee/files/bitlbee.confd-r1
new file mode 100644
index 000000000000..d581222f9fb9
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.confd-r1
@@ -0,0 +1,8 @@
+# Bitlbee options (see /usr/sbin/bitlbee -h)
+BITLBEE_OPTS="-F"
+
+# By default, the bitlbee init script will attempt to stop
+# all bitlbee-owned processes, including per-client forks.
+# Setting this to "no" tells the init script to only
+# stop the main bitlbee process.
+BITLBEE_STOP_ALL="yes"
diff --git a/net-im/bitlbee/files/bitlbee.initd-r1 b/net-im/bitlbee/files/bitlbee.initd-r1
new file mode 100644
index 000000000000..413bd45735ed
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.initd-r1
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or
+# later
+
+DAEMON=/usr/sbin/bitlbee
+PIDFILE=/var/run/bitlbee/bitlbee.pid
+
+depend() {
+	need logger net
+}
+
+start () {
+	ebegin "Starting bitlbee"
+	checkpath -d -m 0755 -o bitlbee:bitlbee $(dirname ${PIDFILE})
+	start-stop-daemon --start --quiet \
+		-u bitlbee:bitlbee --exec ${DAEMON} --pidfile ${PIDFILE} \
+		-- -P ${PIDFILE} ${BITLBEE_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bitlbee"
+	local pidfile=
+	yesno ${BITLBEE_STOP_ALL:-YES} ||
+		pidfile="--pidfile ${PIDFILE}"
+	start-stop-daemon --stop --quiet ${pidfile} -u bitlbee:bitlbee
+	eend $?
+}
+
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
new file mode 100644
index 000000000000..7f107c38de17
--- /dev/null
+++ b/net-im/bitlbee/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="libevent">Use libevent for event handling</flag>
+		<flag name="nss">Use NSS for SSL support in MSN and Jabber</flag>
+		<flag name="otr">Enable support for encrypted conversations</flag>
+		<flag name="plugins">Enable support for plugins</flag>
+		<flag name="purple">Use libpurple instead of the built-in IM protocol support</flag>
+		<flag name="twitter">Enable Twitter protocol support</flag>
+	</use>
+	<longdescription>
+		Bitlbee as an IRC to IM gateway. It provides an irc server that allows
+		you to log on and then connect to various instant messaging protocols
+		(AIM, MSN, Yahoo, Jabber, etc).
+	</longdescription>
+</pkgmetadata>
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
new file mode 100644
index 000000000000..083f60c3259e
--- /dev/null
+++ b/net-im/centerim/Manifest
@@ -0,0 +1,10 @@
+AUX centerim-4.22.10-gcc46.patch 241 SHA256 9b26af1b97513c998cfe3b08c93aecf9a75357e6c2973dbe0ea99c38d5191896 SHA512 bda4a2f1f502972546af28d37ad426d8e1ef2cb1daf9c2434473991dcbebf889d6a4637dfb58fc133dd96c7146348531e9f095d8b15c61ed7bcf037d3e35c356 WHIRLPOOL 183766dcab71bf0b5473f1d994e58229b26064e3db2ec9167dd8ab415dbc6392c835910631df6577581034edbef1061a85e36d8d27769c89baafc04553a2ac90
+AUX centerim-4.22.10-system-expat.patch 1894 SHA256 9633b71d7e7c3de7ac5142905ed69e1ca0e80ddbb0b8e96f732df69ccd359926 SHA512 e935ec7c69a85e680fce65fa38306a0f2793f8852602f7c26cdf7ecbad8d363fd74a36f5629ae0d78e7f0c00c55236a4cacf88debb0818b02e92655333939379 WHIRLPOOL ea93a58c39d6a2f418b4ead8957b7b93a3475d2545c011a60d824ecb01565cd353995ec5eb926acc3cbacfc3e68f372cfa2ff3d4576e62f2064d50c79fba670e
+DIST centerim-4.22.10.tar.gz 2287832 SHA256 93ce15eb9c834a4939b5aa0846d5c6023ec2953214daf8dc26c85ceaa4413f6e SHA512 1cabb6d455e2c1d2bb70a4330f78a34b54dabbc9a7d77d93ef7a08cfae73958670e86dee06b1fb7cb393c248d9682a491edb19a81cb43e7b0f44513c24759116 WHIRLPOOL 58a615cb171221b916c1cea61388659fe2dd6b09ebfe4bf8442109289e1ed89c47ee5e9cd093a05a276d08f33e6f4e7cb951153a6cdf6eed439a9c20b8d3ff78
+DIST centerim5-5.0.0beta2.tar.gz 689578 SHA256 5f4ad8d4ad8ec785f928ad06b42a184a9785a2cce31da5d908963643b0c522c7 SHA512 5057186ddb354c76740ea38d10678a18a716085566630e3338911f2d3931d60925406fe78c25de8ffe9bdbb7a307e7a230d0da6863c2d81ebb63ba2f6b962d0c WHIRLPOOL 089b5cf1e773712379154df9f74a006763d93472103f6a1f18f767701fa8248e76e0b309d7731dfb3d8e072905ddfe05212bfb69cd4a10215ced3553281c59f9
+EBUILD centerim-4.22.10-r1.ebuild 2752 SHA256 f04e1d8a6fea0b7a4e6ba02cbbf7138a356b52de6e93c9bdbb45634b12541b17 SHA512 64fd31a5cab9bbcb31198554125888a8bd95807daf1ab4b33226a7ad3e9dddb36fd962d65560a88b97bf1393bade6892d622f63001e398044ae7fb3fb4479cdc WHIRLPOOL 9f1ef20974a3487f32cda6c30dd7b571315f9ecee1a7b66f9696b0e868f3e7095943d023706e397bf3c853341d83ad429dc0c17fe3956ffc421bc741078ba34c
+EBUILD centerim-4.22.10.ebuild 2440 SHA256 3dd012f23c847097921e8ff05a21ec1414cf4fe888fb97c781f6443d6d975342 SHA512 3f2318218262f97642179bb88835bcadfa7eaf3f10fb56f4bcfdb4e71788c23176425a6ee627bb8a338f45e295046bd7dac5bc7193c25ff30c66399f75788590 WHIRLPOOL e7c0ede34680733608bcdf68fe33ec6a142084e2bce22983a1c6de2b5ce6e30b5befc64dd9722ecdae278ef2d7fceb37717bbfbd0633d0bce1b426056b6354ec
+EBUILD centerim-5.0.0_beta2.ebuild 838 SHA256 3f96c117191e99c999cc632c6ac5d0bd414e8d2ba11098ac776558af7a727085 SHA512 d543dcf3a4078d940227923d335780c049c75fe7009a7e409c0d582b21753e2d6cf1385df5dbc018b27a578cc1e459187100679bf4d360f824e5f8cf1420976e WHIRLPOOL f62f14726572716a6182666eac62808681bb40f7455faed194c03d8a4b7b66978820bb7e8fac6655531f7f9cb7f9dc60566394555565065e4807d104db1f5d67
+MISC ChangeLog 3067 SHA256 fe119bf4a504c95335449cc0e6c73fdbcbde5a1869a609e4c2407f47adf41ee7 SHA512 eaa93e737b4c17c76b62df5363573ec0f698b31b7db3d5b948d354ba19061e1e2c28251ccd12f4dac3982f885c1a584a64f5b418a72749ca07945a1911f4d813 WHIRLPOOL 11c8b801744fddadb90b7b227d82a162ba91640e03ddeb27f7fe9bd0202b5b326ca8d7ce1df4b61fc914aa28151f3da23c345b00cd41f67c48466d315ec3b94e
+MISC ChangeLog-2015 9606 SHA256 98e571d303c7e6f1eba786e54db5ccd920f385dad9362f55b2ceb40655fbc149 SHA512 50a81b2860df30db9eb638c333faa39db6835749de4ba5376d68f08ecb2483fadd2d926532673c7cdf71c742b85a64c813a2c0f312673e2331f9450210c6698e WHIRLPOOL 69cf0a706f87eb6d380ab069f6e99d1b2c282011d645796943a0fadc92c154d12faa162cf1f4c0a155e1f0ffffbf88d4658085f01f749bcda512bec65b3afa75
+MISC metadata.xml 534 SHA256 1b825fab085f553e8799163d8edcd21c4d3a7d1a9832d4975565a54ddb732b3c SHA512 d798c3e47a16394cf1e884b07ffa24c93c2ae224a14a26b36a0e9414adefb4c13f468f1a7f065b63af05d445d869d2bc6d4927782610c62cebc5a36f5787e59c WHIRLPOOL 6b63da8b50b3e9fad79a2b9140e8d7dfc0eea2f3270d58f2fc0b2ad89a2a400d74d1395799370dce8ca67d540054f6e27dbf727b8ad6e83d249c029b702f0dee
diff --git a/net-im/centerim/centerim-4.22.10-r1.ebuild b/net-im/centerim/centerim-4.22.10-r1.ebuild
new file mode 100644
index 000000000000..41ca9434836c
--- /dev/null
+++ b/net-im/centerim/centerim-4.22.10-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils autotools
+
+PROTOCOL_IUSE="+aim gadu +icq +irc +xmpp lj +msn rss +yahoo"
+IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
+
+DESCRIPTION="ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+if [[ ${PV} = *_p* ]] # is this a snaphot?
+then
+	SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz"
+elif [[ ${PV} = *.*.*.* ]] # is this a mobshot?
+then
+	SRC_URI="http://www.centerim.org/download/mobshots/${P}.tar.gz"
+else
+	SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz"
+fi
+HOMEPAGE="http://www.centerim.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	dev-libs/expat
+	bidi? ( dev-libs/fribidi )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	jpeg? ( virtual/jpeg )
+	xmpp? (
+		otr? ( <net-libs/libotr-4 )
+		crypt? ( >=app-crypt/gpgme-1.0.2 )
+	)
+	msn? ( >=net-misc/curl-7.25.0-r1[ssl] )
+	yahoo? ( >=net-misc/curl-7.25.0-r1[ssl] )"
+
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"/${P/_p*}
+
+check_protocol_iuse() {
+	local flag
+
+	for flag in ${PROTOCOL_IUSE}
+	do
+		use ${flag#+} && return 0
+	done
+
+	return 1
+}
+
+pkg_setup() {
+	if ! check_protocol_iuse
+	then
+		eerror
+		eerror "Please activate at least one of the following protocol USE flags:"
+		eerror "${PROTOCOL_IUSE//+}"
+		eerror
+		die "Please activate at least one protocol USE flag!"
+	fi
+
+	if use otr && ! use xmpp
+	then
+		ewarn
+		ewarn "Support for OTR is only supported with Jabber!"
+		ewarn
+	fi
+
+	if use gadu && ! use jpeg
+	then
+		ewarn
+		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+	(
+		cd libjabber/ || exit 1
+		rm \
+			asciitab.h \
+			hashtable.[ch] \
+			iasciitab.h \
+			latin1tab.h \
+			utf8tab.h \
+			xmldef.h \
+			xmlparse.[ch] \
+			xmlrole.[ch] \
+			xmltok.[ch] \
+			xmltok_impl_c.h \
+			xmltok_impl.h \
+	) || die
+	epatch "${FILESDIR}"/${P}-system-expat.patch
+	eautoreconf
+
+	# Don't execute git commands, bug #228151
+	cat >"${S}"/misc/git-version-gen <<-EOF
+		#!/bin/sh
+		echo -n "${PVR}"
+	EOF
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl) \
+		$(use_enable aim) \
+		$(use_with bidi fribidi) \
+		$(use_with jpeg libjpeg) \
+		$(use_with otr libotr) \
+		$(use_enable gadu gg) \
+		$(use_enable icq) \
+		$(use_enable irc) \
+		$(use_enable xmpp jabber) \
+		$(use_enable lj) \
+		$(use_enable msn) \
+		$(use_enable nls locales-fix) \
+		$(use_enable nls) \
+		$(use_enable rss) \
+		$(use_enable yahoo) \
+		|| die "econf failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
+}
diff --git a/net-im/centerim/centerim-4.22.10.ebuild b/net-im/centerim/centerim-4.22.10.ebuild
new file mode 100644
index 000000000000..210b148c5982
--- /dev/null
+++ b/net-im/centerim/centerim-4.22.10.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+PROTOCOL_IUSE="+aim gadu +icq +irc +xmpp lj +msn rss +yahoo"
+IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
+
+DESCRIPTION="CenterIM is a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+if [[ ${PV} = *_p* ]] # is this a snaphot?
+then
+	SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz"
+elif [[ ${PV} = *.*.*.* ]] # is this a mobshot?
+then
+	SRC_URI="http://www.centerim.org/download/mobshots/${P}.tar.gz"
+else
+	SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz"
+fi
+HOMEPAGE="http://www.centerim.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	bidi? ( dev-libs/fribidi )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	jpeg? ( virtual/jpeg )
+	xmpp? (
+		otr? ( <net-libs/libotr-4 )
+		crypt? ( >=app-crypt/gpgme-1.0.2 )
+	)
+	msn? ( >=net-misc/curl-7.25.0-r1[ssl] )
+	yahoo? ( >=net-misc/curl-7.25.0-r1[ssl] )"
+
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"/${P/_p*}
+
+check_protocol_iuse() {
+	local flag
+
+	for flag in ${PROTOCOL_IUSE}
+	do
+		use ${flag#+} && return 0
+	done
+
+	return 1
+}
+
+pkg_setup() {
+	if ! check_protocol_iuse
+	then
+		eerror
+		eerror "Please activate at least one of the following protocol USE flags:"
+		eerror "${PROTOCOL_IUSE//+}"
+		eerror
+		die "Please activate at least one protocol USE flag!"
+	fi
+
+	if use otr && ! use xmpp
+	then
+		ewarn
+		ewarn "Support for OTR is only supported with Jabber!"
+		ewarn
+	fi
+
+	if use gadu && ! use jpeg
+	then
+		ewarn
+		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+
+	# Don't execute git commands, bug #228151
+	cat >"${S}"/misc/git-version-gen <<-EOF
+		#!/bin/sh
+		echo -n "${PVR}"
+	EOF
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl) \
+		$(use_enable aim) \
+		$(use_with bidi fribidi) \
+		$(use_with jpeg libjpeg) \
+		$(use_with otr libotr) \
+		$(use_enable gadu gg) \
+		$(use_enable icq) \
+		$(use_enable irc) \
+		$(use_enable xmpp jabber) \
+		$(use_enable lj) \
+		$(use_enable msn) \
+		$(use_enable nls locales-fix) \
+		$(use_enable nls) \
+		$(use_enable rss) \
+		$(use_enable yahoo) \
+		|| die "econf failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
+}
diff --git a/net-im/centerim/centerim-5.0.0_beta2.ebuild b/net-im/centerim/centerim-5.0.0_beta2.ebuild
new file mode 100644
index 000000000000..b3cd6b97c4d8
--- /dev/null
+++ b/net-im/centerim/centerim-5.0.0_beta2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P="${PN}5-${PV/_}"
+
+DESCRIPTION="CenterIM is a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz"
+HOMEPAGE="http://www.centerim.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug nls"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	>=net-im/pidgin-2.7.0
+	>=dev-libs/glib-2.16.0
+	>=dev-libs/libsigc++-2.2.0"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/usr/lib*/libcppconsui.{a,la}
+
+	dodoc AUTHORS HACKING NEWS README TODO
+}
diff --git a/net-im/centerim/files/centerim-4.22.10-gcc46.patch b/net-im/centerim/files/centerim-4.22.10-gcc46.patch
new file mode 100644
index 000000000000..a03e9eabd13f
--- /dev/null
+++ b/net-im/centerim/files/centerim-4.22.10-gcc46.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/show_bug.cgi?id=363017
+
+--- a/libicq2000/libicq2000/sigslot.h
++++ b/libicq2000/libicq2000/sigslot.h
+@@ -82,6 +82,7 @@
+ #ifndef SIGSLOT_H__
+ #define SIGSLOT_H__
+ 
++#include <cstddef>
+ #include <set>
+ #include <list>
+ 
diff --git a/net-im/centerim/files/centerim-4.22.10-system-expat.patch b/net-im/centerim/files/centerim-4.22.10-system-expat.patch
new file mode 100644
index 000000000000..ef3d52c28c3d
--- /dev/null
+++ b/net-im/centerim/files/centerim-4.22.10-system-expat.patch
@@ -0,0 +1,51 @@
+From 539f0dd1b9b81c4b0aece3ab076b1c75073c8062 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 6 May 2016 02:33:51 +0200
+Subject: [PATCH] Build against system Expat
+
+---
+ libjabber/Makefile.am | 4 ++--
+ libjabber/libxode.h   | 2 +-
+ src/Makefile.am       | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libjabber/Makefile.am b/libjabber/Makefile.am
+index f91ad8f..7b20f6b 100644
+--- a/libjabber/Makefile.am
++++ b/libjabber/Makefile.am
+@@ -1,4 +1,4 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/connwrap
+ noinst_LIBRARIES = liblibjabber.a
+-noinst_HEADERS = xmltok_impl_c.h latin1tab.h log.h asciitab.h libxode.h jabber.h hashtable.h xmlparse.h iasciitab.h xmldef.h xmltok.h utf8tab.h xmltok_impl.h xmlrole.h nametab.h xmltok_ns_c.h
+-liblibjabber_a_SOURCES =  jid.c log.c jutil.c str.c expat.c hashtable.c genhash.c pproxy.c pool.c rate.c xmlparse.c xstream.c xmltok.c xmlnode.c jconn.c xmlrole.c jpacket.c snprintf.c socket.c sha.c
++noinst_HEADERS = log.h libxode.h jabber.h nametab.h
++liblibjabber_a_SOURCES =  jid.c log.c jutil.c str.c expat.c genhash.c pproxy.c pool.c rate.c xstream.c xmlnode.c jconn.c jpacket.c snprintf.c socket.c sha.c
+diff --git a/libjabber/libxode.h b/libjabber/libxode.h
+index d6c92a6..8752b0c 100644
+--- a/libjabber/libxode.h
++++ b/libjabber/libxode.h
+@@ -16,7 +16,7 @@
+ #include <arpa/inet.h>
+ #include <sys/time.h>
+ 
+-#include "xmlparse.h"
++#include <expat.h>
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3a0feaf..b8cf2ff 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,7 +22,7 @@ centerim_LDADD += -llibgadu
+ endif
+ if BUILD_JABBER
+ centerim_LDFLAGS += -L$(top_builddir)/libjabber
+-centerim_LDADD += -llibjabber
++centerim_LDADD += -llibjabber -lexpat
+ endif
+ if BUILD_MSN
+ centerim_LDFLAGS += -L$(top_builddir)/libmsn
+-- 
+2.8.1
+
diff --git a/net-im/centerim/metadata.xml b/net-im/centerim/metadata.xml
new file mode 100644
index 000000000000..81747681819f
--- /dev/null
+++ b/net-im/centerim/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>swegener@gentoo.org</email>
+	<description>Primary Maintainer</description>
+</maintainer>
+<use>
+	<flag name="gadu">Enable support for the Gadu-Gadu protocol</flag>
+	<flag name="irc">Enable support for the IRC protocol</flag>
+	<flag name="lj">Enable support for the LiveJournal weblog system</flag>
+	<flag name="otr">Enable encrypted conversations</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
new file mode 100644
index 000000000000..101b2602f286
--- /dev/null
+++ b/net-im/choqok/Manifest
@@ -0,0 +1,5 @@
+DIST choqok-1.6.0.tar.xz 1170748 SHA256 8a7527067b3694ad16faafac754cfd5f1e5f5fd1547f066d8f14fbcf8327310f SHA512 78c03689e40978213f2f9462780fe47507a2778985d4d5b940cab004f0ac52becfa76d7dbaa886df958134c65b27255e49ac68ddbb2a434131fffe9ca9280cbc WHIRLPOOL 57155eea1f9f54113bfad9d883d77c332b97c0ef4512d15db9764056704d9709b6c4e81ec630cb5b60c0b310953deabdf9cb5b2521b41ea016a421562e2d06fd
+EBUILD choqok-1.6.0.ebuild 1736 SHA256 8e9b6f7e0632eb5d834e8c788c3e74053242d455b8266a90ecb05552ecd47394 SHA512 8cd5381e43ef077bb815af805d5514621b749bdb153bafdd7d9e89065a8124abc05152c77cb67fc0e56065520e98a6230b2b4804491f47479ceb90edc5b3d4eb WHIRLPOOL b75b6f2e2f31d9736ebe269ebcb1e97fb9225348064176186a270fc44ce78a15fcb9b3f65ac7ad5f93a509cc20c0c5c8cc0316e8ff9d57f76b164ace3bdc4986
+MISC ChangeLog 3743 SHA256 0f4314cab0aebb658926963daea999c2111569d19d4d9d676ab4d127c767941f SHA512 82a7bbfde4d4a7ad26367db2e0c64f222f545837de10cc12b48ee8a0b5dc0356ae0da2be88832ca1afd1aab7fc6db2e9a089bb2977e659c07069371d48218b8e WHIRLPOOL 09e741fd7c95eb4920b609149b0be5c4547b7fb62aa2f57201b9c26ce61e8c5b4a2659e933c0d925db545ba21296d81e09183006c1c49b8c10f2eb6f58e8280c
+MISC ChangeLog-2015 6538 SHA256 dcf2d25fc98d4a176a2152bc61bde620125dc5cd4e836eb64bbaf138c5e838c0 SHA512 5f32e424119ca309d68bb15fea173ddeadf90b7449a7ac90b11ecf592f15975858182bc2db7ce22a72ab3fffc7bb6b6ef286795729c9ceb244d22ffa8906d61b WHIRLPOOL d216aaac4e1bcb2f0b67a3468c3a10e09a0db02091590594e22e9b0f7da71b079b6922c636e9654b750b672ff8d01e0a915949eb57dac35d522e918b7ff00fc7
+MISC metadata.xml 531 SHA256 459d337ce30156017e59677d3d541838e2f12794efd62b8c6b955d5751f6b760 SHA512 2704f0f73217dd2a111a043e4a84f8a124cf9907042a38a294f2901a5a2f689d0aba7a8a74f1e70e4dc8c2685616fd3fc3cf7c3c90aecbdbaeffe7ef552152b6 WHIRLPOOL 42d17fde246fbec3c9a17c98299fb63fcd29335e572e67555e6194cdea05debb54dec6c1b430b967440e5dd9ca67d7050839591a0048837e1ca53f12a1a290bf
diff --git a/net-im/choqok/choqok-1.6.0.ebuild b/net-im/choqok/choqok-1.6.0.ebuild
new file mode 100644
index 000000000000..a0d056a482df
--- /dev/null
+++ b/net-im/choqok/choqok-1.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Free/Open Source micro-blogging client by KDE"
+HOMEPAGE="http://choqok.gnufolks.org/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="amd64 x86"
+IUSE="attica konqueror telepathy"
+#qtnetwork
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca[qt5]
+	dev-libs/qoauth:5
+	attica? ( $(add_frameworks_dep attica) )
+	konqueror? (
+		$(add_frameworks_dep kparts)
+		$(add_frameworks_dep kdewebkit)
+		$(add_qt_dep qtwebkit)
+	)
+	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
+"
+RDEPEND="${DEPEND}
+	!net-im/choqok:4
+"
+
+DOCS=( AUTHORS README TODO changelog )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+		$(cmake-utils_use_find_package konqueror KF5Parts)
+		$(cmake-utils_use_find_package konqueror KF5WebKit)
+		$(cmake-utils_use_find_package telepathy TelepathyQt5)
+	)
+
+	kde5_src_configure
+}
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
new file mode 100644
index 000000000000..468d03a98f06
--- /dev/null
+++ b/net-im/choqok/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="attica">Build Open Collaboration Services plugin using <pkg>dev-libs/libattica</pkg></flag>
+		<flag name="konqueror">Build Konqueror Choqok plugin</flag>
+		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/climm/Manifest b/net-im/climm/Manifest
new file mode 100644
index 000000000000..d63440a3e67f
--- /dev/null
+++ b/net-im/climm/Manifest
@@ -0,0 +1,5 @@
+DIST climm-0.7.1.tgz 1296303 SHA256 6212ada46947f0572fb6734b920a2cfd91b6a632cbd044d87476791a318af052 SHA512 8ee8b716229b4181a3b2f7ff3323b4587e80200ca753347f670616da9f25e8fd7cae4da597435d6f71b3a104ad89f3cfe4fd3f9524e259feef220255b6f7d138 WHIRLPOOL 4ca9f3af34512ac5af3f22413b170017a1cba11a42762211fcfd64c948a1c20263f2b9db339e63b829805f45212b5a0feb07c8e04044def07c0001c65dd7e27a
+EBUILD climm-0.7.1.ebuild 1319 SHA256 2b63cc6d7c863bf0419d881f7ae39a0165c9e68597922ddd5929fbb093f14f7c SHA512 6b9578a2671029ceec217b1bff2177d4ed51e6d76af2a6799992369155f69051fcda4b6b60f7afe3be8a9ddd792658f98212fd189af92a74b2ec92e7b7e728ff WHIRLPOOL f55b6786b20de187f0fb6f4208cd87b8a13c728c3e2e5738347e7b570736964b3d85b753d9240a1c8bfc90593d173cd58a87d81822672d7ac6c5c51332b070a0
+MISC ChangeLog 2841 SHA256 8a6e5ab0ed6311cc024036506a7c73448de8145a9031a941f6866535c9e8f5a5 SHA512 507b871ca340e5befd6ab337c85663428b28068358d6ddca6fe073a12cb82517e57c9ddfc929db29f9d1e224f14ab4966c483feb7dc9e511c802e36f20f5879e WHIRLPOOL ea9dfbaeeaa10c64400394a63c410edbbbf4e67dbf6129c71daa273b620fdc7d1a641326a73915a846bcd901e871f261ca6631c49b6f8fc5b28271f55cfd20f7
+MISC ChangeLog-2015 3804 SHA256 c4c2a6b1667971ee698e59dac4c564623b3c492430466999f4288f84cba8f8fd SHA512 dcd3347548d1c0d3508ee2ad6bd62133293425e56b394739ad7d3169c33eb1d32acbb7aad8c7a68a9eac98d95d2239747967a0fcf16271f9f06b95c8d19b4c49 WHIRLPOOL c0f6e560c97c16c411b4fbdcc9d603609d5daf005017333bf8f2d59a968eae33644d9cbc7726772e0c332943fcbb120e8f92ee928948393d80ce30db66bfa34d
+MISC metadata.xml 235 SHA256 ebd7ed91a46cada4db65d727480b26e4b679afc63bfed1d7b4f03ff427685080 SHA512 daf8621a491d4c92f2c6f1bad0f901f7f261d4c546c3fbfde9cf8e4e2db3fc8a82491e05b4329d9d30a3c8bed302eff399d097f5e6728732485bb7bd5e08fad2 WHIRLPOOL 3122aafb8be28da238fa62744f9198a179980fc49a4ad84cc3a99a384344d49ec52539109f14d063424294a657db241a8be15a5b30f3ca1574429597c90535d1
diff --git a/net-im/climm/climm-0.7.1.ebuild b/net-im/climm/climm-0.7.1.ebuild
new file mode 100644
index 000000000000..7d80236c0153
--- /dev/null
+++ b/net-im/climm/climm-0.7.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="ICQ text-mode client with many features"
+HOMEPAGE="http://www.climm.org/"
+SRC_URI="http://www.climm.org/source/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="xmpp gnutls otr tcl ssl"
+
+# In case user don't need xmpp there is a choice gnutls/openssl. Since xmpp
+# requires gnutls then without explicit request to use gnutls (USE=gnutls)
+# for ssl we fall back on gnutls instead of openssl.
+REQUIRED_USE="xmpp? ( ssl gnutls )"
+
+RDEPEND="
+	xmpp? (
+		|| (
+			>=dev-libs/iksemel-1.4[ssl]
+			>=dev-libs/iksemel-1.3[gnutls]
+			)
+		)
+	ssl? (
+		gnutls? (
+			>=net-libs/gnutls-0.8.10
+			dev-libs/libgcrypt:0
+			)
+		!gnutls? ( dev-libs/openssl )
+	)
+	tcl? ( dev-lang/tcl:0 )
+	otr? ( <net-libs/libotr-4 )"
+DEPEND="${RDEPEND}
+	ssl? ( gnutls? ( virtual/pkgconfig ) )"
+
+src_configure() {
+	local myconf
+	if use ssl; then
+		if use gnutls; then
+			einfo "Using gnutls"
+			myconf="--enable-ssl=gnutls"
+		else
+			einfo "Using openSSL"
+			myconf="--enable-ssl=openssl"
+		fi
+	else
+		myconf="--disable-ssl"
+	fi
+
+	econf \
+		$(use_enable xmpp) \
+		$(use_enable otr) \
+		$(use_enable tcl) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
+}
diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml
new file mode 100644
index 000000000000..cba43c0e5a33
--- /dev/null
+++ b/net-im/climm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+	<flag name="otr">Enable encrypted conversations</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/coccinella/Manifest b/net-im/coccinella/Manifest
new file mode 100644
index 000000000000..9ca269bdd4f0
--- /dev/null
+++ b/net-im/coccinella/Manifest
@@ -0,0 +1,5 @@
+DIST Coccinella-0.96.20Src.tar.gz 9297799 SHA256 b4feecfc5934305cbae6bfb9ab9c8b99245c40b28bbdcd682c9f1534f82bd866 SHA512 d19530a6293c3e6cdcda5c6f659acb051d8e6db88b3722deb81e3e418976929cbe415b625ee6b5c356b3a8b0bc2bf2c89e2e0140efeeb002b798e4eb2809b4fc WHIRLPOOL ec7d995ba1d894ae9a33a4dd9ba273ae5dab5d2ab4bc9e2693c5619c471289dcb7cfdb52a0238772d22bd33e2d7d4934915c8a56782a0f2c36ae294a2d04d478
+EBUILD coccinella-0.96.20.ebuild 1729 SHA256 bee0b112d720015575c751b1df325edc1ebadc8bcc81b5586c8dff50c0fa655b SHA512 a22f4637eb872556bc470ebb18fb7c8c0cbc91f45573f7155810191b34ea93c982510ad02eadcea9819e8ec0689f7f799c74866c4976cb4dd3b0a384bcf81332 WHIRLPOOL 480a8bdc4e8168b35f0aa2dffb6755544eb32a7155b6515e9f026e194dd9f9921a7a5dd6a6d32a3dcf431857cfe627ffa84e7377963c3605c75789fa4e00dd3c
+MISC ChangeLog 2533 SHA256 f5edbc035bbf1b93192ca91bf3cc19f53c7ed0ff79ab3aec2cfb368f228e31d6 SHA512 940fa203a450be313436084c565a318647f16c238ea43b43d6526ab025d71fdbab9b5044198e0b85ead6ae615b043f825018b497ff76296416d9f2a22d716bd7 WHIRLPOOL 53c5518b1e6fb0c2bde9979e297626f5a0583a3b65c98f6c491241d5279ca116dfa763e234c6c22f0336fcf5f6f587b3e253bb2edec1f7da7e5b2fbfbf40f8d6
+MISC ChangeLog-2015 3297 SHA256 4db63921664e3b1cc13046bb6fdcb58a062a054ee842d34ea0540169a97f859f SHA512 562ecb88a68f0b434bca78908f1fd1a806a0e831d686aaf3a60d1514fdf908e9607687450a54e20b24938c6a61d350437a12598d09253e89e95831e72da518ef WHIRLPOOL 5aef4e7bd70231c48aa10cf9bfa7f24b7cd4c7d0c66f8532ddb338e6796372ef5111de5f690fc9cf75a1de22c3c00a416153e187a7a0d5b15985238a44cde2b5
+MISC metadata.xml 717 SHA256 17b5a529ed2e47268f97f5e4b5cf074814e870d7e1ad90467fe557684f3c3afa SHA512 5210b2a405d756c27c8b594fcb86ffd255b2400610c425256b4d9af14797f0bdb537dd5f8be46a672ee09c1b0e1ffbab86865be85e84e0fde5ae534455c1e1b8 WHIRLPOOL da6f07c4252ba509d169fbf1918aaad735574eea6f8163c55935c3b4298b5b8b58b3c6052e9353b982d7fa61c1076f088afc66cdf06fad8d270918dd15cf7bcc
diff --git a/net-im/coccinella/coccinella-0.96.20.ebuild b/net-im/coccinella/coccinella-0.96.20.ebuild
new file mode 100644
index 000000000000..d582afacf842
--- /dev/null
+++ b/net-im/coccinella/coccinella-0.96.20.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils fdo-mime
+
+NAME=Coccinella
+DESCRIPTION="Jabber Client With a Built-in Whiteboard and VoIP (jingle)"
+HOMEPAGE="http://www.thecoccinella.org/"
+SRC_URI="mirror://sourceforge/coccinella/${NAME}-${PV}Src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND=">=dev-lang/tk-8.5
+	>=dev-tcltk/tkpng-0.9
+	>=dev-tcltk/tktreectrl-2.2.9
+	>=dev-tcltk/tktray-1.1
+	>=dev-tcltk/snack-2.2
+	ssl? ( >=dev-tcltk/tls-1.4 )
+	>=dev-tcltk/tkimg-1.3"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${NAME}-${PV}Src"
+
+#src_compile() {
+#	einfo "Nothing to compile for ${P}."
+#}
+
+src_install () {
+	rm -R "${S}"/bin/unix/Linux/i686/ || die
+	rm -R "${S}"/bin/macosx || die
+	rm -R "${S}"/bin/windows || die
+	rm -R "${S}"/bin/unix/NetBSD || die
+
+	dodir /opt/coccinella
+	cp -R "${S}"/* "${D}"/opt/coccinella/
+	fperms 0755 /opt/coccinella/Coccinella.tcl
+	dosym /opt/coccinella/Coccinella.tcl /opt/bin/coccinella
+	dodoc README.txt READMEs/*
+
+	for x in 128 64 32 16 ; do
+		src=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella.png
+		src2=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella.png
+		src2shadow=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella2-shadow.png
+		dir=/usr/share/icons/hicolor/${x}x${x}/apps
+		dodir ${dir}
+		dosym ${src} ${dir}/coccinella.png
+		dosym ${src2} ${dir}/coccinella2.png
+		dosym ${src2shadow} ${dir}/coccinella2-shadow.png
+		unset src
+		unset src2
+		unset src2shadow
+		unset dir
+	done
+
+	make_desktop_entry "coccinella" "Coccinella IM Client" "coccinella2-shadow"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/net-im/coccinella/metadata.xml b/net-im/coccinella/metadata.xml
new file mode 100644
index 000000000000..bfbb296357fe
--- /dev/null
+++ b/net-im/coccinella/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+Coccinella is a Jabber client with a whiteboard. The whiteboard is a shared
+desktop which supports text, drawings, images, and multimedia in a number of
+formats, such as MP3 and video. It runs in two main modes, a peer-to-peer
+configuration and a mode compatible with the Jabber Instant Messaging system. A
+flexible plugin architecture may be used to support additional formats. It
+should run on any machine that runs Tcl/Tk.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">coccinella</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
new file mode 100644
index 000000000000..d0d36a796c75
--- /dev/null
+++ b/net-im/corebird/Manifest
@@ -0,0 +1,13 @@
+DIST corebird-0.8.tar.gz 1655839 SHA256 4e68e174edc40b49d70a11c1b0a1b196ca9517daa8eae6ce2da3e8004acda611 SHA512 308bc0ade8ddda0b0be0949e5199bf6ac1b3658bf6e181821a205a602b2a22a97e77583cd5ca63ba272926810095104ae4117e54ccda10234d143c3377b9384d WHIRLPOOL 2e014590c0d9222a6a53d78d855ff9017fa9b3c68c2c354bc2acad1b028bd6253fa9510fbc5ce391bc65319829e14c5447b4be4cbcc8427faace790767e6d98c
+DIST corebird-1.0.tar.gz 1697452 SHA256 0ca4ca20b0281b2901382810ef8bd1682bb896c3915ad3bea3f2a41461118001 SHA512 098dd764a3aecaeda90ad5b0e24a4bf172025ce1a4105b713a1a73385d1de9cca028d7a34a39e9682ad4e2b2b22d4bf2889668c587e363cdfa6053136b1f4c39 WHIRLPOOL e033988b94632ad6b8d4e8c79a6125311466e81d746dd434801451f71e4590558b1797e8690ff033c1c04aeb4a299191993421a64e9d3a925409cda663478ab8
+DIST corebird-1.1.tar.gz 1757414 SHA256 f6109cc2bdc7ee5893c28861a73df4eeaec4b76b99222a90aec381b03b19c8a7 SHA512 b753a22ea9f597cb44df367852c27c94972f8747dfc3541826745c29a44c7b25237d40a7927b2be6002651efdd63f5e4bb6bd2b51edf6b66c3a436963be814bc WHIRLPOOL f01ee9e6452dc4f84f93c73c571033c64a4affdfb67c185e45cf1908101966075d2d310575ebfd8e340ba4fc10a8070af869b54b071a4ed6d95fc60cdb387144
+DIST corebird-1.5.1.tar.gz 501313 SHA256 007d0420c8c32134d47d4c06676f9f3fac654ea818af6daf319ac8eb7c007eb6 SHA512 d40c29d687a55a62df873f853ca30c36630a49fc582a9d21cd69c21fee58595df846dc7126f48ef614bde422f5dc481150eaeddae2dd48997ac0ccfb64ee20db WHIRLPOOL e560fe8657240db3bad6cfce33c4c74a6b0ee698e4dda14257d161b59f46d9b98c5a4bae250726e83946541593174ef1f1feb7f2e0e7ed3505a57626370c8f0c
+DIST corebird-1.5.tar.gz 492120 SHA256 39d451238ef30bf2caf5568d9c02c6e2a2f8b7256f19786ebcd6557adc815203 SHA512 eb0356c28bd4a3385c2194a4a05448741a579c521df481cff8c5f873e8769ccfe72a38a3fa709a43276b107a94c8c900e9163c517fcd7fe23cd738ff59de3eb0 WHIRLPOOL bf70be6b271afbe6735dd0d2ce0e0e0162cc2aac7f1336317cce9c446a7c898d29d4b44ea6305674cd9ead8022b1ddc8ea10a9f88d0422ca410168efd675d550
+EBUILD corebird-0.8.ebuild 1099 SHA256 2c0e2316e4200172b02f21749f0cd9c0e02d099126ab06c44178db8424a860be SHA512 d18d91aec676654cc2785ad2e51e6f9d041894e70eb6d34d36fd4f6823e70381526618ca941f0aaa6ff260596e25450a1615ebe2dc87b3d0bb348b38c4ef45d7 WHIRLPOOL 28d5ec5b6062f88b823c362ce24e36d2c015ad0f50042da99a77f73f15a7e7eee464df4cf2cb9164f6ddd79f076551130c93e5ed74fedd64960777240c3dd8da
+EBUILD corebird-1.0.ebuild 1092 SHA256 7ca96c544dda6ffb8f7071206cefce830b1a5aef5b46764097f39cd01411dea9 SHA512 7245bd8fbd628626ca195f8bdc50e0a6ccd6d7f0d954bdca9984e12a38ec9023082e6a972e89444ba0e1d3899c68a2b82e44f8ad5302e8799629dce770cb4593 WHIRLPOOL 421e6c0d9ea6e6cafcf80be7e5e9c926a763654285585daae4dba93f753b7a7bfac9c4ad0600fb2d0771f443c88ab9205c9e5fb5b9629663d14b9c6904d85c8d
+EBUILD corebird-1.1.ebuild 1092 SHA256 9d8f28b967691714a794ec927008df18e95bcfb589980dfcfc8b2c2c096ec82b SHA512 a58ab7b09cc27f81460428a35dd29b399befdbef63df0f74c75493495e9fe14a0371bcf76f8137f11cf1023c62b5dfdb8ddcdcec4603bf735ff3409b66aae050 WHIRLPOOL 73165b1ff977813c1504529e0a3a526bebc69e1249d15948a7f70235468bf3f10cea4924f911c9a12de93065a11d8eb149816e11c182b945c9a519459012400a
+EBUILD corebird-1.5-r2.ebuild 1430 SHA256 a79a9cc89d03808110c783aac21da64dfdca1e97ec24f8eb7511b20827ab2397 SHA512 6154332e8ed238189d5c10c9e6b70bba2708c5ceb2f04f84f3790a6fc953a1dd00863e639e4bf2b9cebe5847eb559fd9872554f54cfe339e24d2d440ee1141d6 WHIRLPOOL 49ef6ac4c123230de49ffbced9c0b77463d08b23405548c38521cc79e4a3406e328bf95190cfce70e7bf2a77a607e45938073b1fdeb5b500ebd5dc86565b23ac
+EBUILD corebird-1.5.1.ebuild 1430 SHA256 a79a9cc89d03808110c783aac21da64dfdca1e97ec24f8eb7511b20827ab2397 SHA512 6154332e8ed238189d5c10c9e6b70bba2708c5ceb2f04f84f3790a6fc953a1dd00863e639e4bf2b9cebe5847eb559fd9872554f54cfe339e24d2d440ee1141d6 WHIRLPOOL 49ef6ac4c123230de49ffbced9c0b77463d08b23405548c38521cc79e4a3406e328bf95190cfce70e7bf2a77a607e45938073b1fdeb5b500ebd5dc86565b23ac
+MISC ChangeLog 2751 SHA256 fc861d557ff715f5c9ea5951a29d59c09e3c8ebf24e416a5a42a78f756cf2da1 SHA512 14eef97f2b7cea014fcc40798c179be548adaceef9039fe30c66b303eb6bec0ca83fb8100ae29ebcfe2fafde332f530d07a746422de2427387a9fcaf2f13c5d4 WHIRLPOOL 5c4dcc82a1e67f30265fc6310ad668e307b2fcba33b8c1c373c6ee7154cd24d5fbd717451dfe9499b8a30cb02dbdb101ab479db66c18a15ec1517944032d1155
+MISC ChangeLog-2015 753 SHA256 0807fbe3f29d69ecc7e7c2161c55f68e109155d0f600bf583f4a0bd50b71a1de SHA512 a683284f19fab798ff4f681b680842eeef5f8af3d2a607f4213cdce0b9a06c9b054b44f5767d11ff50b6f1baddb59b9cf85d3afea7606f64555f3ce762e00fb6 WHIRLPOOL 59a6793f9e8dad3aa9954e7e19c80804f4682d55ff0374e75eb6f9565bae3ef781d96fbaf7c17b68bd7abfaf814368a3b20128ec71f5854bc07f25aa5c68da1b
+MISC metadata.xml 962 SHA256 d76128945cbc041368ff2b35baedcba56d5a31042aa26934e05c2d91cb458cba SHA512 56bb0081718b710ff89fccf4e77ca77e74362868844e74c455db7fcacd732aa6be2d86e68c4ee79d29bf192c07f4a4f46f489162613cb918b32b46978f701066 WHIRLPOOL 1d6d6a7beeebea9f281a9e54e6600a38cc138cfc7d65f884566411000e063e34179963fd3104091ef20cdd851625feaf9c5bf3a0c9083d6e5ece7f38351c8bf5
diff --git a/net-im/corebird/corebird-0.8.ebuild b/net-im/corebird/corebird-0.8.ebuild
new file mode 100644
index 000000000000..edde2a21c5e9
--- /dev/null
+++ b/net-im/corebird/corebird-0.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.24
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit eutils autotools-utils gnome2 vala
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug glade gstreamer"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.40:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
+	>=net-libs/libsoup-2.42.3.1
+	>=net-libs/rest-0.7.91:0.7
+	>=x11-libs/gtk+-3.12:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	sys-apps/sed
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+	autotools-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable glade catalog)
+		$(usex gstreamer "" --disable-video)
+	)
+	gnome2_src_configure "${myeconfargs[@]}"
+}
diff --git a/net-im/corebird/corebird-1.0.ebuild b/net-im/corebird/corebird-1.0.ebuild
new file mode 100644
index 000000000000..794ed7e9d849
--- /dev/null
+++ b/net-im/corebird/corebird-1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+VALA_MIN_API_VERSION=0.26
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils gnome2 vala
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.40:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
+	>=net-libs/libsoup-2.42.3.1
+	>=net-libs/rest-0.7.91:0.7
+	>=x11-libs/gtk+-3.14:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.40
+	sys-apps/sed
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+	autotools-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(usex gstreamer "" --disable-video)
+	)
+	gnome2_src_configure "${myeconfargs[@]}"
+}
diff --git a/net-im/corebird/corebird-1.1.ebuild b/net-im/corebird/corebird-1.1.ebuild
new file mode 100644
index 000000000000..10ed157602c2
--- /dev/null
+++ b/net-im/corebird/corebird-1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+VALA_MIN_API_VERSION=0.26
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils gnome2 vala
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
+	>=net-libs/libsoup-2.42.3.1
+	>=net-libs/rest-0.7.93:0.7
+	>=x11-libs/gtk+-3.16:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.40
+	sys-apps/sed
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+	autotools-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(usex gstreamer "" --disable-video)
+	)
+	gnome2_src_configure "${myeconfargs[@]}"
+}
diff --git a/net-im/corebird/corebird-1.5-r2.ebuild b/net-im/corebird/corebird-1.5-r2.ebuild
new file mode 100644
index 000000000000..2b05bc95eefc
--- /dev/null
+++ b/net-im/corebird/corebird-1.5-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION=0.34
+
+inherit autotools gnome2 vala virtualx
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer spellcheck"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X]
+		media-libs/gst-plugins-base:1.0[X]
+		>=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-hls:1.0 )
+	spellcheck? ( >=app-text/gspell-1.0[vala] )
+	>=net-libs/libsoup-2.42.3.1
+	>=net-libs/rest-0.7.91:0.7
+	>=x11-libs/gtk+-3.18:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.40
+	sys-apps/sed
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "/highlighting/d" tests/Makefile.am || die
+	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+	eautoreconf
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(usex gstreamer "" --disable-video)
+		--disable-gst-check
+		$(usex spellcheck "" --disable-spellcheck)
+	)
+	gnome2_src_configure "${myeconfargs[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/net-im/corebird/corebird-1.5.1.ebuild b/net-im/corebird/corebird-1.5.1.ebuild
new file mode 100644
index 000000000000..2b05bc95eefc
--- /dev/null
+++ b/net-im/corebird/corebird-1.5.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION=0.34
+
+inherit autotools gnome2 vala virtualx
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer spellcheck"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X]
+		media-libs/gst-plugins-base:1.0[X]
+		>=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-hls:1.0 )
+	spellcheck? ( >=app-text/gspell-1.0[vala] )
+	>=net-libs/libsoup-2.42.3.1
+	>=net-libs/rest-0.7.91:0.7
+	>=x11-libs/gtk+-3.18:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.40
+	sys-apps/sed
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "/highlighting/d" tests/Makefile.am || die
+	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+	eautoreconf
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(usex gstreamer "" --disable-video)
+		--disable-gst-check
+		$(usex spellcheck "" --disable-spellcheck)
+	)
+	gnome2_src_configure "${myeconfargs[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
new file mode 100644
index 000000000000..76003f5872bd
--- /dev/null
+++ b/net-im/corebird/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thatslyude@gmail.com</email>
+		<name>Chandler Paul</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>markpariente@gmail.com</email>
+		<name>Mark R. Pariente</name>
+		<description>Proxied maintainer; CC in all bugs bugs</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>moschlar@metalabs.de</email>
+		<name>Moritz Schlarb</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers Project</name>
+	</maintainer>
+	<use>
+		<flag name="glade">Install glade catalogs for corebird</flag>
+		<flag name="spellcheck">Support spell checking</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">baedert/corebird</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
new file mode 100644
index 000000000000..7e7d6df8fea0
--- /dev/null
+++ b/net-im/coturn/Manifest
@@ -0,0 +1,11 @@
+AUX coturn.conf 46 SHA256 733cec49831e982cdfeedbd73bdeb27f1ccab38cff644d98545d28a5c96a6033 SHA512 f5b813fef017b995d036fc968c6b44cd969867c0233d36ef450357ab5f104a9f38fb27100c22fa14ed4ef49ec410e86c077f400ba7cde1b0e2466368fd02a2dc WHIRLPOOL 2cc05cce634a07eb09cfcf39d118b273b58ae6ae9941e198918fde4192bad08637bbee3d34d9369f3cacfd99180259cc0b9c72ae617d483e7b99f682f2258959
+AUX coturn.service 470 SHA256 84a921cc4a6d4fd63d801c06729c150ef2db0f0b42a6758a56faa013d097b69b SHA512 f4228af88e51a38b06b0f91e1494d4e61a9a9f18cbab9fe85c323267e28045ebaae2832bae114da6e326cf22bf8efbd2bd5677cbcdde8fe994eca60802a6dc66 WHIRLPOOL 2db5ff843ce0dfe705b5d78c117377148e57c59d6e0be9daa84ba72609968ebdce7e15008652bf23290a94708eabf0ec30c09fbb73409cdb46a57324194cb449
+AUX logrotate.coturn 345 SHA256 727d8280ab666f568af6b6cc79764eb1da17d91407d1274ec5f96ee83df417b9 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d WHIRLPOOL adbd1a1aed496b7fad70364df2f540d7e183b354f43a2352180b075740214420da6f3de1805c8f21aa7a4b9e3a01ee3ef51f467d0718454e6cae8fdab6d70ec1
+AUX turnserver.init 636 SHA256 c560435924c7ba5b2e04369c2435e638451cd54fa13b6df6b03734d83fdb50e7 SHA512 bdfad74908009edce899298aca755cead6bcab77663893d0fb4c83134d5d5eb569493be6ae39c4654ddb0079d6bfa259e3932fbb275eae8f6af13c7c197776a7 WHIRLPOOL 9be08f2566f6225568ba50da90fd0399c9eef43854fd9d4d67b64a8957243427fee3e9a9586bf9c58d1cc70058ab3c6177327adb39870e0506b09b647a3a146d
+DIST coturn-4.5.0.4.tar.gz 381015 SHA256 582c5816b115b403f980f3c38edb12b74d3b2500b7cde190cfb292ae5c056c36 SHA512 1d267b715b08853a5434d0a10cffd49e035624353e6733ff7349c549ef3f69240c2488097d81e33f7a551e02d72a26f1f430aefb9cbacda511a2ae6f883cd414 WHIRLPOOL 7ff9b31c3a1a0e2fbc7ae0580df00476e803160fd7f92f3a02ab611c6f940a39334ea5efccb576b348f87c87ff690087af3c9304560caf8215fb14bef9a45f8f
+DIST coturn-4.5.0.6.tar.gz 394071 SHA256 5ad976e142daf392351f86623b217be7ca91322105e0500c379a9dcdbbc466e8 SHA512 4ad7d482af675033d050258e2af04b813561414d4ba926cfd336c6548200dbf1a90f9511983b8cad20713c7edff2a424c9d6b11d401717794e3d1af6b7ed9208 WHIRLPOOL 517353ce5cd90aca4f3991d87cdb0835e97eecf0c6529e93360b9506194f4c0cb1f3cc47e207510bbf3e4f465ab088303cdcd235cccbb11555940a8fa60f0478
+EBUILD coturn-4.5.0.4-r1.ebuild 1848 SHA256 1f55b48e7dd7fb8bf46f720bf6685140dd0f5efc15c926b1edf5c7d5a168eb97 SHA512 4f97bf43ec53608ee08204a430ea13fd800bceeef0aebb18edf14a73a59a213f46229e64bab48534476dc662301fb2c19260398d12af0c9279ea693bdc16ae4e WHIRLPOOL 85cfb5731dd67e899e287e6d21ac17a04f9e6f502aaae70fcd5168f1b7351ddd154caaaf24b59303f95dc1c8f73174b77669931bb81764ec4780a91f89705c9e
+EBUILD coturn-4.5.0.6.ebuild 1848 SHA256 1f55b48e7dd7fb8bf46f720bf6685140dd0f5efc15c926b1edf5c7d5a168eb97 SHA512 4f97bf43ec53608ee08204a430ea13fd800bceeef0aebb18edf14a73a59a213f46229e64bab48534476dc662301fb2c19260398d12af0c9279ea693bdc16ae4e WHIRLPOOL 85cfb5731dd67e899e287e6d21ac17a04f9e6f502aaae70fcd5168f1b7351ddd154caaaf24b59303f95dc1c8f73174b77669931bb81764ec4780a91f89705c9e
+EBUILD coturn-9999.ebuild 1848 SHA256 1f55b48e7dd7fb8bf46f720bf6685140dd0f5efc15c926b1edf5c7d5a168eb97 SHA512 4f97bf43ec53608ee08204a430ea13fd800bceeef0aebb18edf14a73a59a213f46229e64bab48534476dc662301fb2c19260398d12af0c9279ea693bdc16ae4e WHIRLPOOL 85cfb5731dd67e899e287e6d21ac17a04f9e6f502aaae70fcd5168f1b7351ddd154caaaf24b59303f95dc1c8f73174b77669931bb81764ec4780a91f89705c9e
+MISC ChangeLog 396 SHA256 37cfc78131244c3699401f69e9b9743fcd58c7c0f1c9abaab6d281fa18446fe1 SHA512 5c00152eb2ce393339f993caab43440f65533f298769c94bd82c8ccac3d3ac27d60e8df6846834a6ac2e4583d5c1f7e0c3bc04b1ac543dae8f377d1a426fb638 WHIRLPOOL 67ca785ffd5f5b5eff9c41d168578d1bef9b235197b654b77933e6dd8f8e40587f3de4c4a37c5d180c56aa3d57fc516a837f6b182f7770c8e798f2d2730faae3
+MISC metadata.xml 497 SHA256 79ec377c5db67e6fd86271f0df186e9cb842ea4d74d24d34f8b15ed1801ed23c SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb WHIRLPOOL f104996593b8bd7c01ee9cd73a13adaec8dd493d5589e05cd4b8c4f2db2ee975e48f93b8e820db98cd94646c277409979249d2832260f541d230444b0fac8afa
diff --git a/net-im/coturn/coturn-4.5.0.4-r1.ebuild b/net-im/coturn/coturn-4.5.0.4-r1.ebuild
new file mode 100644
index 000000000000..02115af32237
--- /dev/null
+++ b/net-im/coturn/coturn-4.5.0.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user systemd tmpfiles
+DESCRIPTION="coturn TURN server project"
+HOMEPAGE="https://github.com/${PN}/${PN}"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+	DEPEND="dev-vcs/git"
+#	S="${WORKDIR}/${PN}-master"
+else
+	KEYWORDS="~x86 ~amd64"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="mongodb mysql postgres redis sqlite"
+RDEPEND="dev-libs/libevent[ssl]
+	 dev-libs/openssl:*
+	 mongodb? ( dev-libs/mongo-c-driver )
+	 mysql? ( virtual/mysql )
+	 postgres? ( dev-db/postgresql:* )
+	 redis? ( dev-libs/hiredis )
+	 sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
+	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
+	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
+	    || die "sed for simple-log failed"
+	if ! use mongodb; then
+		export TURN_NO_MONGO=yes
+	fi
+	if ! use mysql; then
+		export TURN_NO_MYSQL=yes
+	fi
+	if ! use postgres; then
+		export TURN_NO_PQ=yes
+	fi
+	if ! use redis; then
+		export TURN_NO_HIREDIS=yes
+	fi
+	if ! use sqlite; then
+		export TURN_NO_SQLITE=yes
+	fi
+
+	econf $(use_with sqlite)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/turnserver.init" turnserver
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.${PN}" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	dotmpfiles "${FILESDIR}/${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+	enewgroup turnserver
+	enewuser turnserver -1 -1 -1 turnserver
+	elog "You need to copy /etc/turnserver.conf.default to"
+	elog "/etc/turnserver.conf and do your settings there."
+}
diff --git a/net-im/coturn/coturn-4.5.0.6.ebuild b/net-im/coturn/coturn-4.5.0.6.ebuild
new file mode 100644
index 000000000000..02115af32237
--- /dev/null
+++ b/net-im/coturn/coturn-4.5.0.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user systemd tmpfiles
+DESCRIPTION="coturn TURN server project"
+HOMEPAGE="https://github.com/${PN}/${PN}"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+	DEPEND="dev-vcs/git"
+#	S="${WORKDIR}/${PN}-master"
+else
+	KEYWORDS="~x86 ~amd64"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="mongodb mysql postgres redis sqlite"
+RDEPEND="dev-libs/libevent[ssl]
+	 dev-libs/openssl:*
+	 mongodb? ( dev-libs/mongo-c-driver )
+	 mysql? ( virtual/mysql )
+	 postgres? ( dev-db/postgresql:* )
+	 redis? ( dev-libs/hiredis )
+	 sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
+	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
+	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
+	    || die "sed for simple-log failed"
+	if ! use mongodb; then
+		export TURN_NO_MONGO=yes
+	fi
+	if ! use mysql; then
+		export TURN_NO_MYSQL=yes
+	fi
+	if ! use postgres; then
+		export TURN_NO_PQ=yes
+	fi
+	if ! use redis; then
+		export TURN_NO_HIREDIS=yes
+	fi
+	if ! use sqlite; then
+		export TURN_NO_SQLITE=yes
+	fi
+
+	econf $(use_with sqlite)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/turnserver.init" turnserver
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.${PN}" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	dotmpfiles "${FILESDIR}/${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+	enewgroup turnserver
+	enewuser turnserver -1 -1 -1 turnserver
+	elog "You need to copy /etc/turnserver.conf.default to"
+	elog "/etc/turnserver.conf and do your settings there."
+}
diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild
new file mode 100644
index 000000000000..02115af32237
--- /dev/null
+++ b/net-im/coturn/coturn-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user systemd tmpfiles
+DESCRIPTION="coturn TURN server project"
+HOMEPAGE="https://github.com/${PN}/${PN}"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+	DEPEND="dev-vcs/git"
+#	S="${WORKDIR}/${PN}-master"
+else
+	KEYWORDS="~x86 ~amd64"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="mongodb mysql postgres redis sqlite"
+RDEPEND="dev-libs/libevent[ssl]
+	 dev-libs/openssl:*
+	 mongodb? ( dev-libs/mongo-c-driver )
+	 mysql? ( virtual/mysql )
+	 postgres? ( dev-db/postgresql:* )
+	 redis? ( dev-libs/hiredis )
+	 sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
+	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
+	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
+	    || die "sed for simple-log failed"
+	if ! use mongodb; then
+		export TURN_NO_MONGO=yes
+	fi
+	if ! use mysql; then
+		export TURN_NO_MYSQL=yes
+	fi
+	if ! use postgres; then
+		export TURN_NO_PQ=yes
+	fi
+	if ! use redis; then
+		export TURN_NO_HIREDIS=yes
+	fi
+	if ! use sqlite; then
+		export TURN_NO_SQLITE=yes
+	fi
+
+	econf $(use_with sqlite)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/turnserver.init" turnserver
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.${PN}" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	dotmpfiles "${FILESDIR}/${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+	enewgroup turnserver
+	enewuser turnserver -1 -1 -1 turnserver
+	elog "You need to copy /etc/turnserver.conf.default to"
+	elog "/etc/turnserver.conf and do your settings there."
+}
diff --git a/net-im/coturn/files/coturn.conf b/net-im/coturn/files/coturn.conf
new file mode 100644
index 000000000000..0097a3b49a69
--- /dev/null
+++ b/net-im/coturn/files/coturn.conf
@@ -0,0 +1 @@
+d	/run/turnserver	-	turnserver	turnserver	-	-
diff --git a/net-im/coturn/files/coturn.service b/net-im/coturn/files/coturn.service
new file mode 100644
index 000000000000..e072759e61b0
--- /dev/null
+++ b/net-im/coturn/files/coturn.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=turnserver daemon
+After=networking.target
+
+[Service]
+Type=simple
+User=turnserver
+Group=turnserver
+PermissionsStartOnly=true
+ExecStartPre=/bin/bash -c "[ -f /var/log/turnserver.log ] || touch /var/log/turnserver.log && chown turnserver:turnserver /var/log/turnserver.log && chmod 660 /var/log/turnserver.log"
+ExecStart=/usr/bin/turnserver --pidfile /var/run/turnserver/turnserver.pid
+Restart=always
+RestartSec=30s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/coturn/files/logrotate.coturn b/net-im/coturn/files/logrotate.coturn
new file mode 100644
index 000000000000..06b4d74ec3a1
--- /dev/null
+++ b/net-im/coturn/files/logrotate.coturn
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+/var/log/turnserver.log {
+daily
+rotate 7
+create 660 turnserver turnserver
+notifempty
+size 50M
+sharedscripts
+missingok
+postrotate
+[ -f /var/run/turnserver/turnserver.pid ] && kill -HUP `cat /var/run/turnserver/turnserver.pid`
+endscript
+}
diff --git a/net-im/coturn/files/turnserver.init b/net-im/coturn/files/turnserver.init
new file mode 100755
index 000000000000..682e4f12202d
--- /dev/null
+++ b/net-im/coturn/files/turnserver.init
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+
+depend() {
+	need net
+	use dns
+	after sshd
+}
+
+
+start() {
+	ebegin "Starting turnserver"
+	checkpath -q -d -m 0755 -o turnserver:turnserver /var/run/turnserver
+	checkpath -q -f -m 0660 -o turnserver:turnserver /var/log/turnserver.log
+	start-stop-daemon --start --user turnserver --exec /usr/bin/turnserver -- -o \
+	--pidfile /var/run/turnserver/turnserver.pid >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping turnserver"
+	start-stop-daemon --stop --quiet --pidfile /var/run/turnserver/turnserver.pid
+	eend $?
+}
diff --git a/net-im/coturn/metadata.xml b/net-im/coturn/metadata.xml
new file mode 100644
index 000000000000..2baddb2216a4
--- /dev/null
+++ b/net-im/coturn/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nativemad@gentoo.org</email>
+    <name>Andreas Schuerch</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">coturn/coturn</remote-id>
+  </upstream>
+  <use>
+    <flag name="mongodb">Enable support for the mongodb database</flag>
+    <flag name="redis">Enable support for the redis database</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-im/cpop/Manifest b/net-im/cpop/Manifest
new file mode 100644
index 000000000000..830c8b835835
--- /dev/null
+++ b/net-im/cpop/Manifest
@@ -0,0 +1,6 @@
+AUX cpop-0.0.4-implicit-exit_memset_strlen.patch 1211 SHA256 9a51c665e4184d26edbcd220c30626f01c814e9b4e717939ca6e6ecf0cf9dd55 SHA512 a6b1d15f2e65528489f0bfa38e0f50af268912490fe853ea29eb786e5682d19b224b6a16fcaa3ce56421a9c3a2206beb689e5830914bcabbc1692476cef96f8d WHIRLPOOL 7ecb588810a26963b63dd6ad9bf3b26c8132c6c668fc76405880c1d6bb66ef99e32906400c301c47f3084a723a5b6197c1433202f6f81394806dd18ff28bae72
+DIST cpop-0.0.4.tar.gz 68544 SHA256 68855387c20ce2adaf5a51464b68fc756acfe197ab9b53dbde910757526f45a8 SHA512 c7f4dbff7f8702a8a32447c09457fa6f0810768a41450c43ae71aa67c6fb2d40af634713d1a703dd7f1a9a97ac534f2dab11f8f3f88a79c549224e8b375d721a WHIRLPOOL 20bd2fc1b9d4e4e4d794a917861fc66dd90ebadf01fb8ab1531715beb05ce3504a381aa6623955fde1dc0fda1ef5a8026823124720b1d6b144e93a9e0f33c674
+EBUILD cpop-0.0.4-r1.ebuild 585 SHA256 64ba45193cf32133be9e857d5e675865c87cc0ada6b82b787d5f4b08968948fb SHA512 d349c62543e5133f5ba38dc1d08ef3d3e479768a4edfac8da54a9663986cd36e948e1cfb74f64807ea008c5f4f0ed8c846b5dee9ed392acb51655c7ce5304de8 WHIRLPOOL 8dbc77f9cf16934f1416475d1e249c191ff5765779fa4bbc8ea8e0d2702bf3877fc22b5eb139d19dd0b55074083a669bf5bd396c53e878c8a539fff4d3b42ad2
+MISC ChangeLog 2504 SHA256 c2ddb2952ff730cf738854e5bd0ed0b51042d3f15b8b9f3cad7ad4e2ea63b39f SHA512 468ffce13955186164fd62f00ba40e752d9aa22729645c1c39b39cc11b8d5e51346f5ccdf4b19831e4d952423e5849992df515bd37a9008252849a402b54f92e WHIRLPOOL 47bb495fbb2f4157dd9b4f51a92765f0ca1fd6d283f7b33697f7dd1219a11fcf16a49d9a4d4e2aa585d92f5902c0751d8f801bd98b60b926d9b39a252b5fb9d9
+MISC ChangeLog-2015 1207 SHA256 6b89fb889459a7456f40a20c61881f846ca0be0255479610859705e125079ae7 SHA512 dc87f1984957edc13b206879dfa6a347d87cce54511a378c1fcb9c28458ec526ba6ae22285614158de34a1382be9cbab27be246d5dc2d8acf426835e8b3711e7 WHIRLPOOL 9666c491e62142a1c9cb8efff67d30625ed0fee8b5e2c69a2cf7d722296d381b836f5dd860f9643825cce1cfbf801bf2d6168ccf7dd54abac52bcb08a77c430b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-im/cpop/cpop-0.0.4-r1.ebuild b/net-im/cpop/cpop-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..b86f14d8e51d
--- /dev/null
+++ b/net-im/cpop/cpop-0.0.4-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="GTK+ network popup message client. Compatible with the jpop protocol"
+HOMEPAGE="http://www.draxil.uklinux.net/hip/index.pl?page=cpop"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README
+}
diff --git a/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
new file mode 100644
index 000000000000..3ce224c2910a
--- /dev/null
+++ b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
@@ -0,0 +1,38 @@
+pop_common.c:5:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_common.c:10:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_client.c:61:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_gui_client.c:58:4: warning: incompatible implicit declaration of built-in function ‘memset’
+pop_gui_client.c:72:27: warning: incompatible implicit declaration of built-in function ‘strlen’
+pop_gui_client.c:128:3: warning: incompatible implicit declaration of built-in function ‘exit’
+
+--- pop_client.c
++++ pop_client.c
+@@ -1,11 +1,11 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <glib.h>
+-#include <stdio.h>
+ #include <netdb.h>
+ #include "pop_common.h"
+ #include "pop_client.h"
+--- pop_common.c
++++ pop_common.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ void errquit(char *message)
+ {
+   perror(message);
+--- pop_gui_client.c
++++ pop_gui_client.c
+@@ -1,3 +1,5 @@
++#include <stdlib.h>
++#include <string.h>
+ #include <netdb.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/net-im/cpop/metadata.xml b/net-im/cpop/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-im/cpop/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-im/dianara/Manifest b/net-im/dianara/Manifest
new file mode 100644
index 000000000000..62aab31b653d
--- /dev/null
+++ b/net-im/dianara/Manifest
@@ -0,0 +1,5 @@
+DIST dianara-v1.3.7.tar.gz 914570 SHA256 7c20a4599344d2e87022f405c1b0590ae73fe553e41edef0c6bcddba8b79ccf2 SHA512 9727fabff2ae6a13811d61d15027a5de063628c628bb12c7f82bcefa45f49ee4b48b9dc861de2cede296669bc73a589efb3050200877339b4b5d0f058624b4b7 WHIRLPOOL 9e4d250bacd4db25279a6209508b1377571828b3e3381ae6728392b6a2ced15c25ba01778fb5c5602750d765ddd66a26695705575ed841753c4c0de499e97be6
+EBUILD dianara-1.3.7.ebuild 961 SHA256 b2525726e7d724ae6a119987bcaecd6170420d2e89d043422c6b4591a605549b SHA512 adc44ea421cde9ea3a061180e3d4f7d7f1f53e5b6aa4230cbf2ea33e8126f944e69c4758c7e09b8b521c6d3245b2da40e69f080d87f174abf24fa32d867daf10 WHIRLPOOL 17e64cd46fc4f219592e913a8e8abb1c561731a7635d84afbe39382939ad4dee3768b943cbc921f157ff09a7d4515b7527096695a967e1705008d6bb91e52e3d
+MISC ChangeLog 4614 SHA256 9eee128c8e16381ba8ce472c7783c0e59d617013b12360ea21ea19f14b182700 SHA512 0a88851dd48b56e7a1d7a2737ecdec1157048768e2f92381fff43e3d2611ae8936014a4735538885df61e74ee4d8ace1fc1c9003c796ec29e7a6ca8651861c28 WHIRLPOOL f38a40302e17896f1c702d43056d8aa7a2594f965184ee74b08430356e803a054c23f035664b5367575b656a0ef9ed6d0d81305cd6ffd81a2a9287d0cfe1f772
+MISC ChangeLog-2015 2899 SHA256 db2dd3578a07aaf43fd30d8b188a5784b67f48cb7bdc87540de40e31e9d255dc SHA512 7ed2b4faaee1bc3215e0e76ff00284c7d2c8663de141a4cb5f098344e7e3fc4dc4e97240e6fc6568e318275b36fb2437094ef7896465ac77a55eaaaee142dab6 WHIRLPOOL ab2b098b25b6e8a7af7f2c0661775689dc39f7d7c9547b3c5321c62968664e8cce68cf18acdb2d87b33f2abe642f23611ade53bb52b01e9905dfa082091e4a34
+MISC metadata.xml 261 SHA256 f3bff87b548c92e4ad597767b2ca40ce41abce2bdc10e96ed31d017413539b58 SHA512 a85b18560cf49c8399555ba75ea5ed8086dab2538e2f98fcfa4e974f7b4b5facdc574293ccd700efd4bc35efe7f66438b8054c9830a7cdc24a6e03b68f6e1a58 WHIRLPOOL 6d6e9e49b592b8e42164db928ae575a60c4a117e28f1caaf0251eff107da1b86bf2e97f0f14976a453ac7fb8424bfdf45fc814698f64ff4465d3d4dde3bd3f3e
diff --git a/net-im/dianara/dianara-1.3.7.ebuild b/net-im/dianara/dianara-1.3.7.ebuild
new file mode 100644
index 000000000000..39071737ddd2
--- /dev/null
+++ b/net-im/dianara/dianara-1.3.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils qmake-utils
+
+MY_P=${PN}-v${PV/_beta/beta}
+DESCRIPTION="Qt-based client for the pump.io distributed social network"
+HOMEPAGE="http://dianara.nongnu.org/"
+SRC_URI="mirror://nongnu/dianara/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/qca-2.1.0.3:2[qt5,ssl]
+	>=dev-libs/qoauth-2.0.1_pre20160315-r2:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+	sys-apps/file"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	doman manual/*
+	dodoc README TODO CHANGELOG BUGS
+	doicon -s 32 icon/32x32/${PN}.png
+	doicon -s 64 icon/64x64/${PN}.png
+	domenu ${PN}.desktop
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/dianara/metadata.xml b/net-im/dianara/metadata.xml
new file mode 100644
index 000000000000..f33e939c94d9
--- /dev/null
+++ b/net-im/dianara/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<bugs-to>https://savannah.nongnu.org/bugs/?group=dianara</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
new file mode 100644
index 000000000000..d319b560269f
--- /dev/null
+++ b/net-im/discord-bin/Manifest
@@ -0,0 +1,3 @@
+DIST discord-0.0.2.deb 46975796 SHA256 2500c1f0e3bf51dd45983fb693b3f5efdd31b0edffc947fec7160fad098dc815 SHA512 ca31952e4eba88c0a40a31eb5671ae71641f8575b298557ff0f1bc1d99d12b1cf282f4178650af594562831a31961aa8cd27ae70e301831190ff6647c3561bd2 WHIRLPOOL 13a5967a9b86aca0ec6be991905968d17da16edb119356a7ccd95eb311c0b5d53cd26e27dfe9978a67fd9260008104c0b08ccf115b62934bfdf79be6495af39f
+EBUILD discord-bin-0.0.2-r1.ebuild 1745 SHA256 613fc12d9a3189a61f89de8f921f67ecf647ff8593894d2ddbd19b925d461708 SHA512 7ac8f533e0b67520f0cb05a0b2199286f01426dfc463249ea85cea9644358659fe9a09a92e102c9d202a852fc180b33ae8465409f4d3e005e30ba91981a1185f WHIRLPOOL b0438ae1cb73d294d7d5c0c0d3dd5990691b53f00da4daa315fa5d9f53b58ae916d79e2adde747ec943b0a3ea26f3de009b24dc853aaf8be48c6c1eca49acedd
+MISC metadata.xml 245 SHA256 c8fd18cdca0ab20111109880330a2b5c38b0a9121907a91c9d58742eec7aa5ae SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4 WHIRLPOOL ed161f9c8693ad391d2db9e8cb45156e676b7736e3a0a67c643ba2b6699f313a18e0d028921b519bbc4a8adc1436b60556d5acebfc0f5fcce01904dcfc881864
diff --git a/net-im/discord-bin/discord-bin-0.0.2-r1.ebuild b/net-im/discord-bin/discord-bin-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..ec488a6e7f3b
--- /dev/null
+++ b/net-im/discord-bin/discord-bin-0.0.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN/-bin/}
+inherit eutils gnome2-utils unpacker
+
+DESCRIPTION="All-in-one voice and text chat for gamers"
+HOMEPAGE="https://discordapp.com"
+SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcxx
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+S=${WORKDIR}
+
+RESTRICT="mirror bindist"
+
+QA_PREBUILT="
+	opt/discord/share/discord/Discord
+	opt/discord/share/discord/libnode.so
+	opt/discord/share/discord/libffmpeg.so
+"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/usr/share/discord/Discord:discord:g" \
+		usr/share/${MY_PN}/${MY_PN}.desktop || die
+}
+
+src_install() {
+	insinto /opt/${MY_PN}
+	doins -r usr/.
+
+	fperms +x /opt/${MY_PN}/bin/${MY_PN}
+	dosym ../../opt/${MY_PN}/bin/${MY_PN} /usr/bin/${MY_PN}
+	dosym ../../../opt/${MY_PN}/share/applications/${MY_PN}.desktop \
+		/usr/share/applications/${MY_PN}.desktop
+	dosym ../../../opt/${MY_PN}/share/pixmaps/${MY_PN}.png \
+		/usr/share/pixmaps/${MY_PN}.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml
new file mode 100644
index 000000000000..15fd2f3a22be
--- /dev/null
+++ b/net-im/discord-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
new file mode 100644
index 000000000000..61aa90645a82
--- /dev/null
+++ b/net-im/ejabberd/Manifest
@@ -0,0 +1,20 @@
+AUX ejabberd-16.09-ejabberdctl.patch 2154 SHA256 dff1e6d146751348527dbfaeb0a48f886a2b7e9cd67864a6dcbd0322846dae78 SHA512 8f715dee3570dc5ea44499bde94d6a137ef2a7c28d0535173b88cef0ceeadd94950e42b29d23f689b1de7be7670dd307694524b75102c668ad88f10250ae6166 WHIRLPOOL 533af335b1768e97ce412ddbcd4d066e5dfb1c5c3a6ef853707df6bcf320a1e55bbffc18fc51f28479c8c433207017377234fbb9fe7839cef7630531d383d31b
+AUX ejabberd-17.01-0001-Dont-overwrite-service-file.patch 470 SHA256 d380c2d9ebdcfc7ebae4ee2100c82e584c00dbb610469be2333b7113fa57aa0b SHA512 f3c708a65c4eaeaf95aef9d98c683984f8d897d69a1d361f73a2b6cde30ee8248ddc2b1e1e56bba4718302f3141788aa69c0a1b5846a13b3e10d8304bf9ab70d WHIRLPOOL 770edeacded9c4e0459717a8f28c39c32c1e9ac0a1aa0ec8f2e27b0a81db587a45079701823fe645b44498278162d6c01017e3262681411b79cd8826ab996b53
+AUX ejabberd-17.01-ejabberdctl.patch 2154 SHA256 dff1e6d146751348527dbfaeb0a48f886a2b7e9cd67864a6dcbd0322846dae78 SHA512 8f715dee3570dc5ea44499bde94d6a137ef2a7c28d0535173b88cef0ceeadd94950e42b29d23f689b1de7be7670dd307694524b75102c668ad88f10250ae6166 WHIRLPOOL 533af335b1768e97ce412ddbcd4d066e5dfb1c5c3a6ef853707df6bcf320a1e55bbffc18fc51f28479c8c433207017377234fbb9fe7839cef7630531d383d31b
+AUX ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch 1642 SHA256 3d269d0e64874e2e6ab005daa8ebf33e726edd3d161459206f85a55860760bd3 SHA512 ab2b3fe4f3cca579a174cd77876f6c485fd806454b07d7e8d2a13c710b3f9115aa901f22dd71dfd3ab60a78f819e0c8dfdbcca38ca9c87d65fe5b5a0f105cad6 WHIRLPOOL 1f9821fb0eb64b21e45086843c55df7078452548a4c0f5942d597c6cff9a42e61b1b791b1dfd5cee1720d58d7040fc480a6dc79605165966de226b0b083ef431
+AUX ejabberd-17.04-0002-Dont-overwrite-service-file.patch 470 SHA256 6da56e148b23ad1a061373272cd9b3ed1a56ccc078d8bb9e5c978597722409e8 SHA512 a6b38ae82a0fe5d5d643eb2a122921aff3a9701381f6162213cee11b4950bdb9f16add78465a01eb6df5824dfa4ba2adae6dc0451749f76eefd224f5f97b8b01 WHIRLPOOL 5de1c13898017744045a9b8976588c865db50172fc0bb09b9923c43c9c4da6ff8ae1b02fc45bdb545d78c80918acaedb7d347b538bffbdc24a1e53a8dd0867ff
+AUX ejabberd-17.04-ejabberdctl.patch 2154 SHA256 dff1e6d146751348527dbfaeb0a48f886a2b7e9cd67864a6dcbd0322846dae78 SHA512 8f715dee3570dc5ea44499bde94d6a137ef2a7c28d0535173b88cef0ceeadd94950e42b29d23f689b1de7be7670dd307694524b75102c668ad88f10250ae6166 WHIRLPOOL 533af335b1768e97ce412ddbcd4d066e5dfb1c5c3a6ef853707df6bcf320a1e55bbffc18fc51f28479c8c433207017377234fbb9fe7839cef7630531d383d31b
+AUX ejabberd.confd 161 SHA256 0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb WHIRLPOOL 657c44991244d58c10590093a7f58f654cb45cf7e22244b474459c63a449c17d0cf1d6f2d62008ddb34f0022f8fc9e31f22d2010cb3d1070a462bcb22a9a81fc
+AUX ejabberd.initd 1071 SHA256 db2ca8cc5eece5fab4dc0fd63369d193a271f5ba794228d5490d127febd1b8af SHA512 64839da9c369bf570389e95b0b1b67e1c4b339927c2f1fd4ca113a18410deb3fbe1ecdd41bb46df3d3b52b38149218dfe26b798ff43398151f08799566515352 WHIRLPOOL c8515da650fee72e81fbf752445ae4da9e757af3ff1f18d4418414c588c663d18c3ad5aa7b9d8a0ffcd9e8956bad2e87cb2b1ed84350b7658363efc1fd4699ea
+AUX ejabberd.logrotate 203 SHA256 42f28222c6a5b7c691eb371085cccdef3fcba059a1e89f18744aa9bfc25e6294 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2 WHIRLPOOL ffbdfc1b22e855666aedbf816ec44439addcae21d82509399de046fa6a7c0182c1df756377a9d08d3b1f1d73e1e09ecd85da145357850d8a11d8ddb4b3b29d2a
+AUX ejabberd.tmpfiles.conf 78 SHA256 c805f8a0136a1374b8b74cd5943bb8d7d976cffbd11e10c192ceb52b7fca5e80 SHA512 21953448f1695cf6b45d2eccf2eca7611d45c8407759fcc62b347afd22a4f25b79514275e18c473debc8070345b25bb49e1457e10bc37766f0590cb70f7f0230 WHIRLPOOL fb8b2b549b9e2b8c6270b6a9aeba27f31f448a98cf3c193fb16e3e39717e752a3cbb260ccca62fa100cbd09ffdcdcf42764bf0bf54837d78faf35d1cf173f612
+AUX epam-wrapper 336 SHA256 bd50c1e9aa13e8fe76f043acce7aac10c8bf608b3eab5d76441de26540db3639 SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449 WHIRLPOOL d4b694ea8ec5b9ec1c30332039c44006525bc0c4687622ff19b3a75fbd62e5dd9f1938cf6f3bcd89a5f2cc294a1bdf3e9a09c6b3eae9d5a8c3e30436f0db23c6
+DIST ejabberd-16.09.tar.gz 1687485 SHA256 7b44ab3af3310ca73624c47b65cf30a651d5a1398413e8af51c610d788fb8f14 SHA512 506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f WHIRLPOOL 6c56ad58b4e247cedf29cf247fdadddf727270311a0ba21eef88f84ee6b997ad8be75448e3bfdaa67d978ea167e2feb21bc9ce0839741a62fb60fa045e45edf2
+DIST ejabberd-17.01.tar.gz 1638418 SHA256 7efa8f25fe01bce876f9379ba7b4f49752a0fddc6a78e5ae82196fdc7f70c90b SHA512 d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566 WHIRLPOOL 7b670b087cccc6b4fb804410730571175c253e094fab6fc8c9412eae4e14b844ad38596426b4334bd751a056f940dfd60c1c06d2560af5b36061eb54553886fb
+DIST ejabberd-17.04.tar.gz 1690441 SHA256 b8395bc65b09f135a60320b62338258acd6056cc241e9e245fde267fb18dd3c9 SHA512 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7 WHIRLPOOL c345a6b31e5ea63d72779630d7db8868e997e876ef929dc0de3df0584ca3dcbec1d36e6bb1cacdcc3ee428f9f82b4dbc73d3f08446ace0daa8beccd2fe9a8bfe
+EBUILD ejabberd-16.09.ebuild 10402 SHA256 1610550f6e38eed657a9f9b17f676d9f4dc24ab64d3c9ab91bf5c3aa50e55702 SHA512 fe39e30114f9500bf4ac425014412f420976d1fa0ec339ddace2e4ff679b1466b67d7545db094b6db1b7e4026574448550c265405d488304eb6fd6a547f12ee7 WHIRLPOOL dbf775ebd336dacf6e3a5d976f749f5d928c95b97d89cd1f3f4466034768db26b110921fd0a9c57f1b8a8180ffa15437afbf9740acb63fed796e2fb06e9b24a0
+EBUILD ejabberd-17.01-r2.ebuild 10578 SHA256 c7bb4cd4474ddbdc561bbf90dcec30e7292a65f87a74f899e6ee4898d2e55475 SHA512 4734338caeef8b82849609d080c243c6f0444254cb1428f6bf69ab02775cf48173d2c8fae461adbd7f3a6386b6f9bab35d29f36eb2098f2aeeef8ecae57f47fa WHIRLPOOL 49657b006d8c920549ddf1293aa1c84d710261ce7a12b2992f7255ba3b6d9da7d64daf5885be44e551bf0bc1b1d6e2f4ff825a4d080e4286db6538e06aca7eb9
+EBUILD ejabberd-17.04-r1.ebuild 10647 SHA256 8eb28e41c7a5672e019e82c9f1ce2465e17dbc9674aa822e05e53b48ddbc6ef9 SHA512 d2810306064326f80ff35be3c8ac81f513f846f0e91a01833e3a81834d015d6561051e25f608aa78a4811fa27deee776b4bf82f3a9ab56c4115b8be342773577 WHIRLPOOL c8d136eef362e5d55449cc93daaab54fa4816759a7769bd0fb3ac3b7bbe42835df8e78693472e3f59dba2f071c01dd12ffe55acf8e60baaebd7d281dc131b38d
+MISC ChangeLog 11138 SHA256 0d1085964eb3c92dde95206ef30fcc912be3f9f556e29c35b9f542013e1be4ca SHA512 c80d00d9835c731d8c051fb688d5a11f019faf6f06dce055b729a35a2524afe7cafb8368e2010150f2e65b4457e2648111c1ff65f6695383ea2c6ef0f692b725 WHIRLPOOL c46dbbfa3460bbc1f78295de8e89d22856af75c6b9944884b3cfeea15a99bb0442d73da99e6ae1a5f7c3ea05ca331efea5019aaeabc017a3abba95a97d4e93ae
+MISC ChangeLog-2015 24570 SHA256 903c4319b93b07658e835d9bb3dbd5c2e29601975254e739762f022e94ff2ced SHA512 8ffa26865338adcb4df52c4afb55b9d85c836e69f9fbb6b5391f4baeff6cd7105315d0b109ce639c00475a29e78f4f6400ae0e32e91a38975f1c1a1cccbdf58e WHIRLPOOL dd9d50e7dab81a693deeb36f5144406dcbaf7de85cdef6442e4078db8a8d82bd234bd76fec375bbbfc1dd13285eec9bb67dcd9fdb07124986d5b467e060ac40d
+MISC metadata.xml 1722 SHA256 d430be43e52a701df69897055a72e7a3f58ea960145647faf4f74353857eab38 SHA512 943a50b2d49defcb82428ec1470bf05e890a4c753463da857fca4cb01fdb032aade634c69f9ebf4c3b7cf1023ed9bc2c11e7aa94e8cfed57af1a5dc328bb5d78 WHIRLPOOL 1732e7c645ee7fc63a5baad8ba4befe74d2ffcb53ddbb692a07ad9183d5643c1416ca23fbb259b51e816977da9a099ee7ae0d40d8cc48d002ac63616c9e1e935
diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild b/net-im/ejabberd/ejabberd-16.09.ebuild
new file mode 100644
index 000000000000..99e4a3aabcc2
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-16.09.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+	riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO: 	>=dev-erlang/meck-0.8.4
+# TODO: 	>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+	>=dev-erlang/cache_tab-1.0.4
+	>=dev-erlang/esip-1.0.8
+	>=dev-erlang/fast_tls-1.0.7
+	>=dev-erlang/fast_xml-1.1.15
+	>=dev-erlang/fast_yaml-1.0.6
+	>=dev-erlang/jiffy-0.14.7
+	>=dev-erlang/lager-3.2.1
+	>=dev-erlang/luerl-0.2
+	>=dev-erlang/p1_oauth2-0.6.1
+	>=dev-erlang/p1_utils-1.0.5
+	>=dev-erlang/stringprep-1.0.6
+	>=dev-erlang/stun-1.0.7
+	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
+	nls? ( >=dev-erlang/iconv-1.0.2 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.0
+		<dev-erlang/epam-1.0.1 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	riak? (
+		>=dev-erlang/hamcrest-0.1.0_p20150103
+		>=dev-erlang/riakc-2.1.1_p20151111
+	)
+	sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+	zlib? ( >=dev-erlang/ezlib-1.0.1 )"
+DEPEND="${CDEPEND}
+	>=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+	captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+	sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+		-e "s|\"pamservicename\"|\"xmpp\"|" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+	sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to correct path to captcha.sh in example config'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="$1"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+	local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+	sed -r \
+		-e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to modify example config'
+}
+
+# Check if there already exists a certificate.
+ejabberd_cert_exists() {
+	local cert
+
+	for cert in $(gawk -- \
+			'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \
+			"${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
+		[[ -f ${cert} ]] && return 0
+	done
+
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+	egrep '^(\s*)(mod_irc\s*:.*$)' \
+		"${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!' \
+		-e 's!(User|Group)=(.*)!\1=jabber!' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+	gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+		print $0;
+	} else {
+		next;
+	}
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	skip_docs
+	adjust_config
+	use nls || disable_mod_irc
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable hipe) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable nls iconv) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable riak) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable zlib)
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+		# PAM helper module permissions
+		# https://www.process-one.net/docs/ejabberd/guide_en.html#pam
+		fowners root:jabber "${epam_path}"
+		fperms 4750 "${epam_path}"
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  http://www.process-one.net/en/ejabberd/docs/"
+		echo
+		if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
+			ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after"
+			ewarn "migration to ${PV}. pubsub data may not be migrated automatically and"
+			ewarn "you may need to run migration script manually, see:"
+			ewarn
+			ewarn "  https://github.com/processone/ejabberd/issues/479#issuecomment-124497456"
+			ewarn
+			ewarn "In case you don't care about all stored moods, activities, geoinfo and you"
+			ewarn "know you don't store in pubsub anything important, you can just remove"
+			ewarn "pubsub tables:"
+			ewarn
+			ewarn "  rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*"
+			ewarn
+			ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244"
+			echo
+		fi
+	elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
+		elog "Ejabberd now defaults to using a YAML format for its config file."
+		elog "The old ejabberd.cfg file can be converted using the following instructions:"
+		echo
+		elog "1. Make sure all processes related to the previous version of ejabberd aren't"
+		elog "   running. Usually this just means the ejabberd and epmd daemons and possibly"
+		elog "   the pam-related process (epam) if pam support is enabled."
+		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can"
+		elog "   fail to start ejabberd properly for various reasons. Check ejabberd's main"
+		elog "   log file at /var/log/jabber/ejabberd.log to confirm it started successfully."
+		elog "3. Run"
+		elog "     \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
+		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
+		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config"
+		elog "   file."
+		echo
+	fi
+
+	if ! ejabberd_cert_exists; then
+		ejabberd_cert_install
+	fi
+
+	if use pam; then
+		# sfperms drops read bit from files with suid. Reapply it.
+		# Fix bug #592218.
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+		chmod g+r "${EROOT%/}${epam_path}" \
+			|| die "failed to correct ${epam_path} permissions"
+	fi
+
+	if ! use nls && is_mod_irc_enabled; then
+		ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd"
+		ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml."
+	fi
+}
diff --git a/net-im/ejabberd/ejabberd-17.01-r2.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
new file mode 100644
index 000000000000..7bada46b7dc2
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+	riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO: 	>=dev-erlang/meck-0.8.4
+# TODO: 	>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+	>=dev-erlang/cache_tab-1.0.6
+	>=dev-erlang/esip-1.0.10
+	>=dev-erlang/fast_tls-1.0.10
+	>=dev-erlang/fast_xml-1.1.19
+	>=dev-erlang/fast_yaml-1.0.8
+	>=dev-erlang/jiffy-0.14.8
+	>=dev-erlang/lager-3.2.1
+	>=dev-erlang/luerl-0.2
+	>=dev-erlang/p1_oauth2-0.6.1
+	>=dev-erlang/p1_utils-1.0.6
+	>=dev-erlang/stringprep-1.0.7
+	>=dev-erlang/stun-1.0.9
+	>=dev-erlang/xmpp-1.1.6
+	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
+	nls? ( >=dev-erlang/iconv-1.0.3 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.0-r1
+		<dev-erlang/epam-1.0.1 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	riak? (
+		>=dev-erlang/hamcrest-0.1.0_p20150103
+		>=dev-erlang/riakc-2.4.1
+	)
+	sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+	zlib? ( >=dev-erlang/ezlib-1.0.2 )"
+DEPEND="${CDEPEND}
+	>=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+	captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+	"${FILESDIR}/${P}-0001-Dont-overwrite-service-file.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+	sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+		-e "s|\"pamservicename\"|\"xmpp\"|" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+	sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to correct path to captcha.sh in example config'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="$1"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+	local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+	sed -r \
+		-e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to modify example config'
+}
+
+# Check if there already exists a certificate.
+ejabberd_cert_exists() {
+	local cert
+
+	for cert in $(gawk -- \
+			'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \
+			"${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
+		[[ -f ${cert} ]] && return 0
+	done
+
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+	egrep '^(\s*)(mod_irc\s*:.*$)' \
+		"${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!(User|Group)=(.*)!\1=jabber!' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+	gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+		print $0;
+	} else {
+		next;
+	}
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+pkg_setup() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	skip_docs
+	adjust_config
+	use nls || disable_mod_irc
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable hipe) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable nls iconv) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable riak) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable zlib)
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  http://www.process-one.net/en/ejabberd/docs/"
+		echo
+		if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
+			ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after"
+			ewarn "migration to ${PV}. pubsub data may not be migrated automatically and"
+			ewarn "you may need to run migration script manually, see:"
+			ewarn
+			ewarn "  https://github.com/processone/ejabberd/issues/479#issuecomment-124497456"
+			ewarn
+			ewarn "In case you don't care about all stored moods, activities, geoinfo and you"
+			ewarn "know you don't store in pubsub anything important, you can just remove"
+			ewarn "pubsub tables:"
+			ewarn
+			ewarn "  rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*"
+			ewarn
+			ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244"
+			echo
+		fi
+	elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
+		elog "Ejabberd now defaults to using a YAML format for its config file."
+		elog "The old ejabberd.cfg file can be converted using the following instructions:"
+		echo
+		elog "1. Make sure all processes related to the previous version of ejabberd aren't"
+		elog "   running. Usually this just means the ejabberd and epmd daemons and possibly"
+		elog "   the pam-related process (epam) if pam support is enabled."
+		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can"
+		elog "   fail to start ejabberd properly for various reasons. Check ejabberd's main"
+		elog "   log file at /var/log/jabber/ejabberd.log to confirm it started successfully."
+		elog "3. Run"
+		elog "     \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
+		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
+		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config"
+		elog "   file."
+		echo
+	fi
+
+	if ! ejabberd_cert_exists; then
+		ejabberd_cert_install
+	fi
+
+	if ! use nls && is_mod_irc_enabled; then
+		ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd"
+		ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml."
+	fi
+}
diff --git a/net-im/ejabberd/ejabberd-17.04-r1.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
new file mode 100644
index 000000000000..729fae6076e2
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+	riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO: 	>=dev-erlang/meck-0.8.4
+# TODO: 	>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+	>=dev-erlang/cache_tab-1.0.7
+	>=dev-erlang/esip-1.0.11
+	>=dev-erlang/fast_tls-1.0.11
+	>=dev-erlang/fast_xml-1.1.21
+	>=dev-erlang/fast_yaml-1.0.9
+	>=dev-erlang/jiffy-0.14.8
+	>=dev-erlang/lager-3.2.1
+	>=dev-erlang/luerl-0.2
+	>=dev-erlang/p1_oauth2-0.6.1
+	>=dev-erlang/p1_utils-1.0.8
+	>=dev-erlang/stringprep-1.0.8
+	>=dev-erlang/stun-1.0.10
+	>=dev-erlang/xmpp-1.1.9
+	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
+	nls? ( >=dev-erlang/iconv-1.0.4 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.2 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	riak? (
+		>=dev-erlang/hamcrest-0.1.0_p20150103
+		>=dev-erlang/riakc-2.4.1
+	)
+	sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+	zlib? ( >=dev-erlang/ezlib-1.0.2 )"
+DEPEND="${CDEPEND}
+	>=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+	captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+	"${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
+	"${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+	sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+		-e "s|\"pamservicename\"|\"xmpp\"|" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+	sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to correct path to captcha.sh in example config'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="$1"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+	local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+	sed -r \
+		-e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to modify example config'
+}
+
+# Check if there already exists a certificate.
+ejabberd_cert_exists() {
+	local cert
+
+	for cert in $(gawk -- \
+			'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \
+			"${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
+		[[ -f ${cert} ]] && return 0
+	done
+
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+	egrep '^(\s*)(mod_irc\s*:.*$)' \
+		"${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!(User|Group)=(.*)!\1=jabber!' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+	gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+		print $0;
+	} else {
+		next;
+	}
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+pkg_setup() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	skip_docs
+	adjust_config
+	use nls || disable_mod_irc
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable hipe) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable nls iconv) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable riak) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable zlib)
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  http://www.process-one.net/en/ejabberd/docs/"
+		echo
+		if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
+			ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after"
+			ewarn "migration to ${PV}. pubsub data may not be migrated automatically and"
+			ewarn "you may need to run migration script manually, see:"
+			ewarn
+			ewarn "  https://github.com/processone/ejabberd/issues/479#issuecomment-124497456"
+			ewarn
+			ewarn "In case you don't care about all stored moods, activities, geoinfo and you"
+			ewarn "know you don't store in pubsub anything important, you can just remove"
+			ewarn "pubsub tables:"
+			ewarn
+			ewarn "  rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*"
+			ewarn
+			ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244"
+			echo
+		fi
+	elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
+		elog "Ejabberd now defaults to using a YAML format for its config file."
+		elog "The old ejabberd.cfg file can be converted using the following instructions:"
+		echo
+		elog "1. Make sure all processes related to the previous version of ejabberd aren't"
+		elog "   running. Usually this just means the ejabberd and epmd daemons and possibly"
+		elog "   the pam-related process (epam) if pam support is enabled."
+		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can"
+		elog "   fail to start ejabberd properly for various reasons. Check ejabberd's main"
+		elog "   log file at /var/log/jabber/ejabberd.log to confirm it started successfully."
+		elog "3. Run"
+		elog "     \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
+		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
+		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config"
+		elog "   file."
+		echo
+	fi
+
+	if ! ejabberd_cert_exists; then
+		ejabberd_cert_install
+	fi
+
+	if ! use nls && is_mod_irc_enabled; then
+		ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd"
+		ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml."
+	fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch
new file mode 100644
index 000000000000..6001c651f5d6
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch
@@ -0,0 +1,62 @@
+From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Mon, 29 Aug 2016 22:29:41 +0100
+Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
+
+Set SHELL since the generic jabber user used on Gentoo for jabber
+servers doesn't have a valid shell set by default and fix EXEC_CMD
+otherwise it fails with "This account is currently not available" again
+due to jabber not having a valid shell.
+
+Also, workaround the assumption that jabber's $HOME is a directory when
+instead it defaults to /dev/null on Gentoo.
+---
+ ejabberdctl.template | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ejabberdctl.template b/ejabberdctl.template
+index 5b34ebe..3c080fd 100755
+--- a/ejabberdctl.template
++++ b/ejabberdctl.template
+@@ -16,6 +16,7 @@ IEX={{bindir}}/iex
+ EPMD={{epmd}}
+ INSTALLUSER={{installuser}}
+ ERL_LIBS={{libdir}}
++SHELL=/bin/sh
+ 
+ # check the proper system user is used if defined
+ if [ "$INSTALLUSER" != "" ] ; then
+@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then
+     for GID in `id -G`; do
+         if [ $GID -eq 0 ] ; then
+             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+-            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
++            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
+                 mkdir -p "$INSTALLUSER_HOME"
+                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+             fi
+-            EXEC_CMD="su $INSTALLUSER -c"
++            EXEC_CMD="su $INSTALLUSER -p -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ETC_DIR/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define mnesia options
+ MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
+@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
++export SHELL
+ 
+ shell_escape_str()
+ {
+-- 
+2.9.2
+
diff --git a/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch
new file mode 100644
index 000000000000..92b7b023309e
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.in b/Makefile.in
+index 5ff3efe0..644ed713 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -204,8 +204,8 @@ install: all copy-files
+ 	chmod 755 ejabberd.init
+ 	#
+ 	# Service script
+-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
+-		> ejabberd.service
++	[ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
++		ejabberd.service.template > ejabberd.service
+ 	chmod 644 ejabberd.service
+ 	#
+ 	# Spool directory
diff --git a/net-im/ejabberd/files/ejabberd-17.01-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-17.01-ejabberdctl.patch
new file mode 100644
index 000000000000..6001c651f5d6
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.01-ejabberdctl.patch
@@ -0,0 +1,62 @@
+From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Mon, 29 Aug 2016 22:29:41 +0100
+Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
+
+Set SHELL since the generic jabber user used on Gentoo for jabber
+servers doesn't have a valid shell set by default and fix EXEC_CMD
+otherwise it fails with "This account is currently not available" again
+due to jabber not having a valid shell.
+
+Also, workaround the assumption that jabber's $HOME is a directory when
+instead it defaults to /dev/null on Gentoo.
+---
+ ejabberdctl.template | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ejabberdctl.template b/ejabberdctl.template
+index 5b34ebe..3c080fd 100755
+--- a/ejabberdctl.template
++++ b/ejabberdctl.template
+@@ -16,6 +16,7 @@ IEX={{bindir}}/iex
+ EPMD={{epmd}}
+ INSTALLUSER={{installuser}}
+ ERL_LIBS={{libdir}}
++SHELL=/bin/sh
+ 
+ # check the proper system user is used if defined
+ if [ "$INSTALLUSER" != "" ] ; then
+@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then
+     for GID in `id -G`; do
+         if [ $GID -eq 0 ] ; then
+             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+-            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
++            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
+                 mkdir -p "$INSTALLUSER_HOME"
+                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+             fi
+-            EXEC_CMD="su $INSTALLUSER -c"
++            EXEC_CMD="su $INSTALLUSER -p -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ETC_DIR/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define mnesia options
+ MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
+@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
++export SHELL
+ 
+ shell_escape_str()
+ {
+-- 
+2.9.2
+
diff --git a/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
new file mode 100644
index 000000000000..0a42f549b58c
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
@@ -0,0 +1,53 @@
+From 4086249e78cde107df84e6ad022e9d9821cecc40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 28 May 2017 14:22:08 +0100
+Subject: [PATCH] Don't configure or compile deps
+
+---
+ rebar.config.script | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/rebar.config.script b/rebar.config.script
+index 19142b9e..04f8b310 100644
+--- a/rebar.config.script
++++ b/rebar.config.script
+@@ -242,27 +242,6 @@ CtParams = fun(CompileOpts) ->
+ 		    TestConfig]
+ 	   end,
+ 
+-GenDepConfigureLine =
+-fun(DepPath, Flags) ->
+-	["sh -c 'if test ! -f ",DepPath,"config.status -o ",
+-	 "config.status -nt ",DepPath,"config.status; ",
+-	 "then (cd ", DepPath, " && ",
+-	 "CFLAGS=\"", CFlags,"\" ",
+-	 "CPPFLAGS=\"", CPPFlags, "\" "
+-	 "LDFLAGS=\"", LDFlags, "\"",
+-	 " ./configure ", string:join(Flags, " "),
+-	 "); fi'"]
+-end,
+-
+-GenDepsConfigure =
+-fun(Hooks) ->
+-	lists:map(fun({Pkg, Flags}) ->
+-			  DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"),
+-			  {'compile',
+-			   lists:flatten(GenDepConfigureLine(DepPath, Flags))}
+-		  end, Hooks)
+-end,
+-
+ ProcessErlOpt = fun(Vals) ->
+ 			lists:map(
+ 			  fun({i, Path}) ->
+@@ -315,8 +294,6 @@ Rules = [
+ 	  AppendList([{coveralls, ".*", {git, "https://github.com/markusn/coveralls-erl.git", "master"}}]), []},
+ 	 {[post_hooks], [cover_enabled], os:getenv("TRAVIS") == "true",
+ 	  AppendList2(TravisPostHooks), [], false},
+-	 {[pre_hooks], [post_hook_configure], true,
+-	  AppendList2(GenDepsConfigure), [], []},
+ 	 {[ct_extra_params], [eunit_compile_opts], true,
+ 	  AppendStr2(CtParams), "", []},
+ 	 {[erl_opts], true,
+-- 
+2.12.2
+
diff --git a/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch
new file mode 100644
index 000000000000..2bea750ef04e
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.in b/Makefile.in
+index a0b4553d..4675b88a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -204,8 +204,8 @@ install: all copy-files
+ 	chmod 755 ejabberd.init
+ 	#
+ 	# Service script
+-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
+-		> ejabberd.service
++	[ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
++		ejabberd.service.template > ejabberd.service
+ 	chmod 644 ejabberd.service
+ 	#
+ 	# Spool directory
diff --git a/net-im/ejabberd/files/ejabberd-17.04-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-17.04-ejabberdctl.patch
new file mode 100644
index 000000000000..6001c651f5d6
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.04-ejabberdctl.patch
@@ -0,0 +1,62 @@
+From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Mon, 29 Aug 2016 22:29:41 +0100
+Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
+
+Set SHELL since the generic jabber user used on Gentoo for jabber
+servers doesn't have a valid shell set by default and fix EXEC_CMD
+otherwise it fails with "This account is currently not available" again
+due to jabber not having a valid shell.
+
+Also, workaround the assumption that jabber's $HOME is a directory when
+instead it defaults to /dev/null on Gentoo.
+---
+ ejabberdctl.template | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ejabberdctl.template b/ejabberdctl.template
+index 5b34ebe..3c080fd 100755
+--- a/ejabberdctl.template
++++ b/ejabberdctl.template
+@@ -16,6 +16,7 @@ IEX={{bindir}}/iex
+ EPMD={{epmd}}
+ INSTALLUSER={{installuser}}
+ ERL_LIBS={{libdir}}
++SHELL=/bin/sh
+ 
+ # check the proper system user is used if defined
+ if [ "$INSTALLUSER" != "" ] ; then
+@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then
+     for GID in `id -G`; do
+         if [ $GID -eq 0 ] ; then
+             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+-            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
++            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
+                 mkdir -p "$INSTALLUSER_HOME"
+                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+             fi
+-            EXEC_CMD="su $INSTALLUSER -c"
++            EXEC_CMD="su $INSTALLUSER -p -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ETC_DIR/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define mnesia options
+ MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
+@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
++export SHELL
+ 
+ shell_escape_str()
+ {
+-- 
+2.9.2
+
diff --git a/net-im/ejabberd/files/ejabberd.confd b/net-im/ejabberd/files/ejabberd.confd
new file mode 100644
index 000000000000..b1e984e4d7ab
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.confd
@@ -0,0 +1,5 @@
+# Please configure everything at /etc/jabber/ejabberdctl.cfg
+# Put here only command line arguments for ejabberdctl (if any are required)
+
+#EJABBERDCTL_OPTS=""
+
diff --git a/net-im/ejabberd/files/ejabberd.initd b/net-im/ejabberd/files/ejabberd.initd
new file mode 100644
index 000000000000..94ac2ae8e465
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+	use dns
+	need epmd net
+	provide jabber-server
+}
+
+start() {
+	if ejabberdctl status >/dev/null 2>&1; then
+		ewarn "ejabberd is already started (manually?)."
+		return 0
+	fi
+	ebegin "Starting ejabberd"
+	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ejabberd configuration"
+	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config
+	eend $?
+}
+
+stop() {
+	ejabberdctl status >/dev/null 2>&1
+	if test $? = 3; then
+		ewarn "ejabberd is already stopped (manually?)."
+		return 0
+	fi
+	ebegin "Stopping ejabberd"
+	if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
+		cnt=0
+		sleep 1
+		while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
+			echo -n .
+			cnt=`expr $cnt + 1`
+			if [ $cnt -ge 60 ] ; then
+				eend 1
+				break
+			fi
+			sleep 1
+		done
+		eend 0
+	else
+		eend 1
+		einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
+	fi
+	eend 0
+}
diff --git a/net-im/ejabberd/files/ejabberd.logrotate b/net-im/ejabberd/files/ejabberd.logrotate
new file mode 100644
index 000000000000..4f324729dba8
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.logrotate
@@ -0,0 +1,13 @@
+/var/log/jabber/*.log {
+	su jabber jabber
+	weekly
+	rotate 4
+	missingok
+	nocreate
+	sharedscripts
+	notifempty
+	compress
+	postrotate
+		/usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true
+	endscript
+}
diff --git a/net-im/ejabberd/files/ejabberd.tmpfiles.conf b/net-im/ejabberd/files/ejabberd.tmpfiles.conf
new file mode 100644
index 000000000000..6a9cc9e61b7a
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.tmpfiles.conf
@@ -0,0 +1,2 @@
+d /run/lock/ejabberdctl 0750 jabber jabber
+d /run/ejabberd 0750 jabber jabber
diff --git a/net-im/ejabberd/files/epam-wrapper b/net-im/ejabberd/files/epam-wrapper
new file mode 100644
index 000000000000..9fb0466cf226
--- /dev/null
+++ b/net-im/ejabberd/files/epam-wrapper
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+ERL_LIBS=/usr/lib/erlang/lib
+
+for bin in "$ERL_LIBS"/epam-*/priv/bin/epam; do
+	if [ -x "$bin" ]; then
+		if [ -z "$epam" ]; then
+			epam="$bin"
+		else
+			echo "Multiple epam libraries - don't know what to do" >&2
+			exit 1
+		fi
+	fi
+done
+
+if [ -z "$epam" ]; then
+	echo "Couldn't find epam package" >&2
+	exit 1
+fi
+
+exec "$epam"
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
new file mode 100644
index 000000000000..e8a19e0f1ad2
--- /dev/null
+++ b/net-im/ejabberd/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+		<name>Hanno Böck</name>
+	</maintainer>
+	<longdescription>
+		Free and Open Source distributed fault-tolerant Jabber server. It's
+		mostly written in Erlang, and works on many platforms.
+	</longdescription>
+	<use>
+		<flag name="captcha">Support for CAPTCHA Forms (XEP-158) on registration</flag>
+		<flag name="full-xml">Use XML features in XMPP stream (ex: CDATA),
+			requires XML compliant clients</flag>
+		<flag name="hipe">Compile natively with HiPE, not recommended</flag>
+		<flag name="mssql">Enable Microsoft SQL Server support (via ODBC) for
+			data storage</flag>
+		<flag name="mysql">Enable MySQL support for data storage</flag>
+		<flag name="nls">Enable character set conversion for mod_irc</flag>
+		<flag name="odbc">Enable ODBC support to access data storage</flag>
+		<flag name="postgres">Enable PostgreSQL support for data storage</flag>
+		<flag name="redis">Enable Redis support for transient data</flag>
+		<flag name="riak">Enable support for Riak - distributed NoSQL key-value
+			data store</flag>
+		<flag name="roster-gw">Turn on workaround for processing gateway subscriptions</flag>
+		<flag name="sqlite">Enable SQLite database support</flag>
+		<flag name="zlib">Enable Stream Compression (XEP-0138) using zlib</flag>
+		<!-- TODO Add later: flag name="tools">Build development tools</flag -->
+	</use>
+	<upstream>
+		<remote-id type="github">processone/ejabberd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
new file mode 100644
index 000000000000..582105061da2
--- /dev/null
+++ b/net-im/ekg2/Manifest
@@ -0,0 +1,7 @@
+AUX 0001-Gentoo-use-vendor-dirs-for-perl-modules.patch 786 SHA256 774aadd44164565b198676d87431264b5e10e18af0664dafd1e6fa6f6ac9ac4d SHA512 8156f6a1f29a1a727840223e4d2bf44c9d6f4a544c948094b405f6a22083070bef5e473597bd993d49e51a5bfedeaa942da8d411f8ed9d61988a8341c8b0134b WHIRLPOOL 038c88443d4f3b11730308c6d81ed5db26e22fd2f8b563e49f23d327af7ef2338559fe387b5cb3f729fa6f65f4637deaeecea39d290b41892ff8f7f22da277d7
+DIST ekg2-0.3.1.tar.gz 1704772 SHA256 6ad360f8ca788d4f5baff226200f56922031ceda1ce0814e650fa4d877099c63 SHA512 dc107005f434f9e3011ff2be720b750b09c72fee1f9e1b47dfbf8af8eac1e27b24e028505a0d4928aedd1375a3245e93757410c742ff112ff5dac1e1a4f5a21c WHIRLPOOL 520f2eeb03e3edf3f3a622fcdcd3ca2952c69ac2503c1c5d76af5abdd7bdb12aa216d3ea22539bec2d996f5147bbf0e8198c9cc201677c8a1d2a65cecca0c1a7
+EBUILD ekg2-0.3.1-r2.ebuild 3006 SHA256 bb68e96fa48435dbe81dfe9d4b81f4f62c11cfd28fc2f4e4fcabd6e55974dd49 SHA512 b9370c95aa0af3aed3907090e48639a2b6cc6aae294ba14d5d898a41a62db6519a6a17dd4aa0c9f1817104fafc25e512f5272a377c30939b813d909ba9e1342a WHIRLPOOL a1aa6e2dd385c4e1e399a4c36c864a5be33cdf77dbdc7f42214e4ce76ee880cab0a5cdee08186e1db9b0943040921521dc631758ab56bfb8cb972d86bfc48cb5
+EBUILD ekg2-9999.ebuild 2591 SHA256 e3498304de80f0178205e3322a1872be4b9a5668ab50e794537c533703469b74 SHA512 0931bf1663b43c15e5f292e7969e16179d9eb37a65ffe7bfdeab501f362b383660c3504212da6569d81ccf951ebd701e8ff7d90fbfacab72493bd673cff96e76 WHIRLPOOL 09ffc4a78ebbb50b729f9e476d41b43bb3c8964a9945261cdd7c021c691f64b75da7f992e99d846827334e40fa97e1db150c1b46568dd926ae6885a50f870deb
+MISC ChangeLog 3071 SHA256 a7ac85645de8c6f404184878133bb7a6b1d011f4faf3cf01e00f6e2e179fa40b SHA512 f7ac7d91604954c4c1b2a1b7242a931679deaa2e363ceaa35bd5af18fac5eb07b8a55ab5c0f6dd04b7c94190533e8207d2fb2853fc8f6d788b7d7c3eab6afc08 WHIRLPOOL d82033701a49f651ef885d7ef9885b000389c448e4735e9bd5c139560b0f7c008cdf607ea0fc95204a42bd1c39188fa2906d044502530eef921103a8b5b5c448
+MISC ChangeLog-2015 4859 SHA256 608e48c4c17a87be9326d07e1a1eee13004a21445ca8373fda3c6eba27d14ea8 SHA512 5922bbe40330c239044a0e389c4293cb30c5955e5d979680c2e4bf89de946479281a67f827c0b91e9558c344d88793595f204cdd87b7f27adfbec586408f2cd2 WHIRLPOOL 0b7423f2e337dae904cae0676b4af5f69d6c1920170167866a18f0b5dcb426eb235cd35070e46d614df85a95f9210daef258ca66695b4d812eeffdd87a5fa14a
+MISC metadata.xml 1400 SHA256 9cc4dcb5c2f082efa270722d888e0d530a1db3434104353cf9c0a7157b683448 SHA512 b4bfd15f99b562edb78e6d3a9a41b7e924f1138eaab3319c95a989b3d189282752008cce42bbf837a1b431a8c1e9039ccc364626096300fcde96768abdbfd561 WHIRLPOOL be2998ae69cbead17cea020cc1048b21328417489534db17682946ea3e2b2bf0de3a3a0103b0b070851505d255905ff8914fec1b60c49f9e1fb486f92ff82ee1
diff --git a/net-im/ekg2/ekg2-0.3.1-r2.ebuild b/net-im/ekg2/ekg2-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..cbdc45612f78
--- /dev/null
+++ b/net-im/ekg2/ekg2-0.3.1-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils eutils python-single-r1 versionator
+
+DESCRIPTION="Text-based, multi-protocol instant messenger"
+HOMEPAGE="http://www.ekg2.org"
+SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gadu gif gnutls gpg gpm gsm gtk idn jpeg ncurses nls
+	oracle perl python readline rss spell sqlite ssl threads unicode
+	xmpp xosd zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	gpg? ( app-crypt/gpgme:= )
+	gsm? ( media-sound/gsm:= )
+	gtk? ( x11-libs/gtk+:2= )
+	idn? ( net-dns/libidn:= )
+	nls? ( virtual/libintl:= )
+	oracle? ( dev-db/oracle-instantclient-basic:= )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+	xosd? ( x11-libs/xosd:= )
+	zlib? ( sys-libs/zlib:= )
+
+	gadu? ( <net-libs/libgadu-1.12:=
+		gif? ( media-libs/giflib:= )
+		jpeg? ( virtual/jpeg:0= ) )
+	ncurses? ( sys-libs/ncurses:=[unicode?]
+		gpm? ( sys-libs/gpm:= )
+		spell? ( app-text/aspell:= ) )
+	rss? ( dev-libs/expat:= )
+	sqlite? ( dev-db/sqlite:3= )
+	xmpp? ( dev-libs/expat:=
+		gnutls? ( net-libs/gnutls:= ) )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
+)
+DOCS=(
+	AUTHORS docs/README docs/TODO
+	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
+	docs/themes.txt docs/themes-en.txt
+	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
+)
+
+# Due to MakeMaker being used to build Perl modules.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses && ! use readline; then
+		ewarn 'ekg2 is being compiled without any frontend, you should consider'
+		ewarn 'enabling at least one of following USEflags:'
+		ewarn '  gtk, ncurses, readline.'
+	fi
+
+	if use gnutls && ! use ssl; then
+		ewarn 'You have enabled USE=gnutls without USE=ssl. The SSL support'
+		ewarn 'in ekg2 will be limited to the plugins supporting GnuTLS.'
+	fi
+}
+
+src_configure() {
+	myeconfargs=(
+		$(use_with gadu libgadu)
+		$(use_with gif)
+		# gnutls is jabber-specific
+		$(use xmpp && use_with gnutls libgnutls || echo '--without-libgnutls')
+		$(use_with gpg)
+		$(use_with gpm gpm-mouse)
+		$(use_with gsm libgsm)
+		$(use_with gtk)
+		$(use_with idn libidn)
+		$(use xmpp && echo '--with-expat' || use_with rss expat)
+		$(use_with jpeg libjpeg)
+		$(use_with ncurses)
+		$(use_with oracle logsoracle)
+		$(use_with perl)
+		$(use_with python)
+		$(use_with readline)
+		$(use_with spell aspell)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl openssl)
+		$(use_with threads pthread)
+		$(use_with xosd libxosd)
+		$(use_with zlib)
+		$(use_enable nls)
+		$(use_enable unicode)
+		--with-inotify
+		--without-ioctld
+		--without-sqlite
+		--disable-remote
+		--enable-skip-relative-plugins-dir
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --modules
+}
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
new file mode 100644
index 000000000000..05cb485792d5
--- /dev/null
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="https://github.com/leafnode/${PN}.git"
+
+inherit git-r3
+#endif
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils python-single-r1
+
+DESCRIPTION="Text-based, multi-protocol instant messenger"
+HOMEPAGE="http://www.ekg2.org"
+SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
+	perl python readline rss spell sqlite ssl xmpp unicode zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2=
+	gadu? ( <net-libs/libgadu-1.12:0= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtk? ( x11-libs/gtk+:2= )
+	nls? ( virtual/libintl:0= )
+	openssl? ( dev-libs/openssl:0= )
+	perl? ( dev-lang/perl:0= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	rss? ( dev-libs/expat:0= )
+	ssl? ( net-libs/gnutls:0= )
+	xmpp? ( dev-libs/expat:0= )
+	zlib? ( sys-libs/zlib:0= )
+
+	ncurses? ( sys-libs/ncurses:0=[unicode=]
+		gpm? ( sys-libs/gpm:0= )
+		spell? ( app-text/aspell:0= ) )
+	sqlite? ( dev-db/sqlite:3= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+DOCS=(
+	AUTHORS README.md docs/README docs/TODO
+	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
+	docs/themes.txt docs/themes-en.txt
+	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
+)
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+#endif
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses && ! use readline; then
+		ewarn 'ekg2 is being compiled without any frontend. You should consider'
+		ewarn 'enabling at least one of following USEflags:'
+		ewarn '  gtk, ncurses, readline.'
+	fi
+}
+
+src_configure() {
+	myeconfargs=(
+		# direct plugin references
+		$(use_enable gadu gg)
+		$(use_enable gpg)
+		$(use_enable gtk)
+		$(use_enable ncurses)
+		$(use_enable nntp)
+		$(use_enable openssl sim)
+		$(use_enable perl)
+		$(use_enable python)
+		$(use_enable readline)
+		$(use_enable rss)
+		$(use_enable sqlite logsqlite)
+		$(use_enable xmpp jabber)
+
+		$(use_enable !minimal autoresponder)
+		$(use_enable !minimal jogger)
+		$(use_enable !minimal mail)
+		$(use_enable !minimal polchat)
+		$(use_enable !minimal rivchat)
+		$(use_enable !minimal sms)
+
+		# sqlite switch
+		--with-sqlite3
+
+		# optional deps
+		$(use_with gpm)
+		# do not pass --with-inotify as it will fail if check fails
+		$(use_with spell aspell)
+		$(use_with ssl gnutls)
+		$(use_with zlib)
+
+		# other magic
+		$(use_enable nls)
+		--with-perl-module-build-flags='INSTALLDIRS=vendor'
+		--enable-fast-configure
+	)
+	autotools-utils_src_configure
+}
diff --git a/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch b/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
new file mode 100644
index 000000000000..010b22fc976c
--- /dev/null
+++ b/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
@@ -0,0 +1,25 @@
+From 804370c1ad2f94937ac9184dbbb40354885ea6be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 6 Apr 2011 16:19:46 +0200
+Subject: [PATCH] [Gentoo] use vendor dirs for perl modules.
+
+---
+ plugins/perl/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/perl/Makefile.in b/plugins/perl/Makefile.in
+index 84d378b..309e2e2 100644
+--- a/plugins/perl/Makefile.in
++++ b/plugins/perl/Makefile.in
+@@ -594,7 +594,7 @@ all-local:
+ 	set -e; for dir in $(perl_dirs); do \
+ 	 cd $$dir && \
+ 	 if [ ! -f Makefile ]; then \
+-	   $(PERL) Makefile.PL; \
++	   $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ 	 fi && \
+ 	 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" && \
+ 	 cd ..; \
+-- 
+1.7.4.1
+
diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
new file mode 100644
index 000000000000..d79771701e08
--- /dev/null
+++ b/net-im/ekg2/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+
+	<use>
+		<!-- 0.3* flags -->
+		<flag name="gif" restrict="=net-im/ekg2-0.3*">
+			GIF token support for Gadu-Gadu protocol.</flag>
+		<flag name="gnutls">Enable SSL/TLS support through GnuTLS
+			for the plugins supporting it. If 'ssl' is enabled too, GnuTLS will
+			be preferred where possible (and OpenSSL will be used
+			elsewhere).</flag>
+		<flag name="jpeg">JPEG token support for Gadu-Gadu protocol.</flag>
+		<flag name="ssl" restrict="=net-im/ekg2-0.3*">
+			Enable the complete SSL/TLS support through OpenSSL.
+			This also enables the 'sim' plugin which relies on OpenSSL.</flag>
+		<flag name="oracle">Support logging messages into Oracle database.</flag>
+
+		<!-- common and modern flags -->
+		<flag name="gadu">Enable Gadu-Gadu protocol support (requires
+			<pkg>net-libs/libgadu</pkg>).</flag>
+		<flag name="gpg">Enable jabber message encryption through
+			<pkg>app-crypt/gpgme</pkg>.</flag>
+		<flag name="minimal">Disable building extra plugins with no additional
+			deps.</flag>
+		<flag name="openssl">Support encryption in sim plugin, using OpenSSL.</flag>
+		<flag name="sqlite">Support logging messages into SQLite3 database.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
new file mode 100644
index 000000000000..b6d2c50b6060
--- /dev/null
+++ b/net-im/empathy/Manifest
@@ -0,0 +1,8 @@
+AUX empathy-3.12.7-Fix-parallel-build-in-extensions.patch 2274 SHA256 e708cde80e931361858b60fe093db9641646f92f5c560f0f2a9e0590af3ae3fa SHA512 cd8390e8b1750fec8553aaab278a67fc802c53d4a91f5e9fdeff6d5ad52c1ff00beae6909762ec65bbedaa070d1e9ffc9482294542d78e77139b8e1fc4cae21a WHIRLPOOL b5447bf0cb8733b195c75e0497cfbf59f19d6bba3c15021e6b5ded000ddb449217c50e80fd698d8378554704846959a605dbe5320909fcb0349c06e7e3d7686c
+DIST empathy-3.12.12.tar.xz 5203996 SHA256 dda22adf38772d85cd7ff611bcc1a036a6b8625bc7d146c95d4bfcdbc3ecf7cb SHA512 d16b6c35c58d0cf6306acfd43efff633204cee2a5eb65dc84c3d6fabe48529b9df69e51e85db5068f90b06bec643ce772bae84188dec31950f37553b13e3283f WHIRLPOOL a5ec1a80f44b32c41a15eadc7eb51fd8c4fb95e08130602c4b8995bdf4d813a9628372a58981bc3aa61217be60eec7b7e91b71343e2ff992ad6f17be983487dd
+DIST empathy-3.12.14.tar.xz 5017776 SHA256 7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3 SHA512 f467277278a9e8d330e4ab656b3edb2acac6efec211baa146a5ea0a6d0da299e68cdb83ceb1a27a1aa4744c2ce1a441fa287001003c523036ada517029a40123 WHIRLPOOL 6b1a101c41c237d8eb8c7903b81bff5b8be331c3e9585decc5e1be2a985f10be546b0fd58e4b328a4037c1efffa7c4e9fb62e350210bff94a2d07c8eab318f0b
+EBUILD empathy-3.12.12.ebuild 3243 SHA256 f57a1592b7db429f4b7153e2c07c4d71ba759c2f1f50faa8bbdd7b266c51b4a9 SHA512 a8b055205d04133ac1ecfe12c64d43cb0df5d2995dbe456e5f3f7bc393bc36d9acc116e718353371164ff3553d336460b2bf05871afd053603a80b0d2f0045cc WHIRLPOOL 40c1064efa2a15eb2db73e07172b78a810cc14055cb392c45d535915c5fdc23cd46c38f112a0f83eaf50200f5d717603059da6e226764e745a9b081697abb027
+EBUILD empathy-3.12.14.ebuild 3004 SHA256 4da5a3582ae627bd8470c3f43785ac446719af40923dafb587afeddaee47081a SHA512 0bba36af677b1a33856fa10fd435851f37baf40eabce9f990addd936ecdd1863912a44331d3c08af0b973dea63de2ff35760651e1721ab1ed7fd1c5a7e4bf924 WHIRLPOOL ca90f1663202a817f6aaa0be863e24d9c363bee158e0e8bb48ab1478bb831bc2f6d31aa2d7caf1a80c137031452ab2a8fe418128c338138c3e0f4539caa65d44
+MISC ChangeLog 4530 SHA256 6b68212fbb489edd38d53c70be2e4157708c560d74058707cf2089b3f93730da SHA512 0a2035b53b1a2e12deddaea0422b35fdcf5ceb137b37937b13a8f099525f17ac045c46ce3d4d7389c0cb2bef53464c4e64ef41784e38ad4e9cdfef0e0932f6cf WHIRLPOOL 969009917eff1da597d969fbe702d61f8860c1208cf7f9fab05ebbe0607c97401db9d40cdd25c2c0ccf42b805be699f7bd25de6927ea578544eeeceaf9c68387
+MISC ChangeLog-2015 28378 SHA256 230bc7865e155d4a22d497acfbbd0ef0fea767fd21313f16b91c855dd3dda2ae SHA512 0686d82c2d6dc2dcfad1f3ee1d1593d7e5920a2fb29a6d6e70fd3cc8ab7b9232f1b2ae9259e07a9f6fc8322634684c8a2c839686a659538a4e767144842a92ab WHIRLPOOL f36453dddfcd684f80c1938381346827132c2f6e2ce6b0314c209249cd7250778608255edafb8da42f9b6ddd07c24e745785cb87326a0189e394df8d8b7ba529
+MISC metadata.xml 946 SHA256 898e5bd853ee97bc4806fa81585a707e9ed98e35c0b90578afc74c2f53946569 SHA512 98f60d8d61b6fe772c334bd4a0890aefb105231b1ee6adb8dccc20962334fbf95c229aafba68a8ff500cf067bae20b7049fbe2c0023c4abdabcafeb86b130d83 WHIRLPOOL bb2765c440c61a06e0d9e4b8c1adac506ef2ff1d2fbe7b519cfa64454181c03ea3daa6a5991ba4c2ef63ddd9d3a75a966a20c706890e2054b8117ef7cb1b04ac
diff --git a/net-im/empathy/empathy-3.12.12.ebuild b/net-im/empathy/empathy-3.12.12.ebuild
new file mode 100644
index 000000000000..7f1c071016fe
--- /dev/null
+++ b/net-im/empathy/empathy-3.12.12.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2 autotools python-any-r1 virtualx
+
+DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
+SLOT="0"
+IUSE="debug +geolocation gnome gnome-online-accounts +map spell test +v4l"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.6:2[dbus]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.4:3
+	x11-libs/pango
+	>=dev-libs/dbus-glib-0.51
+	>=dev-libs/folks-0.9.5:=[telepathy]
+	dev-libs/libgee:0.8=
+	>=app-crypt/libsecret-0.5
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/gnutls-2.8.5:=
+	>=net-libs/webkit-gtk-1.9.1:3
+	>=x11-libs/libnotify-0.7:=
+
+	media-libs/gstreamer:1.0
+	>=media-libs/clutter-1.10.0:1.0
+	>=media-libs/clutter-gtk-1.1.2:1.0
+	media-libs/clutter-gst:2.0
+	>=media-libs/cogl-1.14:1.0=
+
+	net-libs/farstream:0.2=
+	>=net-libs/telepathy-farstream-0.6.0:=
+	>=net-libs/telepathy-glib-0.23.2
+	>=net-im/telepathy-logger-0.8.0:=
+
+	app-crypt/gcr[gtk]
+	dev-libs/libxml2:2
+	gnome-base/gsettings-desktop-schemas
+	media-sound/pulseaudio[glib]
+	net-libs/libsoup:2.4
+	x11-libs/libX11
+
+	geolocation? (
+		>=app-misc/geoclue-2.1:2.0
+		>=sci-geosciences/geocode-glib-3.10 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= )
+	map? (
+		>=media-libs/clutter-1.7.14:1.0
+		>=media-libs/clutter-gtk-0.90.3:1.0
+		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
+	spell? (
+		>=app-text/enchant-1.2
+		>=app-text/iso-codes-0.35 )
+	v4l? (
+		media-plugins/gst-plugins-v4l2:1.0
+		>=media-video/cheese-3.4:=
+		virtual/libgudev:= )
+"
+
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-base:1.0
+	net-im/telepathy-connection-managers
+	!<net-voip/telepathy-rakia-0.7
+	x11-themes/adwaita-icon-theme
+	gnome? ( gnome-extra/gnome-contacts )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.0
+	dev-util/itstool
+	virtual/pkgconfig
+	test? (
+		sys-apps/grep
+		>=dev-libs/check-0.9.4 )
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	export PYTHONIOENCODING=UTF-8 # See bug 489774
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=685837
+	epatch "${FILESDIR}/${PN}-3.12.7-Fix-parallel-build-in-extensions.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+	gnome2_src_configure \
+		--disable-Werror \
+		--disable-coding-style-checks \
+		--disable-static \
+		--disable-ubuntu-online-accounts \
+		--enable-gst-1.0 \
+		$(use_enable debug) \
+		$(use_enable geolocation geocode) \
+		$(use_enable geolocation location) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable map) \
+		$(use_enable spell) \
+		$(use_enable v4l gudev) \
+		$(use_with v4l cheese)
+}
+
+src_test() {
+	dbus-launch virtx emake check #504516
+}
diff --git a/net-im/empathy/empathy-3.12.14.ebuild b/net-im/empathy/empathy-3.12.14.ebuild
new file mode 100644
index 000000000000..d5ec3f94f0c3
--- /dev/null
+++ b/net-im/empathy/empathy-3.12.14.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
+SLOT="0"
+IUSE="debug +geolocation gnome gnome-online-accounts +map spell test +v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48:2[dbus]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.4:3
+	x11-libs/pango
+	>=dev-libs/dbus-glib-0.51
+	>=dev-libs/folks-0.9.5:=[telepathy]
+	dev-libs/libgee:0.8=
+	>=app-crypt/libsecret-0.5
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/webkit-gtk-2.10:4
+	>=x11-libs/libnotify-0.7:=
+
+	media-libs/gstreamer:1.0
+	>=media-libs/clutter-1.10.0:1.0
+	>=media-libs/clutter-gtk-1.1.2:1.0
+	media-libs/clutter-gst:3.0
+	>=media-libs/cogl-1.14:1.0=
+
+	net-libs/farstream:0.2=
+	>=net-libs/telepathy-farstream-0.6.0:=
+	>=net-libs/telepathy-glib-0.23.2
+	>=net-im/telepathy-logger-0.8.0:=
+
+	app-crypt/gcr[gtk]
+	dev-libs/libxml2:2
+	gnome-base/gsettings-desktop-schemas
+	media-sound/pulseaudio[glib]
+	net-libs/libsoup:2.4
+	x11-libs/libX11
+
+	geolocation? (
+		>=app-misc/geoclue-2.1:2.0
+		>=sci-geosciences/geocode-glib-3.10 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= )
+	map? (
+		>=media-libs/clutter-1.7.14:1.0
+		>=media-libs/clutter-gtk-0.90.3:1.0
+		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
+	spell? (
+		>=app-text/enchant-1.2
+		>=app-text/iso-codes-0.35 )
+	v4l? (
+		media-plugins/gst-plugins-v4l2:1.0
+		>=media-video/cheese-3.4:=
+		virtual/libgudev:= )
+"
+
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-base:1.0
+	net-im/telepathy-connection-managers
+	!<net-voip/telepathy-rakia-0.7
+	x11-themes/adwaita-icon-theme
+	gnome? ( gnome-extra/gnome-contacts )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.0
+	dev-util/itstool
+	virtual/pkgconfig
+	test? (
+		sys-apps/grep
+		>=dev-libs/check-0.9.4 )
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	export PYTHONIOENCODING=UTF-8 # See bug 489774
+}
+
+src_configure() {
+	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+	gnome2_src_configure \
+		--disable-coding-style-checks \
+		--disable-static \
+		--disable-ubuntu-online-accounts \
+		--enable-gst-1.0 \
+		$(use_enable debug) \
+		$(use_enable geolocation geocode) \
+		$(use_enable geolocation location) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable map) \
+		$(use_enable spell) \
+		$(use_enable v4l gudev) \
+		$(use_with v4l cheese)
+}
+
+src_test() {
+	dbus-launch virtx emake check #504516
+}
diff --git a/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch b/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch
new file mode 100644
index 000000000000..28eef07fbb3c
--- /dev/null
+++ b/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch
@@ -0,0 +1,65 @@
+From 7af14d9ca148e4d1ec2eb70d7b655bb2fc5a052f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Sun, 30 Nov 2014 22:10:59 +0100
+Subject: [PATCH] Fix parallel build in extensions/
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GNU Make manual says:
+
+    A rule with multiple targets is equivalent to writing many rules,
+    each with one target, and all identical aside from that.
+
+In other words, make may very well call glib-gtypes-generator.py twice
+(once for each generated header). And hell breaks loose because the
+python code assumes it will run once (it should be using the tempfile
+module, but that's another bug). On a fast multi-core machine, make -j4
+will easily reproduce this bug.
+
+The solution is hidden in the same manual [1] :
+
+    %.tab.c %.tab.h: %.y
+            bison -d $<
+
+    This tells make that the recipe ‘bison -d x.y’ will make both
+    x.tab.c and x.tab.h.
+
+So by using '%' to replace the 'y' in the targets, I'm telling make that
+running the recipe once will generate both files.
+
+[1] http://www.gnu.org/software/make/manual/make.html#Pattern-Examples
+
+https://bugs.gentoo.org/show_bug.cgi?id=515894
+https://bugzilla.gnome.org/show_bug.cgi?id=685837
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ extensions/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/Makefile.am b/extensions/Makefile.am
+index 79622d4..9082496 100644
+--- a/extensions/Makefile.am
++++ b/extensions/Makefile.am
+@@ -66,7 +66,7 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
+ 		$(tools_dir)/doc-generator.xsl \
+ 		$< > $@
+ 
+-_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
++_gen/gt%pes.h _gen/gt%pes-body.h: _gen/all.xml \
+ 	$(top_srcdir)/tools/glib-gtypes-generator.py
+ 	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
+ 		$< _gen/gtypes Emp
+@@ -82,7 +82,7 @@ _gen/enums.h: _gen/all.xml \
+ 		Emp \
+ 		$< _gen/enums
+ 
+-_gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
++_gen/int%rfaces-body.h _gen/int%rfaces.h: _gen/all.xml \
+ 	$(tools_dir)/glib-interfaces-gen.py
+ 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
+ 		Emp _gen/interfaces-body.h _gen/interfaces.h $<
+-- 
+2.3.6
+
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
new file mode 100644
index 000000000000..54f02c7adf8b
--- /dev/null
+++ b/net-im/empathy/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gnome-online-accounts">Enable using
+			<pkg>net-libs/gnome-online-accounts</pkg> for authorization (e.g.
+			for Google Talk)</flag>
+		<flag name="map">Enable world map support through
+			<pkg>media-libs/libchamplain</pkg></flag>
+	</use>
+	<longdescription>
+		Empathy consists of a rich set of reusable instant messaging widgets,
+		and a GNOME client using those widgets. It uses Telepathy and Nokia's
+		Mission Control. The main goal is to permit desktop integration by 
+		providing libempathy and libempathy-gtk libraries. libempathy-gtk is a
+		set of powerful widgets that can be embeded into any GNOME application.
+		A client application is provided.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
new file mode 100644
index 000000000000..04403395853c
--- /dev/null
+++ b/net-im/err/Manifest
@@ -0,0 +1,7 @@
+AUX errd.confd 167 SHA256 6475348ec29b582c3542be04b01db457731c4d9f4d998a41fefb17f757321235 SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f WHIRLPOOL 1f3ffec6d4e72d21c107326586d5d39bf0bcc9177d9b4b38361dd9b31d816bef70be471b02c5121df31b87a3460a62fa2633e83048cb6f539d55e9d323261d5a
+AUX errd.initd 678 SHA256 824bf6949ea55d6d084234035c8ed2b2b25c9007350118db03bae37d4293e386 SHA512 c7a32d4d81f7f9bc6a598796b0b219e6c6b3187e0fcb9035824cf183b98e4ac95688c106e594f72ab09260d1c5bdc02e09e976e04674b58549d91e2a801752cb WHIRLPOOL b4a69dda495b9c208b14a32717e9481cd1fee49283d2e7b52ce3835c2bdf966a50676b9abf182586a6bd5364f751b5b1af8cb5c648ce268d3d8ec6fce30f4b38
+DIST err-1.7.1.tar.gz 100716 SHA256 a116df7fb4489274b0074c960eebfd7bb938cc777dfc43c773f828aaf9cb5406 SHA512 5be7f6ede6694877e73226de4da58bc47e1230032bc9be8dd3e8fd1448afd1e3ae4c02ecbdb30343b98466bb0d3a8fbfbcb6609c5c50768a9be70b9d22f675a4 WHIRLPOOL a79fd02db047ccfdf25201ade924ed3382d8b729b69bcdebf911d806c167751ec011e62728d9342a4f7c0d8cc6e4b07a40bd5f275ed042ff2451fc17066800e8
+EBUILD err-1.7.1-r1.ebuild 2012 SHA256 111c20e170cd0e434f6faafff2167fefd5fa390457f0da9d87a26a6732e7e99e SHA512 a1d0551b5c4f02baa3d83c6c18a0514cbf7a16408f43468b9ef1bffcfd966d42d509c776e4a992a4a98bdeb0d30d157adf88979b6d9092dcefc97b34700ad971 WHIRLPOOL e120b5a91be0986f0732473ba8c1552f0cbc951af3aea4bec2e16bf311b3a2802169d4b690e299be8fea13a0f4bad41e5722013666f05c9272f8dd912a9bc6b4
+MISC ChangeLog 3112 SHA256 217850fed936e3036bfaa4f990daa0cb3aef3ecc55d3e4d43e259720f8668be5 SHA512 ab62e652a8009001852d068e9b74805551df707af13fefa7501b243b66e61cd8de1a38b6f22ba0923886145c4e826612f8308de9f7678812a4eb883642fb5d16 WHIRLPOOL 33f2edcead1a22ebda76d5a6c533cbe3389adf9c5a96b36bc97c69f93d79e455ab2dd7a0691f74bc7ca5ed9c0f20b2b66edc4076093dc08cd996d5d1718c3c09
+MISC ChangeLog-2015 3042 SHA256 f75dbb906200ac48167ca97ed827191622d0c8a98e8db42360e5b68a10d3c461 SHA512 a7bc7033eace6582cd1a905a4a1eb3ffda73a12052ac26d39e2479d7a32dce695038cef7fb240fccfac33a829da1e2e520862a430ecced93587581ed417d7ae4 WHIRLPOOL e9f48663a38ecba9ec0905f42d44083626f70a1c96a8b2e2e91bb23a6036d85340faec4c142f8992d257f0a81692e59fd361f1949be2af7370de4e2508370ee1
+MISC metadata.xml 689 SHA256 b3f64520ec398cb6c0ac0a6449ce3ffb89434f2dbf33121980726793a75c9707 SHA512 dfc61dbf4405fee8f0494a7872d1fc86e9b34cf5e12e133b88a9041301cca69606b1e26ba8249c0341fb148890b70058f9bcb1a875c1cd742e9559e3bcc1df36 WHIRLPOOL d1aeac2059f0e5ce45481361efdd25c2764853a20a06d40fd9cfb39d69fd0aac52e95ae2bb674d78b7d4dd208963fe5a83ed55106f6b38491d134a5113c5ea3c
diff --git a/net-im/err/err-1.7.1-r1.ebuild b/net-im/err/err-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..ebb937892546
--- /dev/null
+++ b/net-im/err/err-1.7.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils user
+
+DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable"
+HOMEPAGE="https://gbin.github.com/err/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +plugins"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyfire[${PYTHON_USEDEP}]
+	dev-python/python-daemon[${PYTHON_USEDEP}]
+	dev-python/xmpppy[${PYTHON_USEDEP}]
+	dev-python/yapsy[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+		dev-python/twisted-words[${PYTHON_USEDEP}]
+	)
+	plugins? ( dev-vcs/git )"
+
+# Testsuite is broken since 1.6.3
+RESTRICT="test"
+
+# NOTES:
+# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
+# 2. Support for BOT_SENTRY option is missing, cause
+#    we do not have apropriate packages in portage yet
+# 3. Internal web server is broken(dunno why :-()
+
+pkg_setup() {
+	ebegin "Creating err group and user"
+	enewgroup 'err'
+	enewuser 'err' -1 -1 -1 'err'
+	eend ${?}
+}
+
+python_prepare_all() {
+	# Remove configparser and config from requirements as they are NOT needed
+	sed -i \
+		-e "/install_requires/s/'configparser', //" \
+		-e "/install_requires/s/, 'config'//" \
+		setup.py || die
+
+	# Tests are broken and should not be installed
+	rm -r tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd errd
+	newconfd "${FILESDIR}"/errd.confd errd
+
+	dodir /etc/${PN}
+	dodir /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners -R err:err /var/lib/${PN}
+	fowners -R err:err /var/log/${PN}
+
+	insinto /etc/${PN}
+	newins errbot/config-template.py config.py
+}
diff --git a/net-im/err/files/errd.confd b/net-im/err/files/errd.confd
new file mode 100644
index 000000000000..cc70d90b4b43
--- /dev/null
+++ b/net-im/err/files/errd.confd
@@ -0,0 +1,9 @@
+# Path to config directory
+ERR_CONFIG_PATH=/etc/err
+
+# Path to pid file
+ERR_PID_FILE=/var/run/err/err.pid
+
+# User and group to run bot with
+ERR_USER=err
+ERR_GROUP=err
diff --git a/net-im/err/files/errd.initd b/net-im/err/files/errd.initd
new file mode 100644
index 000000000000..438d3dcc4501
--- /dev/null
+++ b/net-im/err/files/errd.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	# create piddir if necessary, bug #448498
+	local piddir=$(dirname ${ERR_PID_FILE})
+	checkpath -q -d -o err:err -m 0770 "${piddir}" || {
+                eend 1
+                return 1
+        }
+
+	ebegin "Starting errd"
+		start-stop-daemon --start --make-pidfile --pidfile ${ERR_PID_FILE} --background --quiet -u ${ERR_USER}:${ERR_GROUP} \
+			--exec /usr/bin/python2 -- /usr/bin/err.py -c ${ERR_CONFIG_PATH}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping errd"
+		start-stop-daemon --stop --pidfile ${ERR_PID_FILE}
+	eend $?
+}
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
new file mode 100644
index 000000000000..e6e55f5a3b8c
--- /dev/null
+++ b/net-im/err/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <use>
+    <flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
+    <flag name="plugins">Enable support for installing plugins with <pkg>dev-vcs/git</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">gbin/err</remote-id>
+    <maintainer status="active">
+      <email>gbin@gootz.net</email>
+      <name>Guillaume BINET</name>
+    </maintainer>
+    <remote-id type="pypi">err</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
new file mode 100644
index 000000000000..c5b3f2a352a6
--- /dev/null
+++ b/net-im/gajim/Manifest
@@ -0,0 +1,8 @@
+AUX 0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch 2104 SHA256 e8678808c7f45610f706159e71bbb0d22bed047fcfca8b9ec21726c24cec0683 SHA512 a9b8c351633aafcc881a4949e72e0ecd89314a93a3a011dad643ff0a64f208654961218e7d7e69af4ae76824d7de88dec3a572cc08aa6338bafa672ef07e4434 WHIRLPOOL e7979d0e913b52d9cdadf073b9c4e9a34c9a5403d0069a012c30ea0dd3257d8ec30c1f1032a409d08b097b24c857dce1549e88902ab31e049f2d575d6408d1c8
+DIST gajim-0.16.6.tar.bz2 4564505 SHA256 1357ed178ce497d28fc2d48960b999821e1370f42ffaa4669c1cb803fce778dc SHA512 6c8c2a38429468a1e6f02aae730ff947c649960e8cc672457c1e1733ab2dad6534b1e5ac2e1c0c385e331a6ba817c6e67c1a27443632b9fd43e7ab76ad66c935 WHIRLPOOL c0b3bdd60405123e1d0d004eac1a606dcbf485a8adf500f2c97ede45ebaf727f0c6c29d91066a7172ac459d473d1dc7703537950d8bfd31f1dbac857b734f4cf
+DIST gajim-0.16.8.tar.bz2 4465521 SHA256 46d4887857455b6e104d0478735edb51569bfa384578ffb4f4da81f1649b6a32 SHA512 702917f5b81a5009177ad305a65398c3f8fc95e4666dbfb33ef569a7c2a494a8ea7c48133a1f8000337381b29fc63b917103e05f64686affaaedb8aa155ac0e0 WHIRLPOOL b2bc7e5a31f6b44fcb84316e0f084b950dca171ab8f73ae30b1adb5d01f502a809a6f7a18375e9ea75b8e864e7a6c86e5ec1564a5884b9e7f274a529d1247455
+EBUILD gajim-0.16.6-r1.ebuild 2971 SHA256 de3ae795413089d4c34c17ccddbf2727d48683cf7a5bf21219ffed13d440aa95 SHA512 746001edd408cd7178d334ed87d4c70cb0b2d7779a3f9b9c23e14252f6764ac00986c686800a28633fb53387fabb74eca8bed3a1c4e351489c240c14c4fb1c81 WHIRLPOOL 7eaa034ac7c0f88d46bd1c8480458f0dd5325960c9b9af9ebcd40ba0df31183e22244432ae738db37e4560fb3965f25d5e026eec1e4a2c7da0a8a9c766737a9f
+EBUILD gajim-0.16.8.ebuild 2820 SHA256 11e95beb3ee9b53218b9d01055221fe2569b35a949e4f0eb2bac908f0e669ebe SHA512 b57b16bc45ff9a1051c62e6de923d39f59bcaf3f83f3ec23b433f08bc3febf377df683c353c3069864fa10d56b9ca6ac2d87b961c9d70228a43110fd507fa306 WHIRLPOOL 436845dc0a7880825df2fef8e7c3cbaee57f3a8c1f167bd7d41c588ad79eeb2d7aa76e30afd3fee860d43b0a34baa6c4f23c90d40a9caa6c5f0a56d78f85f184
+MISC ChangeLog 7069 SHA256 1590397428d0b531f16d063503d0af56af95866da09ae414b037567cbdf5ef7e SHA512 1731a569ff33ad4de8b3b2467b9a55e45439a8a86ef9002fde1206a50e11589b63930d75089bca3e749d08e3d7f142be04a6214ab70c41b4dbfd853fe9ca6ffb WHIRLPOOL 929e234376c79c1f36ad532e560796bac0292fcc9f2555ae320c741eebac25b2fe5cf94ce4ab8336e2359f7a3e0a063c1299d924aee27265ee2d80318bb60d5a
+MISC ChangeLog-2015 33337 SHA256 9f7254e2b5c78bd5f21bdf37d350b51347e893dd22438d3e4c3753a0a9e91a6d SHA512 664003f25e5922466edc4f661cdce760a30613772709de67ae1b90baab25270a434838058bab628862393bbec1d4cee160110dd1057b123427361daa55e48ddf WHIRLPOOL e41dd371fbb2f06d4ddb2135bc79d4973dc53a8c19e5ba0903f40dac01699b4feb2c0e402d1a77267d0e6260cf909aa75f8b1b59d1e3e027b1cfd19ec0375499
+MISC metadata.xml 498 SHA256 9054c8b3b195d0ed43f1f992f15f2efe7d33cb09e0f6011388ee444132c7131e SHA512 f275f9e7d3f4661dd2272a4e2664598f93bf68f008705168a191dacbceca64f0d3c357234a325dbbbc8d8f851ef642f3e5619c30671c71ff9b8b939ed7e6231c WHIRLPOOL 95ed0525fc797c4cce89b2ecf13bb4156e46ed6fb5a20d57fdf5004c2d467804abff180dc74cc0b162f1053228705ba1908c162f50720d57707cd20aed8ff0fd
diff --git a/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch b/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
new file mode 100644
index 000000000000..046c72c0ca2d
--- /dev/null
+++ b/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
@@ -0,0 +1,45 @@
+From 285392b27db7cb01b0566b4bda3920e6559b75e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
+Date: Fri, 26 May 2017 23:10:05 +0200
+Subject: [PATCH] Add config option to activate XEP-0146 commands
+
+Some of the Commands have security implications, thats why we disable them per default
+Fixes #8378
+---
+ src/common/commands.py | 7 ++++---
+ src/common/config.py   | 1 +
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/common/commands.py b/src/common/commands.py
+index 40d700710..46d6947f8 100644
+--- a/src/common/commands.py
++++ b/src/common/commands.py
+@@ -345,9 +345,10 @@ class ConnectionCommands:
+     def __init__(self):
+         # a list of all commands exposed: node -> command class
+         self.__commands = {}
+-        for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
+-        LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
+-            self.__commands[cmdobj.commandnode] = cmdobj
++        if gajim.config.get('remote_commands'):
++            for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
++            LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
++                self.__commands[cmdobj.commandnode] = cmdobj
+ 
+         # a list of sessions; keys are tuples (jid, sessionid, node)
+         self.__sessions = {}
+diff --git a/src/common/config.py b/src/common/config.py
+index 3884d9e1d..7c1313fc4 100644
+--- a/src/common/config.py
++++ b/src/common/config.py
+@@ -313,6 +313,7 @@ class Config:
+             'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')],
+             'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')],
+             'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
++            'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')],
+     }, {})
+ 
+     __options_per_key = {
+-- 
+2.12.2
+
diff --git a/net-im/gajim/gajim-0.16.6-r1.ebuild b/net-im/gajim/gajim-0.16.6-r1.ebuild
new file mode 100644
index 000000000000..e1f02b00663a
--- /dev/null
+++ b/net-im/gajim/gajim-0.16.6-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 versionator
+
+MY_PV=${PV/_/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="
+	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+#	test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( dbus )
+	gnome? ( gnome-keyring )
+	zeroconf? ( dbus )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
+	crypt? (
+		app-crypt/gnupg
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+		)
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-libs/dbus-glib
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+		zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
+		)
+	gnome? (
+		dev-python/libgnome-python[${PYTHON_USEDEP}]
+		dev-python/egg-python[${PYTHON_USEDEP}]
+		)
+	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
+	kde? ( kde-apps/kwalletmanager )
+	networkmanager? (
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			net-misc/networkmanager
+		)
+	spell? ( app-text/gtkspell:2 )
+	srv? (
+		|| (
+			dev-python/libasyncns-python[${PYTHON_USEDEP}]
+			net-dns/bind-tools
+			)
+		)
+	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-Add-config-option-to-activate-XEP-0146.patch" )
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	autotools-utils_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myeconfargs=(
+			$(use_enable nls)
+			$(use_with X x)
+			--docdir="/usr/share/doc/${PF}"
+			--libdir="$(python_get_sitedir)"
+			--enable-site-packages
+		)
+		run_in_build_dir autotools-utils_src_configure
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	compilation() {
+		run_in_build_dir autotools-utils_src_compile
+	}
+	python_foreach_impl compilation
+}
+
+src_test() {
+	testing() {
+		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		run_in_build_dir autotools-utils_src_install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	rm "${ED}/usr/share/doc/${PF}/README.html" || die
+	dohtml README.html
+}
diff --git a/net-im/gajim/gajim-0.16.8.ebuild b/net-im/gajim/gajim-0.16.8.ebuild
new file mode 100644
index 000000000000..ef7a2fe9d3d0
--- /dev/null
+++ b/net-im/gajim/gajim-0.16.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 versionator
+
+MY_PV=${PV/_/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="
+	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+#	test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( dbus )
+	gnome? ( gnome-keyring )
+	zeroconf? ( dbus )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/python-nbxmpp-0.5.6[${PYTHON_USEDEP}]
+	crypt? (
+		app-crypt/gnupg
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+		)
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-libs/dbus-glib
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+		zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
+		)
+	gnome? (
+		dev-python/libgnome-python[${PYTHON_USEDEP}]
+		dev-python/egg-python[${PYTHON_USEDEP}]
+		)
+	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
+	kde? ( kde-apps/kwalletmanager )
+	networkmanager? (
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			net-misc/networkmanager
+		)
+	spell? ( app-text/gtkspell:2 )
+	srv? (
+		|| (
+			dev-python/libasyncns-python[${PYTHON_USEDEP}]
+			net-dns/bind-tools
+			)
+		)
+	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	autotools-utils_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myeconfargs=(
+			$(use_enable nls)
+			$(use_with X x)
+			--docdir="/usr/share/doc/${PF}"
+			--libdir="$(python_get_sitedir)"
+			--enable-site-packages
+		)
+		run_in_build_dir autotools-utils_src_configure
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	compilation() {
+		run_in_build_dir autotools-utils_src_compile
+	}
+	python_foreach_impl compilation
+}
+
+src_test() {
+	testing() {
+		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		run_in_build_dir autotools-utils_src_install
+		python_optimize
+	}
+	python_foreach_impl installation
+}
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
new file mode 100644
index 000000000000..4ed46fbbf676
--- /dev/null
+++ b/net-im/gajim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aidecoe@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    A fully featured and easy to use GTK+ Jabber client written in PyGTK.
+  </longdescription>
+  <use>
+    <flag name="idle">Enable idle module</flag>
+    <flag name="srv">SRV capabilities</flag>
+    <flag name="xhtml">Enable XHTML support</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-im/gg-transport/Manifest b/net-im/gg-transport/Manifest
new file mode 100644
index 000000000000..0382c94c7126
--- /dev/null
+++ b/net-im/gg-transport/Manifest
@@ -0,0 +1,8 @@
+AUX jggtrans-2.2.4 481 SHA256 37fa393aec653588f561a4acd0afb0bbcdb923185f2179f2ea5ec4e75844fc99 SHA512 a560de48a612ed1df9e2bb83452cc769cd6b19b2e5ca66f7420107d8fa2344a957e1d3094a16dec7328d6ef3cb2b1f8f6689cc28be0c0f6e4bdc46141107de23 WHIRLPOOL 9b94dafba1f367171fcf94b37b81d62baf079133a287919971281d175bc1f476d98876314fbb2c905c6d8224c9ef6a67de272b6f6aa6e3567166813d0ffae6bc
+DIST jggtrans-2.2.4.tar.gz 796625 SHA256 678db2bef8e867889715663188f6ac785c7bf6e1bd0840a000f0a76b28892830 SHA512 5487504bc307001bc6bce927cd32e46b126148423aac8fc59944af59c67c5fba68bce001b5321d80a5392758ea88d445f2b68133636afe1f218a4fb696e319bd WHIRLPOOL 5cf18cade4e0e9a6489e42a4cfebcabf54f218f68d8a22312f7bf9dbba475d1b62bc6dc81fa0d9f61d5021e2f5084f399961f40db8948599462a28ccc4f53808
+DIST jggtrans-2.2.6.tar.gz 883775 SHA256 b3e0a56aa2e1e61a182b62bfcffaf585328ebd23b81651990c821d733ac9cde1 SHA512 9fa6beb03427dc29db6b1aa5707486b857d3f850ed4efc9f2a627cbec4a9e40c91a9092b42a4a338976659f6ebfa0ca6f69e194e51bc51744a7665494fc210e7 WHIRLPOOL e1511af1d355921d202d60442d7b2e130706e1de32d9a4fcdcbaf627c8ffce83bd14e5caa6214db44fc3387f9c96b788391d3f3754acd4dd10db822f9fc6c147
+EBUILD gg-transport-2.2.4-r1.ebuild 1170 SHA256 db86423f667f742ebdd7fc6e6ce8599a35c7fd7fb9edf8d27c4b4cf3c9910482 SHA512 6e8e451412716c5e6c07c9ce68a7513c2a13dc2dd15a6558db097063f1eaf46ded197954a8fff8539cfa475a911a377d9bb9533a5c83ac3a66e37c9a21cedc97 WHIRLPOOL ca0dbe833b0de814e7f5965ffe5593ee2b7a910504352e6627b1859ed2469856f71c388097f2ab8e3dd099cc413ed09bb27a9d8fb15d6ee794bf1b1b33ccd78f
+EBUILD gg-transport-2.2.6.ebuild 1198 SHA256 730fab1b1645d26f77b80d5c62a560111f649ef9101dc7737bd6e6a3beb0db85 SHA512 d5159eae44806a1e2bf48a381c2466bc2e49b3a9ff85f7095fa138ec2bfec8fa501df8e8fe1444c463e45c2d9c8d20ba901fb8b370d49759de925626cabf5931 WHIRLPOOL 3668090dd1c04397b355ea5f6b436652d16a82f487762ee2abdf7a75436fade2b92935c7440958bd77e4dd538b8c240ad00239c74c8768de075e6e2804c0d1d3
+MISC ChangeLog 3569 SHA256 b6adf4cfe6c86988dfa1a66a09156e1f14233a838ad89d199b4714505819b2a4 SHA512 b152ba45de2b1c920ac1c7ce1d9bbcae76a1dc57a5791a6cab88862d20971403b5aec9e53f90476fe101c494986b37b3fcc1b360f8f2c761eda59ac6d6f8c612 WHIRLPOOL 9601bc21cf2824279459510526fe9ecfc5df794b10a466d6040456efe4db5cb0c6022f3fbc7280a2e57a5ee2b992f47417c455adff1efb1ab808fdf421768375
+MISC ChangeLog-2015 3735 SHA256 11289510408a203301ca2caceb5b552554bf561b6f646d5d256a15d84ac7d549 SHA512 6d457f53e72531955f1b541a91af8a39879c5ee00d5b471b0c8dd25661cad99b08b4594c20b47ca423e8d779435f3b6253cbb269e3335461abdcd6a2057beded WHIRLPOOL 4d59c929197c88960cf82cfb5ae644c7a56051dda705136fb4aa1e720e28f3887c052a5fe9638e692c3b68e2d658dd2f757cbd07a31309adc05568235c343024
+MISC metadata.xml 419 SHA256 c86d5ba0a8e3ad770cd6b7a7795023a113e56ac111b93d37003355f6079e2582 SHA512 ccd10d0be489555d379a71b089295753208d6097643d5b153eb9376951dc800f084b63b4d2801dd00b0be0d1d816d6388815dff2d6294c422bdedc94972bcddb WHIRLPOOL 9744201dd8ae6bf7469b5be283aa44eee809b154f1c3301c360628b0d80ee550ad1086f37cff74e853c2e399f25952a34582b7a2ec89632ac69799ff3cc609ff
diff --git a/net-im/gg-transport/files/jggtrans-2.2.4 b/net-im/gg-transport/files/jggtrans-2.2.4
new file mode 100644
index 000000000000..35713d52cfec
--- /dev/null
+++ b/net-im/gg-transport/files/jggtrans-2.2.4
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after net jabber-server
+}
+
+start() {
+	ebegin "Starting Jabber GG Transport"
+	start-stop-daemon --start --user jabber --group jabber --exec /usr/sbin/jggtrans -- -u jabber -g jabber /etc/jabber/jggtrans.xml
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Jabber GG Transport"
+	start-stop-daemon --stop --pidfile /var/run/jabber/jggtrans.pid
+	eend $?
+}
diff --git a/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild b/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..b32bdcc0f32c
--- /dev/null
+++ b/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Gadu-Gadu transport for Jabber"
+HOMEPAGE="https://github.com/Jajcus/jggtrans"
+SRC_URI="mirror://github/Jajcus/jggtrans/jggtrans-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/glib-2.6.4
+	net-dns/libidn
+	>=net-libs/libgadu-1.9.0_rc3
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/jggtrans-${PV}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	keepdir /var/spool/jabber/gg
+	keepdir /var/run/jabber
+	keepdir /var/log/jabber
+	fowners jabber:jabber /var/spool/jabber/gg
+	fowners jabber:jabber /var/run/jabber
+	fowners jabber:jabber /var/log/jabber
+
+	newinitd "${FILESDIR}/jggtrans-${PV}" jggtrans
+
+	insinto /etc/jabber
+	doins jggtrans.xml
+
+	sed -i \
+		-e 's,/var/lib/jabber/spool/gg.localhost/,/var/spool/jabber/gg/,' \
+		-e 's,/var/lib/jabber/ggtrans.pid,/var/run/jabber/jggtrans.pid,' \
+		-e 's,/tmp/ggtrans.log,/var/log/jabber/jggtrans.log,' \
+		"${D}/etc/jabber/jggtrans.xml" || die "sed failed"
+
+	dodoc AUTHORS ChangeLog README README.Pl NEWS
+}
diff --git a/net-im/gg-transport/gg-transport-2.2.6.ebuild b/net-im/gg-transport/gg-transport-2.2.6.ebuild
new file mode 100644
index 000000000000..99cf02c8ee1a
--- /dev/null
+++ b/net-im/gg-transport/gg-transport-2.2.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Gadu-Gadu transport for Jabber"
+HOMEPAGE="https://github.com/Jajcus/jggtrans"
+SRC_URI="https://github.com/Jajcus/jggtrans/releases/download/v${PV}/jggtrans-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=net-im/jabber-base-0.01
+	>=dev-libs/glib-2.6.4:2
+	net-dns/libidn
+	>=net-libs/libgadu-1.9.0_rc3
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/jggtrans-${PV}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	keepdir /var/spool/jabber/gg
+	keepdir /var/run/jabber
+	keepdir /var/log/jabber
+	fowners jabber:jabber /var/spool/jabber/gg
+	fowners jabber:jabber /var/run/jabber
+	fowners jabber:jabber /var/log/jabber
+
+	newinitd "${FILESDIR}/jggtrans-2.2.4" jggtrans
+
+	insinto /etc/jabber
+	doins jggtrans.xml
+
+	sed -i \
+		-e 's,/var/lib/jabber/spool/gg.localhost/,/var/spool/jabber/gg/,' \
+		-e 's,/var/lib/jabber/ggtrans.pid,/var/run/jabber/jggtrans.pid,' \
+		-e 's,/tmp/ggtrans.log,/var/log/jabber/jggtrans.log,' \
+		"${D}/etc/jabber/jggtrans.xml" || die "sed failed"
+
+	einstalldocs
+}
diff --git a/net-im/gg-transport/metadata.xml b/net-im/gg-transport/metadata.xml
new file mode 100644
index 000000000000..163724893272
--- /dev/null
+++ b/net-im/gg-transport/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+    Gadu-Gadu is a IM network vary famous in Poland, this package will
+    enable your jabber server to talk to that network.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Jajcus/jggtrans</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-im/gitter-bin/Manifest b/net-im/gitter-bin/Manifest
new file mode 100644
index 000000000000..2395ac048358
--- /dev/null
+++ b/net-im/gitter-bin/Manifest
@@ -0,0 +1,4 @@
+DIST gitter_3.1.0_amd64.deb 43340316 SHA256 dcdba2d424aefe0503a3c4e54f02102a0b336a054e13057cfd78fd7428122f08 SHA512 b2888a2c9ed399102e2e80a2ec1ffafe093bdbe2f11d74753052c14841201cf586e0bb2a42ff8e67517d000a7c0b6f6aed30c32b3a7ecc683a18f8433b0bfa1c WHIRLPOOL c6fe35588266c1c11634109df9d3c88d2a5a26f6889ca82d4930ae22d9dc97391604886df6f3f1454d68d3bb0ec26d5c3da809f3b96a999afd234fcbf444748f
+DIST gitter_3.1.0_i386.deb 45251440 SHA256 b87a6e2f09dee19ed65e7912dbc956fac096740ccdea36aaa528ca3a30f0e8d5 SHA512 4e58f5ca1a5db9139bef29eff2ffd7d599268844c11be65f98e9a78ad7a602c5d115e633c02519d025fe3d81f3174c478d5590bb2beaa92697617dc11fc141f6 WHIRLPOOL 35af6e83cc30bc08e3fb4328c363e2da04b74b8669180f2fc1175083402c034c3f3bd1841b143cea20b463f471a9417ca21d2ea4ea94502a57a8cf54a4379bcf
+EBUILD gitter-bin-3.1.0.ebuild 1988 SHA256 1110f8992050c5043b4675d45acb01ed8c77c9a39616c3faa76467d52b7c2834 SHA512 516f0d52ed13b7a66f1242e5c843019ff13e2bd5e00cf04a74d19da5d81f2a9a2fba90c195f34d85e5b002d19ea421912ce60504832c2a4827b6b34e7418264e WHIRLPOOL 4bf84395d2dc1050b329321a0abbf269e1f57f4b8e8e7e56e9d5681e9d245730b13eb58ef64670dbb23e74e030ba6d00c9609ea56ad293d54b13b1d2488d3387
+MISC metadata.xml 626 SHA256 a7ccbc3247961fdbef3f2b8d50a592361cfcc1228a4e37e507694e42fd2d126c SHA512 5cf4563c5dc36d509ae10a1824bebbd1f559bb57ff642e0f11f55676c894e2fae49060f7e4c1fb5fec9c1bed4814eacb1ecab2bca31eca5de72cb670840e08eb WHIRLPOOL 51144085b191f45d7467ada7e8ff8e5f6f918b312e63da9e5382b8c788c6954fa02c63a000386fe0d44e1af9593827a84ddc5f814451302a4db7f196db5ec2e6
diff --git a/net-im/gitter-bin/gitter-bin-3.1.0.ebuild b/net-im/gitter-bin/gitter-bin-3.1.0.ebuild
new file mode 100644
index 000000000000..4fe366ac20af
--- /dev/null
+++ b/net-im/gitter-bin/gitter-bin-3.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+
+inherit eutils gnome2-utils unpacker
+
+DESCRIPTION="Chat and network platform"
+HOMEPAGE="http://www.gitter.im/"
+SRC_URI="
+	amd64? ( https://update.gitter.im/linux64/${MY_PN}_${PV}_amd64.deb )
+	x86? ( https://update.gitter.im/linux32/${MY_PN}_${PV}_i386.deb )"
+LICENSE="MIT no-source-code"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -*"
+IUSE=""
+RESTRICT="bindist mirror"
+
+RDEPEND="dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	sys-apps/dbus:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libnotify:0
+	x11-libs/libX11:0
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
+
+QA_PREBUILT="/opt/${MY_PN}/${MY_PN^}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local arch=$(usex amd64 "64" "32")
+
+	default
+	# Modify desktop file to use common paths
+	sed -i \
+		-e '/Exec/s/=.*/=\/usr\/bin\/gitter/' \
+		-e '/Icon/s/=.*/=\/usr\/share\/pixmaps\/gitter.png/' \
+		opt/${MY_PN^}/linux${arch}/${MY_PN}.desktop || die "sed failed"
+}
+
+src_install() {
+	local arch=$(usex amd64 "64" "32")
+
+	insinto /usr/share/pixmaps
+	newins opt/${MY_PN^}/linux${arch}/logo.png ${MY_PN}.png
+
+	newicon -s 256 opt/${MY_PN^}/linux${arch}/logo.png ${MY_PN}.png
+	domenu opt/${MY_PN^}/linux${arch}/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins opt/${MY_PN^}/linux${arch}/{Gitter,icudtl.dat,libffmpegsumo.so,nw.pak}
+	insinto /opt/${MY_PN}/locales
+	doins -r opt/${MY_PN^}/linux${arch}/locales/.
+	fperms +x /opt/${MY_PN}/${MY_PN^}
+	dosym /opt/${MY_PN}/${MY_PN^} /usr/bin/${MY_PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/gitter-bin/metadata.xml b/net-im/gitter-bin/metadata.xml
new file mode 100644
index 000000000000..2aa6d30c64dc
--- /dev/null
+++ b/net-im/gitter-bin/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	A chat and networking platform that helps to manage,
+	grow and connect communities through messaging, content
+	and discovery.
+	</longdescription>
+	<upstream>
+		<doc>https://gitter.zendesk.com/hc/en-us</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/hangups/Manifest b/net-im/hangups/Manifest
new file mode 100644
index 000000000000..1baa68a6f862
--- /dev/null
+++ b/net-im/hangups/Manifest
@@ -0,0 +1,3 @@
+AUX unpin-dependencies.patch 1165 SHA256 fb1491b1d84bbffe82beea779f52e96055f15810f769abc1a9a1415d05d84e32 SHA512 590a419d2bf83d5892519cfcd1f9464168d047d84a8a184480cbc1dad8542330bf268d89d618af3fbfe565bda89fa9bbbc1c22a53dbf52e041c0afabf91d839d WHIRLPOOL ed7dbf810b68483543d1a034c29eb20f31b813eab5aba400d6fed2e5f253a1fdb1761599bb5e5b6a56a30f32d78f39b7ef2739d230d8daad7464ab6c8ba3227d
+EBUILD hangups-9999.ebuild 1349 SHA256 bba9cdf3bc798976be1f6c7af40e9b6f8cc9e4920d92997951b78eeea9e4f15c SHA512 6b60697b10e5d8d3349cb844ab80fbdc8bcc8800533f6c31dd5a6a57331150443e83317faf07d285415ec750c4e20b01c6382297516082758f4b780b866a6930 WHIRLPOOL 7f95a832a049cdd1951a1312b264cd0ce506c34a001ef3225a5efc22c162e28370f657ca0d8b0bc659844b25fbe9c9d5d1bc2a201be9d7112268f22f217514ba
+MISC metadata.xml 248 SHA256 af014d222835a5fa433f432bb9f3daecbf20c9659d331c4981608c50e4221d68 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0 WHIRLPOOL 513e5e3fc988e622a5c0a07de8c910fe92319bd9e563240a959edcade0de19f9b01b06531949bd3538425447bd8f02cd8a74fd4196b7aac5c41e968143654490
diff --git a/net-im/hangups/files/unpin-dependencies.patch b/net-im/hangups/files/unpin-dependencies.patch
new file mode 100644
index 000000000000..37c8795cdd8d
--- /dev/null
+++ b/net-im/hangups/files/unpin-dependencies.patch
@@ -0,0 +1,41 @@
+diff --git a/setup.py b/setup.py
+index 740ce61..67e3b84 100644
+--- a/setup.py
++++ b/setup.py
+@@ -65,15 +65,15 @@ with open('README.rst') as f:
+ # hangups from breaking when new versions of dependencies are released,
+ # especially for end-users (non-developers) who use pip to install hangups.
+ install_requires = [
+-    'ConfigArgParse==0.11.0',
++    'ConfigArgParse>=0.11.0',
+     'aiohttp>=1.2,<1.3',
+-    'appdirs==1.4.0',
+-    'readlike==0.1.2',
++    'appdirs>=1.4.0',
++    'readlike>=0.1.2',
+     'requests>=2.6.0,<3',  # uses semantic versioning (after 2.6)
+-    'ReParser==1.4.3',
++    'ReParser>=1.4.3',
+     'protobuf>=3.1.0,<3.2.0',
+-    'urwid==1.3.1',
+-    'MechanicalSoup==0.6.0',
++    'urwid>=1.3.1',
++    'MechanicalSoup>=0.6.0',
+ ]
+ 
+ 
+@@ -109,10 +109,10 @@ setup(
+     packages=['hangups', 'hangups.ui'],
+     install_requires=install_requires,
+     tests_require=[
+-        'pytest==3.0.5',
+-        'pylint==1.6.4',
+-        'pycodestyle==2.2.0',
+-        'httpretty==0.8.14',
++        'pytest>=3.0.5',
++        'pylint>=1.6.4',
++        'pycodestyle>=2.2.0',
++        'httpretty>=0.8.14',
+     ],
+     cmdclass={
+         'test': PytestCommand,
diff --git a/net-im/hangups/hangups-9999.ebuild b/net-im/hangups/hangups-9999.ebuild
new file mode 100644
index 000000000000..134b8dd2876e
--- /dev/null
+++ b/net-im/hangups/hangups-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/tdryer/${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Third Party IM Client for Google Hangouts"
+HOMEPAGE="https://pypi.python.org/pypi/hangups"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}"/unpin-dependencies.patch
+)
+
+COMMON_DEPEND=">=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/aiohttp-1.3.0
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/readlike-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0.0
+	>=dev-python/ReParser-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/urwid-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/MechanicalSoup-0.6.0[${PYTHON_USEDEP}]"
+	DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-3.0.5[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.6.4[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.8.14[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}"
diff --git a/net-im/hangups/metadata.xml b/net-im/hangups/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/net-im/hangups/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
new file mode 100644
index 000000000000..29da38b963c5
--- /dev/null
+++ b/net-im/jabber-base/Manifest
@@ -0,0 +1,5 @@
+EBUILD jabber-base-0.01-r1.ebuild 1525 SHA256 9710f06be1292f09b4be313988d27466222251f2661aa4060389d52ebb6f7de7 SHA512 6651e099d29a9aad2a9baccd81a402036a0d946672ded1c606626e718188c4314649804c6e0596b0cbb1b552f07497a7ac5bb8fb28d61ab5003dd20dd4e695f8 WHIRLPOOL 82958466077d37013c40bc602771b73dde4ae5ded88c8aaa7bf8d1f6a3949c48134ec33c8ede7f232bda53ebb4bd27739f8dc9e5fd095cccb5b7d02f99df96e3
+EBUILD jabber-base-0.01.ebuild 1510 SHA256 b26226a92e104f39b096c5dfdb79ec43910c874380e5422df3976cad14c6985d SHA512 09d4141b7bb70acaecf2c3af5273fed3bd736d12f2374b424e814b5ff0afe77ca08c3508d02ce3510926cb954dda76521283d0ca92c038464a0fc9e0faeb770b WHIRLPOOL 04e8ade108f1b8526ec78eac5fd855849acfabb447623136ac14d3e58ebddba1ec93ddebc4d6680e6ae3eb06c2e5e695589e0fdf52331e59f09c2a372b8fd569
+MISC ChangeLog 2623 SHA256 837ef5e82a26d34b0932e5f368c13a0dbb51332059a3f04dc64cd50084f9eaa0 SHA512 3228457e1103faf6fc164a2f9a67df49cea18b641685ea32781be25f4b16d9971c374ea7922b84149a5e0dd4ebb2a8cf4d1fa6ca555e1669ec4f753d15900408 WHIRLPOOL bf01a6fb059f12402e6a932405504dbdce08b01555df568d3a3c193fefd2b364fbcc68d81b52ec007d48ef30df7c54fd3c16eba366b1a9f2b814851575b270b3
+MISC ChangeLog-2015 2747 SHA256 97bfa187ed9f81bb65b182d444b4a6773d4709cdb4abed0d2f6ec92d21d74ae8 SHA512 69f8f360d5b5cc72351b29ebb5dd121e80139d11961caa6448edf067a8a636a14a52ffa99225f34be62de456ea93c1bb41cdd5fa8ecb7f2df085b395a8f86f25 WHIRLPOOL de479295ccc9ccb4c61b321300e9b904e700898236350f2d29e87d41bb55f22810a36afe01cf3375dc4cdfe6bc0d45bd37f3571c19bff963ae88573cd8ac12ec
+MISC metadata.xml 355 SHA256 7e9d2a65bbec99530c45e587b58e49c56791fcf48844a6e7f8dd9882922cfc65 SHA512 698c13023f9982520b62de0aebd53834d428e1d9ff1e8a65821bc9aff9cd72dab22aa0037bc40a142b0f84c66913034f455c196d595cb6a71ec85c7b82a240d4 WHIRLPOOL 79b7e12001b3ecf1d61b7be0947d12bf7e78fa5249f7918314e4bbbf0f0b170af00a532b0d62f38d55cf500243a735df4a5170687ca350b92f52460934dff500
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
new file mode 100644
index 000000000000..919283672cab
--- /dev/null
+++ b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Jabber servers and transports layout package"
+SRC_URI=""
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+#Info for people working in jabber related packages
+
+#/etc/jabber/ for configuration files
+#/var/run/jabber/ for the pid files
+#/var/spool/jabber/ for the flat files databases (actually there must be a ewarn
+#at end of ebuild telling user to creat /var/spool/jabber/JID, as some transports fail to start if
+#the directory is not there, even if they have permissions to creat it)
+#/var/log/jabber/ for the log files
+
+#for the python based transports with no install script:
+#they must inherit python and be installed in:
+#$(python_get_sitedir)/$package-name
+
+#the user should be the one created here username=group=jabber
+
+src_install() {
+	keepdir /etc/jabber
+	keepdir /var/run/jabber
+	keepdir /var/spool/jabber
+	keepdir /var/log/jabber
+}
+
+pkg_postinst() {
+	# Users should not be created in src_install see bug #124680
+	# Add our default jabber group and user
+	enewgroup jabber
+	enewuser jabber -1 -1 -1 jabber
+	# We can't use fowners & fperms convenience wrappers as we are outside the sandbox
+	chown jabber:jabber /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
+	chmod 770 /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
+}
diff --git a/net-im/jabber-base/jabber-base-0.01.ebuild b/net-im/jabber-base/jabber-base-0.01.ebuild
new file mode 100644
index 000000000000..1f58e3713ebd
--- /dev/null
+++ b/net-im/jabber-base/jabber-base-0.01.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils user
+
+DESCRIPTION="Jabber servers and transports layout package"
+SRC_URI=""
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+#Info for people working in jabber related packages
+
+#/etc/jabber/ for configuration files
+#/var/run/jabber/ for the pid files
+#/var/spool/jabber/ for the flat files databases (actually there must be a ewarn
+#at end of ebuild telling user to creat /var/spool/jabber/JID, as some transports fail to start if
+#the directory is not there, even if they have permissions to creat it)
+#/var/log/jabber/ for the log files
+
+#for the python based transports with no install script:
+#they must inherit python and be installed in:
+#$(python_get_sitedir)/$package-name
+
+#the user should be the one created here username=group=jabber
+
+src_install() {
+	keepdir /etc/jabber
+	keepdir /var/run/jabber
+	keepdir /var/spool/jabber
+	keepdir /var/log/jabber
+}
+
+pkg_postinst() {
+	# Users should not be created in src_install see bug #124680
+	# Add our default jabber group and user
+	enewgroup jabber
+	enewuser jabber -1 -1 -1 jabber
+	# We can't use fowners & fperms convenience wrappers as we are outside the sandbox
+	chown jabber:jabber /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
+	chmod 770 /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
+}
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
new file mode 100644
index 000000000000..ff5cd10b4329
--- /dev/null
+++ b/net-im/jabber-base/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>chainsaw@gentoo.org</email>
+</maintainer>
+	<longdescription>Package that creats the users and directory's for jabber
+	related packages. See ebuild for more info </longdescription>
+</pkgmetadata>
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
new file mode 100644
index 000000000000..3bf120ca315b
--- /dev/null
+++ b/net-im/jabberd2/Manifest
@@ -0,0 +1,17 @@
+AUX jabberd2-2.3.1.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
+AUX jabberd2-2.3.2.init 1890 SHA256 f3593c66ebb4b22210c3cd1ffa4ee0e61990ff7940d6404dc2eb7f0ab9427fbc SHA512 bfd6ae287f89714b79b4050656cb503b0ee8429413e5d307e1b7feecc6a5aed33d362b86f0877d2ab176c7f90697201b833ff564cb01e5bcd284fbae7ff3f1f2 WHIRLPOOL 85eb465ca7d8c1a9b7fd7aead0ecf868c34a9755ee647075a440952dfd6ad0cd7cd1a743fd27cd0f227d23d9684f5b9863ceaf723413d42bdbb177b0146c6cba
+AUX jabberd2-2.3.2.logrotate 197 SHA256 bca314e2555e113ee0916d33060c27332381cc3cd633e00e3d092b1f7b0bd149 SHA512 1e3d74612dd08df2014af2ae0f0681e78c9902644dfbf37100369591803f2cf757d27967f7e9c99d3503cff8480ace7ce4b14303028d25866ebbd4ecf882d7c0 WHIRLPOOL c74129c39e571b811212e7d08d94c461c327f58510d9efa7cd1c96888524730024330c1c46accaafa7888b75d4af98302a91c35a4543928d0fb5e7eacebe6f2b
+AUX jabberd2-2.3.4-optimization.patch 631 SHA256 685c4a5d179a1debd5873dd4efc72883a3ff44489a186593e776795b3a8a93ef SHA512 d4ddd733d5b945fc12ecbb824d40b378dbfec4064fb64396c437495e9b1694ce29c139f377331ef09f4e19c82a7d3b7512e537d14604d8b5a345f3a84f829688 WHIRLPOOL f11e2b46e35c243cb3a4da447ade6c8497e3a53bdd423c2ffe4f417c79f7bd2c6b6296ac5fa00f5d1d652cfc4343abcca51ff04686a21eb178be7826a7f815e5
+AUX jabberd2-2.3.4-websocket.patch 860 SHA256 ca2d8d1a9cba93f11a6f53931c00d90254c46e328b4eba2df433a0ece81684c5 SHA512 e417b96d248be6c05e098e4dcbc2654907621acf3f594cf8ef4d13a7007e23438092d5942c9a3d78fa585150efd69c62426f82ec4d221f96b039c92d42545ea0 WHIRLPOOL 5ec3f9a8e49576dc27d69925ac54b8c45b9f27538191297a85bcbda86827eab8946469a5333c93307c8f0d55ea30a8447bea4a7eae35abac40e5fbe70af6819b
+AUX jabberd2-2.5.0.init 1906 SHA256 f0177c821fdf213ed401ea881ef1f2d3bedd2baca9727d5d34c421bcf4791d34 SHA512 1d46b543f8b477a1db5cf1d23a57ba77cfae7e7752c6f4fdd98ba5ee42c0ba28422b7175ebce4383ec9de2f03655072d4892dac0429fe24fc85f27ff8bdb35f1 WHIRLPOOL 32677b4751900c7a8d0a986aa5503e25550719df74c94aff1ea291d9be1c1c719dd6f3a4be45401849aec630343cec12fb7e2c2af4a60ed64ce7c7ed1ecec2e0
+DIST jabberd-2.3.3.tar.xz 1457340 SHA256 c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da WHIRLPOOL 0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463
+DIST jabberd-2.3.4.tar.xz 1482736 SHA256 9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671 SHA512 593c1a80de52447fa18e448627bdbf85605e8a406129808cd2081576c26d65df3315c5fc91b37d5e832e1a89b4083d873b2db1e65d6ad76fa5b9b4f125786b7f WHIRLPOOL 67a0e96a872a08975d981e1697fab5cf154b4cbea4c698d41d250c1314bc7303a3c15e871fc8b3c4f3769acd91773734ef61b880900132e435d17f9bde587b08
+DIST jabberd-2.5.0.tar.xz 1507916 SHA256 9ec4a8be6c01fe68cccee347e08aab34399205ecfe3557985debc368b86aeb8a SHA512 e1298f42a199bb31cea324f239368327a259eaaa3e4624eac5b6aca983f32467c47248c57e4621fd7f7eb64a3b86d760f5e9a57b4307174d820d20e77ae3229e WHIRLPOOL 4479955ba6f2511fda98660f51d1355532bf8f26c23a74b8aa892810d45c3ff3cdfbb7398d501c44048082e2d4dc50eb88dc135595ef0b35ba1c06c7dbe91d57
+DIST jabberd-2.6.1.tar.xz 1542156 SHA256 c22d45bd4105b344351cbbfd6da99755182f64120747d18e91b6267a73775099 SHA512 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea WHIRLPOOL d8b3d9d1f51e90ba5ca2a8b7b44133938014b7084112d1ea3ae31426948d345aa1470055c4944f1c3c90145d31b4e8f67a23b372ad7a30ebf2305f335547d478
+EBUILD jabberd2-2.3.3-r2.ebuild 4774 SHA256 6d059bb82c9d1cecedeb8322b41e3b2d87a8da3c17ada713a39837070d4a635a SHA512 871a4e298148851aab80a1bf810a0725c5107e07020bcafc99a15ab5b24290ca6aed10d74422c97b44de84aa185bc16b3101cfa99187f44d346af173f3a44d70 WHIRLPOOL 884bfd23ad3e05edd3abf970f778be28201652a348c2dacbbb5335d079210081e0e9ef44c5bac129b0655abbb0fc1dd182fe3c592732d22fd2aac484b7c1436b
+EBUILD jabberd2-2.3.4-r1.ebuild 5255 SHA256 dfd9d9847296e053645579c9c4cd4a70399224a458e860106a2cb0a6a4612b28 SHA512 9262776b94634a9453df7e755d671b1bfbcb7d4c9eb5a31979981c6f632c21168031901d3f164945de7d6bc4e6a256a6e84cba87a7c1cd118280d3a009071316 WHIRLPOOL d13b90fa37b2d2aabcb1907a6628963a103a26cd4f1993f2e64335a7fcc0102f540128f06e07303d5fbe6f1b39dc19d7e2078d8a5e54a868d94df86127cf987b
+EBUILD jabberd2-2.5.0.ebuild 5228 SHA256 12803361e384f417bd071140c7e38e73f900e2558628fd7a3c74aed748bd52ff SHA512 1586e2204e31efe8a0d34e0ba8ab501d0df717e906b1ea33e686cc182390f230293673a9ff291a51d2ba85f529ee684f11a7cd0f1d0883a24a88d6ab1dd58509 WHIRLPOOL ff20425dd70f8e9ada09d422c10a9a09585d44d8e8e19a8c3d83ed42aebc78f0b7ea849b2436baadee2769d460015a1a5a737bcc541cc631c500209d5e665549
+EBUILD jabberd2-2.6.1.ebuild 5210 SHA256 0609685a3246970415a276a05237ac1932a05dd00a8872a03eea51f24d7bfadd SHA512 d5f92e3915c441d0213f0b88fc77616a9b5a5e5fe70d8159a9a4874ffee519bac3e8cd32732dccc69b25437c037dfa15372278bcef9e30b989c429ae5da915d7 WHIRLPOOL 3b93ff4995fec21959f3bb917d7daa656df13d268a65b53debdcc9b340aa50754959508463cafd5c495c63c1ab88f7b24089c94001d340b1fbed3abb08a657a4
+MISC ChangeLog 5749 SHA256 849ad127c868228b6724d402917e23021bdcea9f5d4a1e807ea8e8d39d8c986b SHA512 eff5c2bc4e0a1a900b06650e812e2dcb8e054af2548f83af6db67558468ad367dc3703d49c3c8ad1f238cded731c13ac04b2b6a3c7258ebe11d8db8177985332 WHIRLPOOL 07865ccfd015680c3088ac34e281512e84858e65f4321fce8f8e3293bfd647ac3b8e558eb9f16aa882808e3e43c03b7919c1f304fe10a9834dd53305ff6a5232
+MISC ChangeLog-2015 11634 SHA256 d33519140f0ce244452ad7183c0f92407010f1a3d64917380d2f5dac5cc93f77 SHA512 e364f46f0f11bc98d2a1dfb0f69ed022707d3bb66fa6f5ca594f3fde9de22d89a1a8b825bae58933a0174665f70428ff170baeae8608964518e092de885da598 WHIRLPOOL 2a58ecc746c99bc2244009836d5ff43ab097123b938292bfd7e1aaf9e92de3bd396b07fcf211bcd35c1a5da238d7123836787e50d619d143939552fbea8d7d65
+MISC metadata.xml 518 SHA256 8560dddec61e13df424dc3a12c5928d2a219c71cbeb51289d7618873339e3fe9 SHA512 bd66d981f192750c15e96c89c80dd6fa6f88dec6893dae286f71f8e569dfa117b01df0008d1a9995ed5f635c09824c70ae48127c4cb4570f8d5cd0939071b2df WHIRLPOOL 5293bd82b9c041fa2e3bb0a96089719e81a8bd8b9b652c382cd906a8b49a138242b102c6bc53eb82a82f14debc3a92dc188675480f50d2917021c1d1fe56271e
diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.pamd b/net-im/jabberd2/files/jabberd2-2.3.1.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.pamd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth       required     pam_nologin.so
+auth       include      system-auth
+account    include      system-auth
+session    include      system-auth
diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init
new file mode 100644
index 000000000000..4ef8aaea2c24
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.init
@@ -0,0 +1,96 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="reload"
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+stopJabberServices() {
+
+	eindent
+	for pidfile in /var/run/jabber/*.pid; do
+		if [ -f "${pidfile}" ]; then
+			service=$(basename ${pidfile} .pid)
+			ebegin "Stopping ${service}"
+			start-stop-daemon \
+				--stop \
+				--pidfile ${pidfile}
+			eend $?
+		fi
+	done
+	eoutdent
+
+}
+
+start_pre() {
+	checkpath -d -o jabber /var/run/jabber
+}
+
+start() {
+
+	einfo "Starting Jabber Server ..."
+	local services executable cfgfile pidfile
+	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+	eindent
+	for service in ${services}; do
+
+		cfgfile=$(echo ${service} | cut -d ':' -f 2)
+		service=$(echo ${service} | cut -d ':' -f 1)
+		if [ ! -f "${cfgfile}" ]; then
+			if [ -f "/etc/jabber/${service}.xml" ]; then
+				cfgfile="/etc/jabber/${service}.xml"
+			else
+				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
+				stopJabberServices
+				return 1
+			fi
+		fi
+
+		executable=/usr/bin/${service}
+
+		if [ ! -f "${executable}" ]; then
+			eerror "Can't find executable: ${executable}"
+			stopJabberServices
+			return 1
+		fi
+
+		ebegin "Starting ${service} (${cfgfile})"
+		pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')"
+		start-stop-daemon \
+			--background \
+			--start  \
+			--user jabber:jabber \
+			--exec /usr/bin/${service} \
+			--pid ${pidfile} \
+			-- -c ${cfgfile}
+		eend $?
+
+	done
+	eoutdent
+
+}
+
+reload() {
+	eindent
+	for pidfile in /var/run/jabber/*.pid; do
+		if [ -f "${pidfile}" ]; then
+			service=$(basename ${pidfile} .pid)
+			ebegin "Reloading ${service}"
+			kill -HUP $(cat ${pidfile})
+			eend $?
+		fi
+	done
+ 	eoutdent
+}
+
+stop() {
+
+	einfo "Stopping Jabber Server"
+	stopJabberServices
+
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate
new file mode 100644
index 000000000000..fcec0f7a1d59
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate
@@ -0,0 +1,8 @@
+/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log {
+	su jabber jabber
+	sharedscripts
+	missingok
+	postrotate
+	/etc/init.d/jabberd reload
+	endscript
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
new file mode 100644
index 000000000000..d320b9d1f349
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
@@ -0,0 +1,21 @@
+Re-allow the use of O3/Os, since it seems to have been an old compiler
+bug.
+
+See https://github.com/jabberd2/jabberd2/issues/34
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,13 +23,6 @@
+     LIBS="$LIBS $lt_cv_dlopen_libs"
+ fi
+ 
+-# check for optimisation level
+-AC_MSG_CHECKING([CFLAGS optimization level])
+-[if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then]
+-    AC_MSG_ERROR([maximum allowed optimization level is -O2])
+-fi
+-AC_MSG_RESULT([fine])
+-
+ # extra paths
+ AC_ARG_WITH([extra_include_path], AC_HELP_STRING([--with-extra-include-path],
+                                            [use additional include paths]),
diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
new file mode 100644
index 000000000000..a6f932ccb481
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
@@ -0,0 +1,31 @@
+From b861b9c72adc732cbdfbac4eb8a4205126227f6b Mon Sep 17 00:00:00 2001
+From: Tomasz Sterna <tomek@xiaoka.com>
+Date: Fri, 30 Oct 2015 12:40:32 +0100
+Subject: [PATCH] Enable USE_WEBSOCKET check in SX plugins
+
+---
+ sx/plugins.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sx/plugins.h b/sx/plugins.h
+index b5d3934..65dae93 100644
+--- a/sx/plugins.h
++++ b/sx/plugins.h
+@@ -159,7 +159,7 @@ typedef struct _sx_compress_conn_st {
+ JABBERD2_API int sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args);
+ 
+ /* websocket wrapper plugin */
+-//#ifdef USE_WEBSOCKET
++#ifdef USE_WEBSOCKET
+ #include <http_parser.h>
+ #include <util/util.h>
+ 
+@@ -183,7 +183,7 @@ typedef struct _sx_websocket_conn_st {
+     xht                     headers;
+     void                    *frame;
+ } *_sx_websocket_conn_t;
+-//#endif
++#endif
+ 
+ #ifdef __cplusplus
+ }
diff --git a/net-im/jabberd2/files/jabberd2-2.5.0.init b/net-im/jabberd2/files/jabberd2-2.5.0.init
new file mode 100644
index 000000000000..a5579f7b6c0c
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.5.0.init
@@ -0,0 +1,90 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="reload"
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+stopJabberServices() {
+	eindent
+	for pidfile in /var/run/jabber/*.pid; do
+		if [ -f "${pidfile}" ]; then
+			service=$(basename ${pidfile} .pid)
+			ebegin "Stopping ${service}"
+			start-stop-daemon \
+				--stop \
+				--pidfile ${pidfile}
+			eend $?
+		fi
+	done
+	eoutdent
+}
+
+start_pre() {
+	checkpath -d -o jabber /var/run/jabber
+}
+
+start() {
+	einfo "Starting Jabber Server ..."
+	local services executable cfgfile pidfile
+	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+	eindent
+	for service in ${services}; do
+
+		cfgfile=$(echo ${service} | cut -d ':' -f 2)
+		service=$(echo ${service} | cut -d ':' -f 1)
+		if [ ! -f "${cfgfile}" ]; then
+			if [ -f "/etc/jabber/${service}.xml" ]; then
+				cfgfile="/etc/jabber/${service}.xml"
+			else
+				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
+				stopJabberServices
+				return 1
+			fi
+		fi
+
+		executable="/usr/bin/$(echo ${service} | cut -d '.' -f 1)"
+
+		if [ ! -f "${executable}" ]; then
+			eerror "Can't find executable: ${executable}"
+			stopJabberServices
+			return 1
+		fi
+
+		ebegin "Starting ${service} (${cfgfile})"
+		pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')"
+		start-stop-daemon \
+			--background \
+			--start  \
+			--user jabber:jabber \
+			--exec ${executable} \
+			--pid ${pidfile} \
+			-- -c ${cfgfile}
+		eend $?
+
+	done
+	eoutdent
+}
+
+reload() {
+	eindent
+	for pidfile in /var/run/jabber/*.pid; do
+		if [ -f "${pidfile}" ]; then
+			service=$(basename ${pidfile} .pid)
+			ebegin "Reloading ${service}"
+			kill -HUP $(cat ${pidfile})
+			eend $?
+		fi
+	done
+ 	eoutdent
+}
+
+stop() {
+	einfo "Stopping Jabber Server"
+	stopJabberServices
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild
new file mode 100644
index 000000000000..5a604d5489e3
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25:* )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+		libressl? ( dev-libs/libressl )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+		-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+		-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+		-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+		etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+	# https://github.com/jabberd2/jabberd2/issues/34
+	replace-flags -O[3s] -O2
+
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+	fi
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..1c60a6353293
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25:= )
+	ldap? ( net-nds/openldap )
+	mysql? (
+		virtual/libmysqlclient:=
+		virtual/mysql:=
+	)
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	websocket? ( net-libs/http-parser:= )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+pkg_pretend() {
+	if is-flagq '-O[3s]' ; then
+		ewarn "O3/Os compiler flags have been known to cause problems"
+		ewarn "with old gcc version. Be aware that this could break"
+		ewarn "port binding. Make sure to test this."
+		ewarn "See https://github.com/jabberd2/jabberd2/issues/34"
+	fi
+}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-c2s\.pid/' \
+		etc/c2s.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \
+		etc/router.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \
+		etc/s2s.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \
+		etc/sm.xml.dist.in || die
+
+	epatch "${FILESDIR}"/${P}-optimization.patch \
+		"${FILESDIR}"/${P}-websocket.patch
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable websocket) \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+	fi
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/jabberd2-2.5.0.ebuild b/net-im/jabberd2/jabberd2-2.5.0.ebuild
new file mode 100644
index 000000000000..de2059dd8a06
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.5.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+#RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25:= )
+	ldap? ( net-nds/openldap )
+	mysql? (
+		virtual/libmysqlclient:=
+		virtual/mysql:=
+	)
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	websocket? ( net-libs/http-parser:= )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+#PATCHES=(
+#)
+
+S="${WORKDIR}/jabberd-${PV}"
+
+pkg_pretend() {
+	if is-flagq '-O[3s]' ; then
+		ewarn "O3/Os compiler flags have been known to cause problems"
+		ewarn "with old gcc version. Be aware that this could break"
+		ewarn "port binding. Make sure to test this."
+		ewarn "See https://github.com/jabberd2/jabberd2/issues/34"
+	fi
+}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-c2s\.pid/' \
+		etc/c2s.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \
+		etc/router.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \
+		etc/s2s.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \
+		etc/sm.xml.dist.in || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-pool-debug is currently broken
+	myeconfargs=(
+		--sysconfdir=/etc/jabber
+		--enable-pipe
+		--enable-anon
+		--enable-fs
+		$(usex debug "--enable-debug" "")
+		$(usex memdebug "--enable-nad-debug" "")
+		$(use_enable ssl)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable sqlite)
+		$(use_enable berkdb db)
+		$(use_enable ldap)
+		$(use_enable pam)
+		$(use_enable websocket)
+		$(use_enable experimental)
+		$(use_enable test tests)
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "")
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.5.0.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+	fi
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/jabberd2-2.6.1.ebuild b/net-im/jabberd2/jabberd2-2.6.1.ebuild
new file mode 100644
index 000000000000..cf3d63e5a4cb
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.6.1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+DEPEND="
+	dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25:= )
+	ldap? ( net-nds/openldap )
+	mysql? (
+		virtual/libmysqlclient:=
+		virtual/mysql:=
+	)
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	websocket? ( net-libs/http-parser:= )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="
+	${DEPEND}
+	>=net-im/jabber-base-0.01
+"
+DEPEND="
+	${DEPEND}
+	app-arch/xz-utils
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+DOCS=( AUTHORS README )
+
+#PATCHES=(
+#)
+
+S="${WORKDIR}/jabberd-${PV}"
+
+pkg_pretend() {
+	if is-flagq '-O[3s]' ; then
+		ewarn "O3/Os compiler flags have been known to cause problems"
+		ewarn "with old gcc version. Be aware that this could break"
+		ewarn "port binding. Make sure to test this."
+		ewarn "See https://github.com/jabberd2/jabberd2/issues/34"
+	fi
+}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-c2s\.pid/' \
+		etc/c2s.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \
+		etc/router.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \
+		etc/s2s.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \
+		etc/sm.xml.dist.in || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-pool-debug is currently broken
+	myeconfargs=(
+		--sysconfdir=/etc/jabber
+		--enable-pipe
+		--enable-anon
+		--enable-fs
+		$(usex debug "--enable-debug" "")
+		$(usex memdebug "--enable-nad-debug" "")
+		$(use_enable ssl)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable sqlite)
+		$(use_enable berkdb db)
+		$(use_enable ldap)
+		$(use_enable pam)
+		$(use_enable websocket)
+		$(use_enable experimental)
+		$(use_enable test tests)
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "")
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.5.0.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+	fi
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml
new file mode 100644
index 000000000000..ab20f28a6a32
--- /dev/null
+++ b/net-im/jabberd2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="experimental">Enable experimental features such
+			as TLS Everywhere.</flag>
+		<flag name="memdebug">Enable nad and pool debug.
+			Requires USE="debug" to be set.</flag>
+		<flag name="websocket">Enable WebSocket support on C2S port.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jabberd2/jabberd2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
new file mode 100644
index 000000000000..2565457b2e14
--- /dev/null
+++ b/net-im/kadu/Manifest
@@ -0,0 +1,9 @@
+AUX kadu-2.1-port-to-QtQuick-2.3.patch 5640 SHA256 12276d2b4ea71869b6a454cd9e2fc358f94107822d85399af6a8de51f2207ef1 SHA512 f5923c25861497fac78f29ed70fd5ea444797ecd93cd89d5e87326e76977ac74837975a7c0c948463f7eb0b9db25246c71246710a70aad32e01c378251140505 WHIRLPOOL 62098cfa991030f811f245052dd67d4fdd17722403b61fd18e9ffff33503f06cd6dff2b592f92ae0778adc2d57f32a532a219c287e644de8d1e9d6d7f40ef360
+AUX kadu-2.1-qt5-compilation.patch 542 SHA256 5a18b98d3bc6182e489344157057d60802c52f70f7fa8063254b4b9570df94a2 SHA512 294a2d90145d8765e0ae25482607f326f5fc8a86c589ed686ad37e02a13a5d487c28c5b0fbc3495de690864cc5b120cc5a75297dfc5ff28a4b6e4eaf7eade5d8 WHIRLPOOL db78ee7f4ac1c2eade749d8d6e1e86daf437514288042c111a5caa605f6f14595cae664310cabcf89b3c19d289d2b5c520cc237d65b6ff48efb82bfebeccdd83
+DIST kadu-2.1.tar.bz2 6013519 SHA256 9f8092756d4a870c1ecb016c0cba2c833e1697b3eb7e9bf51813b1f0a541ffb8 SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a WHIRLPOOL 10b214ca8d1964054918dc0e1b85bf1157d2496e3ad340958302083a0374ac4fb7b6ac96741637f3847ac06dd9c322b0e529f9c204b9ebc6658157f7b7c2b8a2
+DIST kadu-4.3.tar.bz2 8087786 SHA256 ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9 WHIRLPOOL 606d25ea578f5edbf768ad9f7cce96a11d58b6a97ff85fc1ba9dbf1062e1ac5774c0b9318ff3bb6cc90767f015b68e8df22086c6cc0ecff5b726e94596562214
+EBUILD kadu-2.1-r1.ebuild 2753 SHA256 f732e12862571eb700b4115a19f0521a03e5cb3befbe089599cb4666b3075ba8 SHA512 c419340e5107b22b678d3b61abe921b29a4155df0773a21edcab6e513100e6cbec823d5effa1975066b04df815f3bfffba308df649c555148e3c3ca18390d56e WHIRLPOOL 497352ceba8461b60b8c3b73f002bb31f9a08caa7caa03a11e79e974890a8761087df2f0ca8db466de35841e396857959ac8b571d90344121375cbb4a8f84235
+EBUILD kadu-4.3-r1.ebuild 2332 SHA256 86ccd0e68c71a7be64206b4af85de2105560314274cca2db3088637f0757792c SHA512 15ae7828478c9fa87ce19f3191dd0ab2abf04ca9eb84eb31127978c08fc8827e4ee2816257a7683396a4bbf538402fb6502513f319e600ec8162257bb4544b3e WHIRLPOOL 59e07296e2e753b4088925f339424fdee45b8e0cc6872f3c9359e4d0343343fe936aebc94452e4969e2e1bcd1bcfa9b8f9e16e913ef684f9fc8ea826916f6b9c
+MISC ChangeLog 3711 SHA256 2f9fb50708693fb45af9e42dcc74c5e2e811b67403284b8f5b57ab12aebfe292 SHA512 7438f66ee90178d94360083c8129a2b4a9a8ae2a4475442af680f39ec1bbab2cb53bd6a0ac58ea202a310b2e8cfb59ca9e09bbc8cfdc27f424fbf6f5f3856105 WHIRLPOOL 817f97bb63482bed5bd2fe89a018483d0800a2efbd440c8b582a6898f6c07397456312f384b6430e63ca0ef5cfe50c90c2cefb2c4a6bb10d1669691307f0044c
+MISC ChangeLog-2015 22539 SHA256 795191f9799eab353a11f4c79b0ed3b36f78d23420d00a6c41be3e85f996498e SHA512 2f7059e1dad15b1369132ee926f0132f18a39c316d4eea498a25cf14795643f887d5ff4155abad5f699e6bb9e7a2f983b2b600b772926007fc26ec8f61998336 WHIRLPOOL b19acd3152dd1b46ab7160eb100a89908825f497efedc8eb9981b1c74200a1ea5de43acb294f60621f4b488a10b6628ee524deb737d0d5c31dac156dcc7028c7
+MISC metadata.xml 635 SHA256 ff678e69d2677fcd15b08cc49179b787e61a4af9a71f0baeceeb9ab898175896 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571 WHIRLPOOL 02ff8b88b92480b71079ed41bd5cbc0db0b9523c3e7058aa2eb88404aafa9d7ce5d6c449fdc53f4ed4085699a629fbcef394f5ff0e0578c4acafc8a96fb8dd2d
diff --git a/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch b/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch
new file mode 100644
index 000000000000..cdfd549a3475
--- /dev/null
+++ b/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch
@@ -0,0 +1,150 @@
+From 6912d8fc02b5ff4d6675656d6c00506c48fdd940 Mon Sep 17 00:00:00 2001
+From: Rafał Przemysław Malinowski <rafal.przemyslaw.malinowski@gmail.com>
+Date: Sat, 21 Mar 2015 01:32:11 +0100
+Subject: [PATCH] gui: ported open chat with from qml to quick 2.3
+
+Signed-off-by: Rafał Przemysław Malinowski <rafal.przemyslaw.malinowski@gmail.com>
+---
+ cmake/KaduMacros.cmake                                  |  2 +-
+ kadu-core/CMakeLists.txt                                |  2 +-
+ kadu-core/gui/windows/open-chat-with/open-chat-with.cpp | 11 ++++++-----
+ kadu-core/gui/windows/open-chat-with/open-chat-with.h   |  4 ++--
+ tests/CMakeLists.txt                                    |  2 +-
+ varia/qml/Contact.qml                                   |  2 +-
+ varia/qml/ContactsGridView.qml                          |  2 +-
+ varia/qml/openChatWith.qml                              |  2 +-
+ 8 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/cmake/KaduMacros.cmake b/cmake/KaduMacros.cmake
+index ac9e94e..0a7712a 100644
+--- a/cmake/KaduMacros.cmake
++++ b/cmake/KaduMacros.cmake
+@@ -183,7 +183,7 @@ function (kadu_plugin KADU_PLUGIN_NAME)
+ 		endforeach ()
+ 	endif ()
+ 
+-	qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE Core Gui Widgets Network Xml WebKit WebKitWidgets Declarative)
++	qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets WebKit WebKitWidgets Widgets Xml)
+ 	if (UNIX AND NOT APPLE)
+ 		qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE DBus)
+ 	endif ()
+diff --git a/kadu-core/CMakeLists.txt b/kadu-core/CMakeLists.txt
+index be52339..46317d1 100644
+--- a/kadu-core/CMakeLists.txt
++++ b/kadu-core/CMakeLists.txt
+@@ -205,7 +205,7 @@ if (FAST_LINKING)
+ 	endif ()
+ endif ()
+ 
+-qt5_use_modules (libkadu LINK_PRIVATE Core Gui Widgets Xml Network WebKit WebKitWidgets Declarative)
++qt5_use_modules (libkadu LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets WebKit WebKitWidgets Widgets Xml)
+ if (UNIX AND NOT APPLE)
+ 	qt5_use_modules (libkadu LINK_PRIVATE DBus X11Extras)
+ endif ()
+diff --git a/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp b/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
+index 2c14c3f..9ff00d1 100644
+--- a/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
++++ b/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
+@@ -21,8 +21,9 @@
+  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include <QtDeclarative/QDeclarativeContext>
+-#include <QtDeclarative/QDeclarativeView>
++#include <QtQml/QQmlContext>
++#include <QtQuick/QQuickItem>
++#include <QtQuickWidgets/QQuickWidget>
+ #include <QtGui/QKeyEvent>
+ #include <QtWidgets/QApplication>
+ #include <QtWidgets/QDesktopWidget>
+@@ -97,18 +98,18 @@ OpenChatWith::OpenChatWith() :
+ 
+ 	MainLayout->addWidget(idWidget);
+ 
+-	BuddiesView = new QDeclarativeView();
++	BuddiesView = new QQuickWidget();
+ 
+ 	Chain = new ModelChain(this);
+ 	ListModel = new BuddyListModel(Chain);
+ 	Chain->setBaseModel(ListModel);
+ 	Chain->addProxyModel(new TalkableProxyModel(Chain));
+ 
+-	QDeclarativeContext *declarativeContext = BuddiesView->rootContext();
++	QQmlContext *declarativeContext = BuddiesView->rootContext();
+ 	declarativeContext->setContextProperty("buddies", Chain->lastModel());
+ 
+ 	BuddiesView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+-	BuddiesView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
++	BuddiesView->setResizeMode(QQuickWidget::SizeRootObjectToView);
+ 	BuddiesView->setSource(QUrl("file:///" + Application::instance()->pathsProvider()->dataPath() + "qml/openChatWith.qml"));
+ 
+ 	if (BuddiesView->rootObject())
+diff --git a/kadu-core/gui/windows/open-chat-with/open-chat-with.h b/kadu-core/gui/windows/open-chat-with/open-chat-with.h
+index b079b25..8268d8e 100644
+--- a/kadu-core/gui/windows/open-chat-with/open-chat-with.h
++++ b/kadu-core/gui/windows/open-chat-with/open-chat-with.h
+@@ -29,9 +29,9 @@
+ 
+ #include "open-chat-with-runner.h"
+ 
+-class QDeclarativeView;
+ class QLabel;
+ class QPushButton;
++class QQuickWidget;
+ class QVBoxLayout;
+ 
+ class BuddyListModel;
+@@ -46,7 +46,7 @@ class KADUAPI OpenChatWith : public QWidget, DesktopAwareObject
+ 
+ 	explicit OpenChatWith();
+ 
+-	QDeclarativeView *BuddiesView;
++	QQuickWidget *BuddiesView;
+ 	LineEditWithClearButton *ContactID;
+ 	QVBoxLayout *MainLayout;
+ 	OpenChatWithRunner *OpenChatRunner;
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 0dc1dcf..db7c42d 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -31,7 +31,7 @@ function (kadu_add_test name_)
+ 	endif ()
+ 	add_test ("${sourcePath}/${name_}" ${name_})
+ 
+-	qt5_use_modules (${name_} LINK_PRIVATE Core Gui Widgets Xml Network WebKit WebKitWidgets Declarative Test)
++	qt5_use_modules (${name_} LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets Test WebKit WebKitWidgets Widgets Xml)
+ 
+ 	# Add libkadu after the plugin so that --as-needed won't drop anything
+ 	# needed by the plugin.
+diff --git a/varia/qml/Contact.qml b/varia/qml/Contact.qml
+index 54a551e..2257348 100644
+--- a/varia/qml/Contact.qml
++++ b/varia/qml/Contact.qml
+@@ -1,4 +1,4 @@
+-import QtQuick 1.1
++import QtQuick 2.3
+ 
+ Rectangle
+ {
+diff --git a/varia/qml/ContactsGridView.qml b/varia/qml/ContactsGridView.qml
+index 769a419..141931e 100644
+--- a/varia/qml/ContactsGridView.qml
++++ b/varia/qml/ContactsGridView.qml
+@@ -1,4 +1,4 @@
+-import QtQuick 1.1
++import QtQuick 2.3
+ 
+ Item
+ {
+diff --git a/varia/qml/openChatWith.qml b/varia/qml/openChatWith.qml
+index 317133e..cce65b5 100644
+--- a/varia/qml/openChatWith.qml
++++ b/varia/qml/openChatWith.qml
+@@ -1,4 +1,4 @@
+-import QtQuick 1.1
++import QtQuick 2.3
+ 
+ Item
+ {
+--
+libgit2 0.24.0
diff --git a/net-im/kadu/files/kadu-2.1-qt5-compilation.patch b/net-im/kadu/files/kadu-2.1-qt5-compilation.patch
new file mode 100644
index 000000000000..68120a4ede0e
--- /dev/null
+++ b/net-im/kadu/files/kadu-2.1-qt5-compilation.patch
@@ -0,0 +1,11 @@
+diff -ruN kadu-2.1/kadu-core/os/single-application/single-application.cpp my/kadu-core/os/single-application/single-application.cpp
+--- kadu-2.1/kadu-core/os/single-application/single-application.cpp	2015-03-24 22:13:18.000000000 +0100
++++ my/kadu-core/os/single-application/single-application.cpp	2015-07-05 21:08:09.044685214 +0200
+@@ -26,6 +26,7 @@
+ #include "long-lived-lock-file.h"
+ 
+ #include <QtCore/QCoreApplication>
++#include <QtCore/QDataStream>
+ #include <QtCore/QDir>
+ #include <QtCore/QRegExp>
+ #include <QtNetwork/QLocalServer>
diff --git a/net-im/kadu/kadu-2.1-r1.ebuild b/net-im/kadu/kadu-2.1-r1.ebuild
new file mode 100644
index 000000000000..fd2aded6d050
--- /dev/null
+++ b/net-im/kadu/kadu-2.1-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils flag-o-matic
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client"
+HOMEPAGE="http://www.kadu.net"
+SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="+gadu mpd otr phonon sdk speech spell xmpp"
+REQUIRED_USE="
+	|| (
+		gadu
+		xmpp
+	)
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5,ssl]
+	>=dev-libs/injeqt-1.0.0
+	>=dev-qt/qtcore-5.2.0:5
+	>=dev-qt/qtdbus-5.2.0:5
+	>=dev-qt/qtdeclarative-5.2.0:5
+	>=dev-qt/qtgui-5.2.0:5
+	>=dev-qt/qtmultimedia-5.2.0:5
+	>=dev-qt/qtnetwork-5.2.0:5
+	>=dev-qt/qtscript-5.2.0:5
+	>=dev-qt/qtsql-5.2.0:5
+	>=dev-qt/qtsvg-5.2.0:5
+	>=dev-qt/qtwebkit-5.2.0:5
+	>=dev-qt/qtwidgets-5.2.0:5
+	>=dev-qt/qtx11extras-5.2.0:5
+	>=dev-qt/qtxml-5.2.0:5
+	>=dev-qt/qtxmlpatterns-5.2.0:5
+	>=app-arch/libarchive-2.6[lzma]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.11.1[threads] )
+	mpd? ( media-libs/libmpdclient )
+	otr? (
+		>=dev-libs/libgcrypt-1.2.2:0
+		>=net-libs/libotr-4.1.0
+	)
+	phonon? ( media-libs/phonon[qt5(+)] )
+	spell? ( app-text/enchant )
+	xmpp? (
+		net-dns/libidn
+		sys-libs/zlib
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-5.2.0:5
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	speech? ( app-accessibility/powiedz )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt5-compilation.patch"
+	"${FILESDIR}/${P}-port-to-QtQuick-2.3.patch"
+)
+
+PLUGINS='
+antistring
+auto_hide
+autoaway
+autoresponder
+autostatus
+cenzor
+chat_notify
+config_wizard
+desktop_docking
+docking
+emoticons
+encryption_ng
+encryption_ng_simlite
+exec_notify
+ext_sound
+falf_mediaplayer
+filedesc
+firewall
+freedesktop_notify
+hints
+history
+idle
+imagelink
+last_seen
+mediaplayer
+mprisplayer_mediaplayer
+pcspeaker
+qt4_docking
+qt4_docking_notify
+screenshot simpleview
+single_window
+sms
+sound
+sql_history
+tabs
+word_fix
+'
+
+src_configure() {
+	# Filter out dangerous flags
+	filter-flags -fno-rtti
+	strip-unsupported-flags
+
+	# Ensure -DQT_NO_DEBUG is added
+	append-cppflags -DQT_NO_DEBUG
+
+	# Plugin selection
+	use gadu && PLUGINS+=' gadu_protocol history_migration profiles_import'
+	use mpd && PLUGINS+=' mpd_mediaplayer'
+	use otr && PLUGINS+=' encryption_otr'
+	use phonon && PLUGINS+=' phonon_sound'
+	use speech && PLUGINS+=' speech'
+	use spell && PLUGINS+=' spellchecker'
+	use xmpp && PLUGINS+=' jabber_protocol'
+
+	# Configure package
+	local mycmakeargs=(
+		-DBUILD_DESCRIPTION='Gentoo Linux'
+		-DCOMPILE_PLUGINS="${PLUGINS}"
+		-DNETWORK_IMPLEMENTATION="Qt"
+		-DINSTALL_SDK=$(usex sdk)
+		-DWITH_ENCHANT=$(usex spell)
+	)
+	unset PLUGINS
+
+	cmake-utils_src_configure
+}
diff --git a/net-im/kadu/kadu-4.3-r1.ebuild b/net-im/kadu/kadu-4.3-r1.ebuild
new file mode 100644
index 000000000000..b3e45cf121e7
--- /dev/null
+++ b/net-im/kadu/kadu-4.3-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils flag-o-matic
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client"
+HOMEPAGE="http://www.kadu.net"
+SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+gadu mpd otr sdk speech spell xmpp"
+REQUIRED_USE="
+	|| (
+		gadu
+		xmpp
+	)
+"
+COMMON_DEPEND="
+	>=app-arch/libarchive-2.6[lzma]
+	>=dev-libs/injeqt-1.1.0
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.11.1[threads] )
+	mpd? ( media-libs/libmpdclient )
+	otr? (
+		>=dev-libs/libgcrypt-1.2.2:0
+		>=net-libs/libotr-4.1.0
+	)
+	spell? ( app-text/enchant )
+	xmpp? (
+		net-dns/libidn
+		>=net-libs/qxmpp-0.9.3-r1
+		sys-libs/zlib
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	speech? ( app-accessibility/powiedz )
+"
+
+PLUGINS='
+antistring
+auto_hide
+autoaway
+autoresponder
+autostatus
+cenzor
+chat_notify
+config_wizard
+docking
+docking_notify
+emoticons
+exec_notify
+ext_sound
+filedesc
+firewall
+freedesktop_notify
+hints
+history
+idle
+imagelink
+last_seen
+mediaplayer
+mprisplayer_mediaplayer
+pcspeaker
+screenshot
+simpleview
+single_window
+sms
+sound
+sql_history
+tabs
+word_fix
+'
+
+src_configure() {
+	# Filter out dangerous flags
+	filter-flags -fno-rtti
+	strip-unsupported-flags
+
+	# Ensure -DQT_NO_DEBUG is added
+	append-cppflags -DQT_NO_DEBUG
+
+	# Plugin selection
+	use gadu && PLUGINS+=' gadu_protocol'
+	use mpd && PLUGINS+=' mpd_mediaplayer'
+	use otr && PLUGINS+=' encryption_otr'
+	use speech && PLUGINS+=' speech'
+	use spell && PLUGINS+=' spellchecker'
+	use xmpp && PLUGINS+=' jabber_protocol'
+
+	# Configure package
+	local mycmakeargs=(
+		-DCOMPILE_PLUGINS="${PLUGINS}"
+		-DENABLE_TESTS=OFF
+		-DNETWORK_IMPLEMENTATION="Qt"
+		-DINSTALL_SDK=$(usex sdk)
+		-DWITH_ENCHANT=$(usex spell)
+	)
+	unset PLUGINS
+
+	cmake-utils_src_configure
+}
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
new file mode 100644
index 000000000000..e884cc37b59a
--- /dev/null
+++ b/net-im/kadu/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<use>
+		<flag name="gadu">Enables Gadu communication protocol</flag>
+		<flag name="mpd">Enables Music Player Daemon support</flag>
+		<flag name="otr">Enable char encryption via OTR library</flag>
+		<flag name="phonon">Enables phonon audio plugin</flag>
+		<flag name="sdk">Install Kadu SDK (cmake module, API headers)</flag>
+		<flag name="speech">Enables speech module</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/kouchat/Manifest b/net-im/kouchat/Manifest
new file mode 100644
index 000000000000..407ce22732c0
--- /dev/null
+++ b/net-im/kouchat/Manifest
@@ -0,0 +1,6 @@
+DIST kouchat-1.1.0-buildfiles.tar.gz 2793 SHA256 80251607b13eb094b73e8556f825c56520adf7c7792b8bd93004feaf8eebd543 SHA512 daae5a4f3374ab588214321793725f4b9add063f4c7b98f64f6db0ab71cc2d07f2ae9f27fb0ed12c7704604fd97781b0cfa9bdb0a188782c4f5bd0172e167c89 WHIRLPOOL db0114019e89907608837c7c4bc6ebb8011d1bacc8035c77bdc314069d8e473a8b227122920fa65fa3dc9f09c335155078cbebbab241a09633627a6de316a921
+DIST kouchat-1.1.0-src.tar.gz 363491 SHA256 be7eb437afc8710405ae0c678e7d0383f416ef34b9401897ef1590149b417f4a SHA512 838d2afac858d698a543ad9ca6e249fa6439cd6f31bf67d20bc44961c9dcbed843fefb51430202666c74c02ec71b8bd30edbd5dcfe5a15d2c364426e99350c27 WHIRLPOOL 08dc58961afc2be4db404674e72fe5c03ba5dbeae523afee73061530919e5655c47ac3cf569551e23158d3a7bfff9f7c1a9b8807f17265d16cf7f6d5685aa6a5
+EBUILD kouchat-1.1.0.ebuild 848 SHA256 883b5272ae48d3160290074098d81cd0f58cdfef584adfb3a94e6ec7e4492860 SHA512 e3133bb7e25c3d78cd1f33ec4786d174e2163f6c5e09979407ec2c713326d90d137214deb43d5c9cf10fcb9b18cacb9e36309e6e5f2b946eb55c39aadbfca788 WHIRLPOOL bf87a3eba4555b703f495ca1cbcea1163d88338b715706b8534b28b8dd9ccb8d4e9567f46c094b5d3c20609f8224fd73a39ff3e50cd6f84a547ed54de8881539
+MISC ChangeLog 2630 SHA256 0a2c5b38d08e88c42137e105c6d10c93aee94a3997a45bf449a8a3a33e1d809e SHA512 b52031d71780e10d2d6632ee6694d200e3a10e9776a0372276f70534c276b5c0b81f0be539a9c8b9b138ce73919fdeb31a0e246640f4f8b66c8d9b1ee4db76e5 WHIRLPOOL 1c73bfe249831919f15fbf45a26411c876a6e35354a07a05c1e5f7b10d22177064c9cfcc36f7291b4147dac6711d3f81ed67c7f4094af14fb489f155d622877f
+MISC ChangeLog-2015 1328 SHA256 a09a53e8733b3988a160ee6abb37270a80ff02479e10aab1eea755d970e11def SHA512 1f1684d638edfd06f04d39e977f6ee0b67d5d77e31344ffc7134df175ed0bdc3b35db010b022394eefb8394b389125b56df24ecde48387fed8bc55ac8d344b60 WHIRLPOOL 4b02ee6b1c28a09b94ebae568577630604cdcf61e5f0b7d26bae8b95236bfd713f4300143970cbaa6743bdde27cb4b33433a36781ca2779595c9ebbcdb609de5
+MISC metadata.xml 313 SHA256 881ff1b8bc19c76b115e1cbc93b3b53a5c09e215853d17ed2f4ce4cd820c9886 SHA512 3325871357331a70e429b6c5166d5604eed1effe2c0365f0eab0368e031005fee9fa99ebc3f37851a3b12039ae3751ba00a3727d9da4f7b50b24ae15a3745fe3 WHIRLPOOL abd70bc4f871c5c412282ee9d4a501c84bdaad324ece627b8540bb1cc2db767640016b3b57ba6c86b04c6812b35b84c512aacb8cdb7f67c031e430c943f9bdb5
diff --git a/net-im/kouchat/kouchat-1.1.0.ebuild b/net-im/kouchat/kouchat-1.1.0.ebuild
new file mode 100644
index 000000000000..3c7522dc9b9c
--- /dev/null
+++ b/net-im/kouchat/kouchat-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE=""
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="KouChat is a simple serverless chat client for local area networks"
+HOMEPAGE="https://kouchat.googlecode.com/"
+SRC_URI="https://kouchat.googlecode.com/files/${P}-src.tar.gz
+	https://dev.gentoo.org/~serkan/distfiles/${P}-buildfiles.tar.gz"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S=${WORKDIR}/${P}-src
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	java-pkg_dolauncher ${PN} --main net.usikkert.kouchat.KouChat
+	java-pkg_dolauncher ${PN}-console --main net.usikkert.kouchat.KouChat --pkg_args "--console"
+	newicon kou_shortcut.png ${PN}.png
+	make_desktop_entry ${PN} "KouChat"
+}
diff --git a/net-im/kouchat/metadata.xml b/net-im/kouchat/metadata.xml
new file mode 100644
index 000000000000..62957fbb082d
--- /dev/null
+++ b/net-im/kouchat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">kouchat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/librvp/Manifest b/net-im/librvp/Manifest
new file mode 100644
index 000000000000..ca020604ccf4
--- /dev/null
+++ b/net-im/librvp/Manifest
@@ -0,0 +1,7 @@
+DIST librvp-0.9.6.tar.gz 464935 SHA256 c57747cd3c3628ff189ce1f30c3a027ad2a0f222cc7615a259124e646fb488e0 SHA512 5ec9aafbfc937b3bac648632e879393b826bd8206d7c16f921705855f0f6e7aadc18b8e119aa8b356e3095d1a0ff798a8d576386dd097b7f7794f577c8190c46 WHIRLPOOL 4b331bbe163c4c6ac8858d0fa916c0b6046fa3d17bb4922c3468663fb9e6401d31037c7ab4354429942cc6ef6574d85db63de524c5592faecc730bf752404955
+DIST librvp-0.9.7.tar.gz 478014 SHA256 c674ad76a4c4b91088b2012b197964cec549edd74a88a53490bd7eda735ffd46 SHA512 dd097f3b845288771be33b553cfc0da90a87350e2021f9fe706e6b7479abc3bb1c7d08a9f38f9376fee235a5491c30bb65e7bd968901626ddf0499aa5ca1580c WHIRLPOOL 1930718c2e8104eb06a481aae75302df3fca123244f17d6c1c4ae759ef20375e4261526bc0e17398c7e9de2a64041f848ebaf102642eeb17c7091956bfae50ff
+EBUILD librvp-0.9.6.ebuild 702 SHA256 8b86afdbd59f006720018ea511fe69b670879a8d6d50fc96dc0a3351c69633a9 SHA512 978a80f8774c98d5ffc75d6315995261f1b74456f10753f32853f257ee47b188b0102d748f84df6389d8ee6f604793afb454d12a71a5f243c5cf526025d0659a WHIRLPOOL 61f3d2083ab5ad812e6df66cf13c205060065316010bc345eb44982cefdc136615887838cc40d6d157661e27273033a44c61ce006823740382e844fe245ddee1
+EBUILD librvp-0.9.7.ebuild 704 SHA256 8d09a2c861080797a89e16e44d8691b8424ac3bb44fb80fd500b42703df1112f SHA512 b26b5fb861a44e561d604df7e28fdc65368a9106994bde2ee14190dbada26df605532921232be81c584f6ab36e1eb73180454e2592365dc38b5c9ca0630abd3a WHIRLPOOL 5aac1f1cace65346b4ff314e825df1c58846b9ea02bc39ada9e60ddcec0652b9a919c3117ba4a922b5769f25a029fd3729082f9659ee9db064fcf5c1120fb143
+MISC ChangeLog 2567 SHA256 c35b15f1a325492f1f18eb945deb6368612b2c458af7f15726fc98d790c43680 SHA512 d20d04377ed6340d418099ffd17ed88a0cbaf67007ec7ca18816488c65848ea2fcbd444ad378dd13187bf502fd8b33f1a554ed503cf79ef78107d15a56d7f87f WHIRLPOOL fc1aed974e86640df9089fc4850096efba7b1ed4df9187c1c30e5cd8bc0cf9b319e8c537842ef481d2246dad005631d00c9240223a2a42a04d7369745b31b367
+MISC ChangeLog-2015 2096 SHA256 eed13962f4511ae63dda9e85e1308c18f42a156ba51ccf86d17792a47c8fa572 SHA512 2e1ebd8740e8772783ca0727a0022f59dc2b6f8d36f4a34199323c837bf2599d7131c85e7574d08d6a5bc442887a6c4d43ba9b806a90f7f3cae2c47c1963de4f WHIRLPOOL 6d3a07aad64a04a67bc2d653e7717368a7832f419dfc5db0a9535d3ab1790224b2cad78b35f479f4edcd1b09625b55d03a130268766923be6a45a9b21dd6d72f
+MISC metadata.xml 404 SHA256 1de16d1a35e3c828df70801e0ab3c0278de671a21db294e945e826e150db127a SHA512 c8a45182953464dc9ebc337a7757f44acf247343d9ea58ace3bf356723402de0134020a44f00acd9016c8fc1ac89f239c124ad381abc497fae110c051b69792f WHIRLPOOL 0aaef72fcdfba3e089fc64aeee780213f09ba54bf617778c5ed03233005b3d540f17a03256db4decd333a76e81d66b0747db10b6c6c4d847c66d99d1b6e6d410
diff --git a/net-im/librvp/librvp-0.9.6.ebuild b/net-im/librvp/librvp-0.9.6.ebuild
new file mode 100644
index 000000000000..307e522caa11
--- /dev/null
+++ b/net-im/librvp/librvp-0.9.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit multilib
+
+DESCRIPTION="An RVP (Microsoft Exchange Instant Messaging) plugin for Pidgin"
+HOMEPAGE="http://www.waider.ie/hacks/workshop/c/rvp/"
+SRC_URI="http://www.waider.ie/hacks/workshop/c/rvp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+src_configure() {
+	econf --with-gaim-plugin-dir=/usr/$(get_libdir)/pidgin \
+		--with-gaim-data-dir=/usr/share/pixmaps/pidgin
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install failure"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/net-im/librvp/librvp-0.9.7.ebuild b/net-im/librvp/librvp-0.9.7.ebuild
new file mode 100644
index 000000000000..6a79a17bc9bb
--- /dev/null
+++ b/net-im/librvp/librvp-0.9.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit multilib
+
+DESCRIPTION="An RVP (Microsoft Exchange Instant Messaging) plugin for Pidgin"
+HOMEPAGE="http://www.waider.ie/hacks/workshop/c/rvp/"
+SRC_URI="http://www.waider.ie/hacks/workshop/c/rvp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+src_configure() {
+	econf --with-gaim-plugin-dir=/usr/$(get_libdir)/pidgin \
+		--with-gaim-data-dir=/usr/share/pixmaps/pidgin
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install failure"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/net-im/librvp/metadata.xml b/net-im/librvp/metadata.xml
new file mode 100644
index 000000000000..df410a0e3a73
--- /dev/null
+++ b/net-im/librvp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		This is an RVP (Microsoft Exchange Instant Messaging) plugin for
+		Gaim 1.x and Pidgin. It's based on some work done at Lucent and
+		available through http://www.bell-labs.com/project/wwexptools/
+	</longdescription>
+</pkgmetadata>
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
new file mode 100644
index 000000000000..e7390074612a
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -0,0 +1,17 @@
+DIST mattermost-desktop-3.5.0-linux-ia32.tar.gz 48847084 SHA256 116e2e5a8892de5b640da58b82eb593b98f62882486f972d015f623862e282b7 SHA512 cdb363ca5c13090ec484976a55efdc398549d6cfaefe19619443433f0cd8382ef00b1a65dc3e82caf4b7b7535e903392e9a51abcece131d4ea9c31661c024e99 WHIRLPOOL 14dc96fdeda67ac8fcbfe1a2eb3fc785c9bb342a34179a7948b60876c962ab31d30777ff2f7940f217ff2c9ca0a6d9422b091cb71065cccdc4cb63152c15c9d5
+DIST mattermost-desktop-3.5.0-linux-x64.tar.gz 47617590 SHA256 a00d98b1cb921e2584a78a75c7b86b936780b788dbb9898b3cba0405bfe33cec SHA512 b9bd3a9c3e3c63fd45764916acbde863c9297b9c6a5fcf6f6321d19945709b6f8d50842bec880d003c0ca5555bde0d46725a485557f8cbfb36fdf36875915f13 WHIRLPOOL a5513503d6f756e9aebdb2ac7ec3c25db96254ea2004d4905071a8c09728874ca29d657438ceac5f4fadde7ccc624349b3e25db4109e13bb49602c52ed590d6d
+DIST mattermost-desktop-3.6.0-linux-ia32.tar.gz 48965181 SHA256 e5e0edff7d7760ad1e56b632c48303f81290f775d6e4990e16ffbb052bff893e SHA512 bfe521f7abb0883e9126f8aaa53adaa066d838f30a7c2a04eb120c04ce62e4cee30e23636b202f413bba8d7ea1289ebedc1bf4485098470aa3a9b07844a94bf3 WHIRLPOOL a6536d452129b8db9c8edf7a40cc3243d05411dee3ad0b410d9219212a09b9f5816c4d4cb8e0ed2492ce9a569ae3ab9f3d2d700b7d63fae0651a2d1b493089c0
+DIST mattermost-desktop-3.6.0-linux-x64.tar.gz 47733150 SHA256 2c3d4dab359f6f43b65dacf8778866015d208c6bef2df6b8f525efb578185f6f SHA512 4f5226f666c798455f2f8702027269b02f72a581dc3d5759727dd70f7a974c9eb9aec418d0b89fdfe2fa3cdf208bd277dca8e684f2e158d2cdb95be9657fe9d1 WHIRLPOOL b3e3471c7d17202de65e9118319bcceb17b1f45b0affe9e81a198d040576a08a06746648a94af9a93068d95ae51edb101a31ac44b57d57aaaf145f6f6d088505
+DIST mattermost-desktop-3.7.0-linux-ia32.tar.gz 57552057 SHA256 a26061952083611482d775ab059b224ba6756c5fe2feaef2315e8a5d755bbc97 SHA512 159e81dd0cf259cf32ca1b55905579df1b0227dd423a2fa71ee3b1c297ca8ca935ff4fba729e512edbc58358caa8dd1b1f5d565045b8cb56c49f1220c5092a72 WHIRLPOOL b8737f1cd9efc318a172172f940c2edfee6a4fc5c50d00898f763657270c16cfd76af04c41f8f867be83738309ad9b682131d511b160f54d5834ad712c77499d
+DIST mattermost-desktop-3.7.0-linux-x64.tar.gz 56145589 SHA256 f6f62d736915c9cceda35580baff3be2af9bf2e23616a83a93187c580b108d4f SHA512 f46f13045850579c49a87ab2a01caf3c3d95ac6bb9bc807c414413df6804ea36342bbc0a31a75d10a3b048dc3ac5a3efe8c26883c0705aec8875900366b9b58a WHIRLPOOL 50593cf3717ec7a43ab0a5b08fec0068f7ec9b27bd208f1e3980c27afae535bf5704762298790f49ccb5cc3dd80950ed608349548a3b34c9039e7d4c107f8a10
+DIST mattermost-desktop-3.7.1-linux-ia32.tar.gz 58727870 SHA256 9b371cd21e9361b2850dba43e532d056af93a7f30581b1f4b05d9c4f38495993 SHA512 679aed097874fea7c245cb4d939065b3d42804a972b2d4593f1d3325b0e9208fe9c1b57c0d0b969ca2a4a5a00a8ee82735bef69eb82151932d1753b69ece3d2f WHIRLPOOL 27edf8c796577250e4d6abeb5d868e13a87f5995d8848ba394ef3d376b563943effed4e42febaed4c9d25d37efef1bcc28d4d3fb8004201262da057320e77515
+DIST mattermost-desktop-3.7.1-linux-x64.tar.gz 57327001 SHA256 45ee2fbb5863cf19b3b9629d444cf660de7ef13010d2e62190acaa60e8dd4cac SHA512 4f709f3377b82e959a553c36932c18662c391a8f6a61a56df227b0f6054569c391a04dba9d071eaa35e9736ec49a2d1ae5339a8962d2476c338344ec977cd64d WHIRLPOOL 5e37ac0c8187bb7a82344a3e625bb6bae5bf989e4c1c64a3007e13d1481cebfb55771e167d1446803212978c42b5b293a8f14759b1ae2187703e20b3d2ba83af
+DIST mattermost-desktop-bin-3.5.0.tar.gz 763198 SHA256 9948a5647906c6e759961072f838cebb38c5649a112fe9d053b90ec13e2c564c SHA512 06924e4ce18cbe8fd50c0742a74b0a2ec732c7a419bb741c6991097a0a7be01afdfc4ce43125856508aa06750e35d12ce34d06a1e5d6eb6ddd14e81a0a6dffba WHIRLPOOL 00e696a34a3c509cf3a15bdc7eb15043eb3141ef6f0aea0e7a2154485093260819e494c46c57d9d7c3a9a293991e35754cfdbb342657d3599d974d8c31f07d14
+DIST mattermost-desktop-bin-3.6.0.tar.gz 769891 SHA256 4f85d81455f8d7f6948e0e997dd8df11936bdf6170f8882bcebaf0ef95fdff7a SHA512 ef781d4d9823642b767705c4182a38414e457978f775c3042ab72a9cf71c82c7c557193e333d18bdfc69cdcc647c39d0a52a666d72aabfbb848940af2d400710 WHIRLPOOL c78d6368f1518dfc3027b5bc21bf5f2c70433c30de85f519fdc2ac4ab1ddc478e48144c7e2604d9f5adc52a01095ee963e04a889a6b0ab3739c54461c63942a3
+DIST mattermost-desktop-bin-3.7.0.tar.gz 817335 SHA256 cc2c1bc2ab6709307d7a1489d40125e81b7208b1b393e0c2af362f415b1dd348 SHA512 3abcd3078adf74922bd31e6e975afd66f2f335f73017f3153cabd6cb38d8a36d9e9a01a1d572f34d123f4e68ed47280901fa3490e90ca04bbd2002cefb912f2f WHIRLPOOL eb761140620c1fd9cf15cf513d763498d8432eccf95318a36f207ef63fbc6088e356e0e21db11c22e59a6ce76500fad89c8d74d3511d64490987fc14ae69ab0b
+DIST mattermost-desktop-bin-3.7.1.tar.gz 817296 SHA256 382312e5140c871cbb36cf1a00df44e58b6f1f19436c4c518550f333f4d38186 SHA512 92a545c823df644e6bb49712c67770fda606644d32ae3501d903223a1d3851f8bc7a55f86aa67f5df1dafcef5f87d438845ac722e44b074acb7b645accde8ae0 WHIRLPOOL a7c3e7f2dc7c66f059f9798b41d4c94b25c5b9add93b6c58faaf8cf8c8e03648b83dc107c6084ac564cb574d339b9b45f3db6feae8c7c273172a0304421049c8
+EBUILD mattermost-desktop-bin-3.5.0.ebuild 1296 SHA256 41763965c5997c32f224dbee8176af2a12fe9f7543aa403fb4933e42907d69fa SHA512 8c37ab8e2c3eca57ae54a8be771fe0f33611ab817c94d9220016390436f1caefed020612364cd15634916a0a67205f3c8909124ab25a219aec6a0c5186de5702 WHIRLPOOL b74214b85622fe01baf114c4fa0a8592ee4833461251f7c61b97c5ecb55ff129c53f5118c05dc9194832a09415b81624fabc9203ef4eff246562ad1d9e2a5daa
+EBUILD mattermost-desktop-bin-3.6.0.ebuild 1296 SHA256 4b0e5b3f6053ac177a2fd17e34127d6f2ddebccd03a08f1846662e4e14acafa5 SHA512 ded3d617cd8e0306722578e86cb150a6a8946ec7b7517d322f3aec8dd63ed906a547756119138454716be2462a3433f4817b49aa6ceaa0c952c4a84600a5ad63 WHIRLPOOL aed741cc56118d397850fec6307597dd9461e21e2c4ae21685a55b7e03a4b0f6b767bdf14ea7f2efb0aef87ebaa94ee63a2d2add9e2639f7d8bc5159c3a40d33
+EBUILD mattermost-desktop-bin-3.7.0.ebuild 1290 SHA256 663834b24e3225dab904fe157d33360cd45af3cf18bdedf11d5c094eefd7e62a SHA512 6c8351e0ff5905c7bdc48e8d3d0d316188a70cb1633fbecc5e867a127e23da7f947e70f6517847df04d2d231b70990040041f6b18546cbe5b441cc939e1addce WHIRLPOOL 419280e61e94953fbce788f06caea08a70797cf7dd180b8e8f5159c8731611da2fb5f33cec5a6e34ffd08f9b99b8d1e5e6409a7352127eb1788a428abbf38535
+EBUILD mattermost-desktop-bin-3.7.1.ebuild 1290 SHA256 663834b24e3225dab904fe157d33360cd45af3cf18bdedf11d5c094eefd7e62a SHA512 6c8351e0ff5905c7bdc48e8d3d0d316188a70cb1633fbecc5e867a127e23da7f947e70f6517847df04d2d231b70990040041f6b18546cbe5b441cc939e1addce WHIRLPOOL 419280e61e94953fbce788f06caea08a70797cf7dd180b8e8f5159c8731611da2fb5f33cec5a6e34ffd08f9b99b8d1e5e6409a7352127eb1788a428abbf38535
+MISC metadata.xml 639 SHA256 8fa1d5cfe32bf7fdf3ab7d768423b237126420babaee202be4e1b184510f6983 SHA512 8863823b55ad69c10524e6e3879de3a9533a528661dbf51eb1b8464f594de83d1a39d63e3c93bb4e9dd0e1b11dc8712f1719cfc463ac53dbcf88355974bb956e WHIRLPOOL ceb0a05e9432bfca15823c2cfa3c5a340f331858f0fb6d49460eedd16f05db776c4fedea62537c2bdb20d48c542655f9930007562b10a273549e4627cc179fb4
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.5.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.5.0.ebuild
new file mode 100644
index 000000000000..e6c1915fe0d7
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.5.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils
+
+MY_PN="${PN%-*}"
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://releases.mattermost.com/desktop/3.5.0/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/3.5.0/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/mattermost-desktop-${PV}"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+"
+
+src_install() {
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+
+	exeinto "/opt/${MY_PN}"
+
+	doexe *.so "${MY_PN}"
+
+	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	newicon "${S}/icon.png" "${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.6.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.6.0.ebuild
new file mode 100644
index 000000000000..71d5332674bc
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils
+
+MY_PN="${PN%-*}"
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/mattermost-desktop-${PV}"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+"
+
+src_install() {
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+
+	exeinto "/opt/${MY_PN}"
+
+	doexe *.so "${MY_PN}"
+
+	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	newicon "${S}/icon.png" "${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.0.ebuild
new file mode 100644
index 000000000000..b7fb85c33a84
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PN="${PN%-*}"
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="gnome-base/gconf:2"
+
+S="${WORKDIR}/mattermost-desktop-${PV}"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+"
+
+DOCS=(
+	NOTICE.txt
+	LICENSES.chromium.html
+	LICENSE.txt
+	LICENSE.electron.txt
+	README.md
+)
+
+src_install() {
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so "${MY_PN}"
+
+	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	newicon "${S}/icon.png" "${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+	einstalldocs
+}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.1.ebuild
new file mode 100644
index 000000000000..b7fb85c33a84
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PN="${PN%-*}"
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="gnome-base/gconf:2"
+
+S="${WORKDIR}/mattermost-desktop-${PV}"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+"
+
+DOCS=(
+	NOTICE.txt
+	LICENSES.chromium.html
+	LICENSE.txt
+	LICENSE.electron.txt
+	README.md
+)
+
+src_install() {
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so "${MY_PN}"
+
+	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	newicon "${S}/icon.png" "${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+	einstalldocs
+}
diff --git a/net-im/mattermost-desktop-bin/metadata.xml b/net-im/mattermost-desktop-bin/metadata.xml
new file mode 100644
index 000000000000..2e5e71506813
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sergey@shiryaev.pro</email>
+		<name>Sergey Shiryaev</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mattermost/desktop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
new file mode 100644
index 000000000000..1a9cb761c126
--- /dev/null
+++ b/net-im/mcabber/Manifest
@@ -0,0 +1,8 @@
+DIST mcabber-1.0.5.tar.bz2 605483 SHA256 a0f200817d2b6196fe4d37918ce16f6fed83a3cef861d7165161e8b1cafcad47 SHA512 81b67899245902f495af7b44a5a0d710db69da731a00fb9ed84bdc0f88d5dc662f340817b1eaa843802c95105846234743eba52117f18bf12dd37a0da61d414d WHIRLPOOL ee09cc76d6e6f8507f6e78ed9f9d9f512f841d36d35d707593c15b9f0b3c9e1bc8910d1e0ff1cdf5ff6c34781a75eb7b1fd447789ba9a36f5137d8bf12dbacbe
+DIST mcabber-1.1.0.tar.bz2 608975 SHA256 04fc2c22c36da75cf4b761b5deccd074a19836368f38ab9d03c1e5708b41f0bd SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f WHIRLPOOL 0d1b126173d3a3fc8629cbdb51697b997f009d4554fbd476f4376a43d9cb3c32ae47800d5efe442cfa542284c5105e6d64afd1d09112c3f36f3d10b3576de428
+EBUILD mcabber-1.0.5.ebuild 3272 SHA256 915634b220256cdec11af1002eb07e475c717a7405883d1115e8dcbae537fc99 SHA512 5f8822af3726417856a26c5a8df2b54b3a0ac7da734e211ac7d97458210a7003d7d2c6b0d09613df5967799af10d23c98bea562554bbcae5971cee1f51f6b632 WHIRLPOOL 196187f2641949b816758de03379c58f615f412eb75b6bf569a4a17bd236b5ce25218ad8030d0f910351c9e8817fecfdde642eee3ef031c8321829ee4842b5c3
+EBUILD mcabber-1.1.0.ebuild 3274 SHA256 46da5b17ceafcf0f6d8898f4264d6c206ce04e7249bcdf06b90cd8a373d25968 SHA512 26410995e3772cfb8e6399a84e80c5214a82c9e8cd4d5bca050cff0d4d984487da2e3b940d32dd42f8274b23934ea7a83b4fac224914e8818cfd5a520ca982c9 WHIRLPOOL c3b6db16a53f7503f9aae9e8403a7adc830b5d045d26bc992675a1828fd94135798e62959fb29c2c01ad245c1ed6856181dfca4e74841a6c73a7a0fd1fada79a
+EBUILD mcabber-9999.ebuild 3127 SHA256 f7032916088304f89a3ab459feed0315ae8295de8d96915cf154d2e629ce4a3c SHA512 52112e47622c116c66e872bff8bced98d85be2b1bd672d569acb04535fdd38560ec30cb96b078bc62a9f540cd8ab3d2ce2bc883d929aedbde56bb3615dad6ac6 WHIRLPOOL 01423a45048541875163493408b54df9599ea6e46e5ff714653fbe61db617295a797f4d92bf087894d71ac00b0860f36b4db90e1b433a24bb369612466621536
+MISC ChangeLog 5364 SHA256 db646f9ac7b775b2988fa5c9b5bfbfffbab98e8f74c90c96c1c3144e0b6bc789 SHA512 c1d442fbfd68b703d2e9425991667a55c9771809997660c56e98c4ea7dd5cce2faf89febec2d29b34830d2e2be0d3db5c8f1794c5ac6f51c191a298015205c6e WHIRLPOOL 9d5e058707d4bf11a5cff4dde065f8d5415b68d9a72fedf9127c54571458e063d3e7eca3402498109eb7555334cad896b23a922e912afef3fdb0bb6f04774ed4
+MISC ChangeLog-2015 9384 SHA256 2b6f982027c6199c6827dd31619e09a38ff848c018425a8f9d853147498c7bab SHA512 383d086c66fdf15cc86faf5c6f3dd90043997b82a744faf241c8f19e61407455d86df27f8297259294f38a6d25ddd201dfe69997cd7c934aea32e9457668ad66 WHIRLPOOL b010b16319758bc048b3a2574b0740c704843dae9fbfac8247659d32df890dd89af49e7d0fae86931910967b32b3a67f66fce54673b9e5a1493e417914a467db
+MISC metadata.xml 737 SHA256 8f26088708d7d0cbc37ae637a91496001c713a15329abfc5b303d26427d878b3 SHA512 c9315017cf969fc0b5b9dccb3fe52e9e563643d85334f5721e729f6e936d3e8bc0024ff292d9e66f3f629755a8d9f5ae39f3a160e2908762977663d94a049c3f WHIRLPOOL b41262e5c9c4603364ba07d41b97afbd8438c3f8840242caadb551dadd46214f5e35627e1cf2cff2304e4bd92f11a1702b5c9f88a71179ea72eed9b9ae06ff9e
diff --git a/net-im/mcabber/mcabber-1.0.5.ebuild b/net-im/mcabber/mcabber-1.0.5.ebuild
new file mode 100644
index 000000000000..f7eb3aa298a3
--- /dev/null
+++ b/net-im/mcabber/mcabber-1.0.5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic autotools-utils
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+#REV="a18e1b488f1c"
+#SRC_URI="http://mcabber.com/hg/index.cgi/archive/${REV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
+
+#S=${WORKDIR}/${PN}-${REV}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${i}"
+done;
+
+RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+	otr? ( >=net-libs/libotr-3.1.0 )
+	aspell? ( app-text/aspell )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	idn? ( net-dns/libidn  )
+	spell? ( app-text/enchant )
+	dev-libs/glib:2
+	sys-libs/ncurses:0=
+	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+## autotools-utils.eclass settings
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
+
+pkg_setup() {
+	if use aspell && use spell; then
+		ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable crypt gpgme) \
+		$(use_enable otr) \
+		$(use_enable aspell) \
+		$(use_enable spell enchant) \
+		$(use_enable modules) \
+		$(use_with idn libidn)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# clean unneeded language documentation
+	for i in ${LANGS}; do
+		use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+	done
+
+	# contrib themes
+	insinto /usr/share/${PN}/themes
+	doins "${S}"/contrib/themes/*
+
+	# contrib generic scripts
+	exeinto /usr/share/${PN}/scripts
+	doexe "${S}"/contrib/*.{pl,py}
+
+	# contrib event scripts
+	exeinto /usr/share/${PN}/scripts/events
+	doexe "${S}"/contrib/events/*
+
+	if use vim-syntax; then
+		cd contrib/vim/ || die
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins mcabber_log-syntax.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins mcabber_log-ftdetect.vim
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "MCabber requires you to create a subdirectory .mcabber in your home"
+	elog "directory and to place a configuration file there."
+	elog "An example mcabberrc was installed as part of the documentation."
+	elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+	elog "following commands:"
+	elog
+	elog "  mkdir -p ~/.mcabber"
+	elog "  bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+	elog
+	elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+	elog
+	elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+	elog "manual page (section 1) for more information."
+	elog
+	elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+	elog "See README_PGP.txt for details."
+	echo
+	einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
+	echo
+}
diff --git a/net-im/mcabber/mcabber-1.1.0.ebuild b/net-im/mcabber/mcabber-1.1.0.ebuild
new file mode 100644
index 000000000000..b3b5e4471f5d
--- /dev/null
+++ b/net-im/mcabber/mcabber-1.1.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic autotools-utils
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+#REV="a18e1b488f1c"
+#SRC_URI="http://mcabber.com/hg/index.cgi/archive/${REV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
+
+#S=${WORKDIR}/${PN}-${REV}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${i}"
+done;
+
+RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+	otr? ( >=net-libs/libotr-3.1.0 )
+	aspell? ( app-text/aspell )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	idn? ( net-dns/libidn  )
+	spell? ( app-text/enchant )
+	dev-libs/glib:2
+	sys-libs/ncurses:0=
+	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+## autotools-utils.eclass settings
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
+
+pkg_setup() {
+	if use aspell && use spell; then
+		ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable crypt gpgme) \
+		$(use_enable otr) \
+		$(use_enable aspell) \
+		$(use_enable spell enchant) \
+		$(use_enable modules) \
+		$(use_with idn libidn)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# clean unneeded language documentation
+	for i in ${LANGS}; do
+		use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+	done
+
+	# contrib themes
+	insinto /usr/share/${PN}/themes
+	doins "${S}"/contrib/themes/*
+
+	# contrib generic scripts
+	exeinto /usr/share/${PN}/scripts
+	doexe "${S}"/contrib/*.{pl,py}
+
+	# contrib event scripts
+	exeinto /usr/share/${PN}/scripts/events
+	doexe "${S}"/contrib/events/*
+
+	if use vim-syntax; then
+		cd contrib/vim/ || die
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins mcabber_log-syntax.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins mcabber_log-ftdetect.vim
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "MCabber requires you to create a subdirectory .mcabber in your home"
+	elog "directory and to place a configuration file there."
+	elog "An example mcabberrc was installed as part of the documentation."
+	elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+	elog "following commands:"
+	elog
+	elog "  mkdir -p ~/.mcabber"
+	elog "  bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+	elog
+	elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+	elog
+	elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+	elog "manual page (section 1) for more information."
+	elog
+	elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+	elog "See README_PGP.txt for details."
+	echo
+	einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
+	echo
+}
diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
new file mode 100644
index 000000000000..647f3fe81bbe
--- /dev/null
+++ b/net-im/mcabber/mcabber-9999.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic autotools-utils mercurial
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
+EHG_CHECKOUT_DIR="${WORKDIR}"
+EHG_BOOTSTRAP="autogen.sh"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${i}"
+done;
+
+RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+	otr? ( >=net-libs/libotr-3.1.0 )
+	aspell? ( app-text/aspell )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	idn? ( net-dns/libidn  )
+	spell? ( app-text/enchant )
+	dev-libs/glib:2
+	sys-libs/ncurses:0=
+	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+## autotools-utils.eclass settings
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
+
+pkg_setup() {
+	if use aspell && use spell; then
+		ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable crypt gpgme) \
+		$(use_enable otr) \
+		$(use_enable aspell) \
+		$(use_enable spell enchant) \
+		$(use_enable modules) \
+		$(use_with idn libidn)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# clean unneeded language documentation
+	for i in ${LANGS}; do
+		use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+	done
+
+	# contrib themes
+	insinto /usr/share/${PN}/themes
+	doins "${S}"/contrib/themes/*
+
+	# contrib generic scripts
+	exeinto /usr/share/${PN}/scripts
+	doexe "${S}"/contrib/*.{pl,py}
+
+	# contrib event scripts
+	exeinto /usr/share/${PN}/scripts/events
+	doexe "${S}"/contrib/events/*
+
+	if use vim-syntax; then
+		cd contrib/vim/ || die
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins mcabber_log-syntax.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins mcabber_log-ftdetect.vim
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "MCabber requires you to create a subdirectory .mcabber in your home"
+	elog "directory and to place a configuration file there."
+	elog "An example mcabberrc was installed as part of the documentation."
+	elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+	elog "following commands:"
+	elog
+	elog "  mkdir -p ~/.mcabber"
+	elog "  bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+	elog
+	elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+	elog
+	elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+	elog "manual page (section 1) for more information."
+	elog
+	elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+	elog "See README_PGP.txt for details."
+	echo
+	einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
+	echo
+}
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
new file mode 100644
index 000000000000..5a98c0903afa
--- /dev/null
+++ b/net-im/mcabber/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Secondary maintainer</description>
+	</maintainer>
+	<longdescription lang="en">
+		MCabber is a small Jabber console client that features
+		such as GPG encryption, SSL support, MUC (Multi-User Chat) support,
+		history logging, commands completion, and external actions triggers.
+	</longdescription>
+	<use>
+		<flag name="aspell">Adds support for app-text/aspell spell
+			checker.</flag>
+		<flag name="otr">Enable encrypted conversations using Off-The-Records
+			messaging
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/metadata.xml b/net-im/metadata.xml
new file mode 100644
index 000000000000..efaf4c0dda2d
--- /dev/null
+++ b/net-im/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The net-im category contains instant messaging software.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-im enthält Instand Messaging Software.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-im contiene programas de mensajería instantánea.
+	</longdescription>
+	<longdescription lang="ja">
+		net-imカテゴリーにはインスタント・メッセージのソフトウェアが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-im categorie bevat applicaties voor instant messaging.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória net-im obsahuje aplikácie pre instant messaging.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-im chứa các phần mềm nhắn tin.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-im contiene programmi per i messaggi istantanei.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria net-im contém programas para mensagens instantâneas.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria net-im zawiera komunikatory internetowe.
+	</longdescription>
+</catmetadata>
+
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest
new file mode 100644
index 000000000000..87d42e2726d9
--- /dev/null
+++ b/net-im/minbif/Manifest
@@ -0,0 +1,9 @@
+AUX minbif-1.0.5-gcc47.patch 1835 SHA256 b95081452749405842c55d38f0093f1f01691fd510f3b8fb9e9df3c95e19b9f0 SHA512 673d82b856af74b16ec5e9db8e5d17521e07369fc8f34902bd72ee1d630ebd13b47de308d4591091029cfed37eaca8146b762185c5761a245acf82e3546b9b88 WHIRLPOOL a76d0cad3ee51dc758a5e59f8559ac1aefca6da151aabbab038965d1fbd8689503bd7cde345997e6d50312aa1d8971c78da500baa925edcc1e98b45e3bef3ceb
+AUX minbif-1.0.5-glib-single-includes.patch 754 SHA256 65c27d01bd9d774da8ef38a1364bf74caf4ce5891776ac0cbb8e391cb57bab4e SHA512 fd7c27d1e171aa1e321e82f5e41e6908109101b52519dcad32a9107d14c95b0664dcf7d6ed1969dfce7397976712a6f094966bb06e36ff21fa0c75fe6d86ea91 WHIRLPOOL 9a42c62d9f9677d9768920dffcbd37690be34dc8ae9bd249b86d637aa013ebbc75596a232298826920f5d505e2ae92212dd01b5a0c9e6a4d704127c3851063c9
+AUX minbif-1.0.5-rename-imlib-load-error.patch 469 SHA256 175dad49e288528612ed1c2c929f6ed9bc8061ef6f210ce5ae30fa1c8781fe12 SHA512 5cfa90fe70a4f2f45967b928d1062ab10d45aa6f7dcd4dd1575abb66047984977482ec8943481cc3344cc172292ea81b33f639baefb771aa181b10ea5f740344 WHIRLPOOL 3a6acd053594d2eb8d4e314b6355904056cf68b8ef404f522ce3e834ff20d0619a5a180b93831b12db134a70b96e4bd83295e5ed8b438087951c66c409c72ed4
+AUX minbif.initd 457 SHA256 2c3300c295e40efc521b01f3157d777d48ac4ef974a78e6302cc01773d7b1178 SHA512 f845120e70b96fc307e5ba5e2fc439713da0040b87fa1cdfd2ea38707c47260381004f5d98ddc08b738a1c928335c0b807ecc09b4d3a3e0dec240cab3e6ff7b7 WHIRLPOOL a52fd09a7b129ccaa64014abc15659eade1edffbca93fd60f8046f760a8f45ebeae4da0b68196be4555f05c6121c5d86e910bda8ed61c608f285b1c8657d98d9
+DIST minbif-1.0.5.tar.gz 176039 SHA256 88271af203a89556165a9ebb4e00e55ea5b649146aea855dd799a79bd9e4befd SHA512 e84c6f38ad35a660f9c319b702ae5743cece167c8e116976a9ca0caf527ad23ea17ea8f518f9bd76536e87283362d2087201a5307128740fc7f05dccabacfbcd WHIRLPOOL 10e51abc809e16c65c86f5887867f9d4b680a60321921a2fdd58345ce100cdea8317d13a007df4efaae786a4ea1b1bdc0231fe186f877f6a5716dbfdc3c32aad
+EBUILD minbif-1.0.5-r2.ebuild 1876 SHA256 627b3cb7021d3dcf3903374171a15921e345aac54bc9825d310b8c90fc1b11b1 SHA512 8b52fea7e4518f89d27b7342a191bd2e2c054500ea58d31c49dc5b75b3870978bcf2d5b625fe1e9e73ff6f75a80b85ae50ff8b763cdc0943c29f944202176889 WHIRLPOOL b0bc3c895c93c64c3ccff43c2f715bf5d168422bffd520d2b77a39d60023588be76ddf9c096aeb0e3aa6f202ee94845d12fbfbf5ccd52e9a0b965ae696ff93ce
+MISC ChangeLog 4186 SHA256 67816280ab5a60baa1c5ec5f4ff207659a1c4882dd46c95ff39b4f395fea7dd1 SHA512 f6d717e8656a70bfa1ef8089dfbb1ec1794549cdf6e3537a6be2cfb23111c5645437d0e33398b7deed31e2c2ee45eb0b5b34fd72b7b974d5c3bdc8dfffde34a9 WHIRLPOOL cbb55233888ffe35cd5bd51729fef9c8a45da66579078c8977d29b93600e32fffb0aee018f8db570dd3d3c14e5343d430c2d36d70f1e21a0c08898cd07b6d2a4
+MISC ChangeLog-2015 3049 SHA256 e8c8aee1907b690c7876a4dee064ddc7e70a3052b16e04b177b8646d4264bf09 SHA512 d4f75cbe122155ebdf93c55e7128f8a7b7422b8e8afcc94a3816acbc7d0238a529d21f1b9550b1681bbcba8150330efc11d33b1ade07b649ddc868333dab10b1 WHIRLPOOL 56b4c4c259a0a0c9ecc977b2c8f94a30ead25248f1ec0bab7d36e23a31d948ebad5f33351c80c42cba4409fac6e63be32f343068388b05ac7467bca5c9025932
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-im/minbif/files/minbif-1.0.5-gcc47.patch b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
new file mode 100644
index 000000000000..8566406a318f
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
@@ -0,0 +1,76 @@
+commit fe71fd989a4501c77314b2906756f4e9a328ff31
+Author: Romain Bignon <romain@symlink.me>
+Date:   Tue May 8 16:46:35 2012 +0200
+
+    fixes for gcc 4.7
+
+--- a/src/im/account.cpp
++++ b/src/im/account.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include <cassert>
+ #include <cstring>
++#include <unistd.h>
+ #ifdef HAVE_IMLIB
+ 	#include <Imlib2.h>
+ #endif /* HAVE_IMLIB */
+--- a/src/im/request.cpp
++++ b/src/im/request.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #include "request.h"
+ #include "buddy.h"
+--- a/src/irc/dcc.cpp
++++ b/src/irc/dcc.cpp
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
++#include <unistd.h>
+ 
+ #include "dcc.h"
+ #include "nick.h"
+--- a/src/irc/irc.cpp
++++ b/src/irc/irc.cpp
+@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const
+ Buddy* IRC::getNick(const im::Buddy& buddy) const
+ {
+ 	map<string, Nick*>::const_iterator it;
+-	Buddy* nb;
++	Buddy* nb = NULL;
+ 	for(it = users.begin();
+ 	    it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy);
+ 	    ++it)
+@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const
+ ConvNick* IRC::getNick(const im::Conversation& conv) const
+ {
+ 	map<string, Nick*>::const_iterator it;
+-	ConvNick* n;
++	ConvNick* n = NULL;
+ 	for(it = users.begin();
+ 	    it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv);
+ 	    ++it)
+--- a/src/server_poll/inetd.cpp
++++ b/src/server_poll/inetd.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include <cassert>
+ #include <glib.h>
++#include <unistd.h>
+ 
+ #include "inetd.h"
+ #include "irc/irc.h"
+--- a/src/sockwrap/sockwrap.cpp
++++ b/src/sockwrap/sockwrap.cpp
+@@ -22,6 +22,7 @@
+ #  include "sockwrap_tls.h"
+ #endif
+ #include "core/util.h"
++#include <unistd.h>
+ 
+ namespace sock
+ {
diff --git a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
new file mode 100644
index 000000000000..599355eb502c
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
@@ -0,0 +1,26 @@
+Index: minbif-1.0.5/src/server_poll/daemon_fork.cpp
+===================================================================
+--- minbif-1.0.5.orig/src/server_poll/daemon_fork.cpp
++++ minbif-1.0.5/src/server_poll/daemon_fork.cpp
+@@ -20,7 +20,7 @@
+ #include <cassert>
+ #include <cstring>
+ #include <cerrno>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <arpa/inet.h>
+Index: minbif-1.0.5/src/server_poll/inetd.cpp
+===================================================================
+--- minbif-1.0.5.orig/src/server_poll/inetd.cpp
++++ minbif-1.0.5/src/server_poll/inetd.cpp
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include <cassert>
+-#include <glib/gmain.h>
++#include <glib.h>
+ 
+ #include "inetd.h"
+ #include "irc/irc.h"
diff --git a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch
new file mode 100644
index 000000000000..e9fa875d247c
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch
@@ -0,0 +1,13 @@
+diff --git a/src/im/account.cpp b/src/im/account.cpp
+index f155334..f040fcd 100644
+--- a/src/im/account.cpp
++++ b/src/im/account.cpp
+@@ -272,7 +272,7 @@ void Account::setBuddyIcon(string filename)
+ 				else
+ 				{
+ 					char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0);
+-					ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN;
++					Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN;
+ 
+ 					close(temp_fd);
+ 					/* Try to encode in a supported format. */
diff --git a/net-im/minbif/files/minbif.initd b/net-im/minbif/files/minbif.initd
new file mode 100644
index 000000000000..06cac415f61d
--- /dev/null
+++ b/net-im/minbif/files/minbif.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MINBIF_EXEC="/usr/bin/minbif"
+
+depend() {
+	need logger net
+}
+
+start() {
+	ebegin "Starting minbif"
+	start-stop-daemon --start --startas ${MINBIF_EXEC} \
+		-c minbif:minbif --exec ${MINBIF_EXEC} -- \
+		/etc/minbif/minbif.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping minbif"
+	start-stop-daemon --stop --exec ${MINBIF_EXEC}
+	eend $?
+}
diff --git a/net-im/minbif/metadata.xml b/net-im/minbif/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-im/minbif/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-im/minbif/minbif-1.0.5-r2.ebuild b/net-im/minbif/minbif-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..1d5e71be66a7
--- /dev/null
+++ b/net-im/minbif/minbif-1.0.5-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils eutils user
+
+DESCRIPTION="an IRC gateway to IM networks"
+HOMEPAGE="https://symlink.me/projects/minbif/wiki/"
+SRC_URI="https://symlink.me/attachments/download/148/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gnutls +imlib +libcaca pam xinetd"
+REQUIRED_USE="
+	libcaca? ( imlib )
+"
+
+DEPEND="
+	>=net-im/pidgin-2.6
+	libcaca? ( media-libs/libcaca media-libs/imlib2 )
+	imlib? ( media-libs/imlib2 )
+	pam? ( sys-libs/pam )
+	gnutls? ( net-libs/gnutls )
+"
+RDEPEND="${DEPEND}
+	virtual/logger
+	xinetd? ( sys-apps/xinetd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch"
+	"${FILESDIR}/${PN}-1.0.5-gcc47.patch"
+	"${FILESDIR}/${PN}-1.0.5-rename-imlib-load-error.patch"
+)
+
+pkg_setup() {
+	enewgroup minbif
+	enewuser minbif -1 -1 /var/lib/minbif minbif
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i "s/-Werror//g" CMakeLists.txt || die "sed failed"
+
+	sed -i "s#share/doc/minbif#share/doc/${P}#" \
+		CMakeLists.txt || die "sed failed"
+
+	if use xinetd; then
+		sed -i "s/type\s=\s[0-9]/type = 0/" \
+			minbif.conf || die "sed failed"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONF_PREFIX="${EPREFIX}"/etc/minbif
+		-DENABLE_VIDEO=OFF
+		$(cmake-utils_use_enable libcaca CACA)
+		$(cmake-utils_use_enable imlib IMLIB)
+		$(cmake-utils_use_enable pam PAM)
+		$(cmake-utils_use_enable gnutls TLS)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /var/lib/minbif
+	fperms 700 /var/lib/minbif
+	fowners minbif:minbif /var/lib/minbif
+
+	dodoc ChangeLog README
+	doman man/minbif.8
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins doc/minbif.xinetd minbif
+	fi
+
+	newinitd "${FILESDIR}"/minbif.initd minbif
+
+	dodir /usr/share/minbif
+	insinto /usr/share/minbif
+	doins -r scripts
+}
diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
new file mode 100644
index 000000000000..5c98667558d7
--- /dev/null
+++ b/net-im/mu-conference/Manifest
@@ -0,0 +1,7 @@
+AUX mu-conference-0.7.init 410 SHA256 44fe11d4959a61fa5f231a4cc103cda70d3dc6983b298ff45a39e871372ad571 SHA512 0686c42f157579acabdf01b688f2934cb06fac62ea8946781afaf4385d6333240acbcad3277af61e5f5bf282bb0ba751583be7116d6239cc25f94812000c174a WHIRLPOOL bdb74d5a194726a2d7f31ac84abf827da8452864a9dd9a94e57d3851241248213de49ffd07457fb82b3c8d475f96940ede9e13bf716c02991d8ba87ec815ca5f
+AUX mu-conference-0.8.81-sha1_64bit.patch 786 SHA256 4161684d79281101eea87e6550a4837a9ff2d3a7221a8bf61fefa52052b127a4 SHA512 8872debbabacd3a39346a838cb71ee8acf7482cbe3d54484c60b7f985b70d601eb6ed3ae77ba4e0f3fd666c25f79b2761112092785560a1484c83eac16b29f5e WHIRLPOOL 846caf187c07edd77d5848ba326c78829f967015768f5ad69fa73f40ab843beb08bf17b60821fb9d22f7baad5c32ea66b4b5d9ddff0cca249303e82532702b61
+DIST mu-conference-0.8.81.tar.gz 247649 SHA256 d3c8f2f0539b06e32b8bcd48dfae008c84961815ada0922ecf095be36b599862 SHA512 96bfafac726ebc8c1a7489f092e5a6d90df0aaff39a183aaa33847e12caf142fe64178d7041fff15115bb5d8116e69b7dce95cb4caf329a4187b5c35ceca28b1 WHIRLPOOL b6da089299d22b3b4e68d79f6451de981e5ccbd7144cf765c2a4073c6b7d58f276c687e4693ab34bbca57275b5b5e48886eded5adc3e5382c61add4d23b9467a
+EBUILD mu-conference-0.8.81-r2.ebuild 2622 SHA256 d012fc6a16fe6f16ebc900e9d5425655d9aefcd908b76dc96086c61e746fb1f2 SHA512 4c32a466dc94de66b082243aa92c417dbcef95499e989fcf7959d52e7f90071dcab60ad6e9fa3c65441774025efc8cd44ef0be8c925440472e2bc600dab6e01a WHIRLPOOL b05e4ea3fd2c456ed0799ed53c4b2025d9ea3cb9a964a72cb63f9a29917515e974988813f56c668d9dd2dfee31156bcf0347965e13423596b5b96c2572bca5ed
+MISC ChangeLog 4116 SHA256 0f0a69f9ecfb296c14a0ca87fdfba04223c90d534f5ab59c8449a2a9af759569 SHA512 54d606eb41bae06b1287c1a6b642d9307cf7f0977a193b111f5674af8f72c8eb831045c545bcd5bc475d0e8bbc709b24dadde91ec6b8e139417893118e36ea4a WHIRLPOOL 683e908aed454f731319c23996b557dd8d4d4fc73d276c96219e43106f95510fb3085e37b8b80ee3018c88592d2b56009e8c4c46dc833d18f89332e5d37180a7
+MISC ChangeLog-2015 5423 SHA256 f6509e6611c6e1ea9ab160f596af3e9a10879e4e446a60b0e72fe4539be96d97 SHA512 b3e782d75a811fdad7871a0ac8f3b73d0d2894859a10d8cec219d0b173e2bf25d8df5ab8db63a15e45a47b2054944352d56cac4cbae483510c4ecf313ed65778 WHIRLPOOL 22d870f25c59808b997d4a2ff09afa6d04d6278eaa48d078f7f7c8fc03fcfaeaf5b59921077c59bbcb7134d20c0dc4ad58016b232b9916fd8e1521389a8e2743
+MISC metadata.xml 238 SHA256 cb95a963ac573f6e49de9bb830176421a2909348dfc1e93fccd5ae38e205c7c5 SHA512 9c93a4d93ed3d61578dc8eb48950760c410b5df76cf2e7c6cdceabf1fc18b91540437e8e0377144def02e4f666b3c7175a059f678f1326d52375bf7281163e82 WHIRLPOOL f02c65ed4910f86366e5df287ee694f9c39dfedce3273dad21279d94b2b16a2d56fe58b52f60795c7e97ab1b5f73904158c3c3d7d0e6ac84458dab9644b3fc38
diff --git a/net-im/mu-conference/files/mu-conference-0.7.init b/net-im/mu-conference/files/mu-conference-0.7.init
new file mode 100644
index 000000000000..a41c470cc815
--- /dev/null
+++ b/net-im/mu-conference/files/mu-conference-0.7.init
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting MUC Jabber Transport"
+	start-stop-daemon \
+		--background \
+		--start  \
+		--user jabber:jabber \
+		--exec /usr/bin/mu-conference \
+		-- -c /etc/jabber/mu-conference.xml
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping MUC Jabber Transport"
+	start-stop-daemon \
+		--stop \
+		--pidfile /var/run/jabber/mu-conference.pid
+	eend $?
+}
diff --git a/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch b/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch
new file mode 100644
index 000000000000..2764daa10544
--- /dev/null
+++ b/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch
@@ -0,0 +1,31 @@
+--- mu-conference-0.8.81/include/lib.h
++++ mu-conference-0.8.81/include/lib.h
+@@ -114,13 +114,6 @@
+ /* SHA calculations                                          */
+ /*                                                           */
+ /* --------------------------------------------------------- */
+-#if (SIZEOF_INT == 4)
+-typedef unsigned int uint32;
+-#elif (SIZEOF_SHORT == 4)
+-typedef unsigned short uint32;
+-#else
+-typedef unsigned int uint32;
+-#endif /* HAVEUINT32 */
+ 
+ char *shahash(char *str);	/* NOT THREAD SAFE */
+ void shahash_r(const char* str, char hashbuf[40]); /* USE ME */
+@@ -301,10 +294,10 @@
+ 
+ 
+ typedef struct {
+-  uint32_t H[5];
+-  uint32_t W[80];
++  guint32 H[5];
++  guint32 W[80];
+   int lenW;
+-  uint32_t sizeHi,sizeLo;
++  guint32 sizeHi,sizeLo;
+ } j_SHA_CTX;
+ 
+ 
+ 
diff --git a/net-im/mu-conference/metadata.xml b/net-im/mu-conference/metadata.xml
new file mode 100644
index 000000000000..e3c243e00aa9
--- /dev/null
+++ b/net-im/mu-conference/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>Multi User Conference for Jabber</longdescription>
+</pkgmetadata>
diff --git a/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild b/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild
new file mode 100644
index 000000000000..ed5e3ea48f72
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="mysql"
+
+RDEPEND="
+	dev-libs/expat
+	>=dev-libs/glib-2:2
+	net-dns/libidn
+	net-im/jabberd2
+	mysql? ( virtual/mysql )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# http://gna.org/bugs/?16238
+	"${FILESDIR}"/${P}-sha1_64bit.patch
+)
+
+src_prepare() {
+	# Fix missing header in src/conference_user.c in order to
+	# make emerge happy and avoid QA notice.
+	sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
+
+	if use mysql; then
+		sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
+			-e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
+	fi
+		sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
+			-e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
+			-e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
+		sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
+		sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
+		sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
+		sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
+	tc-export CC AR RANLIB
+
+	default
+}
+
+src_install() {
+	dobin src/mu-conference
+	fowners jabber:jabber /usr/bin/mu-conference
+	fperms 750 /usr/bin/mu-conference
+
+	newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
+
+	dodoc ChangeLog FAQ mu-conference.sql README README.sql
+	docinto scripts
+	dodoc scripts/*
+
+	local i
+	for i in log spool; do
+		dodir /var/${i}/jabber/mu-conference
+		keepdir /var/${i}/jabber/mu-conference
+		fowners jabber:jabber /var/${i}/jabber/mu-conference
+		fperms 770 /var/${i}/jabber/mu-conference
+	done
+
+	insinto /etc/jabber
+	newins muc-default.xml mu-conference.xml
+	doins style.css
+
+	sed -i \
+		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+		-e 's,./syslogs,/var/log/jabber,g' \
+		-e 's,./logs,/var/log/jabber/mu-conference,g' \
+		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+		-e "s,../style.css,/etc/jabber/style.css,g" \
+		-e "s,7009,5347,g" \
+		"${D}"/etc/jabber/mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+	echo
+	elog "For jabberd-2 connection:"
+	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+	elog "   match the address of your jabberd router."
+	elog "2. Set a common secret in mu-conference.xml and router.xml"
+	echo
+}
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
new file mode 100644
index 000000000000..6544c4815f38
--- /dev/null
+++ b/net-im/openfire/Manifest
@@ -0,0 +1,12 @@
+AUX openfire-confd 491 SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5 SHA512 c35e00f7e6b4136c1e8ab71b9221a91f3821a536be54681567cd5948243b9b1575056324c104cf038df8191777361b5eed8a1917185aead431a8f5343f1ed698 WHIRLPOOL c4a82a28363cca33fd8184010616122b85f4842bf10606cb0f71e8c6a027f29ae11e67d3483c99bfbadb385cff91726b3cc4e9b05ff0bed299a9c46568bd219b
+AUX openfire-initd 632 SHA256 05f398d8598f33cc86eec01c7676e226b797d3f20beb0956a1ac50e7be4209ed SHA512 29dfb750e0d177b2983889d81374f997df95991d773d497c2b8a212281f0763b950f9415dcb82928a60e8c4e90e5f87719f527ec723e04d2b2bdc2b0ce8ad6d2 WHIRLPOOL ebea03096b4857650051e712d94b51697dc297cde7b55c61ba80980eba4772b4ba813fa6eeb290e7d60dbc40619f657e9ffe048b4b71472b83e81f78602e9cc5
+AUX openfire.service 364 SHA256 543c83c5e3b2fd4dea7763d681c16989c0431ef3e4a7043e79e46dff14ebf4f0 SHA512 3dbf25d1566b1d1bdbd9f67deb30456451ffe2fa9d247c66e2bc45b3dc6a0fd91c0fc47d6e4ba5001217225f0a2bd6c2b60eb3056003cc580a10f0560a1fe231 WHIRLPOOL f95f8977777faf9ed8a74ac0d28f600a6838497cdf1cf61bcd230ed7188003f53379728e69127bf28c348d9cd394beabe0cbd3f6ff313718d98bf50a60b0175c
+DIST openfire_src_4_1_0.tar.gz 103449811 SHA256 3e52b27ac9ed5af1acb7065e84a416ad075994445b554e78d7c966724612cbf2 SHA512 3a4e26c260f6a91ece6e6d3fc7c3302b6f1735725ce2686bab8773981dad63ef653a25748852c32e4df8f6bde2882db4043d94b69eb774a5280285fd5b7cd96b WHIRLPOOL da56663dc9cdf831e04aebddff2eb2705b9cb603a0b5110fee1dc00d41252050ba326c84883fb69894ac064a339a11e22ef44c35348de0bb655f55bc8c34c72d
+DIST openfire_src_4_1_4.tar.gz 103457596 SHA256 46aa8fe815b941c423a4575b35204a6b3c74b7746a49420d6444bc018cd2257b SHA512 e9b7bb62656b376ffc52db5403c262d5a986698282ac9eec02d3a893076cc6df3f4666e908672a9d65cb313505fcc377fb3d7bb62f30d665aa8523cab7d714bd WHIRLPOOL 13009d922ebe292380c4b9cafcd1ef13a1bb119a728762da7c1b7f62d4515577f1e63014fbdaeba596cacd463c97935768f31611c67ed62d951840ded77d9aac
+DIST openfire_src_4_1_5.tar.gz 103508870 SHA256 f24c34ec2673dce0f9321237538e954ea767535ed7f17a2574e344170555de5b SHA512 9ccdd2916492ab23a71856ded8024f6dea73491810ee80c8284597eaf8d2fd55ccc47c7d1da704a487aba727761fdc50f0f6baa26349673fe74dabf0f2b36e73 WHIRLPOOL 5983868a5af739e351e83582d652bab173d2cc503fbc4afc0dc43823261ede5fc9da4d257fa2bfeb4ef600f84e5fd2f8472d2804b5b5d8df277c4c11cbd63030
+EBUILD openfire-4.1.0.ebuild 2875 SHA256 f22236881ddadffc220af38472e1caefeb4d7dfead4cfb4d5652d68b267ccff5 SHA512 b5e1a11513de5a1afcfb51a46f024d83a3819230d254a17e32f66f17f96e2a4ee41ce2ddea4b79b2b699e7f3671f3ba816153cec64118d0961119b312324c917 WHIRLPOOL 32bc3ce49695c05b3ff46504a6193b6b51d13d3e862570d7bba7c42f4535c40e079177ecb143455010922c020c513c84946f1fa584060088e99145ddb49a728e
+EBUILD openfire-4.1.4.ebuild 2877 SHA256 f78a6e617ed8a5defd69b680ad6dec5aef9a453a0b66c95e331ff3e3201b6e80 SHA512 fbf36088c9e99e7b86a1a1e37a7a0f4213a370407ddd94f230af373e8e33126e68ad72532ecaa17560586ab479609c2db911506b7fdf4e947041bccd30047583 WHIRLPOOL d6a191ac58ab4e51c985216687d69ee14fbf1b763ee0296a1e7cf66df919dde655f319728e0a0e068d80cd4746d89aa9359d9b44770d86605c09c2ccad94307a
+EBUILD openfire-4.1.5.ebuild 2877 SHA256 f78a6e617ed8a5defd69b680ad6dec5aef9a453a0b66c95e331ff3e3201b6e80 SHA512 fbf36088c9e99e7b86a1a1e37a7a0f4213a370407ddd94f230af373e8e33126e68ad72532ecaa17560586ab479609c2db911506b7fdf4e947041bccd30047583 WHIRLPOOL d6a191ac58ab4e51c985216687d69ee14fbf1b763ee0296a1e7cf66df919dde655f319728e0a0e068d80cd4746d89aa9359d9b44770d86605c09c2ccad94307a
+MISC ChangeLog 5152 SHA256 e4ec783a323d6a6469af32532bd4012165d510e6643449d07d4fdca8d671c5ce SHA512 7fe1785bcf95606a35d0805658b36c3ecfb90098ae2876c2c485493bcbe35d78aa8875a2fc507baca8bd31a666120d4bc464e4262632681d08ac74c54910e79a WHIRLPOOL 2d11c350e655649e3ad6f4e1b5e18d0ec9d53480e8b12832901a02666603a9a8758de1efc34562f971aa79f2723213b923f702286e1dce229d09dfe48efa3ced
+MISC ChangeLog-2015 16423 SHA256 220892faa5e2afedef517f343eac4690079d6ba1a81242578d7209e113a4fdc7 SHA512 116dc0b0e667fd0a20f49c89f064913b9ec521b21e61d71f07f5c46771a0e3d628e021a45dc3ae70cc1bb0ff0630261ebc4540842f4ea160191f32078feb00db WHIRLPOOL 788a15e1fe56fa685f3cff5590a323ad82431cbf7f7fffab31dd6f6a191f770ee9a6ff60620ea56059622bb11dab574995dc80aeeab6f7412f0528aed8506804
+MISC metadata.xml 462 SHA256 0b4915fb5a545e3e4a6d097df85dba8a86892ee400197e4b331ee2e80600a2a5 SHA512 dcac14fdaac6da7b164c1a5083b162909aa6cf6834087e0d0f7ae02f7fada74731eb3979790ab7831bd834c301caf44a7d9e593b51c9fcafbcfd921ebf993dd3 WHIRLPOOL 2682ac2ffa51253f222db6f1c99b209fefa42e0ed6874c7cb1aa4f4362085ba2076f20f5d9da299062aa7a10c2d3d6f64d5e835e42beae76029cab724d236eb5
diff --git a/net-im/openfire/files/openfire-confd b/net-im/openfire/files/openfire-confd
new file mode 100644
index 000000000000..35caecef20cc
--- /dev/null
+++ b/net-im/openfire/files/openfire-confd
@@ -0,0 +1,11 @@
+OPENFIRE_HOME=/opt/openfire
+OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
+OPENFIRE_OPTS="-Xmx256m -DopenfireHome=${OPENFIRE_HOME} -Dopenfire.lib.dir=${OPENFIRE_LIB}"
+OPENFIRE_CLASS="-classpath ${OPENFIRE_LIB}/startup.jar"
+OPENFIRE_JAR="-jar ${OPENFIRE_LIB}/startup.jar"
+OPENFIRE_ARGS="-server ${OPENFIRE_OPTS} ${OPENFIRE_CLASS} ${OPENFIRE_JAR}"
+
+
+#JVM used by the openfire server. You can see a list of available vm's in /usr/lib/jvm/
+#But remenber that openfire needs a 1.5 jvm
+GENTOO_VM=sun-jdk-1.5
diff --git a/net-im/openfire/files/openfire-initd b/net-im/openfire/files/openfire-initd
new file mode 100644
index 000000000000..281e5197af2c
--- /dev/null
+++ b/net-im/openfire/files/openfire-initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+	provide jabber-server
+}
+
+start() {
+	[ -d /var/run/jabber ] || mkdir /var/run/jabber
+	#source /etc/env.d/java/20sun-jdk-1.5.0.06
+	#OPENFIRE_CMD="${JAVA_HOME}/bin/java"
+	OPENFIRE_CMD=`GENTOO_VM=${GENTOO_VM} java-config -J`
+
+	ebegin "Starting Openfire Server"
+	start-stop-daemon \
+		--user jabber \
+		--background \
+		--make-pidfile \
+		--pidfile /var/run/jabber/openfire.pid \
+		--start \
+		--exec ${OPENFIRE_CMD} -- ${OPENFIRE_ARGS} > /var/log/openfire.log 2>&1
+	eend
+}
+
+stop() {
+	ebegin "Stopping Openfire Messenger"
+	start-stop-daemon --pidfile /var/run/jabber/openfire.pid --stop
+	eend
+}
diff --git a/net-im/openfire/files/openfire.service b/net-im/openfire/files/openfire.service
new file mode 100644
index 000000000000..6f2ff26ed497
--- /dev/null
+++ b/net-im/openfire/files/openfire.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Openfire XMPP Server
+After=network.target
+
+[Service]
+User=jabber
+Group=jabber
+PrivateTmp=true
+ExecStart=/usr/bin/java -server -Xmx256m -DopenfireHome=/opt/openfire -Dopenfire.lib.dir=/opt/openfire/lib -classpath /opt/openfire/lib/startup.jar -jar /opt/openfire/lib/startup.jar
+SuccessExitStatus=143 SIGKILL
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/openfire/metadata.xml b/net-im/openfire/metadata.xml
new file mode 100644
index 000000000000..ecc7df224583
--- /dev/null
+++ b/net-im/openfire/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<longdescription>
+		Openfire is a Java implementation of a complete Jabber
+		server.  It includes a web based administration interface, conference
+		support and a web/client support system.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-im/openfire/openfire-4.1.0.ebuild b/net-im/openfire/openfire-4.1.0.ebuild
new file mode 100644
index 000000000000..380dd1027786
--- /dev/null
+++ b/net-im/openfire/openfire-4.1.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+	~dev-java/ant-contrib-1.0_beta2
+	>=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+	if [[ -f /etc/env.d/98openfire ]]; then
+		einfo "This is an upgrade"
+		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+		ewarn "they can be downloaded via Admin Console or at"
+		ewarn "    ${HOMEPAGE}"
+	else
+		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+		ewarn "For more info see bug #139708"
+		sleep 11
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# Jikes doesn't support -source 1.5
+	java-pkg_filter-compiler jikes
+
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
+
+	# delete nativeAuth prebuilt libs:
+	#    uses outdated unmaintained libshaj, does not support amd64
+	rm -rfv target/openfire/resources/nativeAuth || die
+}
+
+src_install() {
+	dodir /opt/openfire
+
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+	newins target/openfire/conf/security.xml security.xml.sample
+
+	dodir /opt/openfire/logs
+	keepdir /opt/openfire/logs
+
+	dodir /opt/openfire/lib
+	insinto /opt/openfire/lib
+	doins target/openfire/lib/*
+
+	dodir /opt/openfire/plugins
+	insinto /opt/openfire/plugins
+	doins -r target/openfire/plugins/*
+
+	dodir /opt/openfire/resources
+	insinto /opt/openfire/resources
+	doins -r target/openfire/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+	local src
+	local dst
+
+	# http://community.igniterealtime.org/thread/52289
+	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+	do
+		src="${dst}".sample
+		if [[ -f "${dst}" ]]; then
+			einfo "Leaving old '${dst}'"
+		else
+			einfo "Created default '${dst}'. Please edit."
+			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+		fi
+	done
+	chown -R jabber:jabber "${ROOT}"/opt/openfire
+}
diff --git a/net-im/openfire/openfire-4.1.4.ebuild b/net-im/openfire/openfire-4.1.4.ebuild
new file mode 100644
index 000000000000..e6feaf1a438d
--- /dev/null
+++ b/net-im/openfire/openfire-4.1.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+	~dev-java/ant-contrib-1.0_beta2
+	>=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+	if [[ -f /etc/env.d/98openfire ]]; then
+		einfo "This is an upgrade"
+		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+		ewarn "they can be downloaded via Admin Console or at"
+		ewarn "    ${HOMEPAGE}"
+	else
+		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+		ewarn "For more info see bug #139708"
+		sleep 11
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# Jikes doesn't support -source 1.5
+	java-pkg_filter-compiler jikes
+
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
+
+	# delete nativeAuth prebuilt libs:
+	#    uses outdated unmaintained libshaj, does not support amd64
+	rm -rfv target/openfire/resources/nativeAuth || die
+}
+
+src_install() {
+	dodir /opt/openfire
+
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+	newins target/openfire/conf/security.xml security.xml.sample
+
+	dodir /opt/openfire/logs
+	keepdir /opt/openfire/logs
+
+	dodir /opt/openfire/lib
+	insinto /opt/openfire/lib
+	doins target/openfire/lib/*
+
+	dodir /opt/openfire/plugins
+	insinto /opt/openfire/plugins
+	doins -r target/openfire/plugins/*
+
+	dodir /opt/openfire/resources
+	insinto /opt/openfire/resources
+	doins -r target/openfire/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+	local src
+	local dst
+
+	# http://community.igniterealtime.org/thread/52289
+	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+	do
+		src="${dst}".sample
+		if [[ -f "${dst}" ]]; then
+			einfo "Leaving old '${dst}'"
+		else
+			einfo "Created default '${dst}'. Please edit."
+			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+		fi
+	done
+	chown -R jabber:jabber "${ROOT}"/opt/openfire
+}
diff --git a/net-im/openfire/openfire-4.1.5.ebuild b/net-im/openfire/openfire-4.1.5.ebuild
new file mode 100644
index 000000000000..e6feaf1a438d
--- /dev/null
+++ b/net-im/openfire/openfire-4.1.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+	~dev-java/ant-contrib-1.0_beta2
+	>=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+	if [[ -f /etc/env.d/98openfire ]]; then
+		einfo "This is an upgrade"
+		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+		ewarn "they can be downloaded via Admin Console or at"
+		ewarn "    ${HOMEPAGE}"
+	else
+		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+		ewarn "For more info see bug #139708"
+		sleep 11
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# Jikes doesn't support -source 1.5
+	java-pkg_filter-compiler jikes
+
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
+
+	# delete nativeAuth prebuilt libs:
+	#    uses outdated unmaintained libshaj, does not support amd64
+	rm -rfv target/openfire/resources/nativeAuth || die
+}
+
+src_install() {
+	dodir /opt/openfire
+
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+	newins target/openfire/conf/security.xml security.xml.sample
+
+	dodir /opt/openfire/logs
+	keepdir /opt/openfire/logs
+
+	dodir /opt/openfire/lib
+	insinto /opt/openfire/lib
+	doins target/openfire/lib/*
+
+	dodir /opt/openfire/plugins
+	insinto /opt/openfire/plugins
+	doins -r target/openfire/plugins/*
+
+	dodir /opt/openfire/resources
+	insinto /opt/openfire/resources
+	doins -r target/openfire/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+	local src
+	local dst
+
+	# http://community.igniterealtime.org/thread/52289
+	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+	do
+		src="${dst}".sample
+		if [[ -f "${dst}" ]]; then
+			einfo "Leaving old '${dst}'"
+		else
+			einfo "Created default '${dst}'. Please edit."
+			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+		fi
+	done
+	chown -R jabber:jabber "${ROOT}"/opt/openfire
+}
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
new file mode 100644
index 000000000000..83aeb065cdda
--- /dev/null
+++ b/net-im/openmittsu/Manifest
@@ -0,0 +1,3 @@
+DIST openmittsu-0.9.2.109.tar.xz 1314888 SHA256 cf012e36ce157023082c8efa04ce6d4521ac16044334647c860a07b2ff94ea35 SHA512 ad70ff7c3ceedcf1d6711468152199742533b8f42abbae5ce52f3e29882ae6aea566e8a39258a3d3676a91774e144a70d91967b31e4634f23d527f14325d0a5b WHIRLPOOL f0843eaa35507374a69977c0e023c060f47448d72ea77c3f640b2b5e1ddd87dff756c31c3827c043107af798b5abb58287b07dba8c841be57167d1e8787b1a24
+EBUILD openmittsu-0.9.2.109.ebuild 1340 SHA256 1900bc66f6da828ea977709fcb0e306fdd22705849c8c21a36c2bbae624d6a4c SHA512 9d5feaeb148e279fd373cff6e5957055e91aea5b1cfb0b426afcdf6dfd391514a17711e58cd90ed3105f9bbd9203be5c32f93dfc77ff28149ee8ca660b9d7751 WHIRLPOOL da41c88027d2065babba6446f43cb9b3e5d8a04ea71a99e397a35a2dca18c714ef13cf8e5679462ab4f16a1daaa13a939a091a756e8d15c7829eca9d96da1256
+MISC metadata.xml 212 SHA256 de74121c61a32da4efe984edecb71e0d5d947d179dd8228f60eb7c8bd94d6b8c SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa WHIRLPOOL f203947dfb1f7a9ab97fd689bd02229e4e48ad74e0f246d810d85d6f49f9802e4be4e7cf75d214a0428fd80dec6d953f5186c7856c266882eab60e712a732da2
diff --git a/net-im/openmittsu/metadata.xml b/net-im/openmittsu/metadata.xml
new file mode 100644
index 000000000000..c665e48637be
--- /dev/null
+++ b/net-im/openmittsu/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>ulm@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-im/openmittsu/openmittsu-0.9.2.109.ebuild b/net-im/openmittsu/openmittsu-0.9.2.109.ebuild
new file mode 100644
index 000000000000..aa52b268de9a
--- /dev/null
+++ b/net-im/openmittsu/openmittsu-0.9.2.109.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
+HOMEPAGE="https://www.openmittsu.de/"
+# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-libs/libsodium-1.0.11:=
+	>=dev-qt/qtcore-5.7.1:5=
+	>=dev-qt/qtgui-5.7.1:5=
+	>=dev-qt/qtmultimedia-5.7.1:5=
+	>=dev-qt/qtnetwork-5.7.1:5=[ssl]
+	>=dev-qt/qtsql-5.7.1:5=[sqlite]
+	>=dev-qt/qtwidgets-5.7.1:5=
+	>=media-gfx/qrencode-3.4.4-r1:="
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	README.md
+	Example-client-configuration-file.ini
+	Example-contacts-file.txt
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# set version manually, since autodetection works only with git
+		"-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
+		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	local my_pn="openMittsu"
+	cmake-utils_src_install
+	newicon resources/icon.png ${my_pn}.png
+	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
+	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
+}
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
new file mode 100644
index 000000000000..0ab6bb3b0f4a
--- /dev/null
+++ b/net-im/pidgin/Manifest
@@ -0,0 +1,11 @@
+AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
+AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 SHA256 548d459f17970d963147db19a2959b19da7d1f6c1958ae3ed3b609cf6be8b775 SHA512 d6d0a925803484311fcb78aecc383f4f572886551edc326c7e34cf1376ee80e1f65a4c564c3473d64233120c20d8143b0d63c4af065a15bfde02d830c83ab2f0 WHIRLPOOL 55183fdb3057a79e367566196abfa368962202eca3f63676cb80d791e0c0baa9245d67733b88d6af523524ec9d0ed941fe284552fe1bdfd91daf1b33ca67ffed
+AUX pidgin-2.10.11-tinfo.patch 892 SHA256 f722ea593f2ec0d9061ca051519bbbb389f2056dbda4fd4e80df545af78a6a16 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db WHIRLPOOL b5a3a5bd8c3d8428aac1e2fe20ec740a03cd397a5b79db2c2df593ed5ace7217871b27ad33bae0ab034f7d229526afc2688617b8fca666de26937b1575cb1a02
+AUX pidgin-2.10.9-fix-gtkmedia.patch 267 SHA256 c0bc25b05a5cfa8583d97533a9c052dc94bb186053ce11cb52b9e79ca3a0b11c SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd WHIRLPOOL 3cb215078dfbed61f3d49ecd3c3fc1f2739fc02787f2ef3fdf41cde371f5c91ade1d4a6fff28db69878f7ba1995eed14aa8c0b8eb4961650d33dfaa88a3cafe1
+DIST pidgin-2.10.9-irc_join_sleep.patch 534 SHA256 ee061505d04c994a36ea1d5eef346b7cbb2512afafa4985a678205ea69d87857 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf WHIRLPOOL 7aa9aa9e5ee7d97445da2c330329c6bfd4ad21347f43220e8377b7ec40eb5eac417be08cddfcdd48c7f847aac00a0f9ab39d0add09f1bee519f96f7586bdf5c9
+DIST pidgin-2.12.0.tar.bz2 9270704 SHA256 8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8 SHA512 e87b39888432982ee36332fd14b272f49f7974de9e8694f7fe3bec2821748d6e6026ac5a63615a93386a033d6ee7c4de5ae0a86b725f63b9cc55650f0ab94b06 WHIRLPOOL 7dc2ed772825169a10b5cf74ef370c1f2c0916a340e472e40b0681a9924fd57f9d67e1701051f571f79d8201ef0d8143e81d87e402aff651f63e6b9b39c80b48
+DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
+EBUILD pidgin-2.12.0.ebuild 7501 SHA256 4f791e1bff65c3d127748b36b542a467ddd8ffe05d0d3f688f7b492ef5546a60 SHA512 48e5911fa22e4c327677f9e1f9b988e1a732e5892b805a42c36ec4c23ba1647a9e50a97aa99a91e402769c3335e730c790084aceaad0113385b995eb1cfdf768 WHIRLPOOL ab1d4f7d2696a2418cc95b6c9195e6a311c1aee330fdab84c10b477062c7e1d3ddef995144eba9ccfb02bb44cd931d1fbdf1bc0fa502672cc2038b562db3e389
+MISC ChangeLog 7792 SHA256 8489d549cfd1ee30b0f8b3e25c3dee008e2b7fa6ce30befe6dcf8950696143e9 SHA512 33c47ad91bf2fc1ca38364498f13ec741230ad9cb0d3b95508c29130061a5440d0ee1aa3f667bae21ac95ac3c6192bb3f52e3fe878645dff3e24380c13cfa14f WHIRLPOOL 7a5d45e4fa2fda58583f705ee1553f77d1fcb49c0f72e1432cdd42be58a1327b60e4bdc1151ff493c9faf1b7d488e6bbd8d6b8ef10f511f626842cb146697789
+MISC ChangeLog-2015 52618 SHA256 5c126fbd42e6ce3ea12244b01fc199903ee30381b06482d6b2d98719dde93e29 SHA512 8e57016594ad6fb2eae142581505167cec0b952a9c9a4382eb7930e6db05642cd533925f4d5ec847d8259ab2419db88b256a4eebc742fc2f85b4bc5ba57c99f7 WHIRLPOOL ce9269a66bb32dfb1343daba276930dcc8a63c5dfb4353214a0767c96b7433ec08683fb11543e36b9b7a5122d122084e7c89de923988ad0433e3d4d25a07db36
+MISC metadata.xml 1480 SHA256 c0404c3f0a1066dc7fddaa01c518a1e6b7594f3014f479265cf5446b8c8d08b2 SHA512 de9430a267c6d93ec7a922f7ee447e36c2008cc37931896513398ae3f32af7e2a08ebb2ff7f9fb254c7facbf1ee5a4959e562e2fccd6bd85595f3d9b1d0e1e00 WHIRLPOOL e716fcd4ad4c294cbbda733531a8778238dd696fc0a0911938f4c54a1859e47b75cb3918a635bc8d34e6d57f13a06e3786af71d2e05969aeac816f5b0c756767
diff --git a/net-im/pidgin/files/pidgin-2.10.0-gold.patch b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
new file mode 100644
index 000000000000..819bfdc5c6bf
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
@@ -0,0 +1,30 @@
+ pidgin/Makefile.am |    2 +-
+ pidgin/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
+index b6a5bd4..96d207d 100644
+--- a/pidgin/Makefile.am
++++ b/pidgin/Makefile.am
+@@ -158,7 +158,7 @@ pidgin_LDADD = \
+ 	$(GTKSPELL_LIBS) \
+ 	$(LIBXML_LIBS) \
+ 	$(GTK_LIBS) \
+-	$(top_builddir)/libpurple/libpurple.la
++	$(top_builddir)/libpurple/libpurple.la -lm
+ 
+ if USE_INTERNAL_LIBGADU
+ INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
+index 615c196..0293e5c 100644
+--- a/pidgin/Makefile.in
++++ b/pidgin/Makefile.in
+@@ -607,7 +607,7 @@ EXTRA_DIST = \
+ @ENABLE_GTK_TRUE@	$(GTKSPELL_LIBS) \
+ @ENABLE_GTK_TRUE@	$(LIBXML_LIBS) \
+ @ENABLE_GTK_TRUE@	$(GTK_LIBS) \
+-@ENABLE_GTK_TRUE@	$(top_builddir)/libpurple/libpurple.la
++@ENABLE_GTK_TRUE@	$(top_builddir)/libpurple/libpurple.la -lm
+ 
+ @ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
diff --git a/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
new file mode 100644
index 000000000000..555ef8c1ab16
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
@@ -0,0 +1,23 @@
+diff -urN pidgin-2.10.10.orig/configure.ac pidgin-2.10.10/configure.ac
+--- pidgin-2.10.10.orig/configure.ac	2014-10-17 04:19:33.000000000 +0400
++++ pidgin-2.10.10/configure.ac	2014-10-28 15:56:27.853702740 +0300
+@@ -569,18 +569,10 @@
+ 	dnl # Check for stuff needed by the Evolution integration plugin.
+ 	dnl #######################################################################
+ 	if test "x$enable_gevolution" = "xyes"; then
+-		evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 < 3.6"
++		evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 >= 3.6"
+ 		PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, , [
+ 			enable_gevolution="no"
+ 		])
+-		if test "x$enable_gevolution" = "xno"; then
+-			evo_deps="libebook-1.0 libedata-book-1.0"
+-			PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
+-				enable_gevolution="yes"
+-			], [
+-				enable_gevolution="no"
+-			])
+-		fi
+ 		if test "x$enable_gevolution" = "xyes"; then
+ 			AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.])
+ 			AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
diff --git a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
new file mode 100644
index 000000000000..370ac62a6e23
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
@@ -0,0 +1,24 @@
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 51471b1..81c57ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],
+ 		[compile finch against the ncurses includes in DIR])],
+ 		[ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
+ if test "x$enable_consoleui" = "xyes"; then
++	PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [
++	PKG_CHECK_MODULES([GNT], [ncurses panel], [], [
+ 	AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
+ 	AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
+ 	    [enable_consoleui=no], [$GNT_LIBS])
+@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then
+ 			fi
+ 		fi
+ 	fi
++	])])
+ fi
+ 
+ if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
diff --git a/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
new file mode 100644
index 000000000000..4cec32663808
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
@@ -0,0 +1,10 @@
+--- a/pidgin/Makefile.am	2014-02-02 22:29:20.000000000 +0100
++++ b/pidgin/Makefile.am	2014-02-14 19:35:24.347547795 +0100
+@@ -154,6 +154,7 @@
+ 	$(GSTREAMER_LIBS) \
+ 	$(XSS_LIBS) \
+ 	$(SM_LIBS) \
++	$(X11_LIBS) \
+ 	$(INTLLIBS) \
+ 	$(GTKSPELL_LIBS) \
+ 	$(LIBXML_LIBS) \
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
new file mode 100644
index 000000000000..718b51ce3ea3
--- /dev/null
+++ b/net-im/pidgin/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<longdescription>
+	Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, SIMPLE, and Zephyr.
+	</longdescription>
+	<use>
+		<flag name="gadu">Enable Gadu Gadu protocol support</flag>
+		<flag name="groupwise">Enable Novell Groupwise protocol support</flag>
+		<flag name="gstreamer">Enables voice and video sessions</flag>
+		<flag name="gtk">Builds Pidgin, the GTK+ interface</flag>
+		<flag name="meanwhile">Enable meanwhile support for Sametime protocol</flag>
+		<flag name="ncurses">Build finch, console interface</flag>
+		<flag name="prediction">Enable Contact Availability Prediction plugin</flag>
+		<flag name="python">Build libgnt (GLib Ncurses Toolkit used by finch) with python scripting support</flag>
+		<flag name="silc">Enable SILC protocol support</flag>
+		<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
+		<flag name="zephyr">Enable Zephyr protocol support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">pidgin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/pidgin/pidgin-2.12.0.ebuild b/net-im/pidgin/pidgin-2.12.0.ebuild
new file mode 100644
index 000000000000..22c9e0d73963
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.12.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+LICENSE="GPL-2"
+SLOT="0/2" # libpurple version
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" aqua"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+		prediction? ( >=dev-db/sqlite-3.3:3 )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		dev-python/dbus-python
+	)
+	perl? ( >=dev-lang/perl-5.16:= )
+	gadu? (
+		|| (
+			>=net-libs/libgadu-1.11.0[ssl,gnutls]
+			>=net-libs/libgadu-1.11.0[-ssl]
+		)
+	)
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	meanwhile? ( net-libs/meanwhile )
+	silc? ( >=net-im/silc-toolkit-1.0.1 )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn )
+	!<x11-plugins/pidgin-facebookchat-1.69-r1"
+	# Mono support crashes pidgin
+	#mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	gtk? (
+		x11-proto/scrnsaverproto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10.0-gold.patch"
+	"${WORKDIR}/${PN}-eds-3.6.patch"
+	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
+	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
+	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+)
+
+pkg_setup() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	local myconf=()
+
+	use gadu 	&& DYNAMIC_PRPLS+=",gg"
+	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
+	use silc 	&& DYNAMIC_PRPLS+=",silc"
+	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
+	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=( --enable-nss=no --enable-gnutls=yes )
+		myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" )
+		myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" )
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=( --enable-gnutls=no --enable-nss=yes )
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python=${PYTHON} )
+	else
+		myconf+=( --without-python )
+	fi
+
+	local myeconfargs=(
+		--disable-mono
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable ncurses consoleui)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable xscreensaver screensaver)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable spell gtkspell)
+		$(use_enable perl)
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable debug)
+		$(use_enable dbus)
+		$(use_enable meanwhile)
+		$(use_enable gstreamer)
+		$(use_with gstreamer gstreamer 1.0)
+		$(use_enable gstreamer farstream)
+		$(use_enable gstreamer vv)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable doc doxygen)
+		$(use_enable networkmanager nm)
+		$(use_enable zeroconf avahi)
+		$(use_enable idn)
+		${myconf[@]}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use gtk; then
+		# Fix tray pathes for e16 (x11-wm/enlightenment) and other
+		# implementations that are not complient with new hicolor theme yet, #323355
+		local pixmapdir
+		for d in 16 22 32 48; do
+			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	if use python && use dbus ; then
+		python_fix_shebang "${D}"
+		python_optimize
+	fi
+
+	dodoc ${DOCS} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+src_test() {
+	emake check
+}
diff --git a/net-im/pork/Manifest b/net-im/pork/Manifest
new file mode 100644
index 000000000000..4b014262004c
--- /dev/null
+++ b/net-im/pork/Manifest
@@ -0,0 +1,6 @@
+AUX pork-0.99.8.1-fix-buildsystem.patch 2980 SHA256 cdb410171b3d40a16b9f4c6887122e0ee8c579a9485e1aef8dbf7dd584af3073 SHA512 410a519a56988746746de788128c09daff66f7ef68babd625c68585cd31955dd3ba7d003227417c675be0e27a7b78724b57585d29c4d3733c0cbc995258a6d44 WHIRLPOOL 123f4a867213c0d3c36414121fc2ec8074c1e712acba0e3269e7a6f63989f30e13a38928e856818bf14d2858ad1b5d43d0514470b0bcc2200cfb2174bba357af
+DIST pork-0.99.8.1.tar.gz 490425 SHA256 f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed SHA512 20efae37c847e4f4552280832c252341f3d541a08f94df21b780d130bb9dc61cf3464f99e119c01a540572a96340d84ed04e81458c0908357693b6af50d6e77f WHIRLPOOL d507920b28046172c607be05b1acbbbcef0889dd2ca1a39d2751e4753939eac868a43076f3281be8f9336eb226528f92fcdb1767c9909b68f0ce482718c108f6
+EBUILD pork-0.99.8.1-r1.ebuild 799 SHA256 f62a5866abf0c1fa718c61b3f4673f501ebaa049470b59d765ec8f26abe48f79 SHA512 24ed68afc98274261c426929b5be43c1cf9d1061a9ed0106a4d325f4fb3be9c2c396c5693ec30ed9bcd1e284cd636d8f570102c8e1dde8e24c55af9db3854526 WHIRLPOOL a2fe3660ae910191228cb6e9a9eab90482a5f9e5572fa42f2ec69e73257a85575360e3283ba53d821ab049385b0644e5b4dca52cabb572e3b539369358e61c79
+MISC ChangeLog 2884 SHA256 7e1142c028c75dccba4ebc6552fd0237e6ab972922f0369a212d04ea6013678e SHA512 9174773dde502b0f97447d6ab5f918f35ba58f9682e0cbaf5c6da303dc1b001cbe14c56855efdd805ffcf5b2f09c2d21dbe698c9e95e2cb918ce378ca2fe93de WHIRLPOOL 6f3a216b784c858c04298a4e3043101bd511beb69d492900f62c3f706a5cce35c0304006d5d3f8fb9b34b7b61c3304f11ce6c53fea8ca266bcd549dc731918da
+MISC ChangeLog-2015 5574 SHA256 684ca6f615838ba6eacfd7f8d96174e898f1352ede1c9f7e8270fbefa3852310 SHA512 e3e1469762b04624b882d28941b7128160841dcc24f4d02ef9750520ad934e0b88a66a8e2889dca405e4d100d9e005b01cefb908ae21b9c44a5d00d3f6768063 WHIRLPOOL 1a9c27395ecb60477e5f92bd29fe9f752b772f9eb77864b9972609fd61065bc459cfd40b9af37dc941362bdac5bc316b736fceaae8e10f82010fdab5dc6e7330
+MISC metadata.xml 366 SHA256 37ed8ce04c33933ea486560cd37744ca0aca9128097054db1e2a190e88fe66c9 SHA512 3cb6bdcf1b0f87c99e7579bf694a95bc4b5128efbb797be26f13e5a53871fee6d20f6e1cd56266a0c877c58bc04cc6e95fc4f6098f0f96763d6cbc976d9ae07c WHIRLPOOL d3c01571856642ceb6b202197433d6e0300d3d7adb5ff3e9711dcb0b4ef95d6b52a3c9beddc0faea10f2ca7bb651bafea8c241be40402ee6d33c6b592aecbcb4
diff --git a/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch b/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch
new file mode 100644
index 000000000000..cb63980ee70e
--- /dev/null
+++ b/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch
@@ -0,0 +1,101 @@
+Fix buildsystem to explicitly compile with -std=gnu89 to avoid
+differencs in inline semantics introduced in GCC5.
+https://bugs.gentoo.org/show_bug.cgi?id=570598
+
+Additionally, fix QA issues caused by implicit declarations, such as:
+* QA Notice: Package triggers severe warnings which indicate that it
+*            may exhibit random runtime failures.
+* pork_inet.c:69:8: warning: implicit declaration of function ‘vasprintf’ [-Wimplicit-function-declaration]
+
+--- pork-0.99.8.1/configure.ac
++++ pork-0.99.8.1/configure.ac
+@@ -114,6 +114,8 @@
+ 
+ AC_CHECK_LIB(ncurses, resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define to 1 if you have the 'resizeterm' function in -lncurses.]))
+ 
++AC_SEARCH_LIBS(stdscr, tinfo)
++
+ AC_CHECK_TYPE(u_int32_t, uint32_t)
+ if test "$ac_cv_type_u_int32_t" = "no"; then
+ 	AC_CHECK_TYPE(uint32_t, unsigned int)
+--- pork-0.99.8.1/Makefile.am
++++ pork-0.99.8.1/Makefile.am
+@@ -1,3 +1,5 @@
++AM_CFLAGS = -std=gnu89
++
+ SUBDIRS = \
+ 	src			\
+ 	doc			\
+--- pork-0.99.8.1/src/Makefile.am
++++ pork-0.99.8.1/src/Makefile.am
+@@ -6,7 +6,7 @@
+ endif
+ 
+ 
+-AM_CFLAGS = -funsigned-char -Imissing -Wall -Iprotocols -fPIC
++AM_CFLAGS = -funsigned-char -Imissing -Wall -Iprotocols -fPIC -std=gnu89
+ AM_CFLAGS += -DHELP_PATH=\"$(pkgdatadir)/help\" -DSYSTEM_PORKRC=\"$(pkgdatadir)/porkrc\"
+ AM_CFLAGS += $(PERL_CFLAGS) $(DEBUG_CFLAGS)
+ 
+--- pork-0.99.8.1/src/missing/Makefile.am
++++ pork-0.99.8.1/src/missing/Makefile.am
+@@ -1,5 +1,5 @@
+ INCLUDES = -I../../src
+-AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
++AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
+ 
+ noinst_LIBRARIES = libmissing.a
+ 
+--- pork-0.99.8.1/src/pork_inet.c
++++ pork-0.99.8.1/src/pork_inet.c
+@@ -9,8 +9,9 @@
+ 
+ #include <config.h>
+ 
+-#include <unistd.h>
++#define _GNU_SOURCE 1
+ #include <stdio.h>
++#include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+--- pork-0.99.8.1/src/pork_screen_io.c
++++ pork-0.99.8.1/src/pork_screen_io.c
+@@ -14,6 +14,8 @@
+ 
+ #include <config.h>
+ 
++#define _GNU_SOURCE 1
++#include <stdio.h>
+ #include <unistd.h>
+ #include <ncurses.h>
+ #include <stdlib.h>
+--- pork-0.99.8.1/src/protocols/aim/Makefile.am
++++ pork-0.99.8.1/src/protocols/aim/Makefile.am
+@@ -1,5 +1,5 @@
+ INCLUDES = -I. -I.. -I../.. -I../../.. -I../../missing -Ilibfaim
+-AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
++AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
+ 
+ noinst_LIBRARIES = libaim.a
+ 
+--- pork-0.99.8.1/src/protocols/irc/Makefile.am
++++ pork-0.99.8.1/src/protocols/irc/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I. -I.. -I../.. -I../../.. -I../../missing
+ 
+-AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
++AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
+ 
+ noinst_LIBRARIES = libirc.a
+ 
+--- pork-0.99.8.1/src/protocols/Makefile.am
++++ pork-0.99.8.1/src/protocols/Makefile.am
+@@ -3,6 +3,6 @@
+ endif
+ 
+ INCLUDES = -I. -I.. -I../.. -I../missing
+-AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
++AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
+ 
+ SUBDIRS = $(irc_dir) aim
diff --git a/net-im/pork/metadata.xml b/net-im/pork/metadata.xml
new file mode 100644
index 000000000000..7ad6912389e9
--- /dev/null
+++ b/net-im/pork/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+	Pork is an AIM client based on the GAIM libraries with an interface similar to IRCII.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ojnk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/pork/pork-0.99.8.1-r1.ebuild b/net-im/pork/pork-0.99.8.1-r1.ebuild
new file mode 100644
index 000000000000..5da6c71b7297
--- /dev/null
+++ b/net-im/pork/pork-0.99.8.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Console based AIM client that looks like ircII"
+HOMEPAGE="http://dev.ojnk.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="perl"
+
+RDEPEND="
+	perl? ( dev-lang/perl )
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable perl)
+}
+
+src_install() {
+	default
+
+	doman doc/pork.1
+	insinto /usr/share/pork/examples
+	doins examples/blist.txt
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README STYLE TODO QUICK_START
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
new file mode 100644
index 000000000000..432133ba2605
--- /dev/null
+++ b/net-im/prosody/Manifest
@@ -0,0 +1,16 @@
+AUX prosody-0.10.0-cfg.lua.patch 1558 SHA256 861374ae08b4f810c34090513e1f478af80c65139b8d02def1bf49143047c9e6 SHA512 39df578b0dc205ed6142fbf23b049e0c1d26d53e6ee0926d3f61965ced2935c18eca4d0b576e47bb58a44484212199c7f788dc7d15bc9e65ad69fdfa6888496f WHIRLPOOL b4707811b5630cf471bca0260828f0d4b2644e3b8ce03934f153397fa41021c9256319d32da928bcdf598259c61c5b83c8d1cbbf0a3b80d49ae411c4d048d325
+AUX prosody-0.9.2-cfg.lua.patch 2173 SHA256 6e0b9039a9066c87ba7bfa4cc8b19b7d5cb83f94294f35071d4ddf7edf5b99ae SHA512 73531ac9c3667fc8c95e572643de760c6da378f73824fb04e4d3d3e4bf0b12b56c6854a61b9340ddbca8ff8fea1bc49927928b7b07016d4aeadad4d52630f1b1 WHIRLPOOL 663ee8b82878714a73c3bb538df538b6b31e62414e49c2bcf7d7ac5b8593c047605c4ac6dd020445399998294a23748c7b79de93531dc2bbd529c0f784aea48a
+AUX prosody.initd-r2 1067 SHA256 5d506c6dac3bb6a0c7992d666a3e9965e49c4d0076f902f68c4ae2b73308fe10 SHA512 6e16462a39fb72bbf7b312b5e02ea1ca766576b18ab0304e48fc8e123c4241fad1d784266d00b63a25ac7d36524cedbf5eb0cafe3a7e745082b50b87a2a9a9da WHIRLPOOL 451f89430a94140e36221d26a5a156e07d33a66c7f2102682fc666a4447cdfb8ed248706d054e09d888c94a7b5dcc8aca8364d380a6efaf21a3b5153169bd717
+AUX prosody.service 275 SHA256 55e5256a884b87a3db553fe6475037af21cfc17502f6f30ef2dab9034425dcf7 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c WHIRLPOOL f46a1ccffe1f578c572f227ac97f1991ca8e9eb6c83c3aa506c05ffc87494b8555203dbe6e8e2a3944a377bdadab86ded509fea900afc55ccf27108a1b429fee
+AUX prosody.tmpfilesd 38 SHA256 58af4b6cd2555f26ee6dd7abe9452933d46dc0f8aa1491fd170499c40da017a5 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc WHIRLPOOL c097006046add8f8e29960e70f81e8bbe54521aaa35f885d8bb915467b1ffc95ecfe893562e3a0e37c327cce4d47ca12ff8c8bf3cdea9df65dd640b578edb006
+DIST prosody-0.10.0.tar.gz 330461 SHA256 7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498 SHA512 ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9 WHIRLPOOL 87236bbf3419b7de89eb8aa7471960eccb5e514ab8dfb256fad2d30865278ba437dcfc4f80f6e856c733a9cbf002af9b4d71b198afc8709d8343fca10caa983e
+DIST prosody-0.9.10.tar.gz 267380 SHA256 4836eefed4d9bbb632cba24ac5bd8e9bc7c029a79d06084b00ffc70858d1662f SHA512 4453fb596704b6a248a52dedc00cfc77edbee1fad502f1197b04c2148092389a294c152c3ba36203f51831d51ee2b915c15382ac86fcff4f35696ecacf926574 WHIRLPOOL 9312a0bfc856b723d02cd5a92fd4d93e3cf1f4335263d6d5d8bb8c6f44bda7b0e038cc9ad5fbdc5ea0e5623bf11b695a65b02ee4ad5134c713c05e5f4502a96c
+DIST prosody-0.9.11.tar.gz 267832 SHA256 32bff4c323747f768c61b5c9a23790126d33258e96d4e589920b4c3d88b67256 SHA512 9de11e130f88d1f9a830a4cd9ad90c0176d97977c81fd7a4405ce735f12d23eaa0bb0f124ce406102c2d072247133bddf371256d696e806cac9ef4bf0821684f WHIRLPOOL 5970e61130e231d980f0d3c80ce98269b888a62da3e15ab82ed1530eece7c5af3a1726b626f3fb2dc33faeff8776bbaffb5fb2e0cd6f886c181e90cc972b5343
+DIST prosody-0.9.12.tar.gz 267869 SHA256 1a59a322b71928a21985522aa00d0eab3552208d7bf9ecb318542a1b2fee3e8d SHA512 e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76 WHIRLPOOL 81355f1c77e8cf5537b44f5d472e44be0c906118f26476a5614252a31b23120f995e70ef1766ec4c9ae9a1bba5f24c876ad6a59e0496723533c6bacda00eb393
+EBUILD prosody-0.10.0-r1.ebuild 2484 SHA256 3526069d69ba4d5bf9c1b3ec15e312b5d3eac5bf7e62e23c05fc609ab6caf87f SHA512 6f527e312dfa4ff3332ce418fec50a3a40d8bfb0c72808bbc48d0251f203cc17b73f737fef8ca169e3b79c6ca2282818b985225797cfaecb66786869e752d6e6 WHIRLPOOL 46c13d7de55075cc2498691243e8885830153c3c73b5d1325613d599836ca09effca04acab13da5087c265b08089ad6d1f74743f5da2d546524f8fe95d5bd07f
+EBUILD prosody-0.9.10.ebuild 2487 SHA256 225218e44cc986635fc90f3156a36db094696e005bd804e6a2c7ba6006853d78 SHA512 cd6822c142e94ab192631c5f818cbc00595d4ca2a9b7fb7d37edd5f4a943f4d2c8809879191540d2eb6b55406fa042d5f89bff9f830a0ab21776f6448dab14b7 WHIRLPOOL 8d80651c6b9461916fe9ea11d8a15a3b2ea74dd699d25adc2a573834e132c5f12761a11c4e99b52f42ad434bd77741a81b9166c3dc3c96db3484f3655c4e4da6
+EBUILD prosody-0.9.11.ebuild 2482 SHA256 023c2dcbd490ea692df9200835900307c2f74ccac93cb37a8a40c0e712555b7a SHA512 c2cf0947fd2119f7266b7fdc60a9596704083f4d61ab6b1d316605e87016f02e03627b8281c1a42172462f6a9f716ab6a8a19ed8c20d7d0500683fb5146bb003 WHIRLPOOL ba5183966739ce953ab935e46990ff6739523531e2922a48bdff4d4e26b33c8627af7ad6e680e59fbf2f9cb0fa73529c5e995d180a5fc3a55ed96f0ebb60886d
+EBUILD prosody-0.9.12.ebuild 2485 SHA256 9b56ed3951b31786f325a2ee1c69472c600095c2fd8ad8e9c569ddff38677a44 SHA512 24a4e28725a7a369952eaaa24fa9f7c0553a5a832dcc7ff0d22b48843dea83461398ce73f922616ede90962e37196d530a8ed93358f39e9733580e224e501611 WHIRLPOOL 52d1ba2546f7f76468adff6fc3212453a2d2029ba36097cbdda7e9ac947fb8fe1727b9e1033d4257f8a1c07c68cd65540939da94cf2dff52f2e378018a854485
+MISC ChangeLog 5129 SHA256 bd913f7dbdca67b9d5b0669f363849fca80f4a39a1dbe6668caa6bc2222b5855 SHA512 c827e3ca9b1f7350333ecd616b8dcd234b31add8dae1ad9776b0477fd3d86f7cc3213ecaf84837fc3ad22e86ce475f0c3c967a6238a4146d8946ba1d17434d00 WHIRLPOOL 3c85871c78a000fa6d1109bcbc292652a42f71c827e51d0be31dfdf39130755079ec61f6a8afb9db65e6ebb78e2dcada3b814c85793b6111013e1674df2421f2
+MISC ChangeLog-2015 8499 SHA256 3fbdf4e095050bc3733a8e40c0175f0efcdb50ce8db729914bdb36420aba694f SHA512 b4c4b232475d7d70bab6cd92e2c1b8eec7ef30282ffc94b5ebcd731bde0018ec971783e77a512e5a3f757820194ac985fe0782f0027b8e0d3b0c8887aa5c6b5d WHIRLPOOL 3096e160e4957290decaf851b8744fc640e597183ccd455db71087ec23b840fa9a79518326bfbd633d8d4c036cd9b419c1d839135411920950391d0eedc454b0
+MISC metadata.xml 624 SHA256 d25bab1a2c6509da9c75b812a1067953743bb3604393c9da0fdaa71711691b6b SHA512 0410e3372d04163cc8b5e03d95f5c0c7e7e6da4e6034adfd86700455c6662d844e8da5590dbd5a633179dd8c3da15760b49d3068787ed61833c9031cec341a24 WHIRLPOOL 150cdeb35016e252caa754dbc3a79f21d02b43bbbbdbaa2b655b8e4067ae7dc3bbe1fe58372883cd0a5daad303fa4df3233d791e14849aef4d51af57421d7175
diff --git a/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch b/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch
new file mode 100644
index 000000000000..d0600ac6d67a
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch
@@ -0,0 +1,41 @@
+--- prosody-0.10.0/prosody.cfg.lua.dist	2017-10-05 11:27:20.852452270 +0200
++++ prosody-0.10.0-gentoo/prosody.cfg.lua.dist	2017-10-05 11:29:07.151997654 +0200
+@@ -1,5 +1,3 @@
+--- Prosody Example Configuration File
+---
+ -- Information on configuring Prosody can be found on our
+ -- website at https://prosody.im/doc/configure
+ --
+@@ -9,8 +7,6 @@
+ -- If there are any errors, it will let you know what and where
+ -- they are, otherwise it will keep quiet.
+ --
+--- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+--- blanks. Good luck, and happy Jabbering!
+ 
+ 
+ ---------- Server-wide settings ----------
+@@ -80,6 +76,12 @@
+ 		--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
+ }
+ 
++-- Settings for Gentoo init script and net-im/jabber-base permissions system:
++daemonize = true;
++prosody_user = "jabber";
++prosody_group = "jabber";
++pidfile = "/var/run/jabber/prosody.pid";
++
+ -- These modules are auto-loaded, but should you want
+ -- to disable them then uncomment them here:
+ modules_disabled = {
+@@ -161,8 +163,8 @@
+ -- Logging configuration
+ -- For advanced logging see https://prosody.im/doc/logging
+ log = {
+-	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+-	error = "prosody.err";
++	info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++	error = "/var/log/jabber/prosody.err";
+ 	-- "*syslog"; -- Uncomment this for logging to syslog
+ 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
diff --git a/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch b/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch
new file mode 100644
index 000000000000..15c09a24fd80
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch
@@ -0,0 +1,52 @@
+diff -ru prosody-0.9.2/prosody.cfg.lua.dist prosody-0.9.2-gentoo/prosody.cfg.lua.dist
+--- prosody-0.9.2/prosody.cfg.lua.dist	2013-12-08 19:05:39.000000000 +0100
++++ prosody-0.9.2-gentoo/prosody.cfg.lua.dist	2014-01-27 03:00:44.929196948 +0100
+@@ -1,5 +1,3 @@
+--- Prosody Example Configuration File
+---
+ -- Information on configuring Prosody can be found on our
+ -- website at http://prosody.im/doc/configure
+ --
+@@ -7,9 +5,6 @@
+ -- when you have finished by running: luac -p prosody.cfg.lua
+ -- If there are any errors, it will let you know what and where
+ -- they are, otherwise it will keep quiet.
+---
+--- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+--- blanks. Good luck, and happy Jabbering!
+ 
+ 
+ ---------- Server-wide settings ----------
+@@ -63,7 +58,7 @@
+ 		--"http_files"; -- Serve static files from a directory over HTTP
+ 
+ 	-- Other specific functionality
+-		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
++		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. (Keep enabled for Gentoo.)
+ 		--"groups"; -- Shared roster support
+ 		--"announce"; -- Send announcement to all online users
+ 		--"welcome"; -- Welcome users who register accounts
+@@ -72,6 +67,12 @@
+ 		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+ };
+ 
++-- Settings for Gentoo init script and net-im/jabber-base permissions system:
++daemonize = true;
++prosody_user = "jabber";
++prosody_group = "jabber";
++pidfile = "/var/run/jabber/prosody.pid";
++
+ -- These modules are auto-loaded, but should you want
+ -- to disable them then uncomment them here:
+ modules_disabled = {
+@@ -139,8 +140,8 @@
+ -- Logging configuration
+ -- For advanced logging see http://prosody.im/doc/logging
+ log = {
+-	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+-	error = "prosody.err";
++	info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++	error = "/var/log/jabber/prosody.err";
+ 	-- "*syslog"; -- Uncomment this for logging to syslog
+ 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
diff --git a/net-im/prosody/files/prosody.initd-r2 b/net-im/prosody/files/prosody.initd-r2
new file mode 100644
index 000000000000..a6b623dd6225
--- /dev/null
+++ b/net-im/prosody/files/prosody.initd-r2
@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prosody is a server for Jabber/XMPP written in Lua."
+description_reload="Reload configuration and reopen log files."
+extra_started_commands="reload"
+pidfile="/var/run/jabber/prosody.pid"
+
+depend() {
+	use dns
+	need net
+	provide jabber-server
+}
+
+checkconfig() {
+	if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
+		eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
+		return 1
+	fi
+	luac -p /etc/jabber/prosody.cfg.lua
+	return $?
+}
+
+start() {
+	checkconfig || return 1
+	checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})"
+	checkpath -q -f -m 0770 -o jabber:jabber "${pidfile}"
+	checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
+	ebegin "Starting Prosody XMPP Server"
+	prosodyctl start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Prosody XMPP Server"
+	prosodyctl stop
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration of Prosody XMPP Server"
+	prosodyctl reload
+	eend $?
+}
diff --git a/net-im/prosody/files/prosody.service b/net-im/prosody/files/prosody.service
new file mode 100644
index 000000000000..5c5ea87bd542
--- /dev/null
+++ b/net-im/prosody/files/prosody.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Prosody XMPP (Jabber) server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/jabber/prosody.pid
+ExecStart=/usr/bin/prosodyctl start
+ExecReload=/usr/bin/prosodyctl reload
+ExecStop=/usr/bin/prosodyctl stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd b/net-im/prosody/files/prosody.tmpfilesd
new file mode 100644
index 000000000000..924ba434659c
--- /dev/null
+++ b/net-im/prosody/files/prosody.tmpfilesd
@@ -0,0 +1 @@
+d /var/run/jabber   710 jabber jabber
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
new file mode 100644
index 000000000000..fa12c884ddaf
--- /dev/null
+++ b/net-im/prosody/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>zx2c4@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="libevent">Use libevent for event handling</flag>
+    <flag name="zlib">Support for compressing XMPP streams with mod_compression</flag>
+    <flag name="jit">Use LuaJIT instead of vanilla Lua</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-im/prosody/prosody-0.10.0-r1.ebuild b/net-im/prosody/prosody-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..d93d0e7b645a
--- /dev/null
+++ b/net-im/prosody/prosody-0.10.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib systemd versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="http://prosody.im/"
+SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
+
+DEPEND="net-im/jabber-base
+		dev-lua/LuaBitOp
+		!jit? ( >=dev-lang/lua-5.1:0 )
+		jit? ( dev-lang/luajit:2 )
+		>=net-dns/libidn-1.1
+		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
+RDEPEND="${DEPEND}
+		>=dev-lua/luaexpat-1.3.0
+		dev-lua/luafilesystem
+		ipv6? ( >=dev-lua/luasocket-3 )
+		!ipv6? ( dev-lua/luasocket )
+		libevent? ( >=dev-lua/luaevent-0.4.3 )
+		mysql? ( dev-lua/luadbi[mysql] )
+		postgres? ( dev-lua/luadbi[postgres] )
+		sqlite? ( dev-lua/luadbi[sqlite] )
+		ssl? ( dev-lua/luasec )
+		zlib? ( dev-lua/lua-zlib )"
+
+S=${WORKDIR}/${MY_P}
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.10.0-cfg.lua.patch"
+	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+		 Makefile || die
+}
+
+src_configure() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	append-cflags -D_GNU_SOURCE
+	luajit=""
+	if use jit; then
+		luajit="--runwith=luajit"
+	fi
+	./configure \
+		--ostype=linux $luajit \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/lib64" \
+		--sysconfdir="${JABBER_ETC}" \
+		--datadir="${JABBER_SPOOL}" \
+		--with-lua-include=/usr/include \
+		--with-lua-lib=/usr/$(get_libdir)/lua \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--c-compiler="$(tc-getCC)" \
+		--linker="$(tc-getCC)" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${FILESDIR}/${PN}".service
+	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+}
+
+src_test() {
+	cd tests || die
+	./run_tests.sh || die
+}
diff --git a/net-im/prosody/prosody-0.9.10.ebuild b/net-im/prosody/prosody-0.9.10.ebuild
new file mode 100644
index 000000000000..f6dde4ed98c7
--- /dev/null
+++ b/net-im/prosody/prosody-0.9.10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib systemd versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="http://prosody.im/"
+SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
+
+DEPEND="net-im/jabber-base
+		!jit? ( >=dev-lang/lua-5.1:0 )
+		jit? ( dev-lang/luajit:2 )
+		>=net-dns/libidn-1.1
+		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
+RDEPEND="${DEPEND}
+		>=dev-lua/luaexpat-1.3.0
+		dev-lua/luafilesystem
+		ipv6? ( >=dev-lua/luasocket-3 )
+		!ipv6? ( dev-lua/luasocket )
+		libevent? ( >=dev-lua/luaevent-0.4.3 )
+		mysql? ( dev-lua/luadbi[mysql] )
+		postgres? ( dev-lua/luadbi[postgres] )
+		sqlite? ( dev-lua/luadbi[sqlite] )
+		ssl? ( <dev-lua/luasec-0.6 )
+		zlib? ( dev-lua/lua-zlib )"
+
+S=${WORKDIR}/${MY_P}
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
+	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+		 Makefile || die
+}
+
+src_configure() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	append-cflags -D_GNU_SOURCE
+	luajit=""
+	if use jit; then
+		luajit="--runwith=luajit"
+	fi
+	./configure \
+		--ostype=linux $luajit \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/lib64" \
+		--sysconfdir="${JABBER_ETC}" \
+		--datadir="${JABBER_SPOOL}" \
+		--with-lua-include=/usr/include \
+		--with-lua-lib=/usr/$(get_libdir)/lua \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--c-compiler="$(tc-getCC)" \
+		--linker="$(tc-getCC)" \
+		--require-config || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${FILESDIR}/${PN}".service
+	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+}
+
+src_test() {
+	cd tests || die
+	./run_tests.sh || die
+}
diff --git a/net-im/prosody/prosody-0.9.11.ebuild b/net-im/prosody/prosody-0.9.11.ebuild
new file mode 100644
index 000000000000..56a9af38c7b5
--- /dev/null
+++ b/net-im/prosody/prosody-0.9.11.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib systemd versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="http://prosody.im/"
+SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
+
+DEPEND="net-im/jabber-base
+		!jit? ( >=dev-lang/lua-5.1:0 )
+		jit? ( dev-lang/luajit:2 )
+		>=net-dns/libidn-1.1
+		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
+RDEPEND="${DEPEND}
+		>=dev-lua/luaexpat-1.3.0
+		dev-lua/luafilesystem
+		ipv6? ( >=dev-lua/luasocket-3 )
+		!ipv6? ( dev-lua/luasocket )
+		libevent? ( >=dev-lua/luaevent-0.4.3 )
+		mysql? ( dev-lua/luadbi[mysql] )
+		postgres? ( dev-lua/luadbi[postgres] )
+		sqlite? ( dev-lua/luadbi[sqlite] )
+		ssl? ( dev-lua/luasec )
+		zlib? ( dev-lua/lua-zlib )"
+
+S=${WORKDIR}/${MY_P}
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
+	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+		 Makefile || die
+}
+
+src_configure() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	append-cflags -D_GNU_SOURCE
+	luajit=""
+	if use jit; then
+		luajit="--runwith=luajit"
+	fi
+	./configure \
+		--ostype=linux $luajit \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/lib64" \
+		--sysconfdir="${JABBER_ETC}" \
+		--datadir="${JABBER_SPOOL}" \
+		--with-lua-include=/usr/include \
+		--with-lua-lib=/usr/$(get_libdir)/lua \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--c-compiler="$(tc-getCC)" \
+		--linker="$(tc-getCC)" \
+		--require-config || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${FILESDIR}/${PN}".service
+	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+}
+
+src_test() {
+	cd tests || die
+	./run_tests.sh || die
+}
diff --git a/net-im/prosody/prosody-0.9.12.ebuild b/net-im/prosody/prosody-0.9.12.ebuild
new file mode 100644
index 000000000000..5ae7723c7dba
--- /dev/null
+++ b/net-im/prosody/prosody-0.9.12.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib systemd versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="http://prosody.im/"
+SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
+
+DEPEND="net-im/jabber-base
+		!jit? ( >=dev-lang/lua-5.1:0 )
+		jit? ( dev-lang/luajit:2 )
+		>=net-dns/libidn-1.1
+		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
+RDEPEND="${DEPEND}
+		>=dev-lua/luaexpat-1.3.0
+		dev-lua/luafilesystem
+		ipv6? ( >=dev-lua/luasocket-3 )
+		!ipv6? ( dev-lua/luasocket )
+		libevent? ( >=dev-lua/luaevent-0.4.3 )
+		mysql? ( dev-lua/luadbi[mysql] )
+		postgres? ( dev-lua/luadbi[postgres] )
+		sqlite? ( dev-lua/luadbi[sqlite] )
+		ssl? ( dev-lua/luasec )
+		zlib? ( dev-lua/lua-zlib )"
+
+S=${WORKDIR}/${MY_P}
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
+	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+		 Makefile || die
+}
+
+src_configure() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	append-cflags -D_GNU_SOURCE
+	luajit=""
+	if use jit; then
+		luajit="--runwith=luajit"
+	fi
+	./configure \
+		--ostype=linux $luajit \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/lib64" \
+		--sysconfdir="${JABBER_ETC}" \
+		--datadir="${JABBER_SPOOL}" \
+		--with-lua-include=/usr/include \
+		--with-lua-lib=/usr/$(get_libdir)/lua \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--c-compiler="$(tc-getCC)" \
+		--linker="$(tc-getCC)" \
+		--require-config || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${FILESDIR}/${PN}".service
+	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+}
+
+src_test() {
+	cd tests || die
+	./run_tests.sh || die
+}
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
new file mode 100644
index 000000000000..9152ee3562ad
--- /dev/null
+++ b/net-im/psi/Manifest
@@ -0,0 +1,10 @@
+DIST psi-1.2.tar.xz 2138940 SHA256 16ce1b767d40453032cd5d9ad5a9d4c6dba43989acc9a09538da3f74b7c614f5 SHA512 a486f6ee910cc17157849a68aa724608ddbeed319511646f6973a0789da192ec0fed7899024ad169c5b0e604372025dad7a58bacd223723d35ea490ec7f00b20 WHIRLPOOL 2a0f37067a085b3ce93864905367fa56584666bee6697bdae8f4eedd74cdf15f7be9eee85ba23440cb39a11e384e5ce7218a408042203fe70b398058a69b7867
+DIST psi-1.3.tar.xz 2143076 SHA256 59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b SHA512 b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe WHIRLPOOL 4fdccf0b730e86a2b44c417ffdb83e0f5acab714e8a00badfed6b3095159a10c11bd8ab1a5656172e12920ff72e20178eca93257974d538152cff7cf49424e47
+DIST psi-l10n-1.2.tar.gz 2992381 SHA256 8a16c2d67c0aafbaa296fe06cd6b7de5f32683487b10245b10e8baae63b8f789 SHA512 946b86d12e76fe9a44f1adc154140a02f3d575e57b5f67c8d95472241c6d4510d1b4be81d8914d5670b15ea8ad1b836aa63fc62c3de94e0091b39e2fb234a130 WHIRLPOOL 6cd52e0dcd76f7df3137055de9d9e4518b1adfb8d6f03e9af59e0a49b01933c400d15671b252ea529543eab8f14aae34be8432c43bb28d9233f57833c0517718
+DIST psi-l10n-1.3.tar.gz 2991441 SHA256 122fb6e45e511fe96d8a84beb86e8e6fcb11500f468f9e97b52fddf193041378 SHA512 22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090 WHIRLPOOL 6aa0b6bbba0feceda1ca38bcff0166d3e6e0ed2b81bfd15bdfeabfac29411f114fbc7a6c27650a7e00f5b89bd53ef47763fd7013cd3cd9233a01612181e7b4c8
+EBUILD psi-1.2.ebuild 2975 SHA256 7e02a8cf358a4ecbd45d485d2be7248edb5a448ab7d39eb0d016848f3f692e42 SHA512 910c5eff50e0dd3150f4c61342586bb38cfe5936b497ec8349694eae469d9d28364af78c5d1c7624ae615c1fb5db09c2f6f6dab4662372545c47e9c5700767aa WHIRLPOOL 407202ea432d6a2fadbf7d5046387f3c0ba353627fdf4bda440a3fe91d95e363d7673a2e0362e080b6315952e3831343e26d59f351f15321320e9d5e5e6ac94c
+EBUILD psi-1.3.ebuild 2977 SHA256 6eddfb31e1ffc82e57b23cf0a62bb5c2b2a36a520aeb2126f77a1d2b06ac8a02 SHA512 c31f84f1172757b8ef18b23665c449c544239bf2a8134bd69d8bf05b7cee49c74ba96564ed0ef070a7772ba5e9fe11fe6ccf7c98e3cc90e5d54a9ebf6dfbf228 WHIRLPOOL 95359daefa890da42217d5fcaaacfda8623d0657b529779b14d40a25336fbf462a3d5a0c6041cbec168f778d4724bd8b477d13abfb107ec8ba16de0d907184c4
+EBUILD psi-9999.ebuild 5084 SHA256 79f3160a3055c705310936df44e6f951cc949cf4946474b0397725328a1f3a15 SHA512 e2717a24e165e8314b8ec8f7706c2fe1c4039bbccb2c35bfeb6f36368725dee3089438f0fda511bc07c57e809b73b4548d43c2bf80ea90df8d0fe6842f5c9c35 WHIRLPOOL 97fd90c25531355c2a94dc8e27de73b74a8b8f765bd2560e40d9b1848d5ff4a999abc789ca7c9e21e618668d32b646a4a4643aa8791d3908bd42c763d417d497
+MISC ChangeLog 4566 SHA256 72d45b68ce7288d0113519e64135d9a631f2ecbb5568ab3ad7b215f218eab1f0 SHA512 8f6080ec5069848472953de765e82d73500952d49cc0d2a63900623be0f13d5d0d8395ca1e1b7995e6e64017a6faaecd3722782df24f43c7780e50dbf5173054 WHIRLPOOL 7c05de788d6cef1aa2b2167ac9e4894319ba8f47f344d40b88b9c221287cd1cb76bb0411a1b20c6b95716e3ebdf163319e989ee91082acb09785fe2f41dd38de
+MISC ChangeLog-2015 36216 SHA256 7b3d30147201ffcffc6b9036dcf8f2f34afd519ff1c90ad48955cd3cdb9cf178 SHA512 68b71f5cfd1b3f26c53d29c324bdf6f674e7365dbb5f8cff88a76256a680fe2d34c1f67b60ade688b5e9afeff53999aad9480040a27014360fb0ee268136ec4f WHIRLPOOL 7041cc58ba0e293129d9b5126daca6dfd88859cb59a9953e949d2c25f414bc26d0525852fbb5967e9a1e04fe490176a61e5ad00c290fe258b404f47701aa7a85
+MISC metadata.xml 1295 SHA256 15f3c621cdb923ff5a7fe60ad893a7fde48ba8ea4c1568d2bd64a755d884efcf SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820 WHIRLPOOL 4d96856f87850d888649dbed6659c1c8ed5e0ac7996037af10468491d3bea6350da03c82c21c6c51e6bb3f1e5a580d247ea7001374cadb9cc7feec94ff4790aa
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
new file mode 100644
index 000000000000..96ff15122396
--- /dev/null
+++ b/net-im/psi/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rion4ik@gmail.com</email>
+		<name>Sergey Ilinykh</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Psi is a very good XMPP client that uses Qt</longdescription>
+	<use>
+		<flag name='aspell'>Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
+		<flag name='enchant'>Enable spellchecking using <pkg>app-text/enchant</pkg></flag>
+		<flag name='extras'>Enable Psi+ patcheset</flag>
+		<flag name='hunspell'>Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
+		<flag name='iconsets'>Install additional iconsets, some of them has not clear licensing</flag>
+		<flag name='sql'>Enable psi-new-history extras patch</flag>
+		<flag name='webengine'>Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag>
+		<flag name='webkit'>Enable themed, html-based chatlogs</flag>
+		<flag name='whiteboarding'>Enable experimental interactive SVG drawing</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">psi-im/psi</remote-id>
+		<remote-id type="sourceforge">psi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
new file mode 100644
index 000000000000..92f7233fa5a6
--- /dev/null
+++ b/net-im/psi/psi-1.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils xdg-utils
+
+DESCRIPTION="Qt XMPP client"
+HOMEPAGE="http://psi-im.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	https://github.com/psi-im/psi-l10n/archive/1.2.tar.gz -> psi-l10n-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aspell crypt dbus debug doc enchant +hunspell ssl webengine webkit whiteboarding xscreensaver"
+
+# qconf generates not quite compatible configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+REQUIRED_USE="
+	?? ( aspell enchant hunspell )
+	webengine? ( !webkit )
+"
+
+RDEPEND="
+	app-crypt/qca:2[qt5]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	net-dns/libidn
+	sys-libs/zlib[minizip]
+	x11-libs/libX11
+	x11-libs/libxcb
+	aspell? ( app-text/aspell )
+	dbus? ( dev-qt/qtdbus:5 )
+	enchant? ( >=app-text/enchant-1.3.0 )
+	hunspell? ( app-text/hunspell:= )
+	webengine? (
+		>=dev-qt/qtwebchannel-5.7:5
+		>=dev-qt/qtwebengine-5.7:5[widgets]
+	)
+	webkit? ( dev-qt/qtwebkit:5 )
+	whiteboarding? ( dev-qt/qtsvg:5 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+PDEPEND="
+	crypt? ( app-crypt/qca[gpg] )
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+
+RESTRICT="test"
+
+src_configure() {
+	CONF=(
+		--no-separate-debug-info
+		--qtdir="$(qt5_get_bindir)/.."
+		$(use_enable aspell)
+		$(use_enable dbus qdbus)
+		$(use_enable enchant)
+		$(use_enable hunspell)
+		$(use_enable xscreensaver xss)
+		$(use_enable whiteboarding)
+	)
+
+	use debug && CONF+=("--debug")
+	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
+	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
+
+	econf "${CONF[@]}"
+
+	eqmake5 psi.pro
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc api_public
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# this way the docs will be installed in the standard gentoo dir
+	rm "${ED}"/usr/share/psi/{COPYING,README} || die "Installed file set seems to be changed by upstream"
+	newdoc iconsets/roster/README README.roster
+	newdoc iconsets/system/README README.system
+	newdoc certs/README README.certs
+	dodoc README
+
+	use doc && HTML_DOCS=( doc/api/. )
+	einstalldocs
+
+	# install translations
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+	cd "${WORKDIR}/psi-l10n-${PV}" || die
+	insinto /usr/share/psi
+	install_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed"
+		doins "translations/${PN}_${1}.qm"
+	}
+	l10n_for_each_locale_do install_locale
+}
+
+pkg_postinst()
+{
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/psi/psi-1.3.ebuild b/net-im/psi/psi-1.3.ebuild
new file mode 100644
index 000000000000..3d47e6fece4d
--- /dev/null
+++ b/net-im/psi/psi-1.3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils xdg-utils
+
+DESCRIPTION="Qt XMPP client"
+HOMEPAGE="http://psi-im.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> psi-l10n-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aspell crypt dbus debug doc enchant +hunspell ssl webengine webkit whiteboarding xscreensaver"
+
+# qconf generates not quite compatible configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+REQUIRED_USE="
+	?? ( aspell enchant hunspell )
+	webengine? ( !webkit )
+"
+
+RDEPEND="
+	app-crypt/qca:2[qt5]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	net-dns/libidn
+	sys-libs/zlib[minizip]
+	x11-libs/libX11
+	x11-libs/libxcb
+	aspell? ( app-text/aspell )
+	dbus? ( dev-qt/qtdbus:5 )
+	enchant? ( >=app-text/enchant-1.3.0 )
+	hunspell? ( app-text/hunspell:= )
+	webengine? (
+		>=dev-qt/qtwebchannel-5.7:5
+		>=dev-qt/qtwebengine-5.7:5[widgets]
+	)
+	webkit? ( dev-qt/qtwebkit:5 )
+	whiteboarding? ( dev-qt/qtsvg:5 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+PDEPEND="
+	crypt? ( app-crypt/qca[gpg] )
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+
+RESTRICT="test"
+
+src_configure() {
+	CONF=(
+		--no-separate-debug-info
+		--qtdir="$(qt5_get_bindir)/.."
+		$(use_enable aspell)
+		$(use_enable dbus qdbus)
+		$(use_enable enchant)
+		$(use_enable hunspell)
+		$(use_enable xscreensaver xss)
+		$(use_enable whiteboarding)
+	)
+
+	use debug && CONF+=("--debug")
+	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
+	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
+
+	econf "${CONF[@]}"
+
+	eqmake5 psi.pro
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc api_public
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# this way the docs will be installed in the standard gentoo dir
+	rm "${ED}"/usr/share/psi/{COPYING,README} || die "Installed file set seems to be changed by upstream"
+	newdoc iconsets/roster/README README.roster
+	newdoc iconsets/system/README README.system
+	newdoc certs/README README.certs
+	dodoc README
+
+	use doc && HTML_DOCS=( doc/api/. )
+	einstalldocs
+
+	# install translations
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+	cd "${WORKDIR}/psi-l10n-${PV}" || die
+	insinto /usr/share/psi
+	install_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed"
+		doins "translations/${PN}_${1}.qm"
+	}
+	l10n_for_each_locale_do install_locale
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
new file mode 100644
index 000000000000..20f9be17efad
--- /dev/null
+++ b/net-im/psi/psi-9999.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n git-r3 qmake-utils xdg-utils
+
+DESCRIPTION="Qt XMPP client"
+HOMEPAGE="http://psi-im.org/"
+
+PSI_URI="https://github.com/psi-im"
+PSI_PLUS_URI="https://github.com/psi-plus"
+EGIT_REPO_URI="${PSI_URI}/${PN}.git"
+PSI_LANGS_URI="${PSI_URI}/psi-l10n.git"
+PSI_PLUS_LANGS_URI="${PSI_PLUS_URI}/psi-plus-l10n.git"
+EGIT_MIN_CLONE_TYPE="single"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl webengine webkit whiteboarding xscreensaver"
+
+# qconf generates not quite compatible configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+REQUIRED_USE="
+	?? ( aspell enchant hunspell )
+	iconsets? ( extras )
+	sql? ( extras )
+	webengine? ( !webkit )
+"
+
+RDEPEND="
+	app-crypt/qca:2[qt5]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	net-dns/libidn
+	sys-libs/zlib[minizip]
+	x11-libs/libX11
+	x11-libs/libxcb
+	aspell? ( app-text/aspell )
+	dbus? ( dev-qt/qtdbus:5 )
+	enchant? ( >=app-text/enchant-1.3.0 )
+	extras? (
+		sql? ( dev-qt/qtsql:5 )
+	)
+	hunspell? ( app-text/hunspell:= )
+	webengine? (
+		>=dev-qt/qtwebchannel-5.7:5
+		>=dev-qt/qtwebengine-5.7:5[widgets]
+	)
+	webkit? ( dev-qt/qtwebkit:5 )
+	whiteboarding? ( dev-qt/qtsvg:5 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	extras? ( >=sys-devel/qconf-2.3 )
+"
+PDEPEND="
+	crypt? ( app-crypt/qca[gpg] )
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+
+RESTRICT="test iconsets? ( bindist )"
+
+pkg_setup() {
+	MY_PN=psi
+	if use extras; then
+		MY_PN=psi-plus
+		echo
+		ewarn "You're about to build patched version of Psi called Psi+."
+		ewarn "It has new nice features not yet included to Psi."
+		ewarn "Take a look at homepage for more info: http://psi-plus.com/"
+		echo
+
+		if use iconsets; then
+			echo
+			ewarn "Some artwork is from open source projects, but some is provided 'as-is'"
+			ewarn "and has not clear licensing."
+			ewarn "Possibly this build is not redistributable in some countries."
+		fi
+	fi
+}
+
+src_unpack() {
+	git-r3_src_unpack
+
+	# fetch translations
+	unset EGIT_BRANCH EGIT_COMMIT
+	EGIT_REPO_URI=$(usex extras "${PSI_PLUS_LANGS_URI}" "${PSI_LANGS_URI}")
+	EGIT_CHECKOUT_DIR="${WORKDIR}/psi-l10n"
+	git-r3_src_unpack
+
+	if use extras; then
+		unset EGIT_BRANCH EGIT_COMMIT
+		EGIT_CHECKOUT_DIR="${WORKDIR}/psi-plus" \
+		EGIT_REPO_URI="${PSI_PLUS_URI}/main.git" \
+		git-r3_src_unpack
+
+		if use iconsets; then
+			unset EGIT_BRANCH EGIT_COMMIT
+			EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \
+			EGIT_REPO_URI="${PSI_PLUS_URI}/resources.git" \
+			git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	if use extras; then
+		cp -a "${WORKDIR}/psi-plus/iconsets" "${S}" || die "failed to copy iconsets"
+		if use iconsets; then
+			cp -a "${WORKDIR}/resources/iconsets" "${S}" || die "failed to copy additional iconsets"
+		fi
+
+		eapply "${WORKDIR}/psi-plus/patches"/*.diff
+		use sql && eapply "${WORKDIR}/psi-plus/patches/dev/psi-new-history.patch"
+
+		vergen="${WORKDIR}/psi-plus/admin/psi-plus-nightly-version"
+		features="$(use webkit && echo '--webkit') $(use webengine && echo '--webengine') $(use sql && echo '--sql')"
+		NIGHTLY_VER=$("${vergen}" ./ $features)
+		elog "Prepared version: ${NIGHTLY_VER}"
+		echo "${NIGHTLY_VER}" > version || die "Failed to write version file"
+
+		qconf || die "Failed to create ./configure."
+	fi
+}
+
+src_configure() {
+	CONF=(
+		--no-separate-debug-info
+		--qtdir="$(qt5_get_bindir)/.."
+		$(use_enable aspell)
+		$(use_enable dbus qdbus)
+		$(use_enable enchant)
+		$(use_enable hunspell)
+		$(use_enable xscreensaver xss)
+		$(use_enable whiteboarding)
+	)
+
+	use debug && CONF+=("--debug")
+	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
+	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
+
+	econf "${CONF[@]}"
+
+	eqmake5 psi.pro
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc api_public
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# this way the docs will be installed in the standard gentoo dir
+	rm "${ED}"/usr/share/${MY_PN}/{COPYING,README} || die "Installed file set seems to be changed by upstream"
+	newdoc iconsets/roster/README README.roster
+	newdoc iconsets/system/README README.system
+	newdoc certs/README README.certs
+	dodoc README
+
+	use doc && HTML_DOCS=( doc/api/. )
+	einstalldocs
+
+	# install translations
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+	cd "${WORKDIR}/psi-l10n" || die
+	insinto /usr/share/${MY_PN}
+	install_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed"
+		doins "translations/${PN}_${1}.qm"
+	}
+	l10n_for_each_locale_do install_locale
+}
+
+pkg_postinst(){
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/purple-events/Manifest b/net-im/purple-events/Manifest
new file mode 100644
index 000000000000..b1d1a047a440
--- /dev/null
+++ b/net-im/purple-events/Manifest
@@ -0,0 +1,7 @@
+DIST purple-events-0.2.tar.xz 223180 SHA256 f0908efb74fb56acaf42e1155878c610ba8271a44509e91ae4e02bd1214aa24c SHA512 2efbeae39d45157f37d6fcc8e45d89980d2adc025d64ec194a5784b0616c8bef80929549a26ce814a4fa8c5cf9fd1621155bcd4fb6d35e6104d318a76b9c4e63 WHIRLPOOL 0f59c66b3c7bb8ce8059b2266038775ba8d5b25ec0a03c309dd497591e91c523dc8c0bb2faa6dd463dcb05bbe03984c9a6dc196ebb06a93a6f5fc49098a3d02d
+DIST purple-events-0.99.1.tar.gz 24437 SHA256 178ea872947155e26222ad0ddce3d22ab97707f27d5ed5e867e9367cd80f3872 SHA512 105126fd0dbcc74d6a5878308e43ff27df4c9f1ec20601f382419cb8ebbe1a39e44da6327be86d779dbc66f6251699126776fc8389cdf48dc1569ae6bd8fa6fb WHIRLPOOL e38a449a41adc6fbea94b03ccd32554777a396fd79d39d61734592f438ca655eb33da20db27d54dcb0ba95091613082dd22aba363b7bc6fba402940d90a3746f
+EBUILD purple-events-0.2.ebuild 491 SHA256 39bb31c5c9da07f3151bda2cd469b097a58c9632164c8eee5ac63ccecde11434 SHA512 6fee6d318f07a363914730ab67c608a5b165e39c22ce69ae921473093635d7cd81eb2a4ebce1340d809b5523fca07dc5e53c23fb9fb9d8672d345563480e6f09 WHIRLPOOL 6f1356dd6b6b8812d6eb48a3caebb0e4e3aa8be1835c07a9dcb12f19bce4529677e4e6bc62f08eaf175be644bea39028b156b60c81025c205c22675beb337bd4
+EBUILD purple-events-0.99.1.ebuild 585 SHA256 6b06d2996e033569c41422c392baa856aadbed9a5fde5a081ce72992e96d0b1e SHA512 ad0a392feb2af4b87a39de433122b707dea66e157c95f970121206a26eef66db7ed5b4a2c9233aea9cb21912d3ea7a6f1f84937e371b478c2b3b95ed51e54522 WHIRLPOOL 38cdb0f35ca79533edfe88eeecf3241811f3b779c01ae8c581794d176f6a12d677705699d21de9914e92d2705ce9d3c5fb307074cf4676fce094cfbcbc7d1e60
+MISC ChangeLog 2963 SHA256 d3b5e258f3025b596611af547b7dcb73334a1655777bef7ad37dd789f670a5ff SHA512 ec9ef3a6685bc7c6eb12e31097cc1fd516d2c1e4476d8b48d56efff5c266816c9597bd058b31b75a77d0e2382cb952352f331039bbfbd79dade10669f7c32c47 WHIRLPOOL 17ca2885472939e4357971059ef3230cf026f6b9af25a4e7ee7f3b31b67c1b69ad793082e7dac5d56439878775de5439b6b2171af100364f533f82d4a437b59a
+MISC ChangeLog-2015 752 SHA256 5ebc944192a692684f0efd11c1e22c31fcdebef16769c6d87200c32158143e62 SHA512 91f99372243fbc8217afe9f32f3827e95f5f5734eb1c0cf90c772f7b4ba8412ebb10df74f7e4555d1e06960abba0453e0df69d04b896a9b610b25ad0206525be WHIRLPOOL 9159e195296a68eec4ae8dffe0b47d509c4ceda727fc55104c431cabf1888fd25bda37238c43166408fca974cd710489d523f6d979e25e0bbf7aebf872c5154d
+MISC metadata.xml 371 SHA256 cff3a3830a0942eb72bb2b1b8d44fd6b44858a9843c86a90de36e7248a304381 SHA512 1a92967f30ac2254f9a886930fd27fdb2d7e0f01435354c013d69eea3c16743a18bea3a48d81312d2d29085217f30c9b03e7764eb0c4987e7f2ea8beb1ecffe7 WHIRLPOOL 69fcdd045d2d4e2627a00933fb33fa0f341876f7110f38d149548e059696d9efc4f0758958d5ece37303292a51d51b73abc914223c002cfc874d5969104d6d65
diff --git a/net-im/purple-events/metadata.xml b/net-im/purple-events/metadata.xml
new file mode 100644
index 000000000000..3f46e584eca5
--- /dev/null
+++ b/net-im/purple-events/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<maintainer status="active">
+			<email>sardemff7+gentoo@sardemff7.net</email>
+			<name>Quentin “Sardem FF7” Glidic</name>
+		</maintainer>
+		<remote-id type="github">sardemff7/purple-events</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/purple-events/purple-events-0.2.ebuild b/net-im/purple-events/purple-events-0.2.ebuild
new file mode 100644
index 000000000000..f3af9f56c707
--- /dev/null
+++ b/net-im/purple-events/purple-events-0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Allows a fine-grained control over libpurple events"
+HOMEPAGE="http://purple-events.sardemff7.net/"
+SRC_URI="mirror://github/sardemff7/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-silent-rules
+}
diff --git a/net-im/purple-events/purple-events-0.99.1.ebuild b/net-im/purple-events/purple-events-0.99.1.ebuild
new file mode 100644
index 000000000000..4b59ac92ba07
--- /dev/null
+++ b/net-im/purple-events/purple-events-0.99.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Allows a fine-grained control over libpurple events"
+HOMEPAGE="http://purple-events.sardemff7.net/"
+SRC_URI="https://github.com/sardemff7/purple-events/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-im/pyaim-t/Manifest b/net-im/pyaim-t/Manifest
new file mode 100644
index 000000000000..39a32a073e81
--- /dev/null
+++ b/net-im/pyaim-t/Manifest
@@ -0,0 +1,8 @@
+AUX pyaim-t-0.8-initd-r1 606 SHA256 3793bd9b49518de796f81275d227b052d04ecc4b1a03773edfe21064d5ddc619 SHA512 1bf3ac3c520631dd2899766ff847ccff71521bbe6a042b920a8dcd8d1b916b11ba0b7bce303c26fcf425b01d99952b1ddfffbcd6cb66c10a6ae4cda8f2816c00 WHIRLPOOL 1925e7833261d809a02825c2694113785e66890eb0c5deb51d4523b04c1c9db450f6bb005ba0d38a08941e308bb621b14ebb2ab468f7997f89994f4a927622bf
+AUX pyaim-t-0.8.0.1-pillow-imaging.patch 1236 SHA256 a40c1f221a0bec925392750087f1fb9977636467981b9592465947bc06759f70 SHA512 d013553eb5771b104e8b62eebe838199cbaa098f62265e27013296faf152c9a5a5f2dd2d972a3152518bd821c5c492ed615749444e76d72948e85554c83b84bd WHIRLPOOL adc1fa83b3dd2ac3a68b93c01fd1ddcf4e81f774c7e43700414f4e7fad5ee37490ef64b729d920199cd9cca05560aacc6d66a0a451a87159ae26fa5b0485c67a
+AUX pyaim-t-0.8.0.1-python26-warnings.patch 3678 SHA256 22ba536c958395cd0fc47a0c9f8590f6a9c9cf3338e6c5cd29a554ee0d8fff37 SHA512 fdf3caf1edbefbec7a1eaa61e25ef2d014be86d17bbfbccd4e85eaea0e2f4d227426820de09573d443c3c9d9588c6b901578f8935c541615bc765b3dd7d73cc4 WHIRLPOOL 65c15b9c395de1a52cb3e427ec0161a72604e3ef0fa0a4097d9a535cb5790b18f2288559d365ea845c1f0f36eb36799d694594d5e0bcdd91caa55636b8543093
+DIST pyaim-t-0.8.0.1.tar.gz 143968 SHA256 c9447ff37b4d5d49d9ae9e88e694493cb7449008c882edbb0babf4b4dd5c4bfa SHA512 70d92cb99f36452d95b32bda04ad5f4c74387ab4cc40ed3cd06da58285f4f4b5122aa470e34e4fb1dfedc13ef33feafb3ba6a7036caee9d95edb8969df730540 WHIRLPOOL 337e4ce76c6f8997054d3e93be5d11a94121ca99200a2205fb59cc38595e626e4f2307078a9f7d1a22ec73b40298bf91a430db86cba28e8b2178f4681ff8248f
+EBUILD pyaim-t-0.8.0.1-r1.ebuild 1724 SHA256 26be19cf84e76b8ced19c9ee9f75663a9288952deed6cbd69720538833e17a4e SHA512 2f17e19cc537cad89c186f0e97fec2233097f275f4358b4b0241ab91bf3da6ba37b323e3514d46af79116d042eef04e6f5b72b10b4eb3546db7ccf3aef3b9a1a WHIRLPOOL 3d4584c23f9914cc98659c629076201c88eff3bbe0ca2b826ecad5465a0a2d9755f009816b9331c3f79d14a1779d86ca0a759e6b8e4e0caa67fabfeb820315cd
+MISC ChangeLog 3520 SHA256 d0714f1ab64e06abdabd6b57151788852a34fba31e8cfee1282ebf159c7e08b3 SHA512 7f1e4e5959cd07f972010ba91b267be88f9f1c1bf0785ee318996ff2f06524e123e3efdd749a17fa4bf783c413890ea18a38ef3f9fc9b8095df65e51dbbe9f12 WHIRLPOOL 1804ea75fd8c8ce87fdf1aa89fa580a45a9fe6237d160b5249d25d91d5812121657aaef139b593a34beb19644d6059a8e55be898ff5c7471ec6a7dadc2afac29
+MISC ChangeLog-2015 3528 SHA256 945732d41b904fc5bb68eafebb545b57acad2daeaf27cc70f40825455e85dbbd SHA512 d1beb22d208b223039a7a6e283013d0448ed779a065db25587fa2e13e35ffc01e8eb622956279bf4ff14154f7cbaff224bf6a68e3c8a371210e192dadef09ff7 WHIRLPOOL a26d22e99769f69f69d94615371c18fa5b19959a122a8bf304c0182eb357fc0763920d606c89d8bcfda6f80ffc68d67921648da2f3f6424a9b052559d70f5f2a
+MISC metadata.xml 709 SHA256 2ee63ed5a098e099dc605fb0da9db9ccf6da2f5c3007929cf830b4e8fe390cef SHA512 888a405de6859c9cef60a19f5e639363f957ca79a8fbce4ca44736ecf51d0e5810f3c15c2ec8797e06ac52e77481514cc74d2050cbfdfcac0b6c538f516fa3d7 WHIRLPOOL 9b6b8094c300857f627f10bae44e4d84ddc57241d0f81a38089a80e71559a7498fae1fb3fb1e440a0ef8ca2bf486b93e2f3d9a55585b629a4c069fb1a6aa050c
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1 b/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
new file mode 100644
index 000000000000..d823e193c5ae
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting AIM Jabber Transport"
+	checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
+	start-stop-daemon --start --pidfile /var/run/jabber/pyaim-t.pid -u jabber -g jabber \
+		--exec INSPATH/pyaim-t.py -- \
+		-b -c /etc/jabber/pyaim-t.xml -l /var/log/jabber/pyaim-t.log
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping AIM Jabber Transport"
+	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyaim-t.pid
+	eend $?
+}
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
new file mode 100644
index 000000000000..13067925c18a
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
@@ -0,0 +1,36 @@
+diff -Naur pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-1/src/contact.py
+--- pyaimt-0.8.0.1/src/contact.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/src/contact.py	2013-09-18 17:57:12.863780595 +0200
+@@ -13,7 +13,7 @@
+ import globals
+ import base64
+ if not config.disableAvatars:
+-	import Image
++	import PIL.Image as Image
+ import StringIO
+ 
+ 
+diff -Naur pyaimt-0.8.0.1/src/imgmanip.py pyaimt-0.8.0.1-1/src/imgmanip.py
+--- pyaimt-0.8.0.1/src/imgmanip.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/src/imgmanip.py	2013-09-18 17:57:12.863780595 +0200
+@@ -5,7 +5,7 @@
+ 
+ if not config.disableAvatars:
+ 	try:
+-		import Image
++		import PIL.Image as Image
+ 		import StringIO
+ 
+ 		def convertToPNG(imageData):
+diff -Naur pyaimt-0.8.0.1/tools/infodump.py pyaimt-0.8.0.1-1/tools/infodump.py
+--- pyaimt-0.8.0.1/tools/infodump.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/tools/infodump.py	2013-09-18 17:57:12.864780582 +0200
+@@ -41,7 +41,7 @@
+ 	print "Nevow Version: Unknown or Not Installed"
+ 
+ try:
+-	from Image import VERSION
++	from PIL.Image import VERSION
+ 	print "Python Imaging Library (PIL) Version: " + VERSION
+ except:
+ 	print "Python Imaging Library (PIL) Version: Unknown or Not Installed"
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
new file mode 100644
index 000000000000..a6fa52e757e8
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
@@ -0,0 +1,118 @@
+diff -Naur pyaimt-0.8.0.1/src/avatar.py pyaimt-0.8.0.1-py26//src/avatar.py
+--- pyaimt-0.8.0.1/src/avatar.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/avatar.py	2011-08-24 20:30:06.146311346 +0200
+@@ -6,7 +6,7 @@
+ from twisted.words.xish.domish import Element
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
++from hashlib import sha1
+ import base64
+ import os
+ import os.path
+@@ -46,7 +46,7 @@
+ class Avatar:
+ 	""" Represents an Avatar. Does not store the image in memory. """
+ 	def __init__(self, imageData, avatarCache):
+-		self.__imageHash = sha.sha(imageData).hexdigest()
++		self.__imageHash = sha1(imageData).hexdigest()
+ 		self.__avatarCache = avatarCache
+ 
+ 	def getImageHash(self):
+diff -Naur pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-py26//src/contact.py
+--- pyaimt-0.8.0.1/src/contact.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/contact.py	2011-08-24 20:30:06.146311346 +0200
+@@ -8,7 +8,6 @@
+ import config
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
+ import legacy
+ import globals
+ import base64
+diff -Naur pyaimt-0.8.0.1/src/legacy/aimt.py pyaimt-0.8.0.1-py26//src/legacy/aimt.py
+--- pyaimt-0.8.0.1/src/legacy/aimt.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/aimt.py	2011-08-24 20:32:28.187361518 +0200
+@@ -11,7 +11,6 @@
+ import re
+ import time
+ import binascii
+-import md5
+ import imgmanip
+ 
+ 
+diff -Naur pyaimt-0.8.0.1/src/legacy/buddies.py pyaimt-0.8.0.1-py26//src/legacy/buddies.py
+--- pyaimt-0.8.0.1/src/legacy/buddies.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/buddies.py	2011-08-24 20:30:06.147311326 +0200
+@@ -12,7 +12,7 @@
+ import os.path
+ import binascii
+ import os.path
+-import md5
++from hashlib import md5
+ 
+ X = os.path.sep
+ 
+@@ -138,7 +138,7 @@
+ 				avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData))
+ 				c.updateAvatar(avatarData, push=True)
+ 				if not md5Hash:
+-					m = md5.new()
++					m = md5()
+ 					m.update(iconData)
+ 					md5Hash = m.digest()
+ 				if not numHash:
+diff -Naur pyaimt-0.8.0.1/src/legacy/glue.py pyaimt-0.8.0.1-py26//src/legacy/glue.py
+--- pyaimt-0.8.0.1/src/legacy/glue.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/glue.py	2011-08-24 20:31:20.066825898 +0200
+@@ -19,7 +19,7 @@
+ import time
+ import binascii
+ import avatar
+-import md5
++from hashlib import md5
+ 
+ # The name of the transport
+ name = "AIM Transport"
+@@ -450,7 +450,7 @@
+ 			try:
+ 				self.myavatar = imgmanip.convertToJPG(imageData)
+ 				self.myavatarlen = len(self.myavatar)
+-				m=md5.new()
++				m=md5()
+ 				m.update(self.myavatar)
+ 				self.myavatarsum = m.digest()
+ 				self.myavatarstamp = time.time()
+diff -Naur pyaimt-0.8.0.1/src/tlib/oscar.py pyaimt-0.8.0.1-py26//src/tlib/oscar.py
+--- pyaimt-0.8.0.1/src/tlib/oscar.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/tlib/oscar.py	2011-08-24 20:30:22.415200813 +0200
+@@ -20,7 +20,7 @@
+ from scheduler import Scheduler
+ 
+ import struct
+-import md5
++from hashlib import md5
+ import string
+ import socket
+ import random
+@@ -106,9 +106,9 @@
+     return dict,data
+ 
+ def encryptPasswordMD5(password,key):
+-    m=md5.new()
++    m=md5()
+     m.update(key)
+-    m.update(md5.new(password).digest())
++    m.update(md5(password).digest())
+     m.update("AOL Instant Messenger (SM)")
+     return m.digest()
+ 
+@@ -534,7 +534,7 @@
+         self.iconSum = tlvs.get(0xd5,"")
+ 
+     def updateIcon(self, iconData):
+-        m=md5.new()
++        m=md5()
+         m.update(iconData)
+         self.iconSum = m.digest()
+         log.msg("icon sum is %s" % binascii.hexlify(self.iconSum))
diff --git a/net-im/pyaim-t/metadata.xml b/net-im/pyaim-t/metadata.xml
new file mode 100644
index 000000000000..e42a28de7600
--- /dev/null
+++ b/net-im/pyaim-t/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>volkris@gmail.com</email>
+		<name>Chris Carlin</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Python based jabber transport for AIM</longdescription>
+	<use>
+		<flag name="webinterface">Install dependencies needed for the web
+		interface</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">pyaimt</remote-id>
+		<remote-id type="launchpad">ubuntu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
new file mode 100644
index 000000000000..fb672c1c6789
--- /dev/null
+++ b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+MY_PN="pyaimt"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python based jabber transport for AIM"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz -> ${P}.tar.gz
+	https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="webinterface"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	net-im/jabber-base"
+RDEPEND="${DEPEND}
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-words[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python26-warnings.patch"
+	epatch "${FILESDIR}/${P}-pillow-imaging.patch"
+}
+
+src_install() {
+	python_moduleinto ${PN}
+	cp PyAIMt.py ${PN}.py
+	python_domodule ${PN}.py data tools src
+
+	insinto /etc/jabber
+	newins config_example.xml ${PN}.xml
+	fperms 600 /etc/jabber/${PN}.xml
+	fowners jabber:jabber /etc/jabber/${PN}.xml
+	fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py"
+	sed -i \
+		-e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
+		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+		"${ED}/etc/jabber/${PN}.xml" || die
+
+	newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
+	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" "${ED}/etc/init.d/${PN}" || die
+	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
+}
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
new file mode 100644
index 000000000000..dd11a0334ae0
--- /dev/null
+++ b/net-im/pyicq-t/Manifest
@@ -0,0 +1,9 @@
+AUX pyicq-t-0.8-initd-r1 606 SHA256 1a4fdd4c028374e8aaa5e6747c3d6740a4f4061445ae1f170b3a559a157d67c6 SHA512 f8563a7ec081ecbef2f40f7c923ceb43b6abe0ff016df57540fedf3feeff1e06f19fa777324ae97937c46c85344db25ffa7097d259c0e2f4c6bad9b7eaf30971 WHIRLPOOL 7d21acf866e746d8df35d27aa09077055322ec8ce06c8bb94c4c19ce188cdcf04945e15d67fbadd4c7e272e5262a96090dd4d13fd5666035c8b624ae051ae8dc
+AUX pyicq-t-0.8.1.5-pillow-imaging.patch 1236 SHA256 cab74a08da743737a7ee5956e74eb3e40a279bb83d74729d59689c03ccc5d645 SHA512 e7e454493286e02e525cdc6d8b63fbb102eca0f242f046ec30f7541ff1a9579b43bad2250d34a7049d06c9958e4d93304d5f873b84cf2af6fbcaef726a8a5d5b WHIRLPOOL 3378a5dbc1b7502caa65c6e026a37427f32ca8ddffe924aa831c9f51f321605fcee01053a23cdab63ec8840eac5b09d80a3ab88f99e6e1bae656f3c25ff228ac
+AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 SHA256 6e5eff6faf6e87535401a4c697a4d23f35270ecfda1ac56ab73c491cc7baa34a SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949 WHIRLPOOL 387207927e4c0a68f0adeaf7cc3c8201aa0c21e4481e87ad776c7c9f2b45cfb0f7f190e2557f8c7a1f55960dc3831fca2e17109314605ca997da6d66e750f855
+AUX pyicq-t.service 223 SHA256 aef74fac046f4d9ba0beb84d9c8ac7cfcb69baadf7792707e9f7d53756aa826a SHA512 e1df68340f54bc6568308fefcc723323358c27b143cd3258f451ebf06e5f6ac0a7b66d7567543212e5924144164e0d9a2121fb96fa2721b234399a19127850c6 WHIRLPOOL 75ce17d110fa7084e323551eb4819f9407db11dae2a54e0d838447ddcedf7178189c27b46c859cda71a0b5e80dbae28bfb14bc5c9a32ca9ce1d8f538d3077c20
+DIST pyicqt-0.8.1.5.tar.gz 183865 SHA256 15ffa7b7d8f2d749492eec3b87bf64f8a429452282ca14e36ba5aee45b5322df SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde WHIRLPOOL 91a51c81d32bc688d4ffb6f4623ae1efe7e5dc5d524b7fd2f519720dc81078d6547ea64a5311bcfcfae0ad77f8fe7ab933f5b63e3f2887fe4671c71b2a6848d9
+EBUILD pyicq-t-0.8.1.5-r6.ebuild 1732 SHA256 b69172ad71c3b5e0f9515f08ebec3cee97719ee99383114588daf5ad8cc1b2c2 SHA512 b25404c4d29d8542efa53ed1266be9d663fd191b43140de7b9fe326dd67a94994d399000582efc05e77a42f7f85c72c64e87df73d381280b9dfd00f551d0be08 WHIRLPOOL 5a4000d0bbb2930392565d99251f91b59d391b7fffb87be71df0d2be182c6f709492aacc93a73b3723cf9c8590749a2df189294acac6b17c99f3feede49ebc69
+MISC ChangeLog 3837 SHA256 e254c7719aa878cd2c53843c69dc8faf50d6d4bb93d315cc6e30759b27ee3d36 SHA512 b83ea5582b0349d5df426bc1d9356b34d1fc0b681783270f0bff59fe7f4d87f50b9f92dcb1f3e0d37767f760c1d9d8dc6e31597d583a79206513e50ee3b94a1a WHIRLPOOL e6c77a40e9cf0bf581d358e61c0226b72bf1ed9887f8ad09e38dfcbe9a6d6bacaf1945452317dd939b50dceb610fecd1ab8bf383ec57bb99618b635a27c1ec40
+MISC ChangeLog-2015 5702 SHA256 442b475d3220b3391cd2236287ee8ae9b46fb2ce42d260eb5f1b18ee8a50ae56 SHA512 1948e68d2d066710b31b9944bf330c54c000e4ef65e7c57a00376927024c04c7a9b62194e6891e532e39a0c5b731cd0448a219501505f9460dd96bae8ed38478 WHIRLPOOL 03d7889a07227e1c800ae0655fbf456d4c25b77f6345a3ff0c0164f01f281608d6115c31e0a7e6aaaddf059287d4e011bceaded6cd716351dc2bcbefb459d4bf
+MISC metadata.xml 419 SHA256 39fc89c0c64124dd905f4bf7c0ad8abc999f257746c5bd664d0c73c9b7813829 SHA512 1f30a23054f9f867a94d7e899f5be0780b08cf070c9a2831a34f4fbafe03e19dc9fedb023d3825411104a7322e0d0c8b6928a4f30794511371dd9ec7ea2e339f WHIRLPOOL d584ad798ca77700f8952c9f0927f98b5fad3fa5277f4d182c10b750261614c6fdcdb3e7aa839f59c7250ace3c9dde47ca1fd882450a4f42a2d98116ae2262a4
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1
new file mode 100644
index 000000000000..eda03d55077e
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting ICQ Jabber Transport"
+	checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
+	start-stop-daemon --start --pidfile /var/run/jabber/pyicq-t.pid -u jabber -g jabber \
+		--exec INSPATH/pyicq-t.py -- \
+		-b -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ICQ Jabber Transport"
+	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyicq-t.pid
+	eend $?
+}
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch
new file mode 100644
index 000000000000..62df75873c08
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch
@@ -0,0 +1,36 @@
+diff -Naur pyicqt-0.8.1.5/src/contact.py pyicqt-0.8.1.5-1/src/contact.py
+--- pyicqt-0.8.1.5/src/contact.py	2009-08-24 14:37:59.000000000 +0200
++++ pyicqt-0.8.1.5-1/src/contact.py	2013-09-11 22:19:01.320467367 +0200
+@@ -13,7 +13,7 @@
+ import globals
+ import base64
+ if not config.disableAvatars:
+-	import Image
++	import PIL.Image as Image
+ import StringIO
+ 
+ 
+diff -Naur pyicqt-0.8.1.5/src/imgmanip.py pyicqt-0.8.1.5-1/src/imgmanip.py
+--- pyicqt-0.8.1.5/src/imgmanip.py	2009-08-24 14:37:59.000000000 +0200
++++ pyicqt-0.8.1.5-1/src/imgmanip.py	2013-09-11 22:19:25.257168117 +0200
+@@ -5,7 +5,7 @@
+ 
+ if not config.disableAvatars:
+ 	try:
+-		import Image
++		import PIL.Image as Image
+ 		import StringIO
+ 
+ 		def convertToPNG(imageData):
+diff -Naur pyicqt-0.8.1.5/tools/infodump.py pyicqt-0.8.1.5-1/tools/infodump.py
+--- pyicqt-0.8.1.5/tools/infodump.py	2009-08-24 14:37:59.000000000 +0200
++++ pyicqt-0.8.1.5-1/tools/infodump.py	2013-09-11 22:18:34.084807860 +0200
+@@ -41,7 +41,7 @@
+ 	print "Nevow Version: Unknown or Not Installed"
+ 
+ try:
+-	from Image import VERSION
++	from PIL.Image import VERSION
+ 	print "Python Imaging Library (PIL) Version: " + VERSION
+ except:
+ 	print "Python Imaging Library (PIL) Version: Unknown or Not Installed"
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff
new file mode 100644
index 000000000000..fd8e9e5ab8f0
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff
@@ -0,0 +1,118 @@
+diff -Naur pyicqt-0.8.1.5/src/avatar.py p1//src/avatar.py
+--- pyicqt-0.8.1.5/src/avatar.py	2010-06-07 12:16:36.000000000 +0200
++++ p1//src/avatar.py	2010-06-07 12:16:16.000000000 +0200
+@@ -6,7 +6,7 @@
+ from twisted.words.xish.domish import Element
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
++from hashlib import sha1
+ import base64
+ import os
+ import os.path
+@@ -46,7 +46,7 @@
+ class Avatar:
+ 	""" Represents an Avatar. Does not store the image in memory. """
+ 	def __init__(self, imageData, avatarCache):
+-		self.__imageHash = sha.sha(imageData).hexdigest()
++		self.__imageHash = sha1(imageData).hexdigest()
+ 		self.__avatarCache = avatarCache
+ 
+ 	def getImageHash(self):
+diff -Naur pyicqt-0.8.1.5/src/contact.py p1//src/contact.py
+--- pyicqt-0.8.1.5/src/contact.py	2010-06-07 12:16:43.000000000 +0200
++++ p1//src/contact.py	2010-06-07 12:16:16.000000000 +0200
+@@ -8,7 +8,6 @@
+ import config
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
+ import legacy
+ import globals
+ import base64
+diff -Naur pyicqt-0.8.1.5/src/legacy/buddies.py p1//src/legacy/buddies.py
+--- pyicqt-0.8.1.5/src/legacy/buddies.py	2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/buddies.py	2010-06-07 12:07:37.000000000 +0200
+@@ -12,7 +12,7 @@
+ import os.path
+ import binascii
+ import os.path
+-import md5
++from hashlib import md5
+ 
+ X = os.path.sep
+ 
+@@ -188,7 +188,7 @@
+ 				avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData))
+ 				c.updateAvatar(avatarData, push=True)
+ 				if not md5Hash:
+-					m = md5.new()
++					m = md5()
+ 					m.update(iconData)
+ 					md5Hash = m.digest()
+ 				if not numHash:
+diff -Naur pyicqt-0.8.1.5/src/legacy/glue.py p1//src/legacy/glue.py
+--- pyicqt-0.8.1.5/src/legacy/glue.py	2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/glue.py	2010-06-07 12:07:37.000000000 +0200
+@@ -18,7 +18,7 @@
+ import time
+ import binascii
+ import avatar
+-import md5
++from hashlib import md5
+ import random
+ 
+ from twisted.python import log
+@@ -398,7 +398,7 @@
+ 			try:
+ 				self.myavatar = imgmanip.convertToJPG(imageData)
+ 				self.myavatarlen = len(self.myavatar)
+-				m=md5.new()
++				m=md5()
+ 				m.update(self.myavatar)
+ 				self.myavatarsum = m.digest()
+ 				self.myavatarstamp = time.time()
+diff -Naur pyicqt-0.8.1.5/src/legacy/icqt.py p1//src/legacy/icqt.py
+--- pyicqt-0.8.1.5/src/legacy/icqt.py	2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/icqt.py	2010-06-07 12:07:37.000000000 +0200
+@@ -14,7 +14,6 @@
+ import time
+ import datetime
+ import binascii
+-import md5
+ import locale
+ import struct
+ 
+diff -Naur pyicqt-0.8.1.5/src/tlib/oscar.py p1//src/tlib/oscar.py
+--- pyicqt-0.8.1.5/src/tlib/oscar.py	2009-08-24 14:37:59.000000000 +0200
++++ p1//src/tlib/oscar.py	2010-06-07 12:07:37.000000000 +0200
+@@ -21,7 +21,7 @@
+ from scheduler import Scheduler
+ 
+ import struct
+-import md5
++from hashlib import md5
+ import string
+ import socket
+ import random
+@@ -120,9 +120,9 @@
+     return dict,data
+ 
+ def encryptPasswordMD5(password,key):
+-    m=md5.new()
++    m=md5()
+     m.update(key)
+-    m.update(md5.new(password).digest())
++    m.update(md5(password).digest())
+     m.update("AOL Instant Messenger (SM)")
+     return m.digest()
+ 
+@@ -534,7 +534,7 @@
+         self.iconSum = tlvs.get(0xd5,"")
+ 
+     def updateIcon(self, iconData):
+-        m=md5.new()
++        m=md5()
+         m.update(iconData)
+         self.iconSum = m.digest()
+         log.msg("icon sum is %s" % binascii.hexlify(self.iconSum))
diff --git a/net-im/pyicq-t/files/pyicq-t.service b/net-im/pyicq-t/files/pyicq-t.service
new file mode 100644
index 000000000000..852ec13315af
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=PyICQt is an ICQ transport for Jabber/XMPP
+
+[Service]
+ExecStart=INSPATH/pyicq-t.py -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log
+User=jabber
+Group=jabber
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/pyicq-t/metadata.xml b/net-im/pyicq-t/metadata.xml
new file mode 100644
index 000000000000..1e72bf501ea4
--- /dev/null
+++ b/net-im/pyicq-t/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>Python based jabber transport for ICQ</longdescription>
+	<use>
+		<flag name="webinterface">Install dependencies needed for the web
+		interface</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">pyicqt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild
new file mode 100644
index 000000000000..39f7edef3082
--- /dev/null
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 systemd
+
+MY_P="${P/pyicq-t/pyicqt}"
+
+DESCRIPTION="Python based jabber transport for ICQ"
+HOMEPAGE="https://code.google.com/p/pyicqt/"
+SRC_URI="https://pyicqt.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="webinterface"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	net-im/jabber-base"
+RDEPEND="${DEPEND}
+	|| (
+		(
+			dev-python/twisted-core[${PYTHON_USEDEP}]
+			dev-python/twisted-words[${PYTHON_USEDEP}]
+			dev-python/twisted-web[${PYTHON_USEDEP}]
+		)
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/${P}-python26-warnings.diff"
+	"${FILESDIR}/${P}-pillow-imaging.patch"
+)
+
+src_install() {
+	python_moduleinto ${PN}
+	cp PyICQt.py ${PN}.py || die
+	python_domodule ${PN}.py data tools src
+
+	insinto /etc/jabber
+	newins config_example.xml ${PN}.xml
+	fperms 600 /etc/jabber/${PN}.xml
+	fowners jabber:jabber /etc/jabber/${PN}.xml
+	fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py"
+	sed -i \
+		-e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
+		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+		"${ED}/etc/jabber/${PN}.xml" || die
+
+	newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" \
+		"${ED}/etc/init.d/${PN}" "${ED}/usr/lib/systemd/system/${PN}.service" || die
+
+	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
+}
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
new file mode 100644
index 000000000000..972e4e67f243
--- /dev/null
+++ b/net-im/qtox/Manifest
@@ -0,0 +1,7 @@
+DIST qtox-1.11.0.tar.lz 2860849 SHA256 c4d3ac9d263fd4e603867fe0ae263bff4f810593cc518858bc1d0c274883652f SHA512 3117b5ec9d88f58023f6c2f5e7c37c547ab920588d385e3abe062fb22ad79c49a9b6eb9ca31c6d56f9d03cfea55ef56ddc7e2e53bd43629825ea7b460b31f505 WHIRLPOOL 26da6d3e330b05e97b75c1046ee3bd818694a60dfa637317333f5e8bf85de5f4c7aed3f9bc2f13f53e13dda1690bc705d776a38e5cf5080fa095dc006cab2c3f
+DIST qtox-1.8.1.tar.gz 3594727 SHA256 32837b5f824b6987a68f9211f93a7ec32b892be895605012d35784d702f13d6c SHA512 9ba32ce43f2d335fe9e07bcca651e0e18ae2f3247e52364918148e400e51f6e2364d1596c7c882674c190bf5438e69cd13e77512eeeec7cba212195e9559a5ae WHIRLPOOL a6bd845a3c8d31ea1c8aa3bee360c46c562aaff0ad35c9d92bdd8167c550904428936edb0e88c0b72362704d2e5b844ea16afcc57704d442cdd6558344572557
+EBUILD qtox-1.11.0.ebuild 1620 SHA256 26810f3b34d35f4462eef85f64ea01b2789bcbf0151ea9847330bc0777029592 SHA512 78eb94640ee216cbc111671e89e4bb3cb647cba0da35da55e4f6c5027a9cb32678efa23fe4c92c53e114be1d823428741b8387632f23fa96fe7478c485532420 WHIRLPOOL 1a0a7c3f501413a6f03d61c8a16ae7763b6db9b34631f064b6ddd43cc53d27f1f9e7c480442d2125ccaa87fbdddd8094c438b45e2a25fb383a3a34b99136e033
+EBUILD qtox-1.8.1.ebuild 1645 SHA256 8ffd697252c347004e7c3a54aea235ce2c997a3102bd265976ab3ea25c166e27 SHA512 77f53452e5de2599f96828de62a42b5827aa716e204ecb907ca882b86851cb8c9152d9855555d25e7913662ab313193ae7cf9c1fd32425e3a2d52554e9c163a2 WHIRLPOOL f803ccb23fd82d3db5d901eab02b0f3a07bd5ad2b1cebc87c49b32267bc660cdaed472f314a9899b0edc7af8bff8d45de3c82ffcd558940ca2b8f6ec80d2b882
+EBUILD qtox-9999.ebuild 1511 SHA256 ac1dfe679213659163a6c685da71ab114d028807b8533c754d23a77ce1dcfcc5 SHA512 b433b3f17dd56d1781b8bf8f45d2416ed0b6c55359c3be9080f6482c9e43bfc0da98342765ccdf6d91b499e34235a6cf552fefd86aad30d70a719e3176ec7880 WHIRLPOOL 191d61013b0ac85eaf1d8a6d2dcbb7d1a8c69fa54e00bb3728938f565aa8453457d3cef6cdfe979dd9db1bd7edefe1dcea9187a1c3519321b332a091c887997f
+MISC ChangeLog 3657 SHA256 e9ad4d46c8010b58842a9db822050160c5db96346737d666b3d9b2d03ebf58e3 SHA512 91311325dafb65cae8034b349acc2d3fcaba7ec89c30b61c9eb81df240d283aabe2b7ae96194f0c7a9d598ecfdca435f3a78946b63ef6b04873daa381f5a7131 WHIRLPOOL 18b7460578c2381f2214b88351bb73abbc98794d3284aaaa532b177d17b2f76c5dedf5429d9508cb61876a2e55c02d31472b8987375d1aa335943702cb3c86ab
+MISC metadata.xml 581 SHA256 a6c2731f8c5f981e2d5826cd4a37e2793e8acd2a2348b3c6317890b52b8514ee SHA512 5309c7c89755e543ff5783db805536cd3d25f6cf7146d2c2b2e090cb0cd04dfe1480cde851ac31c42493ea0279cab3b762001a59b36c0b8c40ab700d4681488b WHIRLPOOL 16f64aa7633215b6971e0683ac4250d4d13c8f17232c92be1ce77b31dffea879390ea7d8f677302c8e9f5afaedf5bf962e9ebef9ef700f2deb87a3be687b7a0b
diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
new file mode 100644
index 000000000000..32a9c62df147
--- /dev/null
+++ b/net-im/qtox/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zexavexxe@gmail.com</email>
+		<name>Zetok Zalbavar</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="gtk">Adds support for GTK and Status Notifier tray backends</flag>
+		<flag name="X">Adds support for X11</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">qTox/qTox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/qtox/qtox-1.11.0.ebuild b/net-im/qtox/qtox-1.11.0.ebuild
new file mode 100644
index 000000000000..8921fd9330eb
--- /dev/null
+++ b/net-im/qtox/qtox-1.11.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils unpacker xdg-utils
+
+DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
+HOMEPAGE="https://github.com/qTox/qTox"
+SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.lz -> ${P}.tar.lz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk test X"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	dev-db/sqlcipher
+	dev-libs/libsodium
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[gif,jpeg,png,xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/qrencode
+	media-libs/openal
+	>=media-video/ffmpeg-2.6.3[webp,v4l]
+	gtk? (	dev-libs/atk
+			dev-libs/glib:2
+			x11-libs/gdk-pixbuf[X]
+			x11-libs/gtk+:2
+			x11-libs/cairo[X]
+			x11-libs/pango[X] )
+	net-libs/tox:0/0.1[av]
+	X? ( x11-libs/libX11
+		x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+	$(unpacker_src_uri_depends)
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# bug 628574
+	if ! use test; then
+		sed -i CMakeLists.txt -e "/include(Testing)/s/^/#/" || die
+		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/s/^/#/" || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_STATUSNOTIFIER=$(usex gtk)
+		-DENABLE_GTK_SYSTRAY=$(usex gtk)
+		-DGIT_DESCRIBE="${PV}"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/qtox/qtox-1.8.1.ebuild b/net-im/qtox/qtox-1.8.1.ebuild
new file mode 100644
index 000000000000..57ea1302d280
--- /dev/null
+++ b/net-im/qtox/qtox-1.8.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils toolchain-funcs
+
+DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
+HOMEPAGE="https://github.com/qTox/qTox"
+SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk X"
+
+# needed, since tarball provided by github extracts to `qTox`
+S="${WORKDIR}/qTox-${PV}"
+
+RDEPEND="
+	dev-db/sqlcipher
+	dev-libs/libsodium
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[gif,jpeg,png,xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/qrencode
+	media-libs/openal
+	>=media-video/ffmpeg-2.6.3[webp,v4l]
+	gtk? (	dev-libs/atk
+			dev-libs/glib:2
+			x11-libs/gdk-pixbuf[X]
+			x11-libs/gtk+:2
+			x11-libs/cairo[X]
+			x11-libs/pango[X] )
+	net-libs/tox:0/0.1[av]
+	X? ( x11-libs/libX11
+		x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if tc-is-gcc ; then
+			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 || $(gcc-major-version) -lt 4 ]] ; then
+				eerror "You need at least sys-devel/gcc-4.8.3"
+				die "You need at least sys-devel/gcc-4.8.3"
+			fi
+		fi
+	fi
+}
+
+src_configure() {
+	use gtk || local NO_GTK_SUPPORT="ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO"
+	use X || local NO_X_SUPPORT="DISABLE_PLATFORM_EXT=YES"
+	eqmake5 \
+			PREFIX="${D}/usr" \
+			GIT_DESCRIBE="${PV}" \
+			${NO_GTK_SUPPORT} \
+			${NO_X_SUPPORT}
+}
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
new file mode 100644
index 000000000000..21c7d9d197cb
--- /dev/null
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils git-r3 gnome2-utils xdg-utils
+
+DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
+HOMEPAGE="https://github.com/qTox/qTox"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/qTox/qTox.git"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk test X"
+
+RDEPEND="
+	dev-db/sqlcipher
+	dev-libs/libsodium
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[gif,jpeg,png,xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/qrencode
+	media-libs/openal
+	>=media-video/ffmpeg-2.6.3[webp,v4l]
+	gtk? (	dev-libs/atk
+			dev-libs/glib:2
+			x11-libs/gdk-pixbuf[X]
+			x11-libs/gtk+:2
+			x11-libs/cairo[X]
+			x11-libs/pango[X] )
+	net-libs/tox:0/0.1[av]
+	X? ( x11-libs/libX11
+		x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# bug 628574
+	if ! use test; then
+		sed -i CMakeLists.txt -e "/include(Testing)/s/^/#/" || die
+		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/s/^/#/" || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_STATUSNOTIFIER=$(usex gtk)
+		-DENABLE_GTK_SYSTRAY=$(usex gtk)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
new file mode 100644
index 000000000000..ff8a38f6ddff
--- /dev/null
+++ b/net-im/qutim/Manifest
@@ -0,0 +1,7 @@
+AUX qutim-0.3.2-astral-migrate-qt-telepaphy.patch 5761 SHA256 865b38868e90a599b9123eb5d42e6946c39e98871ee5e39aea3fe4b08b82a956 SHA512 e930fe3f6d33fc27c5cc578fceb09280c72201290e0e3eb97f57d8fd08616e4234b526db1a0445f78ef0338b1b6c83f60ff8be1123a8a5639a5b9d58f51d2f26 WHIRLPOOL 7c16f5f04fa367e48da1e20242d20a4b7c84024a7aa860a6ab70f8b8b7102e3b9d965d13666083e275ff3232248faf1811393d64ff1f7bff3bf2957cfe87de60
+AUX qutim-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch 1449 SHA256 bd3f74150aae084cc3e9a354561e8fe47b64e8296dd84deb81fd8e58037be80a SHA512 8e19aedd6b1835d8e4cc956dee990efae208506f911c398f388a33687627b12b5b458c3e25d4a8c72ae3428e2fef472e30e764f91ce1815941da3c7e1675121c WHIRLPOOL 6ff25a1ed89d41ce6221362225bf93754e2f9fcd9064e3f8602c910eb7686829460782da8a2ddba326c9156e31fef23eb15f1751e052f4dbefb0224da90d0ed3
+DIST qutim-0.3.3.p_1.tar.xz 8708952 SHA256 945dc03d25ccd985b8c0d0d4ef2c98e3731428135c60df4a0deaf9c9b1a8f2e3 SHA512 658c0d114a6771cd7ae9f3090e6ab6deba8e92465b9cd966d7ab4d4626dbb7335a712d7c0f64c886d7bcb7a3fbcd0b18398946a366ec1e150a9e2ae5e4e638e9 WHIRLPOOL 05c3360134fd41f8dabad232cef42db2222f1973bee32dcf02d1784634b6c0163066f739c15c7ad1b46af9a8f9b0d90b9e4e9cf79f72f6f754af2f50b95f8d5c
+EBUILD qutim-0.3.3_p1.ebuild 5232 SHA256 393868dacbe0fbe1c3864eba3dd2b4efb5d20a7e78eebebf8ce9efd900685704 SHA512 71e649c2bdda35d571db14f6aa2b9a2db06ebf3afe3b9d29aadcf5f79523b3a40158c8d65a3468306522a6b6da664a24c6b4129484f63966480a7f16cd2ea163 WHIRLPOOL 42cda14ce42c143927b99f9736c743a885a1dfc0ebd16c4fcad3ab1e17494f3ae42f98ac8e23a2d9d89d6f25360ed16e77d63ab2e6eb554c141c436e19a97b95
+MISC ChangeLog 4296 SHA256 4938ce2eb867c89e8e822e25aaa2b96000fb13dc32c51635b341e0b9b20e43c5 SHA512 8df5fe13c5e88eef36eab3d2d2bb9214e9e21d1e0832623ff5b2186dc2ae5c6bcbfc6c4db98e287c0383c97e5c68cc59aa1ee4000f8a8405460b78c4f49b4bf6 WHIRLPOOL c7eb597d3a6d2be85c7a34451a6e2bd54cb630acaf97e4e543f7bc4bdb02ae495ca3f6aacaf70bdfade96d52002d7a54fef381f4c300c8f9ceb0de71b6c9792c
+MISC ChangeLog-2015 6782 SHA256 7f728b621f9f96647d6086640cdad94012a55c94b77c1b4d7ae22a0ae0056dbe SHA512 095eb514f90989040ef8a87b3c75e86ee143710d72e0004ee0d25f3d530ce4c8c52c17b1af7ece34ee270fb20dd9ba212445d29d6dab1274876e0adea346e0ba WHIRLPOOL 2ba7d08e8400ea40b1403f0052fe82e92c30db3956846f4384520932dc449ada6b59e77ca31d6e72f0d4ba16442788d2415fd2d864fdb4b979ae73365f2595d6
+MISC metadata.xml 2244 SHA256 ef9a2eab33d9cb4ae95f0f9f32d8d4d5a6cc72ae80a9b6a1d8fc0aa18804607f SHA512 542b96b146a5445eb6f72555dbc2d7f5601aade61243a9f39a79919dda709a8527c490e955e02c8c02e37d8788c31edf73c2e0ce98cae9ff679837264957047f WHIRLPOOL 5a2788f12759a8076cf7493cb9810eadf0dfaa7e0e008e7233b7526f92c9e2c80937b7561a82d69211502374afcb03c2455454fa29f3b56768c05ce572ab3dc1
diff --git a/net-im/qutim/files/qutim-0.3.2-astral-migrate-qt-telepaphy.patch b/net-im/qutim/files/qutim-0.3.2-astral-migrate-qt-telepaphy.patch
new file mode 100644
index 000000000000..dd1aba82891c
--- /dev/null
+++ b/net-im/qutim/files/qutim-0.3.2-astral-migrate-qt-telepaphy.patch
@@ -0,0 +1,151 @@
+From bb8654db870d983d5b6558d9f16b22f443315eaf Mon Sep 17 00:00:00 2001
+From: Alexander Golubev <fatzer2@gmail.com>
+Date: Mon, 3 Nov 2014 16:30:27 +0300
+Subject: [PATCH 3/3] protocol/astral: migrate to qt-telepaphy API v0.9
+
+---
+ protocols/astral/src/astralaccount.cpp | 12 ++++++------
+ protocols/astral/src/astralaccount.h   | 14 +++++++-------
+ protocols/astral/src/astralcontact.h   |  6 +++---
+ protocols/astral/src/astralplugin.cpp  |  6 +++---
+ protocols/astral/src/astralroster.cpp  | 14 +++++++-------
+ protocols/astral/src/astralsession.h   |  4 ++--
+ 6 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/protocols/astral/src/astralaccount.cpp b/protocols/astral/src/astralaccount.cpp
+index 1d51707..e9bf729 100644
+--- a/protocols/astral/src/astralaccount.cpp
++++ b/protocols/astral/src/astralaccount.cpp
+@@ -26,9 +26,9 @@
+ #include "astralprotocol.h"
+ #include "astralroster.h"
+ #include "astralsessionmanager.h"
+-#include <TelepathyQt4/Account>
+-#include <TelepathyQt4/AccountManager>
+-#include <TelepathyQt4/PendingChannel>
++#include <TelepathyQt/Account>
++#include <TelepathyQt/AccountManager>
++#include <TelepathyQt/PendingChannel>
+ #include <QDebug>
+ 
+ struct AstralAccountPrivate
+@@ -146,14 +146,14 @@ void AstralAccount::onNewChannels(const Tp::ChannelDetailsList &channels)
+ 	qDebug() << "AstralAccount::onNewChannels";
+ 	foreach (const Tp::ChannelDetails &details, channels)
+ 	{
+-		QString channelType = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")).toString();
+-		bool requested = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".Requested")).toBool();
++		QString channelType = details.properties.value(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")).toString();
++		bool requested = details.properties.value(TP_QT_IFACE_CHANNEL + QLatin1String(".Requested")).toBool();
+ 		qDebug() << " channelType:" << channelType;
+ 		qDebug() << " requested  :" << requested;
+ 		qDebug() << " channelPath:" << details.channel.path();
+ 		qDebug() << " properties :" << details.properties;
+ 
+-		if (channelType == TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT && !requested)
++		if (channelType == TP_QT_IFACE_CHANNEL_TYPE_TEXT && !requested)
+ 		{
+ 			TextChannelPtr channel = TextChannel::create(p->conn,
+ 														 details.channel.path(),
+diff --git a/protocols/astral/src/astralaccount.h b/protocols/astral/src/astralaccount.h
+index 2781fb9..6e4378d 100644
+--- a/protocols/astral/src/astralaccount.h
++++ b/protocols/astral/src/astralaccount.h
+@@ -26,13 +26,13 @@
+ #define ASTRALACCOUNT_H
+ 
+ #include <qutim/account.h>
+-#include <TelepathyQt4/ConnectionManager>
+-#include <TelepathyQt4/Connection>
+-#include <TelepathyQt4/TextChannel>
+-#include <TelepathyQt4/AccountManager>
+-#include <TelepathyQt4/PendingConnection>
+-#include <TelepathyQt4/PendingOperation>
+-#include <TelepathyQt4/PendingReady>
++#include <TelepathyQt/ConnectionManager>
++#include <TelepathyQt/Connection>
++#include <TelepathyQt/TextChannel>
++#include <TelepathyQt/AccountManager>
++#include <TelepathyQt/PendingConnection>
++#include <TelepathyQt/PendingOperation>
++#include <TelepathyQt/PendingReady>
+ 
+ #include "astralroster.h"
+ 
+diff --git a/protocols/astral/src/astralcontact.h b/protocols/astral/src/astralcontact.h
+index ce0e9dd..5adfb07 100644
+--- a/protocols/astral/src/astralcontact.h
++++ b/protocols/astral/src/astralcontact.h
+@@ -26,9 +26,9 @@
+ #define ASTRALCONTACT_H
+ 
+ #include <qutim/contact.h>
+-#include <TelepathyQt4/Types>
+-#include <TelepathyQt4/Contact>
+-#include <TelepathyQt4/Connection>
++#include <TelepathyQt/Types>
++#include <TelepathyQt/Contact>
++#include <TelepathyQt/Connection>
+ 
+ using namespace Tp;
+ using namespace qutim_sdk_0_3;
+diff --git a/protocols/astral/src/astralplugin.cpp b/protocols/astral/src/astralplugin.cpp
+index e907866..d79642e 100644
+--- a/protocols/astral/src/astralplugin.cpp
++++ b/protocols/astral/src/astralplugin.cpp
+@@ -24,9 +24,9 @@
+ ****************************************************************************/
+ #include "astralplugin.h"
+ #include <QtCore/QtDebug>
+-#include <TelepathyQt4/Debug>
+-#include <TelepathyQt4/Constants>
+-#include <TelepathyQt4/Types>
++#include <TelepathyQt/Debug>
++#include <TelepathyQt/Constants>
++#include <TelepathyQt/Types>
+ //#include <TelepathyQt4/ConnectionInterfaceAvatarsInterface>
+ 
+ AstralPlugin::AstralPlugin()
+diff --git a/protocols/astral/src/astralroster.cpp b/protocols/astral/src/astralroster.cpp
+index 9eb209f..588cc55 100644
+--- a/protocols/astral/src/astralroster.cpp
++++ b/protocols/astral/src/astralroster.cpp
+@@ -24,13 +24,13 @@
+ ****************************************************************************/
+ #include "astralroster.h"
+ #include "astralaccount.h"
+-#include <TelepathyQt4/Types>
+-#include <TelepathyQt4/Contact>
+-#include <TelepathyQt4/ContactManager>
+-#include <TelepathyQt4/PendingConnection>
+-#include <TelepathyQt4/PendingContacts>
+-#include <TelepathyQt4/PendingOperation>
+-#include <TelepathyQt4/PendingReady>
++#include <TelepathyQt/Types>
++#include <TelepathyQt/Contact>
++#include <TelepathyQt/ContactManager>
++#include <TelepathyQt/PendingConnection>
++#include <TelepathyQt/PendingContacts>
++#include <TelepathyQt/PendingOperation>
++#include <TelepathyQt/PendingReady>
+ 
+ struct AstralRosterPrivate
+ {
+diff --git a/protocols/astral/src/astralsession.h b/protocols/astral/src/astralsession.h
+index fa78e45..a5dd1c3 100644
+--- a/protocols/astral/src/astralsession.h
++++ b/protocols/astral/src/astralsession.h
+@@ -26,8 +26,8 @@
+ #define ASTRALSESSION_H
+ 
+ #include <qutim/chatunit.h>
+-#include <TelepathyQt4/TextChannel>
+-#include <TelepathyQt4/Message>
++#include <TelepathyQt/TextChannel>
++#include <TelepathyQt/Message>
+ 
+ using namespace qutim_sdk_0_3;
+ using namespace Tp;
+-- 
+2.0.4
+
diff --git a/net-im/qutim/files/qutim-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch b/net-im/qutim/files/qutim-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch
new file mode 100644
index 000000000000..955fd0dc5e17
--- /dev/null
+++ b/net-im/qutim/files/qutim-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch
@@ -0,0 +1,26 @@
+Fix issues caused by turning on -std=c++14 by default in gcc.6.1+.
+See Gentoo-Bug #623572.
+Upstream commit 7453ef49e8fb64b05cfe7b8c0622bf00eba3080f "Turned on -std=c++11 by default " does the same changes.
+
+diff --git a/protocols/irc/src/irccommandalias.cpp b/protocols/irc/src/irccommandalias.cpp
+index cfe8a620e..41282f15f 100644
+--- a/protocols/irc/src/irccommandalias.cpp
++++ b/protocols/irc/src/irccommandalias.cpp
+@@ -148,7 +148,7 @@ QString IrcPingAlias::generate(IrcCommandAlias::Type aliasType, const QStringLis
+ }
+ 
+ #define ADD_BAN_CMD(MODE, TYPE, NAME, TITLE, ADDITIONALCMD) \
+-	cmd = new IrcCommandAlias(NAME, "MODE %n +b "MODE ADDITIONALCMD, IrcCommandAlias::Participant); \
++	cmd = new IrcCommandAlias(NAME, "MODE %n +b " MODE ADDITIONALCMD, IrcCommandAlias::Participant); \
+ 	gen = new IrcActionGenerator(QIcon(), TITLE, cmd); \
+ 	gen->setType(TYPE); \
+ 	MenuController::addAction<IrcChannelParticipant>(gen, kickBanGroup);
+@@ -172,7 +172,7 @@ QString IrcPingAlias::generate(IrcCommandAlias::Type aliasType, const QStringLis
+ 	REGISTER_CTCP_CMD(TITLE)
+ 
+ #define ADD_MODE(MODE, PRIORITY, NAME, TITLE)\
+-	cmd = new IrcCommandAlias(NAME, "MODE %n "MODE" %o", IrcCommandAlias::Participant);\
++	cmd = new IrcCommandAlias(NAME, "MODE %n " MODE " %o", IrcCommandAlias::Participant);\
+ 	gen = new IrcActionGenerator(QIcon(), TITLE, cmd);\
+ 	gen->setPriority(PRIORITY);\
+ 	MenuController::addAction<IrcChannelParticipant>(gen, modesGroup);\
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
new file mode 100644
index 000000000000..a8922ddd4abf
--- /dev/null
+++ b/net-im/qutim/metadata.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>fatzer2@gmail.com</email>
+	<name>Alexander Golubev</name>
+	<description>Proxied maintainer. Assign bugs on him</description>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<upstream>
+	<maintainer>
+		<email>euroelessar@yandex.ru</email>
+		<name>Ruslan Nigmatullin</name>
+	</maintainer>
+	<bugs-to>https://github.com/euroelessar/qutim/issues</bugs-to>
+</upstream>
+<use>
+	<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
+	<flag name="awn">Enable integration with gnome-extra/avant-window-navigator</flag>
+	<flag name="crypt">Enable AES crypto plugin</flag>
+	<flag name="histman">Enable history importer plugin</flag>
+	<flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
+	<flag name="irc">Enable IRC protocol support</flag>
+	<flag name="mrim">Enable mail.ru protocol support</flag>
+	<flag name="otr">Enable plugin for encrypted conversations (Off-The-Record messaging)</flag>
+	<flag name="phonon">Add sound support via <pkg>media-libs/phonon</pkg></flag>
+	<flag name="purple">Enable libpurple-based protocol support</flag>
+	<flag name="qml">Enable QtQuick-based chat plugin</flag>
+	<flag name="sdl">Add sound support via <pkg>media-libs/sdl-mixer</pkg></flag>
+	<flag name="vkontakte">Enable vkontakte protocol support</flag>
+	<flag name="webkit">Enable Adium-like WebView plugin</flag>
+	<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
+	<flag name="tools">Enable some extra tools for qt developers</flag>
+	<flag name="telepathy">Enable to connect various IMs through <pkg>net-libs/telepathy-qt</pkg></flag>
+	<flag name="antiboss">Enable support for the antiboss plugin</flag>
+	<flag name="espionage">!!Not recomended, contains privacy risk!! Enable control plugin that controls user by sending messages and roster to remote server</flag>
+	<flag name="plugman">Enable downloadable content management with <pkg>dev-libs/libattica</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild
new file mode 100644
index 000000000000..998b0b5189c1
--- /dev/null
+++ b/net-im/qutim/qutim-0.3.3_p1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+LANGS="ar be bg cs de en_GB es fr he nds ru sk uk uz zh_CN"
+
+inherit qt4-r2 cmake-utils
+
+MY_PV="${PV/_p/.p_}"
+DESCRIPTION="Qt4-based multi-protocol instant messenger"
+HOMEPAGE="https://www.qutim.org"
+SRC_URI="https://www.qutim.org/dwnl/80/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# general USE
+IUSE="doc +sound tools"
+# protocol uses
+IUSE="$IUSE telepathy irc xmpp mrim oscar purple vkontakte"
+# plugins
+IUSE="$IUSE antiboss aspell ayatana awn crypt dbus debug -espionage histman hunspell
+	otr plugman phonon purple qml sdl +ssl +xscreensaver webkit"
+
+REQUIRED_USE="
+	oscar? ( ssl )
+	qml? ( webkit )
+"
+
+# Minimum Qt version required
+QT_PV="4.7.0:4"
+
+CDEPEND="
+	x11-libs/libqxt
+	>=dev-qt/qtcore-${QT_PV}[ssl?]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}
+
+	telepathy? ( >=net-libs/telepathy-qt-0.3 )
+	xmpp? (
+		app-crypt/qca:2[qt4(+)]
+		>=net-libs/jreen-1.2.0[qt4]
+	)
+	oscar? ( app-crypt/qca:2[qt4(+)] )
+	purple? ( net-im/pidgin )
+	vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} )
+
+	aspell? ( app-text/aspell )
+	awn? ( >=dev-qt/qtdbus-${QT_PV} )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
+	dbus? ( >=dev-qt/qtdbus-${QT_PV} )
+	espionage? ( app-crypt/qca:2[qt4(+)] )
+	histman? ( >=dev-qt/qtsql-${QT_PV} )
+	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
+	hunspell? ( app-text/hunspell )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	phonon? ( media-libs/phonon[qt4] )
+	plugman? (
+		dev-libs/libattica
+		app-arch/libarchive
+	)
+	qml? (
+		>=dev-qt/qtopengl-${QT_PV}
+	)
+	sdl? ( media-libs/sdl-mixer )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${CDEPEND}
+	xmpp? ( app-crypt/qca:2[gpg] )
+	oscar? ( app-crypt/qca:2[ssl] )
+	kde-frameworks/oxygen-icons
+"
+
+DOCS=( AUTHORS ChangeLog )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-astral-migrate-qt-telepaphy.patch"
+	"${FILESDIR}/${PN}-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# fix automagic dep on libXScrnSaver
+	if ! use xscreensaver; then
+		sed -i -e '/XSS xscrnsaver/d' \
+			core/src/corelayers/idledetector/CMakeLists.txt || die
+	fi
+
+	# remove unwanted translations
+	local lang
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm -f translations/modules/*/${lang}.{po,ts}
+	done
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSTEM_JREEN=ON
+		$(cmake-utils_use_with doc DOXYGEN)
+		$(cmake-utils_use doc     QUTIM_GENERATE_DOCS)
+		$(cmake-utils_use sound   QUTIM_INSTALL_SOUND_THEME  )
+		$(cmake-utils_use tools   QUTIM_DEVELOPER_BUILD      )
+
+		# protocols
+		$(cmake-utils_use telepathy ASTRAL )
+		$(cmake-utils_use irc              )
+		$(cmake-utils_use xmpp JABBER      )
+		$(cmake-utils_use mrim             )
+		$(cmake-utils_use oscar            )
+		$(cmake-utils_use purple QUETZAL   )
+		$(cmake-utils_use vkontakte        )
+
+		# plugins
+		$(cmake-utils_use  webkit      ADIUMWEBVIEW      )
+		$(cmake-utils_use  crypt       AESCRYPTO         )
+		$(cmake-utils_use  antiboss    ANTIBOSS          )
+		$(cmake-utils_use  aspell      ASPELLER          )
+		$(cmake-utils_use  awn         AWN               )
+		$(cmake-utils_use  espionage   CONTROL           ) # Also requires -DENABLE_ESPIONAGE=ON (see bellow)
+		$(cmake-utils_use  dbus        DBUSAPI           )
+		$(cmake-utils_use  dbus        DBUSNOTIFICATIONS )
+		$(cmake-utils_use  histman     HISTMAN           )
+		$(cmake-utils_use  hunspell    HUNSPELLER        )
+		$(cmake-utils_use  ayatana     INDICATOR         )
+		$(cmake-utils_use  qml         KINETICPOPUPS     )
+		$(cmake-utils_use  phonon      PHONONSOUND       )
+		$(cmake-utils_use  plugman     PLUGMAN           )
+		$(cmake-utils_use  debug       LOGGER            )
+		$(cmake-utils_use  dbus        NOWPLAYING        )
+		$(cmake-utils_use  otr         OFFTHERECORD      )
+		$(cmake-utils_use  qml         QMLCHAT           )
+		$(cmake-utils_use  sdl         SDLSOUND          )
+		$(cmake-utils_use_enable espionage               )
+		-DLINUXINTEGRATION=ON
+		-DDOCKTILE=OFF	# QtDockTile currenly supports only unity;
+						# consider to make it optional if it also support kde or whatever
+		-DUPDATER=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_QtMobility=ON # required dependency last-rited
+		-DKDEINTEGRATION=OFF # bug 631122
+	)
+	# NOTE: Integration plugins are autodisabled:
+	# symbianintegration macintegration maemo5integration haikunotifications meegointegration winintegration
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst () {
+	elog "Next qutim plugins are enabled by default:"
+	elog "  antispam autopaster autoreply birthdayreminder blogimprover clconf"
+	elog "  emoedit floaties formula highlighter imagepub massmessaging"
+	elog "  oldcontactdelegate qrcicons screenshoter scriptapi unreadmessageskeeper urlpreview"
+	elog "  weather webhistory yandexnarod"
+	elog "If you have strong reasons to make their build optional feel free to fill bugrepot."
+
+	if use espionage; then
+		ewarn "You have enabled the control (espionage) plugin. It may "
+		ewarn "deal negative security impact on the privacy of your client."
+	fi
+}
diff --git a/net-im/reaim/Manifest b/net-im/reaim/Manifest
new file mode 100644
index 000000000000..2a29f7ada74a
--- /dev/null
+++ b/net-im/reaim/Manifest
@@ -0,0 +1,6 @@
+AUX reaim 541 SHA256 99157f216c7a57d26aa2f79e8c6685dbd4f49072d049f1f2014066d0e703a6ba SHA512 ba5bf5c556e0d50225b28511a96b609fb705491367469086eb67203681c63b9fef22a2650a59977445cd7c8a3d8b0bd50578e68e024e3869a90cdb89354047d4 WHIRLPOOL c18b0b2094be92640e3ff50371681ba3d24b43c31ef5eecd76477baa9fd8f041cf070f199cfb3363a95eb127d1a46fe2f88f29537d7412063e6795850eebda38
+DIST reaim-0.8.tar.gz 39944 SHA256 8a530d8b2ee40c63dd71f20657f324252732632778928ecccaea2a237be19eb5 SHA512 7a1517e7adf52f2b1b6ec7e4a55c8c74ab099fdf1a654f41b6a0ac13dff39d4706551977d53c2db6f5154cd42f96f14087d2866f563883db9c07b3400ec986b0 WHIRLPOOL 069debf6b8eb5a2b4742ede40642673c922bf8c1ced8f42ad90ba6d3aaca0fcaa41d4ef59cc3ea8cee45abbcdc7fd4b3852f092e9875f32fd0cf0bdf5e8061e8
+EBUILD reaim-0.8-r2.ebuild 685 SHA256 95f4ec220bbe6abfe5e9b1cfa058165698b571b405309db4655d27453f2ac0af SHA512 1d594e9cfeac434e3b9780bbc12a591710f9642382d94965484a907b2bd1b3a5179920eacf50aa5293ba748eb9e9237272aafd298841062bfe9e300d47e5abe7 WHIRLPOOL 5296ee3c99ba0ba5cec60639395a8f9ddc2edfc58f8f452d3007686609f8365060dba705677ec3b7f0412e604eca351afc4c4e372a25b90b7c887347a834e129
+MISC ChangeLog 2852 SHA256 f541207a743983b91fe1fbdb2264434215457e2ff4c06e0df7bba0a9659b98d2 SHA512 0916125159f204caccf7d0fbf967c905cc80830c0df0eda4aba0cc304156bc8c7d329285a4ca49e6707dcfc717c16541271b58a726a2bd2ce79479c58e0f7267 WHIRLPOOL 7a9c7c96af9978e36ef442a4c2afc91ecf2f992af61b704ea99694c9af5085f714d2f9c301de0c1e3556e8b20a3f723a108c0c673c10e48b1a40a5053a91a354
+MISC ChangeLog-2015 1297 SHA256 e4f7ccb7a3c98259b7046ed1dfa0dbf60e37c8e20842544f9c14a530fcf4f34d SHA512 56a1649299d6b912642e3747bf872509c1b4318bc03cb579e33ec76cc225022307369427b4530e5aaa763ef170770001fd3d2b2b36be797c9691a16144dcd3c1 WHIRLPOOL 43899972c099bd5847395eee27fed1ccef9dc6cb9b46cb071660ab18cedc52b58d796addf81790b3f3d36a7f8e0f7909cb04af1378b996816607a4123b8ad070
+MISC metadata.xml 242 SHA256 08ef0829236364b3c4191d6b2243792d0afa84505f4f591cd0f3fa1645158082 SHA512 e52f13e1042e04bd69519b36a795de14ba97c9f0be16cbc00ca570c6a1588f3d84cfefcd5b7e3332bbdafbf947e2a44b31c736eabcd9e82958a76798944982b1 WHIRLPOOL 8a0906fc778dfe626025dfb1306b1ee55abfbf70af247e29a28506db03b6f609ddb9efd53916c6bde7c594df6266e4b6fda9d3100b4e74b8805caa33d7dbaf66
diff --git a/net-im/reaim/files/reaim b/net-im/reaim/files/reaim
new file mode 100644
index 000000000000..83c4de5ff38e
--- /dev/null
+++ b/net-im/reaim/files/reaim
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net iptables
+}
+
+start() {
+	ebegin "Starting reaim"
+	iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 5190 -j REDIRECT --to-ports 5190
+	start-stop-daemon --start --quiet --exec /usr/sbin/reaim
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping reaim"
+	iptables -t nat -D PREROUTING -i eth0 -p tcp --dport 5190 -j REDIRECT --to-ports 5190
+	start-stop-daemon --stop --quiet --exec /usr/sbin/reaim
+	eend $?
+}
diff --git a/net-im/reaim/metadata.xml b/net-im/reaim/metadata.xml
new file mode 100644
index 000000000000..7951268cae31
--- /dev/null
+++ b/net-im/reaim/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">reaim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/reaim/reaim-0.8-r2.ebuild b/net-im/reaim/reaim-0.8-r2.ebuild
new file mode 100644
index 000000000000..f2f98fe678d0
--- /dev/null
+++ b/net-im/reaim/reaim-0.8-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="AIM transport proxy over NAT firewalls"
+HOMEPAGE="http://reaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/reaim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="net-firewall/iptables"
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	sed -i -e 's/gcc/$(CC) $(CFLAGS) $(LDFLAGS)/' \
+		-e 's/ -g / /'  Makefile || die "sed failed" #365863
+	default
+}
+
+src_install() {
+	local HTML_DOCS=( html )
+	einstalldocs
+	doman reaim.8
+	dosbin reaim
+	doinitd "${FILESDIR}"/reaim
+}
diff --git a/net-im/sendxmpp/Manifest b/net-im/sendxmpp/Manifest
new file mode 100644
index 000000000000..29f5ebb80067
--- /dev/null
+++ b/net-im/sendxmpp/Manifest
@@ -0,0 +1,7 @@
+DIST sendxmpp-1.24.tar.gz 9657 SHA256 dfaf735b4585efd6b3b0f95db31203f9ab0fe607b50e75c6951bc18a6269837d SHA512 349aac46ad4e13836f797f953d1acb33014d66de2bebed4961bcd981b765b5f0014bd2291a7355f0f8e80db522e3e843088fe08c0a21d4dda360dc2834db4842 WHIRLPOOL 81752d7b8843be27db101c0e20ebaccfe14a403f0064214e1b430ddd1117e6b81ab3ccf3e96bcc123e79601bb4658124e11b850799bf6a984cd1127965b5af8f
+DIST sendxmpp_1.23.orig.tar.gz 9196 SHA256 8a8b408ebd1df0157418981035748d9eb2464d353c5ea8ac48b074b8a85b9616 SHA512 65cbda52450a3537982d0c8f94265a1f8c336379ea4e4bc56c772bb613ea03fe25feb85fb4c8e3b26a48ad03d0c5e07188268e07c1da9981cb1dab87b17d9ba8 WHIRLPOOL e522c3950014f1cffc890ab2bdbfe6a4d3c0a9278fb935eec6918ce013011ed6037dcc912b4671c3a8fbca02245f8192ebb915571bf96381a19d6ab923f26a01
+EBUILD sendxmpp-1.23.ebuild 520 SHA256 ac4ac01e365d67c141e4c416cd08b5d99b585d70afc94ded4c634288fdb0589c SHA512 e33d5b689932055d70a1ffcb0f199733c1236d0b0a1f901946efc9a54b02346de2a6fb9f0febadfb5fbe825ee53f0d402a42268cb476c5b18aa17e2b8b74da22 WHIRLPOOL 0a7f5ac139ef7d4bc7d58214d0c8bff1166dbe4c9c7668ab387630f2d56300ace4e22a7b1774fdfa20e7d26de9e6d28195743e42c184aa28e57dd5b3eacbacf5
+EBUILD sendxmpp-1.24.ebuild 496 SHA256 6de4e4cd3206e5858f880814f00a15ad230026fa3f55de161632593f380348fc SHA512 d47476d84c82e581693d40581794f3c7e197339101cba6c5ed7cd27654a7fe146409ccd21bbea5cc8e36ce963a4aee7db21d7369a6815d4db72b4e2585ee50d4 WHIRLPOOL 1cff24cbde44188e7167d2289be66152caf77a92598489396cc24939e872bca0e16d9a86fa26b6eec4e219539afcae0c993f7a7f79e73574317c30fa1e5561e0
+MISC ChangeLog 2507 SHA256 49e1d65a7a8d6439d2248d350b5371634d6840b865dff51ad64a87e4936aacb0 SHA512 af93ebf31dc204e37b83e8977b9306801d17d9bc882942d4ee49df401b891b3975e0d228728145625c3c16247a5531d015de9b7c687bc806c52db51d4b79e2a9 WHIRLPOOL f1b329e237aaa9f23a4bb8b1874a4f1eba631d73762e90af1d3e05a6749f2fa1eb6588e8a2e0456fcaa9170a9950860858aeee059a9443750ed1774817005ac2
+MISC ChangeLog-2015 3191 SHA256 c256c519f3bba54081142d5d5acf1095f0fd5c0888389a62bcf563e8b80e50c0 SHA512 66d27f7425c11210671b3b1d93978bc4e4ee7f6495e9860bc8ef69195191dcd36d660863e8d84ae80561d6eb64237097bb369258ed2a03b2106cb0d917c4cc30 WHIRLPOOL 111e1f579d8d7c298ee4836fb7c0c5eb4f81114cd62a0f3d57311c215ce34804c19cdf7be35e3fcaf74b25e443645e25244b4333d1a582c613f3a182b63e8564
+MISC metadata.xml 246 SHA256 0173dcab407a6023a20dc01c041901cb7812129f728bd1834195289a2b0de1fd SHA512 b64c7aae46e2d47987372d30818221d17e5635606a61a1f87737bd3820e9db37d6ad91a470fdeac55fe42c85d3e86f3c28e81d45bc7a0d5440f8c6d5f52bd28d WHIRLPOOL 0ea1ab0230c190afad9c6ce34296240fba03e1f237440a6bdf8c9d27be01a76743fced3a261b23ee5353e3e97103cff314cd55302c97a2b9fc958ac8bc61c536
diff --git a/net-im/sendxmpp/metadata.xml b/net-im/sendxmpp/metadata.xml
new file mode 100644
index 000000000000..560b8ad5f525
--- /dev/null
+++ b/net-im/sendxmpp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">lhost/sendxmpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/sendxmpp/sendxmpp-1.23.ebuild b/net-im/sendxmpp/sendxmpp-1.23.ebuild
new file mode 100644
index 000000000000..85910cbbd41a
--- /dev/null
+++ b/net-im/sendxmpp/sendxmpp-1.23.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="A perl-script to send xmpp (jabber), similar to what mail(1) does for mail"
+HOMEPAGE="http://sendxmpp.hostname.sk/"
+SRC_URI="mirror://debian/pool/main/s/sendxmpp/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc sparc x86"
+IUSE=""
+
+RDEPEND="dev-perl/Net-XMPP
+	dev-perl/Authen-SASL
+	virtual/perl-Getopt-Long"
+
+S="${WORKDIR}"/lhost-${PN}-610082b
diff --git a/net-im/sendxmpp/sendxmpp-1.24.ebuild b/net-im/sendxmpp/sendxmpp-1.24.ebuild
new file mode 100644
index 000000000000..6f0f864fb38b
--- /dev/null
+++ b/net-im/sendxmpp/sendxmpp-1.24.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="A perl-script to send xmpp (jabber), similar to what mail(1) does for mail"
+HOMEPAGE="http://sendxmpp.hostname.sk/"
+SRC_URI="https://github.com/lhost/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Net-XMPP
+	dev-perl/Authen-SASL
+	virtual/perl-Getopt-Long"
diff --git a/net-im/silc-toolkit/Manifest b/net-im/silc-toolkit/Manifest
new file mode 100644
index 000000000000..7a7bd021eb72
--- /dev/null
+++ b/net-im/silc-toolkit/Manifest
@@ -0,0 +1,5 @@
+DIST silc-toolkit-1.1.10.tar.bz2 1830280 SHA256 a76cc364813b2d09dee7a9e99fda77db71b5bf752297176eb8de4fb0466eed76 SHA512 b23b956a79cff6b0471d0fe3b7b57a473272416deaf8546b66987247bef2ee1fc3a8d3db03165a8c3d7f012549f02834d70e3473704e5b39f647a025f4e6befc WHIRLPOOL 5255d960591e1e4e1588334231b877662182420eb492e9f760805991ed03752bfce2404b26beacc624a93bb46251d2e7d711fdafc407bccfb07729a51727693b
+EBUILD silc-toolkit-1.1.10.ebuild 1034 SHA256 1fb39f9af0bfc4e2f20a9cdcf4535d094777ca9540d83dc14e07bf48f230e26e SHA512 0e57706a16979f4a8fbce66ca7294e8841eadf1f353c0010f7f6f58e099f51be4424e0aa1e326c431afc98dc3cd0b8a89f3120e8885829195968d208564f55a6 WHIRLPOOL cf5a010a8f4fb12abdfb3abc50e74e2e68274e6af3bf75c17c7f140c1de5912d039fbc844aa2eeb756535cc688417b9935232ceb3256b5a072da8ca99589bb4d
+MISC ChangeLog 2471 SHA256 851d98fd9c4cca9bffa8da88c1d1a2205a9e28c6c0c3a1f18932a3d014273dbd SHA512 280f05670ab2f34663a4bac45d52c7208805ad737dbfd45752033e3ad2f49349cbca8dcd08ffabeb86b615cb7a0549ed2f506dfa5b38c2e7f695f0424471725f WHIRLPOOL faed70295894e85bdb99e3aa21c1aaf605270e1ad68c85d08778a89732302c113992bda6cc7552375a544237d12736e3288fa98ab0cf925547117efca5996704
+MISC ChangeLog-2015 14129 SHA256 1daa398be8a5c033b48bdbdc97e57ebb5e995fd0ea4c473143561185ec55e0e3 SHA512 2c43ecb0cad89aa55aa0df38047fa09eb5abade9d2571044b55549c4c5fc82d14ac26e3d59849b33f7b3413a29ad19359183d879f346387ea646347d2d529cb8 WHIRLPOOL ef3a85dce967d96593f8691fcfcb10003657075c29bb6cd32aac7176983faa8ba3f273d97571ca764ae7a43c31a0214534be4598beb3173a5ed8d55b49df809b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-im/silc-toolkit/metadata.xml b/net-im/silc-toolkit/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-im/silc-toolkit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild b/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
new file mode 100644
index 000000000000..93e387e6d9a0
--- /dev/null
+++ b/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="SDK for the SILC protocol"
+HOMEPAGE="http://silcnet.org/"
+SRC_URI="http://silcnet.org/download/toolkit/sources/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="debug ipv6"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# They have incorrect DESTDIR usage
+	sed -i \
+		"s/^\(pkgconfigdir =\) \$(libdir)\/pkgconfig/\1	\/usr\/$(get_libdir)\/pkgconfig/"\
+		"${S}"/lib/Makefile.{am,in}
+}
+
+src_configure() {
+	econf \
+		--datadir="${EPREFIX}/usr/share/${PN}" \
+		--datarootdir="${EPREFIX}/usr/share/${PN}" \
+		--includedir="${EPREFIX}/usr/include/${PN}" \
+		--sysconfdir="${EPREFIX}/etc/silc" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-optimizations \
+		--with-simdir=/usr/$(get_libdir)/${PN}/modules \
+		$(use_enable debug) \
+		$(use_enable ipv6)
+}
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
new file mode 100644
index 000000000000..89427d6b44df
--- /dev/null
+++ b/net-im/skype/Manifest
@@ -0,0 +1,8 @@
+AUX skype 55 SHA256 4b7dcba418eb0b971d6051ffb928eb377b1c8ae233c9837ce1e0c4bd06cf75f4 SHA512 051e51fdc18ea93550a00bf1795232e172f046862257fe7d7d01c68fdee45fec5d863b63c00fd0b9dff1a3bd04fcc30f1f1221f3579d95fe7128b88e188c5724 WHIRLPOOL 37a6d3f02460f5673701067a682d61da95ffa17a2fecb59f8f58fc738877996fc182bb683397621a5f189e881b6925521c47555026fbee3abacf2a918048c7d0
+AUX skype-4.3.0.37-desktop.patch 331 SHA256 afc6c53311814b1bcbf90c04f69fd3d9fbe2495d94811c80ba3332d8f1b31bd8 SHA512 3141a1b3e70836fead32e612da44f2a4312443e26b549bdd864602e9119be6f2b92f2e829f89cb28ba54607c2db28b00ab8b8d10fecbaada435bd6dacb8f6f5d WHIRLPOOL 2b3f98d5c62b246c43dddf7005d2009d049e9c9c21d7f77e069389b7de70ef203e4ac2c263e5af59d9633e5ebe5145717f47d41f7057b0b9b09eaa4e4bf514db
+DIST skype-4.3.0.37.tar.bz2 19310701 SHA256 8c99dc3978a588fb13303df7c8134379fb55b8dd460efefbc79ae594269b892d SHA512 935d0c06c031a90414f9b20c9a782c59deee36abff781c08f1dfd62194763dc9674bb85d478ae916b1bf440b123291d64380bc28295e9ecdd6522d17b434b7a5 WHIRLPOOL 1e5a84b04d7eb9bbf3bae9ae6e69bb41587a1cef7f5ff19af0363343fd7fc949d5202959efaf93b0ed9ccb939b8b2ad4d61fc9626fffbdc2a8d898f9fa29b300
+EBUILD skype-4.3.0.37-r5.ebuild 3184 SHA256 6da4d3d99c3b07e8d686c3a95ea16ca46a4b090c7918f81c0166bd19cadc2fe3 SHA512 fde2d345561b40340584118db541e2ab8a5ba28ce0a5be243b9088b7bd1c7058469555079d41e9a1d9138c716deb0ee663955fd14e13251f09ecf67e8a8ba1a1 WHIRLPOOL 8c40f56e5ec1e7b722b237e0fe34250d81f50580736b00c019c1b6ceaec82240da0ec0aebc6f5a04dfef26b9f772cdb4010660d55f60d7d7808c560465ad05a6
+EBUILD skype-4.3.0.37-r6.ebuild 3075 SHA256 922cac61d0c30e94473e77a1175e44b32c327cc1c9eacb1a2b95e8812e0e4e89 SHA512 f697b3de7175b2d47e68f7c7ca34fb2dc80cba629038301bc3db1e97836073b1571485930660563e2a84d2a25f0b4b6bc5c64ee3919c9dea379f31825a60119b WHIRLPOOL 376f4b3c48dec4d4b983071f38a13a9a1a1666c4385890939680e5c684cbdf65891f8934c2d691159a3125addbdc40d006376d14a96961a415c7f6cd842b4aef
+MISC ChangeLog 3894 SHA256 824153834716d631a84e73297ce927164918e71fa3055f4189524fb98c4ba186 SHA512 98b94c9d8037223bfb5011ad49b59a5633228daff08ec4d1cf682f80f70aa432f2effa2c3329608f9205f35bb9fb41570f3bc63b813555f28e42a1d21f7b2d61 WHIRLPOOL ec74ba02f5a69c497d791b5cc7b450160b072782c21fa1727da53435b33c90b0ad28def56f1dc4f2dd46dedee0e21df662126b03ff837d6a59d4def33919d134
+MISC ChangeLog-2015 31502 SHA256 134bd6094f04b74d3ba624f7993f5d4cae262ec4ffa1f397d56436e067748cd7 SHA512 a47aa927d7924e5bdf08261b15b8ce1e4e0a2b2b175609095c60d3239b8f301c3a27e510a20debfa22273c525255f247e37e53c98ab644ea27eae58661ca9911 WHIRLPOOL 481202464af2cc7bccd0f1582e0892f500eee2da9833696315823d13999d47f3553e7852a329b583bd487c75ea46b7da1e3dea8729a9b822ffe9cdef5e6acf7e
+MISC metadata.xml 836 SHA256 73c49e0768633555f0c1550b440a969305486c159c1d97fe53681dcd35a001be SHA512 b59552280a3ff780ceae4231ce408475bb613dcbc70e242bbd50b5caf813e07bc67c425b1d528e92bf4555584b38664c94a3342c39dc6b4d914ac9ea6fd35050 WHIRLPOOL 61b974599a3621644d551c69ebedc3a1b152b9e7ae2573fbe335a79956e544b2de2c758f24f9c9bddf3880e2a8b3710a3e4ad9a4efed2a48c53961e32eaf1020
diff --git a/net-im/skype/files/skype b/net-im/skype/files/skype
new file mode 100644
index 000000000000..3a647adddbda
--- /dev/null
+++ b/net-im/skype/files/skype
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec i686-pc-linux-gnu-apulse skype-bin "$@"
diff --git a/net-im/skype/files/skype-4.3.0.37-desktop.patch b/net-im/skype/files/skype-4.3.0.37-desktop.patch
new file mode 100644
index 000000000000..af31e0e34aea
--- /dev/null
+++ b/net-im/skype/files/skype-4.3.0.37-desktop.patch
@@ -0,0 +1,15 @@
+--- skype.desktop
++++ skype.desktop
+@@ -2,10 +2,10 @@
+ Name=Skype
+ Comment=Skype Internet Telephony
+ Exec=skype %U
+-Icon=skype.png
++Icon=skype
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+-Categories=Network;Application;
++Categories=Network;InstantMessaging;Telephony;
+ MimeType=x-scheme-handler/skype;
+ X-KDE-Protocols=skype
diff --git a/net-im/skype/metadata.xml b/net-im/skype/metadata.xml
new file mode 100644
index 000000000000..6a054bc85f02
--- /dev/null
+++ b/net-im/skype/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>shentino@gmail.com</email>
+		<name>Raymond Jennings</name>
+		<description>Proxy maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="apulse">Use <pkg>media-sound/apulse</pkg> for PulseAudio emulation</flag>
+		<flag name="pax_kernel">Triggers a paxmarking of the main skype binary</flag>
+	</use>
+	<longdescription>Skype is for doing things together, whenever you’re apart. Skype’s text, voice and video make it simple to share experiences with the people that matter to you, wherever they are.</longdescription>
+</pkgmetadata>
diff --git a/net-im/skype/skype-4.3.0.37-r5.ebuild b/net-im/skype/skype-4.3.0.37-r5.ebuild
new file mode 100644
index 000000000000..f95c93110a80
--- /dev/null
+++ b/net-im/skype/skype-4.3.0.37-r5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils gnome2-utils pax-utils
+
+DESCRIPTION="P2P Internet Telephony (VoiceIP) client"
+HOMEPAGE="http://www.skype.com/"
+SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2"
+
+LICENSE="skype-4.0.0.7-copyright BSD MIT RSA W3C regexp-UofT no-source-code"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apulse pax_kernel plasma +pulseaudio selinux"
+REQUIRED_USE="apulse? ( !pulseaudio )"
+
+QA_PREBUILT=opt/bin/${PN}
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	virtual/ttf-fonts
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtdbus:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
+	dev-qt/qtwebkit:4[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXScrnSaver[abi_x86_32(-)]
+	x11-libs/libXv[abi_x86_32(-)]
+	apulse? ( media-sound/apulse[abi_x86_32(-)] )
+	plasma? ( dev-libs/sni-qt[abi_x86_32(-)] )
+	pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
+	selinux? ( sec-policy/selinux-skype )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-desktop.patch"
+}
+
+src_compile() {
+	if type -P lrelease >/dev/null; then
+		lrelease lang/*.ts || die
+	fi
+	rm -f lang/*.ts || die
+}
+
+src_install() {
+
+	if use apulse; then
+		into /opt
+		newbin ${PN} ${PN}-bin
+		dobin "${FILESDIR}/${PN}"
+		fowners root:audio /opt/bin/${PN} /opt/bin/${PN}-bin
+	else
+		into /opt
+		dobin ${PN}
+		fowners root:audio /opt/bin/${PN}
+	fi
+
+	insinto /etc/dbus-1/system.d
+	doins ${PN}.conf
+
+	insinto /usr/share/skype
+	doins -r avatars lang sounds
+
+	dodoc README
+
+	local res
+	for res in 16 32 48 64 96 128 256; do
+		newicon -s ${res} icons/SkypeBlue_${res}x${res}.png ${PN}.png
+	done
+
+	domenu skype.desktop
+
+	if use pax_kernel; then
+		if use apulse; then
+			pax-mark Cm "${ED}"/opt/bin/${PN}-bin || die
+		else
+			pax-mark Cm "${ED}"/opt/bin/${PN} || die
+		fi
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+
+	echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN}
+	doenvd "${T}"/99${PN} #430142
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	rm -rf "${EROOT}"/usr/share/${PN} #421165
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	# https://bugs.gentoo.org/360815
+	elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by"
+	elog "media-libs/libv4l package and \"README\" document of this package."
+
+	if ! use pulseaudio && ! use apulse; then
+		ewarn "ALSA support was removed from Skype"
+		ewarn "consider installing media-sound/pulseaudio"
+		ewarn "or media-sound/apulse for pulseaudio emulation"
+		ewarn "otherwise sound will not work for you."
+		ewarn "These packages can be pulled in by setting"
+		ewarn "appropriate USE flags for net-im/skype."
+	fi
+	elog "If skype is segfaulting for you with gcc-5+ please consider "
+	elog "instalation of dev-qt/qtwebkit[-exceptions]"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/skype/skype-4.3.0.37-r6.ebuild b/net-im/skype/skype-4.3.0.37-r6.ebuild
new file mode 100644
index 000000000000..ebf518304ed5
--- /dev/null
+++ b/net-im/skype/skype-4.3.0.37-r6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils gnome2-utils pax-utils
+
+DESCRIPTION="P2P Internet Telephony (VoiceIP) client"
+HOMEPAGE="http://www.skype.com/"
+SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2"
+
+LICENSE="skype-4.0.0.7-copyright BSD MIT RSA W3C regexp-UofT no-source-code"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apulse pax_kernel plasma +pulseaudio selinux"
+REQUIRED_USE="apulse? ( !pulseaudio )"
+
+QA_PREBUILT=opt/bin/${PN}
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	virtual/ttf-fonts
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtdbus:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
+	dev-qt/qtwebkit:4[-exceptions,abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXScrnSaver[abi_x86_32(-)]
+	x11-libs/libXv[abi_x86_32(-)]
+	apulse? ( media-sound/apulse[abi_x86_32(-)] )
+	plasma? ( dev-libs/sni-qt[abi_x86_32(-)] )
+	pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
+	selinux? ( sec-policy/selinux-skype )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-desktop.patch"
+}
+
+src_compile() {
+	if type -P lrelease >/dev/null; then
+		lrelease lang/*.ts || die
+	fi
+	rm -f lang/*.ts || die
+}
+
+src_install() {
+
+	if use apulse; then
+		into /opt
+		newbin ${PN} ${PN}-bin
+		dobin "${FILESDIR}/${PN}"
+		fowners root:audio /opt/bin/${PN} /opt/bin/${PN}-bin
+	else
+		into /opt
+		dobin ${PN}
+		fowners root:audio /opt/bin/${PN}
+	fi
+
+	insinto /etc/dbus-1/system.d
+	doins ${PN}.conf
+
+	insinto /usr/share/skype
+	doins -r avatars lang sounds
+
+	dodoc README
+
+	local res
+	for res in 16 32 48 64 96 128 256; do
+		newicon -s ${res} icons/SkypeBlue_${res}x${res}.png ${PN}.png
+	done
+
+	domenu skype.desktop
+
+	if use pax_kernel; then
+		if use apulse; then
+			pax-mark Cm "${ED}"/opt/bin/${PN}-bin || die
+		else
+			pax-mark Cm "${ED}"/opt/bin/${PN} || die
+		fi
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+
+	echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN}
+	doenvd "${T}"/99${PN} #430142
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	rm -rf "${EROOT}"/usr/share/${PN} #421165
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	# https://bugs.gentoo.org/360815
+	elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by"
+	elog "media-libs/libv4l package and \"README\" document of this package."
+
+	if ! use pulseaudio && ! use apulse; then
+		ewarn "ALSA support was removed from Skype"
+		ewarn "consider installing media-sound/pulseaudio"
+		ewarn "or media-sound/apulse for pulseaudio emulation"
+		ewarn "otherwise sound will not work for you."
+		ewarn "These packages can be pulled in by setting"
+		ewarn "appropriate USE flags for net-im/skype."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
new file mode 100644
index 000000000000..9e0bb5f6b248
--- /dev/null
+++ b/net-im/skypeforlinux/Manifest
@@ -0,0 +1,6 @@
+DIST skypeforlinux_5.4.0.1-1.x86_64.rpm 72058201 SHA256 7acb723ba220ba2a2776f98a021a47223ead0a7959f33201ec6d4e9145024702 SHA512 706d33b1ea5c0b9e7aa1799b06ac465f5aafc29627ef4b3660598b0f1762986ba217af0903af1da41f2478ca5011adf9070fe7a331ecfcb028f81ca839b03ccb WHIRLPOOL 83a4fe4931432d7a5fce7231e008011905a41fb6f28240a42c355bc27d673033eecbddfc100da053a9efbea5c1d5c89161e1aab88394ab775a16ebf6848ae819
+DIST skypeforlinux_5.5.0.1-1.x86_64.rpm 72080362 SHA256 f32db8a5858a9eb8dde3ca7b29b920649bb2422649ccb58ffee77ff73d81a919 SHA512 73ae5e8443e8e7110a74456d336933d1fe1873009189e764e31904b7c82b3c6b0a6603e527d455b08e780a73b5c1f7794faea5de8179cb600114561ffbb5bcd9 WHIRLPOOL 467d1442ff1d8b0ed8756d1f82dae32d3f182c20f84e944835a564537dff34000504216a445f1ebc9e9ac19553e21646b212baec34154c5b08e6a664059a42bb
+EBUILD skypeforlinux-5.4.0.1.ebuild 3449 SHA256 40a4d7309e802015977483b68426acc55bc590726b879d67356430383684123b SHA512 2e8cb9616010aa713d0b7b77abb94b19b876aead22665a58621cd00d927fb2c0ea9c3443be352e04763e7436adc37dee73f47d330242cab5d2334ded442180c9 WHIRLPOOL a353b7bcdfcd5fc733ae8a552097bcf792bb3a4fad0bfbb4afef73bd6b70bd7d1e3acf34cbbae3c7b443fb34ac39f919774f05d4438a5ce2e83d183109a1a5bb
+EBUILD skypeforlinux-5.5.0.1.ebuild 3615 SHA256 de4564a6bad6034008b3b9e395aa4cd98071a59a2738122825ec9ad0790c82a8 SHA512 b83858622d06584dff1f5a73384e79ae1e27c06764a7bcb76e29866a00d7efc410c1dd58ab56228b1072a444a17845b11c7bbb8e25d12b2b01e2687cb868cf51 WHIRLPOOL 1451c06ebb3560e261b6f4c5ba25d64aed404a742caf01aee46dcff01a47d77ef2c2d0d7b67e794a8916cb2ea977694f7023d501ed39b0d7118e032b027c5fdd
+MISC ChangeLog 4074 SHA256 048821c2b04fa76f7c3706f64825c0c91dcee56cc252d69f8377e58fea20977c SHA512 c535bf149e97e6bc99b3645affa45fc8936cf8ed6404b28bdd50b5bfdf11a5b86f7143ce2462607fb464f9dd716b857e1749cf09949fb1334c317767b679aa03 WHIRLPOOL 36f897d7fcd95fcf0df50658b370f162d134460c41a10f8950a170b3343a515ce3a274152d83e51f783bc9eb709731faf05551aebda03c8cdcd651a15cea8967
+MISC metadata.xml 795 SHA256 9761bc0707d9fc9a0e4cc9bb1801186f4e85059dbfb632985f39c6ec50d7c2ff SHA512 7c97ba77885e397a00e855ffca0dd1f2aa4e1b9c5780650cac09a729ecf4cce07599179c67b86ace1d7e1cd47eafe3a397e9487b42de56e96a86ffb15947abf9 WHIRLPOOL 0dfb8521b022bbc4b0d549a8f41232e3b2438f871c2c30fa72d0fe31a6fe1652d433c79c0f696eab358940e29d279660bc01ef70fbb17b2d5c74cd67da545046
diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml
new file mode 100644
index 000000000000..6b8ada5cd1b6
--- /dev/null
+++ b/net-im/skypeforlinux/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>shentino@gmail.com</email>
+		<name>Raymond Jennings</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>krlgrudzinski@gmail.com</email>
+		<name>Karol Grudziński</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="pax_kernel">Triggers a paxmarking of the main skype binary</flag>
+	</use>
+	<longdescription>Skype is for doing things together, whenever you're apart. Skype's text, voice and video make it simple to share experiences with the people that matter to you, wherever they are.</longdescription>
+</pkgmetadata>
diff --git a/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild b/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild
new file mode 100644
index 000000000000..da51c705af20
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit pax-utils rpm multilib-build
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS no-source-code"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pax_kernel"
+
+S="${WORKDIR}"
+QA_PREBUILT=opt/skypeforlinux/skypeforlinux
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	gnome-base/libgnome-keyring[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	sys-libs/glibc
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Exec=.*!Exec=${EPREFIX}/opt/bin/skypeforlinux!" \
+		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	insinto /opt/skypeforlinux/locales
+	doins usr/share/skypeforlinux/locales/*.pak
+
+	insinto /opt/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release
+	doins usr/share/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node
+
+	insinto /opt/skypeforlinux/resources
+	doins usr/share/skypeforlinux/resources/*.asar
+
+	insinto /opt/skypeforlinux
+	doins usr/share/skypeforlinux/*.pak
+	doins usr/share/skypeforlinux/*.bin
+	doins usr/share/skypeforlinux/*.dat
+	doins usr/share/skypeforlinux/version
+	exeinto /opt/skypeforlinux
+	doexe usr/share/skypeforlinux/*.so
+	doexe usr/share/skypeforlinux/skypeforlinux
+
+	into /opt
+	dobin usr/bin/skypeforlinux
+
+	dodoc -r usr/share/doc/skypeforlinux/.
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	if use pax_kernel; then
+		pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
diff --git a/net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild b/net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild
new file mode 100644
index 000000000000..f9444b1d3cd5
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit pax-utils rpm multilib-build xdg-utils
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS no-source-code"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pax_kernel"
+
+S="${WORKDIR}"
+QA_PREBUILT=opt/skypeforlinux/skypeforlinux
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	gnome-base/libgnome-keyring[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	sys-libs/glibc
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Exec=.*!Exec=${EPREFIX}/opt/bin/skypeforlinux!" \
+		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	insinto /opt/skypeforlinux/locales
+	doins usr/share/skypeforlinux/locales/*.pak
+
+	insinto /opt/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release
+	doins usr/share/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node
+
+	insinto /opt/skypeforlinux/resources
+	doins usr/share/skypeforlinux/resources/*.asar
+
+	insinto /opt/skypeforlinux
+	doins usr/share/skypeforlinux/*.pak
+	doins usr/share/skypeforlinux/*.bin
+	doins usr/share/skypeforlinux/*.dat
+	doins usr/share/skypeforlinux/version
+	exeinto /opt/skypeforlinux
+	doexe usr/share/skypeforlinux/*.so
+	doexe usr/share/skypeforlinux/skypeforlinux
+
+	into /opt
+	dobin usr/bin/skypeforlinux
+
+	dodoc -r usr/share/doc/skypeforlinux/.
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	if use pax_kernel; then
+		pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/skypetab-ng/Manifest b/net-im/skypetab-ng/Manifest
new file mode 100644
index 000000000000..4ab1878e91ad
--- /dev/null
+++ b/net-im/skypetab-ng/Manifest
@@ -0,0 +1,9 @@
+AUX skypetab-ng-0.5.2_p20150201-isdigit.patch 418 SHA256 4c3a1e2380264bbcbd4a02dff383ffead57f8e2c3642b23b3a4ab6f1a187be40 SHA512 180097346e84957408793c8104f0e90e7fc8c79712431c2a292ea59b81a2b4733c13540bb4cfa838982056ba122a249e108a0a79b8a0966d8b818ef4af376f0f WHIRLPOOL 80365612453ab7c6e709d500106b9f006ac584fb2b47b5a31df786ac1a902ba821bba0517033e5beca17f84ee309f9a0c8cf9e7d97eb0df25400a71f97cba8ff
+DIST skypetab-ng-0.5.2.tar.gz 54244 SHA256 cb47961ddb9d5754141c10c862d991704ae065abf2cba1e4763a78a5dcbf0805 SHA512 28a19ea983a81c069bb6ad24c337561293f7ec53ca9a315fb872c9341dccecf4eb30e1652b1f012f7be34060fb955a8c085327ae03017264ccc4510976d3f6ea WHIRLPOOL 48b1a86a588dd60c3ee7b9185625027bbaef69b0a6dce237c1e38d3c7dc5b762675d7d21efb88bef7e3840ac1464cdfa3ca4a531756ab3f3f155c2a681aec0e7
+DIST skypetab-ng-0.5.2_p20150201.tar.bz2 53527 SHA256 c2ec5b1b206b9dd6c285daea58fc68966237a1a29fdc67c3feec2030a78d8487 SHA512 cb423d83a1ea6979bf8732b2f546860778f0a5b4dddf3e7704c5fc71d15c25b191dcf510ede2315350aa26cf8c0580cd7fae5cd79ff035e5053857849bd0427c WHIRLPOOL c5bcaf70547305eb6c5f3fb74d516b3d7083eb3ccc569c8d7c08ee33b41c5196e2688d4ec9a5cab7bc8dad3491b3b17ac7d5cd7dbda37757619ae98b532eeb32
+EBUILD skypetab-ng-0.5.2.ebuild 835 SHA256 b4d08ced3c2b8c1509a1981facb5c227b6cc1199ed7431b85ded972a46b86fda SHA512 8b2ec88234daddb4e779d9838ea5368acc61bfc17d78db9ae17351944bd93fd6c6ebbed25ce2bf8148b4d7edf5891d260cbef7ac31a3e3744fbca265593d9e5b WHIRLPOOL 09c6080466c3ee04495abd4c8615bed36470af61115d03409670fb70aba17dd97a05f3a7af7efcabd646c1e1afcd7a62217a3af81548868cae615e93cb382877
+EBUILD skypetab-ng-0.5.2_p20150201.ebuild 892 SHA256 af6989c8a02f47e813b69aa7506b92787ad302a721436ba9858cb9aa44850fba SHA512 4df94aa8d978b2c8447ccfbbbb3ef557a34b2f62665ad050e6d2778665a55d0d4560dd6b067c1008ab104c754f0b6def589b2a9b9d4fe13f78eb2ce3eb56f0c2 WHIRLPOOL 08d905f301630724ffc4ed1a2d95761cfd0df1bd5c40a0e637c70311b127d90e7d1894704ca2d717d210ef040346970a04c1a9bc949ba8ffd4ca096063f9459a
+EBUILD skypetab-ng-9999.ebuild 919 SHA256 4ae1b5937e9c9acba077880b8e238ec874c7e857f40ec3aef2d3ba2ccc9967ad SHA512 432d4cee78bd7e0e1aca5f67f8496beb6bbec05e190884b83ef7773155e72b098085530788bf3161492eac84cf2333dda657225794d83fb4fae2abf694169a9e WHIRLPOOL 6f3982794c971b3f3efaec46894ecdf9c75e22d4d2779ad824be0fcda51231929b499572c0a2d1bb10d05a47c36b48a3ca27da1a5ea58a113f71df6562e84f2c
+MISC ChangeLog 2916 SHA256 826f346dfed8d1bceeb5e230a6acab2308c0b9acfe66ecb8acb6f535b93e90d9 SHA512 48a649d8fbe33eab9d56c42a243c39c8d33544299d3152edebe40842dc797935cf56a690695fe69935e1889c63dedcd3b282ab95d6558bc5e7b3c03c1b23977d WHIRLPOOL 458460a8a16a7573775bcf57647a3ff188dc2c7df9459a0b01f997364d7f2369a930edc1a490afa9f7a09b912617a24ff29b715f5b97108f80dcd8d7dc86f28e
+MISC ChangeLog-2015 3706 SHA256 cd3162b089d8862d73940f79714dfe93d9341ffe22c2b7f212ac01c025e29aaa SHA512 1a9f4064e93bd24c33c030e63a3876b5ee2af8ff4d9062a9fa09803471a30a64aa50a8b6f6d0ab844b00acd9777577db0bd4231e8df74398bf5ff6ca91a1c09a WHIRLPOOL b75fe2d0cf4c030619c02f8623d0adde5e395311c5d23475bcdcb2f92c5d7d39802108cf2d9b81c44517aa0c56760b3574437bb1042204e64dd17d16a161903e
+MISC metadata.xml 384 SHA256 3bb02dcc0d908fcd2335ddab516bdef189232b1b7fc6df3a52c99da7571b4cbe SHA512 ad8ad0e6f1a274a685aa5902efa90fffac674885bf39d35541584174233654a35863ee21da16c225af1072a715763ab296ebe8fd5160d1e4f6ac15f4e453c279 WHIRLPOOL b018b024a367e9619e7b629e897fa400252327600cc3e4c2e37b1bd70b8dca89ef49b72d92a07c93768a587ed1c3e39e2fa255aff0cd63a4614ee78165011e59
diff --git a/net-im/skypetab-ng/files/skypetab-ng-0.5.2_p20150201-isdigit.patch b/net-im/skypetab-ng/files/skypetab-ng-0.5.2_p20150201-isdigit.patch
new file mode 100644
index 000000000000..9b199e5361c8
--- /dev/null
+++ b/net-im/skypetab-ng/files/skypetab-ng-0.5.2_p20150201-isdigit.patch
@@ -0,0 +1,14 @@
+Missing header noticed by gcc:
+ * skype-poll-fix.c:38:9: warning: implicit declaration of function ‘isdigit’ [-Wimplicit-function-declaration]
+diff --git a/skype-poll-fix.c b/skype-poll-fix.c
+index ccc88a1..fd21ba8 100644
+--- a/skype-poll-fix.c
++++ b/skype-poll-fix.c
+@@ -2,2 +2,3 @@
+ #define _GNU_SOURCE
++#include <ctype.h>
+ #include <stdio.h>
+@@ -13,3 +14,2 @@
+ #include <sys/time.h>
+-#include <ctype.h>
+ #endif
diff --git a/net-im/skypetab-ng/metadata.xml b/net-im/skypetab-ng/metadata.xml
new file mode 100644
index 000000000000..c16dc3f5475c
--- /dev/null
+++ b/net-im/skypetab-ng/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kekekeks/skypetab-ng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild
new file mode 100644
index 000000000000..2aaaab6d100f
--- /dev/null
+++ b/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/kekekeks/${PN}.git"
+	UNPACKER_ECLASS="git-2"
+	LIVE_EBUILD=yes
+else
+	UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit qt4-r2 multilib ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="-* ~x86 ~amd64"
+	SRC_URI="https://github.com/kekekeks/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
+HOMEPAGE="https://github.com/kekekeks/skypetab-ng"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
+"
+RDEPEND="${DEPEND}
+	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
+"
+
+pkg_setup() {
+	use amd64 && multilib_toolchain_setup x86
+}
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.2_p20150201.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.2_p20150201.ebuild
new file mode 100644
index 000000000000..0ea51d9f8ee0
--- /dev/null
+++ b/net-im/skypetab-ng/skypetab-ng-0.5.2_p20150201.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/kekekeks/${PN}.git"
+	UNPACKER_ECLASS="git-2"
+	LIVE_EBUILD=yes
+else
+	UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit eutils qt4-r2 multilib ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="-* ~x86 ~amd64"
+	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+fi
+
+DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
+HOMEPAGE="https://github.com/kekekeks/skypetab-ng"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
+"
+RDEPEND="${DEPEND}
+	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
+"
+
+pkg_setup() {
+	use amd64 && multilib_toolchain_setup x86
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-isdigit.patch
+}
diff --git a/net-im/skypetab-ng/skypetab-ng-9999.ebuild b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
new file mode 100644
index 000000000000..2295ba44020b
--- /dev/null
+++ b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/kekekeks/${PN}.git"
+	UNPACKER_ECLASS="git-2"
+	LIVE_EBUILD=yes
+else
+	UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit eutils qt4-r2 multilib ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="-* ~x86 ~amd64"
+	SRC_URI="https://github.com/kekekeks/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
+HOMEPAGE="https://github.com/kekekeks/skypetab-ng"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
+"
+RDEPEND="${DEPEND}
+	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
+"
+
+pkg_setup() {
+	use amd64 && multilib_toolchain_setup x86
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.2_p20150201-isdigit.patch
+}
diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
new file mode 100644
index 000000000000..808183e53327
--- /dev/null
+++ b/net-im/slack-bin/Manifest
@@ -0,0 +1,11 @@
+DIST slack-desktop-2.1.2-amd64.deb 46460486 SHA256 46576dbe929d4d60d0311056c0268d22dfaa58edc6774ce8a7e61873414bbf2e SHA512 b23ccee498c2c6d043bdb4632b1b2755b3f0a96a1d78338020fb4221c49b7feeb437cc358abcf285e0f0a0f7b57f4db6792b2baa8b339596a287f1272ed12284 WHIRLPOOL 7b9dbf46c988dce1837318c4568ef7357481058593d80d0d00f0b8924a1ead28d8aaf3548d7e1f095d62042a05d721ba047658fcbb1758aad1ea006e69c74dcf
+DIST slack-desktop-2.1.2-i386.deb 42997902 SHA256 cc9660d95f5ce765c18b35191e2475d6bd272affc6d47f176759cc202910ddb4 SHA512 6b68123d3c85687043e886974449fe424af267c326ffc869d03d911ae5d0f30f5081b611e136bc4f832da8d555b2851a4c093df9c8be2de98235ebcd03528d8c WHIRLPOOL 80514dc501a94652bb54dad205224ee73cc4abd12f356aaf2b454aff67f99b4a16ec88bde0f9c541dbbddfcb8739df040656ca6c91b42b2947d6862743be41a8
+DIST slack-desktop-2.5.2-amd64.deb 47812458 SHA256 b176a9d292319a5157af4d1fb84cb07111d04ef517663df1f6dc5a8a8296e855 SHA512 0e8f305e33c17884bbb71cdcc236a602918e8596b00c525f155a1e0740ac02d0f99256b2afabe4381a09e6cd06e425f99b9d219bea43f113b9488c9bb0929ca9 WHIRLPOOL 692273af0c9fb6f3fd3871004e2fd7c9eae9ad58c5fb2e4a81695cadaab5a49a6f397f5bfde44af701b2cb08665d66a1820f98c90ac33c26ede7beac1fd9c960
+DIST slack-desktop-2.6.3-amd64.deb 51434914 SHA256 ec11c05e954b1291f2503bbbd9d0b371190bdf157b2d973e54fa42418ea1e2f0 SHA512 943abc3084e395277c41f7a42feffcdeb184900c9cf0bce58bbbe6891d23b97b937fa8d47a1200e9aaa62ed0f7d4b6e3f24d41cd610cd185df570e58c31640bf WHIRLPOOL 0cc64b62f13388fc75b131b18cf8f753c5408d072818b6f6a4c260cc24173580ffe04bc671fc2066dcaac53464c59fea3d475c3cecae570fcbcff0a148673cba
+DIST slack-desktop-2.8.0-amd64.deb 51225854 SHA256 15626e80dfef62d9f26d1c46987f4a6b333d722d49513797913e238741c4700a SHA512 9a3a8c4eec95583cde76003e99679dda9d6e44692258242bef888043666d589da8a7a5d68898f61e645a6810291ef36fea9551834c3d2fbec8e3baa6a84313d0 WHIRLPOOL d4ebec25adb2a5d18ac45e3eebfa90c5a72d04150c0e78b616219864cfe6fdcff17f16b5cf55d589b779f4d2308165919b7d1527dae1d6c439f4e1eb84d7f5ec
+EBUILD slack-bin-2.1.2.ebuild 1769 SHA256 2f12fe11165bb9ccf2e08855f4584506c4df2f5a2e26e41934877ffa677ccc13 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b WHIRLPOOL 6091c7706d4b06fbc344662d6f8aa3cd01c4564708adb841f57a244746034b5a80495bfc890fa4b262b10016fd6056d30340aab91f150dd472296055bc1761ce
+EBUILD slack-bin-2.5.2.ebuild 1674 SHA256 c9a35843990e66f0d95801c9b89c699aa7623e2a2f4061922538acef35f24bb8 SHA512 5b975220ef97fe554c46df85cf98eb51c89e48026f460d2e4cfaae1ae72c5af7e919519d2fdf28e95f3d22929caf8b5237075f57b1add35394b621bc987eb62c WHIRLPOOL cfd50bf2b002370f803c75f2bf81c729b586074aa3ce5837bc33521a16ee8facdb0d07eb21f314503822c5fb1e2465c57f86a159291b3dbb5ed7605c53e4a232
+EBUILD slack-bin-2.6.3.ebuild 1674 SHA256 c9a35843990e66f0d95801c9b89c699aa7623e2a2f4061922538acef35f24bb8 SHA512 5b975220ef97fe554c46df85cf98eb51c89e48026f460d2e4cfaae1ae72c5af7e919519d2fdf28e95f3d22929caf8b5237075f57b1add35394b621bc987eb62c WHIRLPOOL cfd50bf2b002370f803c75f2bf81c729b586074aa3ce5837bc33521a16ee8facdb0d07eb21f314503822c5fb1e2465c57f86a159291b3dbb5ed7605c53e4a232
+EBUILD slack-bin-2.8.0.ebuild 1716 SHA256 a871f09e0bc553d26f168b53b99705cffcd5c4cdef3927950ce83f339670bc5c SHA512 2f83f679d34b0e5052379081a69546e336e89ae981db1a991c0178624cc898f2f28fd7849e595c17b1fa3cdf0627796445dab7b79a19fcd61adc6c5d00ad3226 WHIRLPOOL 01351a8089c3dfd054683e7392f5cd94ed944ce6cae36ded46d8d2ac7d3b42228ff9d0d399f762d9295d3bffc2820366e0936e29ca18723643ed3b965cd28399
+MISC ChangeLog 920 SHA256 df34f9ec77e50aa2c09c92c06c9167140555113ed5e76e760a0a8d28c2cd1d7d SHA512 fdf09663e6d43d33bf2a65174b7602848be4f911deb785ca1a980bf9f94b195cbdcee4888fdd6411d461ee76f15583dd78805f45278f8cee6efaef577e62a6f0 WHIRLPOOL 0ae7d3d1d138d9b510ebda4fd78347eb43fbc6d1cbf97f6e3e656178cc1090d696f279017145efcc6b079e99ffd3453ff913b2e6495dee3f7b717b35c48505c1
+MISC metadata.xml 686 SHA256 24aad708b95356458d295aa3455d6b2ad51184def17589d0774e57d8cfc1b914 SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631 WHIRLPOOL 9131d36c8920cf1b19dfcf3b2a53d8860d4f75f64bcb52b34d6f87b7668a86eb424a6dc33f2d562eeefbab64672e84da4384b809c6dfb464bc387356d329857b
diff --git a/net-im/slack-bin/metadata.xml b/net-im/slack-bin/metadata.xml
new file mode 100644
index 000000000000..15eca405ed06
--- /dev/null
+++ b/net-im/slack-bin/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	Slack offers persistent chat rooms organized by topic,
+	as well as private groups and direct messaging.
+	All content inside Slack is searchable, including files, conversations,
+	and people.
+	</longdescription>
+	<upstream>
+		<doc>https://get.slack.help/hc/en-us</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/slack-bin/slack-bin-2.1.2.ebuild b/net-im/slack-bin/slack-bin-2.1.2.ebuild
new file mode 100644
index 000000000000..6a7b8f24e9b0
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-2.1.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+BASE_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-_arch_.deb"
+
+inherit eutils gnome2-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="http://www.slack.com/"
+SRC_URI="x86? ( ${BASE_URI/_arch_/i386} )
+	amd64? ( ${BASE_URI/_arch_/amd64} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist mirror"
+
+RDEPEND="dev-libs/atk:0
+	dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	gnome-base/libgnome-keyring:0
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-misc/curl:0
+	net-print/cups:0
+	sys-apps/dbus:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11:0
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/pixmaps
+	doins usr/share/pixmaps/${MY_PN}.png
+
+	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
+	domenu usr/share/applications/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins -r usr/lib/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_PN}
+	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-im/slack-bin/slack-bin-2.5.2.ebuild b/net-im/slack-bin/slack-bin-2.5.2.ebuild
new file mode 100644
index 000000000000..df38598b0cdb
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-2.5.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+
+inherit eutils gnome2-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="http://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror"
+
+RDEPEND="dev-libs/atk:0
+	dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-misc/curl:0
+	net-print/cups:0
+	sys-apps/dbus:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11:0
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libxkbfile:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/pixmaps
+	doins usr/share/pixmaps/${MY_PN}.png
+
+	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
+	domenu usr/share/applications/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins -r usr/lib/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_PN}
+	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-im/slack-bin/slack-bin-2.6.3.ebuild b/net-im/slack-bin/slack-bin-2.6.3.ebuild
new file mode 100644
index 000000000000..df38598b0cdb
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-2.6.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+
+inherit eutils gnome2-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="http://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror"
+
+RDEPEND="dev-libs/atk:0
+	dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-misc/curl:0
+	net-print/cups:0
+	sys-apps/dbus:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11:0
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libxkbfile:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/pixmaps
+	doins usr/share/pixmaps/${MY_PN}.png
+
+	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
+	domenu usr/share/applications/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins -r usr/lib/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_PN}
+	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-im/slack-bin/slack-bin-2.8.0.ebuild b/net-im/slack-bin/slack-bin-2.8.0.ebuild
new file mode 100644
index 000000000000..02da826eadc2
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-2.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+
+inherit eutils gnome2-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="http://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror"
+
+RDEPEND="app-crypt/libsecret:0
+	dev-libs/atk:0
+	dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-misc/curl:0
+	net-print/cups:0
+	sys-apps/dbus:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11:0
+	x11-libs/libxcb:0/1.12
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libxkbfile:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/pixmaps
+	doins usr/share/pixmaps/${MY_PN}.png
+
+	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
+	domenu usr/share/applications/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins -r usr/lib/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_PN}
+	dosym /opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
new file mode 100644
index 000000000000..b39f43dc1194
--- /dev/null
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -0,0 +1,10 @@
+DIST tdesktop-1.1.19.tar.gz 16839630 SHA256 a1dceffb4ba3039d1ca7ad3859616556ac46ada3c6ea8425b23569500b705ada SHA512 dc421d319b195fe4a15ab5177ddacdc351c86127aad8634cd78cc4f809cbd9effbfeb2d25d553b593f49752e9f08b430ce486b8a0c4e6323c735feb665d4122e WHIRLPOOL 945bdcc2f3aaa6cfc74a03d757e8ada98c36197937386aeaf9e9e5e0f4175c92f6cce4032bff029b5e9e583a4c593d251b9c87804c2095399285dbed0f8cdccb
+DIST tdesktop-1.1.23.tar.gz 16863984 SHA256 56b7fce84adf85a4af1c3174353169f32d0b0c052a4e7a284fc741fa96b04030 SHA512 98b09de4e53e89b26725097816e471faec21d8c3ab6d8c353f853f24223e1abedbaf8c0a426848dfb06d56010e4494c9e59796c07e3e786ba9ab4477ac0985c3 WHIRLPOOL daeec7eb1f08cd64cbff2076e27ffe470d1b1cb5f5684f765d17954e227ddf30b72698331d2aa6fbdaa0e81fd63cd757c9f63f7fa6a6d8366b8e917a6a33ec69
+DIST tsetup.1.1.19.tar.xz 30034012 SHA256 4ef097787f2ec3f4d9403fc7767a71c4f822b790c64eb9c23357040513f792f5 SHA512 0b5c63a3a844054602a1677863dfea86e8b7c490072918ed6abcee5982cf017194abc16365c4d4962128c5e196e0c98723eec0b8c1208243992cacad3a007771 WHIRLPOOL f48e15c3422a93e12cc9a3f9636317307a06b595f029d40ed43b237d654c683aba0572e1d346f146b77d20bac75ccf727f6b6cb7558deeabefbd5ca52e87e31c
+DIST tsetup.1.1.23.tar.xz 30306844 SHA256 e7955a6ad0ce9105ac3c2ae6ddf1d480430acb0e295149f0d08e951ece74000c SHA512 0dfd3ca6f71395d36aec15b161ef41bad84155151772569e298cfb7a3ef49c86254b9f9a78810408deb41379db8efd8af10b0177397021c6c4c714222df567b0 WHIRLPOOL a93703fc8a13709aef82ddbd1ed2bf29cc1ce9dcc326f1b469bf8b61013a54cd072f556385cc76b167e679c5630b6718ea9ee57326104718a366289f27b988bc
+DIST tsetup32.1.1.19.tar.xz 30964820 SHA256 11fcd4f55846bbc2dd844c8bd28c3a11bd8b5294e16f98ac081524a5d36f00b4 SHA512 85dcabfd7e1707df0a7f2378eba1b7f430c443b1d166d071cb1373a18f249745b1d662ace2ee0b2596599ce7fcc3db7bfc271f5a7abb87c0866209f66d6bf99b WHIRLPOOL 8d7f5222a5b4c50f643c77a6c636d25cca500dd11a1e37ea5dbd6900b16d4fd5c9019ea2065555850607d671af4a1811ec042e0f10d808b168ce37fed5480f49
+DIST tsetup32.1.1.23.tar.xz 31249588 SHA256 d3a93bd958e3e692e39c9744e62a967e42ee089c68a106a3ab236937252111ef SHA512 461becb89b675d5cf7c3d3dfb063e9c86fd4dc5327a81d9f7d141048c57ec48c2f4b2a994aa588dc0b2675b3a8227a7f8d72d5ff7784fb82e31fa2f247f3576a WHIRLPOOL ba006e224f141dd983c456faa3d3ff37aef97858bb0aa4f3c161353ade8cc4363fb93619cf95ff2fff1aba57e7280786f6c867b8e75cfd2f04a944a3cfcc37ac
+EBUILD telegram-desktop-bin-1.1.19.ebuild 1274 SHA256 1db09fba9e8f11d1283d48c30389cb0062858154c5a348893bdd62ac0da76e08 SHA512 b9808063b09984ba3cce75b9594de1a6988f71bd11bb6e42d245a71f350de69288855f9487288c23c186011154dea14799b0d2525c83310bfeaffb4ec1ae42a0 WHIRLPOOL 65c11ae42dfa906456b8f1b5b93dabfe3bcd7128010031727c643e0a9bb6e505a6d2e9ba1c7b494a282490c3783aefb371dd98ef63e7905612dc09bb23dedf9a
+EBUILD telegram-desktop-bin-1.1.23-r1.ebuild 1248 SHA256 28891cdfeb335f5f2b4f0c60bffb98b34e848c57f1337de472ba253ce8684182 SHA512 9dbba0b7caa21831c476c7050ad7b4728b1823bd595f7cb4ca593c5002f2344b16d31d61df2355a5f2c86b03e6072524777a48f6a0e4a6887e039cffd7bb7019 WHIRLPOOL bc39cefa57e2d46c3f169caaabf4229ffada5576fb82482654041a233961b35928ea62b574db77a39928b88a76934599c532b7a24418c8bcadbfdf3050f48d7f
+MISC ChangeLog 4180 SHA256 4fc9eb57a1a568abd6c34a7d18cd27ca27b29519b0c37f209276280ed6b99726 SHA512 90837bcbf6df8207c543e3503daf34a9bcf74223f6fecb0c57773da6d9e267b370e92b07e06c2c226234b6daa34a2e839f58b0d134c74e3777a75bf99414ef0e WHIRLPOOL c571d7c9ace077cb059ca5f8e285f0eb78d3c8f296f80f1e3d11b67fa927fbaa85a4049f234d99813fa67c59b79ce74eb0a6be971a3a9be2f6128f7c25aeb34f
+MISC metadata.xml 517 SHA256 e8c0262bd58f368e19242424d8607a23256a06e87fa05e954fce7a3db541f246 SHA512 989427c9234e7068b2be670bbaa8c73752e0c64dd010dd81c12e648b4a3e754c4d8404f92d5bebb09210299163fd776b94c7b29a974e41bf5eaf7ca50e044a58 WHIRLPOOL f798f213288c304fb496ee6859a60770c93bb20ed76fc3317565a0cb4b1532dad8ab77899240c13b3316e533d10c12b5082c2d3907cf00485487c5fad4f9db4d
diff --git a/net-im/telegram-desktop-bin/metadata.xml b/net-im/telegram-desktop-bin/metadata.xml
new file mode 100644
index 000000000000..82d984627d85
--- /dev/null
+++ b/net-im/telegram-desktop-bin/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>victor@enise.org</email>
+    <name>Victor Gaydov</name>
+    <description>Proxied maintainer</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">telegramdesktop/tdesktop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.19.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.19.ebuild
new file mode 100644
index 000000000000..00c726c9f93a
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.19.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="telegram"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=sys-apps/dbus-1.4.20
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+DEPEND=""
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	newbin "${S}/Telegram" telegram-desktop
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram-desktop.png
+	done
+
+	newmenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop telegram-desktop.desktop
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.23-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.23-r1.ebuild
new file mode 100644
index 000000000000..2de83b92ec61
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.23-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="telegram"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=sys-apps/dbus-1.4.20
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+DEPEND=""
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	newbin "${S}/Telegram" telegram-desktop
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram-desktop.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/net-im/telepathy-connection-managers/Manifest b/net-im/telepathy-connection-managers/Manifest
new file mode 100644
index 000000000000..6094445aa0cc
--- /dev/null
+++ b/net-im/telepathy-connection-managers/Manifest
@@ -0,0 +1,4 @@
+EBUILD telepathy-connection-managers-2-r2.ebuild 1097 SHA256 767e37fbf32a6978a10fc1f82aebb2301917ae267a68da0b969e004d5f49df3d SHA512 b09873feee1115a47ba57561c43be3b03b8d7ee5337793b04c0711c131c5fc5f64eb26580cfa4e4de1ea513bceb5a419db3d2e2e1ae789b3546e46fd61609f66 WHIRLPOOL 6d03febaf7e7427e477fd7e881d046603b208dae05171d62e103742a1ca40c709a8be6eb8d48bb624b7a65a558e4cac3f156d93b7bb1becd96ace9a32d599ce5
+MISC ChangeLog 3694 SHA256 0e94617d4aaa61bb92d719e7cd64b5c0a32463bc0319e74afc738987f0b1fbbb SHA512 af606a44ab01d1f5acf9ca15395dba21b82a0af41de3fa045cbde7c6b1e79add99579c4cdbb8b880312c9911a0b457ef2aa1a111c1859ca6fa2ca60f5bdcc84d WHIRLPOOL f463e34377b0690b3e83346442a02a7aaf46c29c91bcb5582f4b570d47de1a02aa64dd37183caf5a41570f89684ff11c766f048d2870b41388f2cc644fdb0586
+MISC ChangeLog-2015 5729 SHA256 ce032141aab7c35d78bac0934f80754b2ea48a7803c8a7e6f5a18957694e7c24 SHA512 b63f2cff89bbbc65ca69d724bf369c951514a4e8b021650fa9a566245d46e85680662b074b5036886039d29ba3093184860de0c9ad36a1e5672990c31120e6bb WHIRLPOOL a140709ea6c1e3e8051fe2bc299f7606ac54aea9ffce064f8385db9cdc2467021984919f220aa4e0a323ba9c7a57fc4a28e65b6d998ea078c4413dd31208168e
+MISC metadata.xml 895 SHA256 35cda0e7ce527444a494edb48f8e00ed84ed56f7cc772ddc4a57828d39a3cb3a SHA512 951e7a3875627d7a920baa828ee43c6d310a42bb9fb0955e6ab7a81af182b1daaf16da7df1f14644b1022f534d491b1e795c1ab7f63b8191eae0cea1366029f8 WHIRLPOOL 883ddfbb1d3bf1ef855d068f6b8c3f4bb329688a0525c31517776e9b84bbaccd2dbb71a764eabfa189390fff7a79b93f59d989c133b96d97a55d6410ee0a6158
diff --git a/net-im/telepathy-connection-managers/metadata.xml b/net-im/telepathy-connection-managers/metadata.xml
new file mode 100644
index 000000000000..9731573c34cb
--- /dev/null
+++ b/net-im/telepathy-connection-managers/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+  <flag name="gadu">Enable Gadu Gadu protocol support.</flag>
+  <flag name="irc">Enable Internet Relay Chat (IRC) support.</flag>
+  <flag name="meanwhile">Enable meanwhile support for Sametime protocol.</flag>
+  <flag name="sip">Enable SIP/SIMPLE messaging and calling.</flag>
+  <flag name="sipe">Enable Sip Exchange Protocol.</flag>
+  <flag name="steam">Enable Steam Chat support.</flag>
+  <flag name="xmpp">Enable XMPP protocol handler (this is also Google Talk).</flag>
+  <flag name="yahoo">Enable Yahoo! messaging support.</flag>
+  <flag name="zeroconf">Enable Link-Local Messaging via the zeroconf or Bonjour protocol.</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild b/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild
new file mode 100644
index 000000000000..deda90c6a96d
--- /dev/null
+++ b/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Meta-package for Telepathy Connection Managers"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI=""
+LICENSE="metapackage"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+
+IUSE="gadu icq +irc meanwhile msn sip sipe +xmpp yahoo steam zeroconf"
+
+DEPEND=""
+# These version support the 0.24.0 Telepathy specification
+# They work with Mission Control 5.14
+RDEPEND="
+	gadu? (
+		net-im/pidgin[gadu]
+		net-voip/telepathy-haze
+	)
+	icq? ( >=net-voip/telepathy-haze-0.6.0 )
+	irc? ( >=net-irc/telepathy-idle-0.1.14 )
+	meanwhile? (
+		net-im/pidgin[meanwhile]
+		net-voip/telepathy-haze
+	)
+	msn? ( >=net-voip/telepathy-gabble-0.16.4 )
+	sip? ( >=net-voip/telepathy-rakia-0.7.4 )
+	sipe? ( >=x11-plugins/pidgin-sipe-1.17.1[telepathy] )
+	steam? (
+		x11-plugins/pidgin-opensteamworks
+		net-voip/telepathy-haze
+	)
+	xmpp? ( >=net-voip/telepathy-gabble-0.16.4 )
+	yahoo? ( >=net-voip/telepathy-haze-0.6.0 )
+	zeroconf? ( >=net-voip/telepathy-salut-0.8.1 )
+"
diff --git a/net-im/telepathy-logger/Manifest b/net-im/telepathy-logger/Manifest
new file mode 100644
index 000000000000..ed1d8f6df3a6
--- /dev/null
+++ b/net-im/telepathy-logger/Manifest
@@ -0,0 +1,7 @@
+DIST telepathy-logger-0.8.1.tar.bz2 569680 SHA256 359528f5fa1539b250fead8d68c7a0eaef11ed4284dfb3761fff2b6dd688da39 SHA512 8c4a8b4fc6f8d98378bfa3008bcc7d921a7bdf659144bd60827d9bdd234644738224a17e5b39099b6b3df224cad8f1d03b9fed3e25b37a14d079eb22b13d5a30 WHIRLPOOL 2fefc7f5e464e845226cae9f10a2722c887fd67e0292cc634c3f624d329cd342d0c6797a70960549e2b0393ac940b4911c62dd5ec17722dffbbbec176154f2e0
+DIST telepathy-logger-0.8.2.tar.bz2 562670 SHA256 8fcad534d653b1b365132c5b158adae947810ffbae9843f72dd1797966415dae SHA512 f3eda26133a4c38eeb79b01cbe3b7801a5eb773e8b4e6ce621c47d3ca701025364c6b2b890caea00104f01ba85ae891a6fad82d7a9dc487fd7a980221cede451 WHIRLPOOL 84aabf0f9cf594ade109f37490d999cd3f37fca894a2a659b97da4314d3aa3375c97fdad4a282208c427e8c34d81568f8298c5872c8ad9a7f213d2b00b0dfe9f
+EBUILD telepathy-logger-0.8.1.ebuild 1231 SHA256 e54590c60a5497c40d796d5c9b8846edc9f0a9c5f7e9938dc99fff66a7c5c428 SHA512 6e6c07d870c31c8c4fdc2a6465ffd532dc574d4d8c74c7974b976f060ee417101f1de6be65a932f61f5d9a67caca43e445bb5b281bab81d2cf3b37cb7306528e WHIRLPOOL 9ffa207a5d21dafd51f82f59fbeb972e63ec4cbd8589238c1635f277c7f1a7413718cd6301b861e7927447f328dab73484266000ac07846fb339dc5eb91f492f
+EBUILD telepathy-logger-0.8.2.ebuild 1243 SHA256 cb6246ceb59089cad9372d55cf6c530f81cd3c10b7df93b74a5b2c04fe520380 SHA512 b71e9ce31ec8e925bd04f7710ab4b130098a21d9c2464056c4c9c5705cc0c0ee57c427629faf9dfef5d76f7324a2fd101809713f9e290587aff37e7140dffb33 WHIRLPOOL b89e40a4637bb9d1a751ddcc1e2928edd61d93e7fcaae49be99950ebcef90f374ca751d7a43c45191755fa33c06addbb7e680ed4ad35b728f7da1bee893da640
+MISC ChangeLog 3353 SHA256 814141578ff92e6fe304a37a08eac52976f02c9e52c7bb8804e768b7bd9bf8db SHA512 a0a85f7a92593f338ed8f7ec3faa35347e8e68098cfd6b860535b305c16f1416423900ddc91571c976476bb6c65705109acb8bf8357c3fd71f72ef55cbc56322 WHIRLPOOL 4b29e3a78df58fb5acf865b528323b4a1bfce46db2ab0a094fb53cb33fdcfdef7b23f46644585b9ec9e490876a6097d7e5e9ec60f6ee08a13b496ce1a6e386b9
+MISC ChangeLog-2015 10641 SHA256 16c9855ad70a07a2ee53e5d245522c6653c8acc2dd029387feef879e25005c90 SHA512 76ca30a6231ffd459d38a128e154abd844bdc04e246f6667377c752169cac1710cee9fbe99ee99ea49f1bcdedd2e43d1a818604805597be98cf765e43ae7969d WHIRLPOOL 81815b9a5d6a4bc42d2bc9b726c224d50956002466c96c4e4e6b5233419ec5b03bf0c65708e171c42fb415528633659af5d6c9f43b4238a49008c6ad579e939c
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/net-im/telepathy-logger/metadata.xml b/net-im/telepathy-logger/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/net-im/telepathy-logger/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.1.ebuild
new file mode 100644
index 000000000000..f35448d9d60f
--- /dev/null
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used"
+HOMEPAGE="https://telepathy.freedesktop.org/wiki/Logger"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.1
+	>=dev-libs/dbus-glib-0.82
+	>=net-libs/telepathy-glib-0.19.2[introspection?]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-db/sqlite:3
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# --enable-debug needed due https://bugs.freedesktop.org/show_bug.cgi?id=83390
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-debug \
+		--enable-public-extensions \
+		--disable-coding-style-checks \
+		--disable-Werror \
+		--disable-static
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2.ebuild
new file mode 100644
index 000000000000..6cf78fe9bc0f
--- /dev/null
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used"
+HOMEPAGE="https://telepathy.freedesktop.org/wiki/Logger"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.1
+	>=dev-libs/dbus-glib-0.82
+	>=net-libs/telepathy-glib-0.19.2[introspection?]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-db/sqlite:3
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# --enable-debug needed due to https://bugs.freedesktop.org/show_bug.cgi?id=83390
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-debug \
+		--enable-public-extensions \
+		--disable-coding-style-checks \
+		--disable-Werror \
+		--disable-static
+}
+
+src_test() {
+	virtx emake -j1 check
+}
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
new file mode 100644
index 000000000000..c44aa1874df7
--- /dev/null
+++ b/net-im/telepathy-mission-control/Manifest
@@ -0,0 +1,5 @@
+DIST telepathy-mission-control-5.16.4.tar.gz 1102177 SHA256 9769ddac7ad8aad21f6db854016792162b57e6fa0b0aed8d823d76a71fe7e6cb SHA512 5ed624df2d041554af074c22a18db2405fa5bd41bec40edc574382eb9d8b9f93ff6f4be3042d27f950694a353f4192670e200f5f8865419701ca520a973959ed WHIRLPOOL 7672345d3ac76c879c22c2a5cb0180a5fe4bc03403f1e5d934a3b3944ec75eb6c0c6f17610f9619acc6a35892d16dd2c642fc85d2dbf3659f058da9c49aa717e
+EBUILD telepathy-mission-control-5.16.4.ebuild 1245 SHA256 9fffdb1f6dbcb71ae84555b27ba4cfe3a0b4b99bedd9d027976ffee54318e6ec SHA512 0168a4d07b175d48b6d2ec3df358fdb785e598eb57769f6e5fe21ff21ede4e202640b374447f27f5f43cff5aa42143984d5940e88b15b890f02975245d1e7af3 WHIRLPOOL 9e5a5ce534704646bc0e4f8232a0a5d47d2fcdf1e8ffcbaaabdb95e4fbc83c837203d8628e55de2eb9b93e54f89312005362f3e38a38bf815ae2402ac0b79623
+MISC ChangeLog 6834 SHA256 5b542e804d2f3b0382ca0ae081a8c486239ea1442078fbf12adfaa79282ea9dd SHA512 259c972a71288f5d7faa04301ebca59af193399b68ea65376ade9c3e4dcf52f88796deb4254357c2cd6fe229c1ba4a6ca021f37b49e0a2f12487521fd0887b45 WHIRLPOOL bbaf406834182f8752d6a3f25afca208194c064861ea96b5571a6856f569ddd7b79a944d756a36377ece00c1cb713cef0a33ef1b2491f4fa1bfe7f18cc601dc6
+MISC ChangeLog-2015 21429 SHA256 12560a53e59f4b4650c7a779978d99cd4b44972b6ca5cefa7ff2e2fa15ec02a1 SHA512 b54f29ee5278c0877fc151bc9840677351ebb588b2de56361926b74ec1c6d1c81edab6a66d2e381cd3c267ca4c3c7cc505d513ca8f43cdc2ce64d0678ae19db2 WHIRLPOOL 789db7cde0ea04c385c9f8cdad62ae1b6efbd77f904371884d04e278c9549e697a14b370c1a45eb2a2cc7de192b2d137a4e4e7064b6f0a2545aff06b742d23ff
+MISC metadata.xml 599 SHA256 f98501c70e3d3ffd4383aba27cce198a0be7dae46236014a78c04b41be112db7 SHA512 fba9a9332501e7fce4d62efbbb643cde3579a393918cf6ecc59cb1aae6bd04adfb62d379d446805d01ebed51f9799ad453fdc7490268616e127ff128142f4868 WHIRLPOOL 671a190eb21bf07ae90746e97e65af4b3e6b226820d210d3a4642a5ab09d8c084f36f8c0e02ab6e5b2b20ba3790fff49f4f58961a040d9c1b9128e54a77e6052
diff --git a/net-im/telepathy-mission-control/metadata.xml b/net-im/telepathy-mission-control/metadata.xml
new file mode 100644
index 000000000000..91b0f11bc72b
--- /dev/null
+++ b/net-im/telepathy-mission-control/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<longdescription>Mission Control, or MC, is a telepathy component providing a
+way for "end-user" applications to abstract some of the details of connection
+managers, to provide a simple way to manipulate a bunch of connection managers
+at once, and to remove the need to have in each program the account
+definitions and credentials.</longdescription>
+</pkgmetadata>
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild
new file mode 100644
index 000000000000..5ec4c3d284d2
--- /dev/null
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+# Needed for tests and build #489466
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework"
+HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="debug networkmanager" # test
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.82
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-0.95
+	>=net-libs/telepathy-glib-0.20
+	networkmanager? ( >=net-misc/networkmanager-1:= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
+	virtual/pkgconfig
+"
+#	test? ( dev-python/twisted-words )"
+
+# Tests are broken, see upstream bug #29334 and #64212
+# upstream doesn't want it enabled everywhere (#29334#c12)
+RESTRICT="test"
+
+src_configure() {
+	# creds is not available
+	gnome2_src_configure \
+		--disable-static \
+		--disable-upower \
+		$(use_enable debug) \
+		$(use_with networkmanager connectivity nm)
+}
diff --git a/net-im/tkabber/Manifest b/net-im/tkabber/Manifest
new file mode 100644
index 000000000000..cac5c8491ce2
--- /dev/null
+++ b/net-im/tkabber/Manifest
@@ -0,0 +1,6 @@
+DIST tkabber-0.11.1.tar.gz 1026405 SHA256 9b12b726b609297254e7b0c5e500d415a6517bd6c951d53e7b429dca4a29bba7 SHA512 a28f4f9d2873366b4ffc6153e08d21e77dd0178fea13d894e79ce941779d8e4c97e48b572cbfd8c6c25c0636f6c8d8ca8d9b081aaccbb8e6d809de3228bdd268 WHIRLPOOL 07d45bed685067966cf514388831e6ad455ca3e15d9e1a90d03b03e8980dad9ce6376e891e6e453456f61819b592cd5db13d0eb351f99835b149cdf5bd724070
+DIST tkabber-plugins-0.11.1.tar.gz 615335 SHA256 ffad9602ef0383ffc209b6c8f235170270c98def3a5e4a5481714da6378eb94b SHA512 f77e4a2a3f11629796c6bdcc5ee9a782cc42ca9a43d8a9033b260df7f6260549860b6d53095067e4c3da9a1733a0570656ab807ff7853a4573c2e7f68a497014 WHIRLPOOL e8318a2f674f5643daf350252babfc267cc0b6b3b60a8020b3ef5f2f72c647c54ba35a06fcc4a244d07d1a867ab47b3f359cea0f876d864bebf52aeec68fc607
+EBUILD tkabber-0.11.1-r1.ebuild 1085 SHA256 864af7cd3afae85bcf7fd39ce0f8c669fb7c683311d48f354e66fc1ac178cab7 SHA512 4ea78131bbc587c906991b704b07f330bbcdc244dd0ca91ff21122f43780817b4d0cc8a40fea3794f5616daa1cfe636dd8ba5db4fc226cbadc1eadabe383f95a WHIRLPOOL 016434e663e915c140c3d0445b8507fc2e575fe6088d6d1a0b132746ebd1c6b8e1b535131c1b590b2d1b6103b58c37f035668556cf591eec2963d79b15244df7
+MISC ChangeLog 2855 SHA256 97b5016dd77641519e737c9a5a6b04d3b589bc2ac211e15250055111f8a384a2 SHA512 0a6401e84f4c7989ab3cce5c5d83ee687b08caab9ec8139e8de1ba4f850e859165a1725987a6850d314ac7619efc3bef9f546815e4ef1f8c8ed69f7ee80f459a WHIRLPOOL 3f6c31277d28a12f974b1c7f4fde7dafefd4e8790df1fd5cd4c8e2c8f77e80872b652d321985a6eb3417e8a344a2a75a5f2603d1944367861958071299a8fb8a
+MISC ChangeLog-2015 6909 SHA256 89bd52d4d51a39b4666c97c2992a11263238c7e232df3e0ae032a9e10d76d61e SHA512 af6773644590bdc614099ad6a1d4a96f5516018e5a7e76fc612f2cf6e6f0307ee29de060600602583b7ca69aa91b6c83cc5175f9c98599a54a931eefb8f20b8e WHIRLPOOL 60f5d7ec772830567d2edeaf4a3c8c9589a1258bf5c4f8c7481c117c53e7dfbacbb424df191653b4b49ef91247d839e8998156ae814199e2bc53b8314c4b3dd3
+MISC metadata.xml 416 SHA256 bb4e816426213ece96801c4cf57939da14de7b46c66c3c06567e4f676b4e7976 SHA512 95bb361f0dd66f6a990fbfe5f0df70e281076d779a94ae434cc36800a010b665da66b73c05c9091c88cd139cd83363b15b95644f2b0caf020b91fa93ad6d5abe WHIRLPOOL 7386d8310d2af54e90060dda90711aba72afeae497d62fb1ae96b75726a10f58b3cdaebbf6afd1e8e3cd4a3369d154fffa4c4e3831b22250ac0dc90e35ee275e
diff --git a/net-im/tkabber/metadata.xml b/net-im/tkabber/metadata.xml
new file mode 100644
index 000000000000..59548fbeeef0
--- /dev/null
+++ b/net-im/tkabber/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>Tkabber is a Free and Open Source client for the Jabber instant messaging system. It's writen in Tcl/Tk, and works on many platforms.</longdescription>
+<use>
+	<flag name="plugins">Enables installation the extra plugins</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/tkabber/tkabber-0.11.1-r1.ebuild b/net-im/tkabber/tkabber-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..55a50b6c3c34
--- /dev/null
+++ b/net-im/tkabber/tkabber-0.11.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A jabber client written in Tcl/Tk"
+HOMEPAGE="http://tkabber.jabber.ru/"
+SRC_URI="
+	http://files.jabber.ru/tkabber/${P}.tar.gz
+	plugins? ( http://files.jabber.ru/tkabber/tkabber-plugins-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="plugins ssl"
+
+DEPEND="
+	>=dev-lang/tcl-8.3.3:0=
+	>=dev-lang/tk-8.3.3:0=
+	>=dev-tcltk/tcllib-1.3
+	>=dev-tcltk/bwidget-1.3
+	>=dev-tcltk/tkXwin-1.0
+	>=dev-tcltk/tkimg-1.2
+	>=dev-tcltk/tktray-1.1
+	ssl? ( >=dev-tcltk/tls-1.4.1 )
+"
+RDEPEND="${DEPEND}"
+
+# Disabled because it depends on gpgme 0.3.x
+#	crypt? ( >=dev-tcltk/tclgpgme-1.0 )
+
+src_compile() {
+	# dont run make, because the Makefile is broken with all=install
+	:
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr \
+		DOCDIR="/usr/share/doc/${P}"
+
+	dodoc AUTHORS ChangeLog INSTALL README
+
+	if use plugins; then
+		cd "${WORKDIR}/tkabber-plugins-${PV}"
+		emake install DESTDIR="${D}" PREFIX=/usr \
+			DOCDIR="/usr/share/doc/${P}"
+	fi
+}
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
new file mode 100644
index 000000000000..a84555419173
--- /dev/null
+++ b/net-im/toxic/Manifest
@@ -0,0 +1,9 @@
+DIST toxic-0.7.1.tar.gz 1137112 SHA256 414ca2cd369e277872c7248c43f82afa0ac2f6c8fa5fc8e93f7c3e8ab6d11b9c SHA512 c304b07a67ed27a25394590eb8759b5dd957605be4eb9e64590d4580da0977e1cd201e8b95ae1b31e995772560510ceb0643028696e2df69e1f5d0dff575b553 WHIRLPOOL 228193bb78bf38bd5f5f5ff371a87f12561edcb5729337b58198df36e5ec55b99f2c2ca84f5b471846e7f84445f1c5181c5fa71ff287f62d5e34f833a45747d6
+DIST toxic-0.7.2.tar.gz 1136947 SHA256 a2962aca766caf84b52a52e9a5ce2276a9d3906685f565d2a00551e7c2916c59 SHA512 cf3fd0afdc63aa4d2039e08a8f9f32a042a6412f0a242823205fcf058f56e732468389d4bdf614ded8b0d9704b05a315044ee216edd51546501a24be0b6d5b26 WHIRLPOOL 47b5ee57a38084ea7dcff12cac77b05a2d8d486f0ecaffe5e5db11825338a785a96563e10abcb788accea527d2da6f690b326628dd09601d2bf002f69cc60de3
+DIST toxic-0.8.0.tar.gz 1145799 SHA256 4078167ff09a94a78cd46d55163524b0a6692b56a74458c99093b84316a6c604 SHA512 3c59edb61b1bcdbfa3a8391a1a1ceccc6c9c38b49c1709813d60480b180fb39607806116b9dcd1de35ebb02e23e95d78c8191f04a4875e06e27fa43bc9800b33 WHIRLPOOL 3b99ab4720c5360ce531db210a23e830eb99be70836fb7ef9d7604b526f26a7fd92dfd4ab26d1cbdb642371cc98a646aad9f4527b7c2c9f2da50f2347ab7a74e
+EBUILD toxic-0.7.1.ebuild 1021 SHA256 d53365e386652145852eea64b5997aad0c7f02dbf0a33a892fc08835268f5c5c SHA512 812dbd65ffc7666d76b708276df42a3cd97103d413ed877c87ed98fe415c388e17b44bde3a06cb44506e2acf33d7120683c31dee67cad6b7a713845341696280 WHIRLPOOL 5cf559b43901d7ea7d368603226f44d8454799a58b8d955760e9cf1a9c179aa9746d96f984e6dfe57e4bd401c51f0e69be3e745d7c75d77550af60f8866f97ed
+EBUILD toxic-0.7.2-r1.ebuild 1022 SHA256 c1740bcf9fc448f7ea5004c3524097dfa0aaa99c5252f1a70b20c897d7dbafed SHA512 3a9a3a7a9cd916259db815a80c61bbef245a224e806647acebe213fca878e2d05996b3d4d182e6f46a855d51bb2acc1f353fc396d7fe2093efd1b6031cf85989 WHIRLPOOL ca255f361df2db7795812ecb39f25bd153c5060c473adaabb0d9cb0bfd5a8c6d9e8b4249df803384848533b34da98cfdf8ba6edb83f29f96ed06d34148780cb7
+EBUILD toxic-0.7.2.ebuild 1022 SHA256 eb2e6718a27a4ef9001104a01027e37a11df5f199ba1fbd2e39efb96bcb0b0e0 SHA512 02f2715812d23c8a0528cfca01780be03bdf5934cff94500e2bf962c48402c1c43ea578fe8d621e06e2df5ba31076c8bdbf114c71d2dce4622436300099f795a WHIRLPOOL 85debf0460882d1ea914ba304e45e1347a55634362a6110fbce83aa4addba68f350e085fe8d183b9e582d976a94fc209fd40f10ddecda5e96fbee8199dc7de0b
+EBUILD toxic-0.8.0.ebuild 1632 SHA256 d3126b98b5f7dae046d83e9e9fe46430bfc9128a1dd94e011f2b1d24df41c65c SHA512 b19c30c5f38c8e8424a601430086cffa7a02b45416efa02e88853bd411b848ca06648b464f74e8351bf63c66da7cb89c08ad6045447ade6d69eea06269e09b9f WHIRLPOOL 03998ef100e10d59bd54443614bed2cae601fe733352ae0956f19ccecb1bf16b3a64442791fc9b130f20b8d09e3be287b5531f671c475ce1ee8ea22aac4c368e
+MISC ChangeLog 295 SHA256 986413122b4d536037782b78c0c8c01a7bf0e91a366942dfa01ce9bae59e0d7f SHA512 18c184b5553f5886753fb242505c6ae8e8810bc672ed71693650075cfcea8decc5dc899abbc05c208b1757d00f76dffa7492cabfef3d4f7bf17b13c913a9752c WHIRLPOOL 19e1cb6777ae83bc20a87547750e910d57b00282d524339e3c7a2552cb7cc82eee2dc6ac8fbb7b04e3f5880674fe58f3c82d91d8b385da69349ed980f81049bc
+MISC metadata.xml 803 SHA256 6670993ac4ebe7981cf1cd8e41cea60a32b4b609bcba9d9b1c4edd45c9881166 SHA512 98cf29bd18eaa0949e158592961b96d4974ad6c5108cbebff9aeebfc01161831621ca3b058c928de8761d114cd50f7ba8a67709b335d50e1f0771e44de725da6 WHIRLPOOL bb84b5f93303b1387df863ea54d8b99e572c50c4637f0a19e5a807ed81cdb218022bd17d6067e1b98c73ccdfe6408b0f836c25d29d83912d4e909152d3ce605d
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
new file mode 100644
index 000000000000..4a6dc2b64633
--- /dev/null
+++ b/net-im/toxic/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlg@gentoo.org</email>
+		<name>Daniel Campbell</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>jfreegman@tox.chat</email>
+			<name>Jakob Kreuze</name>
+		</maintainer>
+		<remote-id type="github">jfreegman/toxic</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		An ncurses-based Tox client written in C. Supports audio calling, file sharing, and desktop notifications.
+	</longdescription>
+	<use>
+		<flag name="notifications">Enables desktop notifications with libnotify</flag>
+		<flag name="av">Enables audio calling and/or audio notifications</flag>
+		<flag name="qrcode">Enables QR code support</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/toxic/toxic-0.7.1.ebuild b/net-im/toxic/toxic-0.7.1.ebuild
new file mode 100644
index 000000000000..db462b32e61e
--- /dev/null
+++ b/net-im/toxic/toxic-0.7.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A curses-based client for Tox."
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X +av notifications"
+
+RDEPEND="
+	net-libs/tox:0/0.0[av?]
+	dev-libs/libconfig
+	media-gfx/qrencode
+	net-misc/curl
+	sys-libs/ncurses:0=
+	av? ( media-libs/openal media-libs/freealut )
+	notifications? ( x11-libs/libnotify )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	if ! use av; then
+		export DISABLE_AV=1
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	if ! use notifications; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	sed -i \
+		-e "s,/usr/local,${EPREFIX}/usr,g" \
+		cfg/global_vars.mk || die "PREFIX sed failed"
+}
+
+src_install() {
+	default
+	if ! use av; then
+		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sound dir"
+	fi
+}
diff --git a/net-im/toxic/toxic-0.7.2-r1.ebuild b/net-im/toxic/toxic-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..5f233b24df59
--- /dev/null
+++ b/net-im/toxic/toxic-0.7.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A curses-based client for Tox."
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X +av notifications"
+
+RDEPEND="
+	net-libs/tox:0/0.1[av?]
+	dev-libs/libconfig
+	media-gfx/qrencode
+	net-misc/curl
+	sys-libs/ncurses:0=
+	av? ( media-libs/openal media-libs/freealut )
+	notifications? ( x11-libs/libnotify )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	if ! use av; then
+		export DISABLE_AV=1
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	if ! use notifications; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	sed -i \
+		-e "s,/usr/local,${EPREFIX}/usr,g" \
+		cfg/global_vars.mk || die "PREFIX sed failed"
+}
+
+src_install() {
+	default
+	if ! use av; then
+		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sound dir"
+	fi
+}
diff --git a/net-im/toxic/toxic-0.7.2.ebuild b/net-im/toxic/toxic-0.7.2.ebuild
new file mode 100644
index 000000000000..318b8bf15675
--- /dev/null
+++ b/net-im/toxic/toxic-0.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A curses-based client for Tox."
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X +av notifications"
+
+RDEPEND="
+	net-libs/tox:0/0.0[av?]
+	dev-libs/libconfig
+	media-gfx/qrencode
+	net-misc/curl
+	sys-libs/ncurses:0=
+	av? ( media-libs/openal media-libs/freealut )
+	notifications? ( x11-libs/libnotify )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	if ! use av; then
+		export DISABLE_AV=1
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	if ! use notifications; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	sed -i \
+		-e "s,/usr/local,${EPREFIX}/usr,g" \
+		cfg/global_vars.mk || die "PREFIX sed failed"
+}
+
+src_install() {
+	default
+	if ! use av; then
+		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sound dir"
+	fi
+}
diff --git a/net-im/toxic/toxic-0.8.0.ebuild b/net-im/toxic/toxic-0.8.0.ebuild
new file mode 100644
index 000000000000..4758d0bbde4b
--- /dev/null
+++ b/net-im/toxic/toxic-0.8.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit python-single-r1
+
+DESCRIPTION="A curses-based client for Tox."
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X +av notifications +python +qrcode"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	net-libs/tox:0/0.1[av?]
+	dev-libs/libconfig
+	net-misc/curl:0=
+	sys-libs/ncurses:0=
+	av? ( media-libs/openal media-libs/freealut )
+	notifications? ( x11-libs/libnotify )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode )
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# bug 630370: version string correction 0.7.2 -> 0.8.0
+	# REMOVE THIS FOR toxic != 0.8.0
+	sed -i \
+		-e 's/^\(TOXIC_VERSION =\).*$/\1 0.8.0/' \
+		cfg/global_vars.mk || die "Version string correction failed."
+}
+
+src_configure() {
+	if ! use av; then
+		export DISABLE_AV=1
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	if ! use notifications; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	if ! use qrcode; then
+		export DISABLE_QRPNG=1
+	fi
+	if use python; then
+		export ENABLE_PYTHON=1
+	fi
+	sed -i \
+		-e "s,/usr/local,${EPREFIX}/usr,g" \
+		cfg/global_vars.mk || die "PREFIX sed failed"
+}
+
+src_install() {
+	default
+	if ! use av; then
+		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+	fi
+}
diff --git a/net-im/turses/Manifest b/net-im/turses/Manifest
new file mode 100644
index 000000000000..411bb7d2079b
--- /dev/null
+++ b/net-im/turses/Manifest
@@ -0,0 +1,5 @@
+DIST turses-0.2.23.tar.gz 2241497 SHA256 f8532a317da939f8c2e285dfd00f73f7878152a5ce12c473ab8023ffe382868a SHA512 ef5b880319f4126a99787cd11fa4573b6c6ff626a759f2515ad507006625f1192e4ca1552ca687ca8ecdf2545a17c228fa956019c325d582e7f80bd8a3e6432b WHIRLPOOL a268261b44faeb3a6f88e59ac9f532fe9a578e425dc2738411d09d64715601fd17eaec979c8eaa55964ed61c6b518e7389417cc068160d5b5b85d48954a22d68
+EBUILD turses-0.2.23.ebuild 1113 SHA256 860cab47f9889832523d8a5f55e6d3feaad53a5cefbfca52e4e473f0954ced09 SHA512 03acadf81e0c0c16ed63be18d7eb62d0c3315b06bc1b8f5c247db3f817da3ef993c4bb59bc708179d20a995ff2fdf4235e74f1c9add0f39f5260bfab285ae202 WHIRLPOOL 4cb4c10fa3f6af40889c013a469c45f337cd495d7de060acc24c50869ead0372c6d9710613e2d7f05bf300f994545404dd661128b9d00da417cb3a64a5f2a261
+MISC ChangeLog 2621 SHA256 72b07936faed1d851cd475993844800a29b62a1aeef704ef845fd1436897dd72 SHA512 60653b13214116ae9c5c23dc5967380227d0d6e58c7fd3f0bf2c49f4affd9901200510f1a53d561a3d8da41085d4138cecbc17c9d65746cb3ed6918a2f604b49 WHIRLPOOL 1c71b087b0e8fb1ea33a221aec54005e7b23a5713f49686eee428512f081858e0dc8352b6b3232c770589648b476b79a77ca3ba4230077960183cbb7303a2e54
+MISC ChangeLog-2015 1964 SHA256 53d1b0bbe202f9a7ce4c3b6822ebba4039ab779c6b6113aae00e6ef9b9f389a7 SHA512 e67083f653b9d273d9476250f730a8254574f4e6e13bfeb73b550f5ecab210c44b910fec47d194f449b815781e14123100272c0b521f5f2a22e481849858d132 WHIRLPOOL 1458f9b145aea380e18636e54390a8514ce4c71d354aa6e346da1c039e5cf7adf006e37e83e0f1f4a0a0d974e150aac1419f9128af41d1a3dcb9fdaba2efcf1c
+MISC metadata.xml 258 SHA256 007a45d719f2bfa3adb5a856a352dda6d206def30e1b80af120677b4fe12839b SHA512 2cbceb342ddfd9d396111dd47218cad48ac7296fedf4781373439c9cae59ed3caa720a5b25b427f90acdd0a27bbc4355ddf2fec5f7e82f8655bc3a2076d527db WHIRLPOOL 156055ef81ec6fc3ced3253685e3be23c7301de48c1ef04b22e20ebf86ef0433a1a1fd12a8fd30a623b97bc933d7f0b16a1c152cb6ee175b2a3677fec3b9adcc
diff --git a/net-im/turses/metadata.xml b/net-im/turses/metadata.xml
new file mode 100644
index 000000000000..d80086bbb34f
--- /dev/null
+++ b/net-im/turses/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">alejandrogomez/turses</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-im/turses/turses-0.2.23.ebuild b/net-im/turses/turses-0.2.23.ebuild
new file mode 100644
index 000000000000..ece5e2e592de
--- /dev/null
+++ b/net-im/turses/turses-0.2.23.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line twitter client"
+HOMEPAGE="https://github.com/alejandrogomez/turses"
+SRC_URI="https://github.com/alejandrogomez/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	>dev-python/tweepy-2.2[${PYTHON_USEDEP}]
+	<dev-python/tweepy-3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+	emake -C docs man
+}
+
+python_test() {
+	py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman "docs/_build/man/turses.1"
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
new file mode 100644
index 000000000000..28ce3665ab9c
--- /dev/null
+++ b/net-im/vacuum/Manifest
@@ -0,0 +1,7 @@
+AUX vacuum-1.2.4-gcc6-not-string-literals.patch 3213 SHA256 2083e791790e6337fd550da9fe7a245124f4082e92c849628162ee5a5c4dcbb3 SHA512 1ee8a0be4c0f6495c9446a506293ba529b3ca59ae4362ae456db7b15c52afb358691776a6c8c49e48af1a2f9847d25c78ca66a9a1180a5c388e743f3b37ae424 WHIRLPOOL e6e61c17641cfe84b4a1240823979ae7ac35608f82dd9d83e30f0948d16a6e2b6e7c101a0724bd0767015232bfaa91f46286292a3d5efe1933d484f34a8942f5
+DIST vacuum-1.2.5.tar.gz 2242073 SHA256 3237933f68884fb5b3422ad0fc97083b40a7aae9d8c105a23720c09599ffe5da SHA512 85e36ed312beb59b667f376d45511f3c9414ba8165746cc1da15992eac4716995aa01da505a2f2dd58c8d64822f25c9106691be26a534e01a21f0201049300fc WHIRLPOOL 474930024e8a3a7d501f4dc48ec0919c2dfc73021fb4fee589de5a9986f3598442dbc74bb08d8364223f8c637fb68341cd3b859864afff4c9bc7c8bcdcd05ff5
+EBUILD vacuum-1.2.5.ebuild 2394 SHA256 a147d49832b601d53ec893e6255734f42d593bba0d87879e64c1011aa979b3b8 SHA512 2b2fa3ec5ce9eca347d88b6f6e026c269906e8b6bada05767a9c2fa645ff8ae987ccacee816ee4d7a220d5cbc537ee9d9ab026fd39fa0e80dc81f50ebbe0e143 WHIRLPOOL 9e7a35e7e6b75844f4d637c5b3becaeccde0e2ceb1fb048f3785dc5244a268317198b5f2912bfce08c66c1f614e9d551e789855d1353cf0ccf1138fd2ee47463
+EBUILD vacuum-9999.ebuild 2946 SHA256 5a9089073ab20ac04060d627285b049db5dc169cbbbd845737770186cb5dbfc5 SHA512 d102a7f9641184bc94d7cf1a59382f9975e9e19d321fdbb41820bc727eb7ba7a2426fa55a8d556298c3d801e7f8d6e4aedbe9e7ba64faad08d55f2d0fe5cff5a WHIRLPOOL f94729cef3808886cb5b59b7c36c2c3fa3b4abcd79c9bf9e3826d5f382b517814ac33d12dc7ca027b9f12c8505eb2bdb4602169fc3b47329cf42991977fba27a
+MISC ChangeLog 2624 SHA256 e3f798fa71e646e41ebb136ef931572c446a36de7cdaa6bafcd0e290f0d1b5e0 SHA512 458310b39056069160e6478da5e595e848f45af6be3228190a06ad3ad00490b2a1267fbd01775bfb064e10638887672e38c9b38f9332a02d17a8cc21c612b3cd WHIRLPOOL 01ad1e2a3a54dd9f6cd47aaebe70a709d8810d78f2d3f753c098bfcab45c8a177698417487cfc4bfef5ff7ba9c48cb34c6c0da2361000250d6679ad21f1e2859
+MISC ChangeLog-2015 4183 SHA256 2804ab9d8d52c9c0dac768f6253fe0596fbc021c4d9c5b4fe5d5c52cd36ccf5b SHA512 9c5edbd7bb81a6a8218f9a0384e6aa83fc9884ecad0139b5582e87af12f8ba3c4fdfa82a508ce8a23c1c69da048ec0caaf44e6aab83a4bd384775ea5c4e8ef6d WHIRLPOOL f47ac15cfc029dde0486fe799c6a4735c59a102db9e6d175dc1d5ba3b6e01b397af011ff55525a748afe2b96650676bfa1b8c0cc83a502a605fee7b1728db9e9
+MISC metadata.xml 4327 SHA256 86f6d6de1c8418bf8a8377d2dfa494616ea0e3378cd2a06c4b8f43f5cf39c352 SHA512 a70dca323c5eddf7ae1a4fd592dbb410930b09876805b8b46cbffec34184ddbfffbb4ad1e39f4c07d3ee0edc4e7fa2cc4293d6dec8aff80a3a2cd231a722162e WHIRLPOOL ad66fcd557dde9a683a102af985ea74fa8d6c25260cc4abfdd0a6284bbbcdab8a64552bfaae6c528037aaca60bbbb84a733b76c6fd6574ab1ba0f143eda28a44
diff --git a/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch b/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch
new file mode 100644
index 000000000000..d936c76e61eb
--- /dev/null
+++ b/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch
@@ -0,0 +1,51 @@
+diff -Naur vacuum-1.2.4.old/src/plugins/messagearchiver/messagearchiver.cpp vacuum-1.2.4/src/plugins/messagearchiver/messagearchiver.cpp
+--- vacuum-1.2.4.old/src/plugins/messagearchiver/messagearchiver.cpp	2017-03-27 22:36:48.177650414 -0400
++++ vacuum-1.2.4/src/plugins/messagearchiver/messagearchiver.cpp	2017-03-27 22:37:22.198212428 -0400
+@@ -9,8 +9,8 @@
+ #define SESSIONS_FILE_NAME    "sessions.xml"
+ 
+ #define SHC_MESSAGE_BODY      "/message/body"
+-#define SHC_PREFS             "/iq[@type='set']/pref[@xmlns="NS_ARCHIVE"]"
+-#define SHC_PREFS_OLD         "/iq[@type='set']/pref[@xmlns="NS_ARCHIVE_OLD"]"
++#define SHC_PREFS             "/iq[@type='set']/pref[@xmlns=" NS_ARCHIVE "]"
++#define SHC_PREFS_OLD         "/iq[@type='set']/pref[@xmlns=" NS_ARCHIVE_OLD "]"
+ 
+ #define ADR_STREAM_JID        Action::DR_StreamJid
+ #define ADR_CONTACT_JID       Action::DR_Parametr1
+diff -Naur vacuum-1.2.4.old/src/plugins/privacylists/privacylists.cpp vacuum-1.2.4/src/plugins/privacylists/privacylists.cpp
+--- vacuum-1.2.4.old/src/plugins/privacylists/privacylists.cpp	2017-03-27 22:36:48.175650440 -0400
++++ vacuum-1.2.4/src/plugins/privacylists/privacylists.cpp	2017-03-27 22:37:48.508882851 -0400
+@@ -1,7 +1,7 @@
+ #include "privacylists.h"
+ 
+-#define SHC_PRIVACY         "/iq[@type='set']/query[@xmlns='"NS_JABBER_PRIVACY"']"
+-#define SHC_ROSTER          "/iq/query[@xmlns='"NS_JABBER_ROSTER"']"
++#define SHC_PRIVACY         "/iq[@type='set']/query[@xmlns='" NS_JABBER_PRIVACY "']"
++#define SHC_ROSTER          "/iq/query[@xmlns='" NS_JABBER_ROSTER "']"
+ 
+ #define PRIVACY_TIMEOUT     60000
+ #define AUTO_LISTS_TIMEOUT  2000
+diff -Naur vacuum-1.2.4.old/src/plugins/sessionnegotiation/sessionnegotiation.cpp vacuum-1.2.4/src/plugins/sessionnegotiation/sessionnegotiation.cpp
+--- vacuum-1.2.4.old/src/plugins/sessionnegotiation/sessionnegotiation.cpp	2017-03-27 22:36:48.174650453 -0400
++++ vacuum-1.2.4/src/plugins/sessionnegotiation/sessionnegotiation.cpp	2017-03-27 22:38:07.340651610 -0400
+@@ -4,7 +4,7 @@
+ #include <QTextDocument>
+ #include <QCryptographicHash>
+ 
+-#define SHC_STANZA_SESSION            "/message/feature[@xmlns='"NS_FEATURENEG"']"
++#define SHC_STANZA_SESSION            "/message/feature[@xmlns='" NS_FEATURENEG "']"
+ 
+ #define SFP_DISCLOSURE                "disclosure"
+ #define SFP_MULTISESSION              "multisession"
+diff -Naur vacuum-1.2.4.old/src/plugins/simplemessagestyle/simplemessagestyle.cpp vacuum-1.2.4/src/plugins/simplemessagestyle/simplemessagestyle.cpp
+--- vacuum-1.2.4.old/src/plugins/simplemessagestyle/simplemessagestyle.cpp	2017-03-27 22:36:48.173650466 -0400
++++ vacuum-1.2.4/src/plugins/simplemessagestyle/simplemessagestyle.cpp	2017-03-27 22:38:33.557335864 -0400
+@@ -15,7 +15,7 @@
+ #include <utils/options.h>
+ 
+ #define SCROLL_TIMEOUT                      100
+-#define SHARED_STYLE_PATH                   RESOURCES_DIR"/"RSR_STORAGE_SIMPLEMESSAGESTYLES"/"STORAGE_SHARED_DIR
++#define SHARED_STYLE_PATH                   RESOURCES_DIR "/" RSR_STORAGE_SIMPLEMESSAGESTYLES "/" STORAGE_SHARED_DIR
+ 
+ static const char *SenderColors[] =  {
+ 	"blue", "blueviolet", "brown", "cadetblue", "chocolate", "coral", "cornflowerblue", "crimson",
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
new file mode 100644
index 000000000000..3f054b4c28bd
--- /dev/null
+++ b/net-im/vacuum/metadata.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+  <use>
+    <flag name="adiummessagestyle">Use UI styles created for Adium</flag>
+    <flag name="annotations">Enable adding comments to the contacts in the roster</flag>
+    <flag name="autostatus">Change the status in accordance with the time of inactivity</flag>
+    <flag name="avatars">Enable assigning and displaying avatars</flag>
+    <flag name="birthdayreminder">Reminds about birthdays of your friends</flag>
+    <flag name="bitsofbinary">Allow other modules to receive or send a small amount of binary data in XMPP stanza</flag>
+    <flag name="bookmarks">Enable creating bookmarks of the Jabber conferences and Web pages</flag>
+    <flag name="captchaforms">Perform tests for humanity outside of Web browser</flag>
+    <flag name="chatstates">Post user's activity to the chat</flag>
+    <flag name="clientinfo">Enable sending and receiving peer's application version, local time and last activity info</flag>
+    <flag name="commands">Enable performing special commands provided by various services</flag>
+    <flag name="compress">Compress stream of messages</flag>
+    <flag name="console">Enable inspecting a raw XML stream</flag>
+    <flag name="dataforms">Allow other modules to process and display data forms intended for the user</flag>
+    <flag name="datastreamsmanager">Enable initiating a custom data stream between two XMPP entities</flag>
+    <flag name="emoticons">Enable using smiley images in messages</flag>
+    <flag name="filemessagearchive">Allows to save the history of conversations to local files</flag>
+    <flag name="filestreamsmanager">Enable transferring files between two XMPP entities</flag>
+    <flag name="filetransfer">Enable sending files to peers</flag>
+    <flag name="gateways">Simplify the interaction with gateways to other IM systems</flag>
+    <flag name="inbandstreams">Enable initiating in-band data stream between two XMPP enitites</flag>
+    <flag name="iqauth">Enable logging on Jabber servers withous SASL authentication support</flag>
+    <flag name="jabbersearch">Enable searching contacts in Jabber networks</flag>
+    <flag name="messagearchiver">Enable saving the communication history both locally and on the server</flag>
+    <flag name="messagecarbons">Allows to keep all user IM clients engaged in a conversation</flag>
+    <flag name="multiuserchat">Enable Jabber multi-user conferences</flag>
+    <flag name="pepmanager">Allows other plugins to recieve and publish PEP events</flag>
+    <flag name="privacylists">Enable blocking the undesirable contacts</flag>
+    <flag name="privatestorage">Allow other modules to store arbitrary data on the server</flag>
+	<flag name="recentcontacts">Displays a recently used contacts</flag>
+    <flag name="registration">Enable creating accounts in Jabber services</flag>
+    <flag name="remotecontrol">Allows to remotely control the client</flag>
+    <flag name="rosteritemexchange">Allows to exchange contact list items</flag>
+    <flag name="rostersearch">Allows to search for contacts in the roster</flag>
+    <flag name="servermessagearchive">Allows to save the history of communications on the server</flag>
+    <flag name="servicediscovery">Enable receiving information about Jabber entities</flag>
+    <flag name="sessionnegotiation">Enable initiating the session between two entities with setting the rules for XMPP stanzas exchange</flag>
+    <flag name="shortcutmanager">Allows to setup user defined shortcuts</flag>
+    <flag name="socksstreams">Enable initiating SOCKS5 data streams between two XMPP entities</flag>
+    <flag name="urlprocessor">Allows other plugins to load data from custom types of URLs</flag>
+    <flag name="vcard">Enable obtaining peer's personal contact information</flag>
+    <flag name="xmppuriqueries">Allow other plugins to handle XMPP URI queries</flag>
+    <flag name="aspell">Select <pkg>app-text/aspell</pkg> spell checker backend</flag>
+    <flag name="enchant">Select <pkg>app-text/enchant</pkg> spell checker backend</flag>
+    <flag name="hunspell">Select <pkg>app-text/hunspell</pkg> spell checker backend</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-im/vacuum/vacuum-1.2.5.ebuild b/net-im/vacuum/vacuum-1.2.5.ebuild
new file mode 100644
index 000000000000..497f62a40580
--- /dev/null
+++ b/net-im/vacuum/vacuum-1.2.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}-im
+PLOCALES="de es pl ru uk"
+inherit cmake-utils l10n
+
+DESCRIPTION="Qt Crossplatform Jabber client"
+HOMEPAGE="https://code.google.com/p/vacuum-im"
+SRC_URI="https://github.com/Vacuum-IM/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/1.17" # subslot = libvacuumutils soname version
+KEYWORDS="~amd64 ~x86"
+PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver multiuserchat pepmanager privacylists privatestorage registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries )
+IUSE="${PLUGINS[@]/#/+}"
+
+REQUIRED_USE="
+	annotations? ( privatestorage )
+	avatars? ( vcard )
+	birthdayreminder? ( vcard )
+	bookmarks? ( privatestorage )
+	captchaforms? ( dataforms )
+	commands? ( dataforms )
+	datastreamsmanager? ( dataforms )
+	filemessagearchive? ( messagearchiver )
+	filestreamsmanager? ( datastreamsmanager )
+	filetransfer? ( filestreamsmanager datastreamsmanager )
+	pepmanager? ( servicediscovery )
+	registration? ( dataforms )
+	remotecontrol? ( commands dataforms )
+	servermessagearchive? ( messagearchiver )
+	sessionnegotiation? ( dataforms )
+"
+
+RDEPEND="
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	dev-qt/qtlockedfile[qt4(+)]
+	dev-libs/openssl:0
+	net-dns/libidn
+	sys-libs/zlib[minizip]
+	x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2.4-gcc6-not-string-literals.patch )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# Force usage of system libraries
+	rm -rf src/thirdparty/{idn,minizip,zlib}
+
+	# CMP0022 warning
+	sed -e "/^cmake_minimum_required/s/2.8/2.8.12/" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="$(get_libdir)"
+		-DINSTALL_SDK=ON
+		-DLANGS="$(l10n_get_locales)"
+		-DINSTALL_DOCS=OFF
+		-DFORCE_BUNDLED_MINIZIP=OFF
+	)
+
+	local x
+	for x in ${PLUGINS[@]}; do
+		mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) )
+	done
+
+	cmake-utils_src_configure
+}
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
new file mode 100644
index 000000000000..76ab422c67cf
--- /dev/null
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="dev_qt5"
+EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im.git"
+PLOCALES="de es pl ru uk"
+inherit cmake-utils git-r3 l10n
+
+DESCRIPTION="Qt Crossplatform Jabber client"
+HOMEPAGE="http://www.vacuum-im.org/"
+
+LICENSE="GPL-3"
+SLOT="0/37" # subslot = libvacuumutils soname version
+KEYWORDS=""
+PLUGINS=( adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries )
+SPELLCHECKER_BACKENDS="aspell +enchant hunspell"
+IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell"
+
+REQUIRED_USE="
+	annotations? ( privatestorage )
+	avatars? ( vcard )
+	birthdayreminder? ( vcard )
+	bookmarks? ( privatestorage )
+	captchaforms? ( dataforms )
+	commands? ( dataforms )
+	datastreamsmanager? ( dataforms )
+	filemessagearchive? ( messagearchiver )
+	filestreamsmanager? ( datastreamsmanager )
+	filetransfer? ( filestreamsmanager datastreamsmanager )
+	messagecarbons? ( servicediscovery )
+	pepmanager? ( servicediscovery )
+	recentcontacts? ( privatestorage )
+	registration? ( dataforms )
+	remotecontrol? ( commands dataforms )
+	servermessagearchive? ( messagearchiver )
+	sessionnegotiation? ( dataforms )
+	spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) )
+"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtlockedfile[qt5(+)]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtxml:5
+	net-dns/libidn
+	sys-libs/zlib[minizip]
+	x11-libs/libXScrnSaver
+	adiummessagestyle? ( dev-qt/qtwebkit:5 )
+	filemessagearchive? ( dev-qt/qtsql:5[sqlite] )
+	messagearchiver? ( dev-qt/qtsql:5[sqlite] )
+	spell? (
+		aspell? ( app-text/aspell )
+		enchant? ( app-text/enchant )
+		hunspell? ( app-text/hunspell )
+	)
+"
+RDEPEND="${DEPEND}
+	!net-im/vacuum-spellchecker
+"
+
+DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
+
+src_prepare() {
+	# Force usage of system libraries
+	rm -rf src/thirdparty/{idn,hunspell,minizip,zlib}
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="$(get_libdir)"
+		-DINSTALL_SDK=ON
+		-DLANGS="$(l10n_get_locales)"
+		-DINSTALL_DOCS=OFF
+		-DFORCE_BUNDLED_MINIZIP=OFF
+		-DPLUGIN_statistics=OFF
+		-DNO_WEBKIT=$(usex !adiummessagestyle)
+		-DPLUGIN_spellchecker=$(usex spell)
+	)
+
+	for x in ${PLUGINS[@]}; do
+		mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) )
+	done
+
+	for i in ${SPELLCHECKER_BACKENDS//+/}; do
+		use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" )
+	done
+
+	cmake-utils_src_configure
+}
diff --git a/net-im/ysm/Manifest b/net-im/ysm/Manifest
new file mode 100644
index 000000000000..ef17d82a2253
--- /dev/null
+++ b/net-im/ysm/Manifest
@@ -0,0 +1,5 @@
+DIST ysmv7_2_9_9_1.tar.bz2 260796 SHA256 3d415ea55fc713527b96f9d9735fe0be225bf15ab20690cf4e5c67154d8404f2 SHA512 77721a1befe4c48da47e1ccce5e407df86a3e4b861468951cf325bb94e8c4399956ff79d4d4096beea6659807984dc127bda0168f9292ff77287ae431c098fc8 WHIRLPOOL cfd1167f4f6e0657a6ca104e6062052af73eeb465d033bbdcd317e4800217b875d4f8617e35e0a0b9de9f64edfee0f8d9ce12e9ecf3185961ea0def8fb2aa8ef
+EBUILD ysm-2.9.9.1-r1.ebuild 575 SHA256 dd61feeab420fc6629cc561ea074b88b74ee3a24443250f7d0a33ff094e22119 SHA512 7c76c770862dec69c9d8f5d1a0d17ea7f86d2aa6496069e5f5b1c0631caa758735bde742b8626d13f9583c5559ad905bcf57ea116c3e3b964a623b171ee93bd4 WHIRLPOOL b917303204f6b880631fb2cacedf6043ad61ab3babd97c2b2199b1429a9601762e58b70f7c3d076de82f0a075314af817876da7a753436b236e1dc553d35af56
+MISC ChangeLog 2674 SHA256 94faa0163e62c58ded63369a18214360eed911938ca6cb91cfd4301ad4e81519 SHA512 b0fd84de9c6df1de98078e3f675685b5a1e050eddd9f3e86d9fd3e6967c3561fcb4e33e5d7bcb757ae8f7830519d37d75a5fabe610837bbe99e782899ee8db4c WHIRLPOOL cbfd38605eaf4990f1641b1b7b5bdba3ae26b9d9793d7e5e383e57ed7da844ec021d82eb3e15ee5f2a9dc0d0187603083b9d2dc62b42dcabeae46eac53288a19
+MISC ChangeLog-2015 2826 SHA256 3aeb94d6109e1075776bf13eca45d5e1286833bcb431275f90754e4a9fa30dbc SHA512 543770c0417a8aa6c53c299953b171457a0ae5f9635e0e777b3655052dc1d483072987dda6da79f7b22aa4a43ed9e3cfd715746f483bbc75eedcc3136c0c60a0 WHIRLPOOL 25245b88a75984b602c420139c79cc8664b62f774ae8eaddb939b0fafd574738e0090d22788aada26541a0d8cc9c05b967ab9ad16c3553d26fb78324e52ec57c
+MISC metadata.xml 242 SHA256 0b0cf477567f4b81e1dce429b26af86e3f1dc78822ddf00b517c91125e483c97 SHA512 434c964dde1f5ce541b0016f8e4839295edcda9ac6a5220f9b5bf4b7ea5ee7335b692c5df95035d3d501e6f1c6b05a6ebf2fd1d6c01673f9a0f00ea039065e70 WHIRLPOOL ab147e9d6b884316152ce310e849ed8efb55c2be10cfcd0a49aa941065c51d12389cf60123ea3a88a4c74d885ecc7e2a2647b18f7be5464fb0dbb1bcb12f8bf5
diff --git a/net-im/ysm/metadata.xml b/net-im/ysm/metadata.xml
new file mode 100644
index 000000000000..bf2e0f5bcd39
--- /dev/null
+++ b/net-im/ysm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">ysmv7</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/ysm/ysm-2.9.9.1-r1.ebuild b/net-im/ysm/ysm-2.9.9.1-r1.ebuild
new file mode 100644
index 000000000000..1cc3184874b7
--- /dev/null
+++ b/net-im/ysm/ysm-2.9.9.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator
+
+MY_PV="$(replace_all_version_separators _)"
+
+DESCRIPTION="A console ICQ client supporting versions 7/8"
+HOMEPAGE="http://ysmv7.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ysmv7/${PN}v7_${MY_PV}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+RESTRICT="mirror"
+
+S=${WORKDIR}/${PN}v7_${MY_PV}
+
+src_prepare() {
+	# fix bug 570408 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	default
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-im