gentoo resync : 01.12.2017

17 files changed, 225 insertions, 620 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 1a1002e4a4e3..6581cb6062c4 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index 1f429d42edc7..7827e58d588a 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,3 +1,3 @@
 EBUILD jabber-base-0.01-r1.ebuild 1525 BLAKE2B ee403af798d7b57f66847083d387d1fa874acf95c54643d56734b3d8ab7a78997bc62d3b793d852e53b72ddef8788cf9f3fa205d757c497db236b48fa72b8d9b SHA512 6651e099d29a9aad2a9baccd81a402036a0d946672ded1c606626e718188c4314649804c6e0596b0cbb1b552f07497a7ac5bb8fb28d61ab5003dd20dd4e695f8
 EBUILD jabber-base-0.01.ebuild 1510 BLAKE2B 86cb7256daebc4baf43e3981fe8056ab02d4652de970c92718cd4277a286161909d0dcf20a7328dd8ca43455f1aa8a37543a08d31017799aa17d9bb11c9bf0c7 SHA512 09d4141b7bb70acaecf2c3af5273fed3bd736d12f2374b424e814b5ff0afe77ca08c3508d02ce3510926cb954dda76521283d0ca92c038464a0fc9e0faeb770b
-MISC metadata.xml 355 BLAKE2B b293b0ce94b60f3a56c4b51958d664b696f12ac21a1a0280939316dcc7454d1c80b88a83316d4b380fdeaf80e2ba40de82f1102a01451f5264edda4373f1af18 SHA512 698c13023f9982520b62de0aebd53834d428e1d9ff1e8a65821bc9aff9cd72dab22aa0037bc40a142b0f84c66913034f455c196d595cb6a71ec85c7b82a240d4
+MISC metadata.xml 363 BLAKE2B d39b7cb71af89d54bcd663508abec175512058c81d0ecc11cbcf76455e40dbf36c5641bf943266e8f7ce0a7f6bb5807f0fbfe78a2d04054178bf99c15dc1060a SHA512 44bd244e6521f2132804357972d71f92e704471a42828f41b334966d02509c948674aaf20f7c61ff33c2432467cd6b021c30a27bcd851fdedcc7f353903f8462
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
index ff5cd10b4329..1eebfe0ed7d2 100644
--- a/net-im/jabber-base/metadata.xml
+++ b/net-im/jabber-base/metadata.xml
@@ -1,9 +1,11 @@
 <?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>
+	<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
index 29248818ac2c..b622ce064c92 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,15 +1,9 @@
 AUX jabberd2-2.3.1.pamd 158 BLAKE2B f92e86a1df67595956537043f3dfe1f3d5241dd67f785a9cf5d8ac7958c9caedf9e09bdb630ebac0774c497fbdfe5f2e40308340eb5c8781b2da523b8682fa5a SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979
 AUX jabberd2-2.3.2.init 1890 BLAKE2B 7c035f149bdca36e2f69a736b9a70e289e3fe57b51126c0824d12eb5347ed6966eb68b833cda05fab36448163cdd1ef5793047e6ada34ece1e3c9e1fff9d2246 SHA512 bfd6ae287f89714b79b4050656cb503b0ee8429413e5d307e1b7feecc6a5aed33d362b86f0877d2ab176c7f90697201b833ff564cb01e5bcd284fbae7ff3f1f2
 AUX jabberd2-2.3.2.logrotate 197 BLAKE2B fda6fbf48c70913229f5729606c069ee3bca78ba6235cc83e41ac5f2a304828c869611e30b2accc566928ee800ef9e1ddd0566bdb4c64a04653f0a730809a85a SHA512 1e3d74612dd08df2014af2ae0f0681e78c9902644dfbf37100369591803f2cf757d27967f7e9c99d3503cff8480ace7ce4b14303028d25866ebbd4ecf882d7c0
-AUX jabberd2-2.3.4-optimization.patch 631 BLAKE2B d8f295e887e5e9e1a5465b61dd5f4a04c1baf453f8e8f2df1c7d85667d249c01fc156f7b1885ee32679b912eb70aaf60f7a0b8ff6b97a5ae30c3b32a095be168 SHA512 d4ddd733d5b945fc12ecbb824d40b378dbfec4064fb64396c437495e9b1694ce29c139f377331ef09f4e19c82a7d3b7512e537d14604d8b5a345f3a84f829688
-AUX jabberd2-2.3.4-websocket.patch 860 BLAKE2B 86644f988de9a235a881ef25407c7c350e883ec49b0291b2f26fb656645f424fa4873ad51fd9770bb6c5bc11c5fcba7d59c8f1256723282f5a0f8aca21caf35d SHA512 e417b96d248be6c05e098e4dcbc2654907621acf3f594cf8ef4d13a7007e23438092d5942c9a3d78fa585150efd69c62426f82ec4d221f96b039c92d42545ea0
 AUX jabberd2-2.5.0.init 1906 BLAKE2B aec00b17bf41584a707d69745082abb33a4e9982a0027fad5956ea5ed6a1a5f49f27af9fef6457e04a088169bfa73733dca5eb2dcf67dea081f0593eeb869c8f SHA512 1d46b543f8b477a1db5cf1d23a57ba77cfae7e7752c6f4fdd98ba5ee42c0ba28422b7175ebce4383ec9de2f03655072d4892dac0429fe24fc85f27ff8bdb35f1
 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
+DIST jabberd-2.6.1.tar.xz 1542156 BLAKE2B e6c66cc7490772a496face76ff0d57d950cf66798b326c1abf849a4a1cb2cec1cf1055d18bd97313cdc375e853568df17649026876de314ef319aee602b3b027 SHA512 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea
 EBUILD jabberd2-2.3.3-r2.ebuild 4774 BLAKE2B f6cbce8265a10973c76c420a07315dda67a03f60285e14fa94483a5856f8987536c8cc22938c262376ebcf380b2048cd9f959169cc464889cce3ed516770a2b9 SHA512 871a4e298148851aab80a1bf810a0725c5107e07020bcafc99a15ab5b24290ca6aed10d74422c97b44de84aa185bc16b3101cfa99187f44d346af173f3a44d70
-EBUILD jabberd2-2.3.4-r1.ebuild 5255 BLAKE2B a3115205538fb058fdd45013488e0746438b8418ba8e169ce68502c062c15bbbc6e3b711bd71dcd68218241cc1e5179691d984a50ee8be7c48b55fc5966f135b SHA512 9262776b94634a9453df7e755d671b1bfbcb7d4c9eb5a31979981c6f632c21168031901d3f164945de7d6bc4e6a256a6e84cba87a7c1cd118280d3a009071316
-EBUILD jabberd2-2.5.0.ebuild 5228 BLAKE2B 6216d2363b7adb05e32f9d0e49733b7200492bbb0d8f1cc6d05c8b920124035e78ded6e43a9595ab2daaec106e5d748bb21c49404cdcf483adf1501b2bf3c89d SHA512 1586e2204e31efe8a0d34e0ba8ab501d0df717e906b1ea33e686cc182390f230293673a9ff291a51d2ba85f529ee684f11a7cd0f1d0883a24a88d6ab1dd58509
-EBUILD jabberd2-2.6.1.ebuild 5210 BLAKE2B 2facdf2be6a92c76a410dfe4c33d7da3906838b3e3f0c4c6fcb09a0cb8996db2768a2fe4905306359f5b622d63a6bf2e6071519a83af7c521bc99fcb76cda48e SHA512 d5f92e3915c441d0213f0b88fc77616a9b5a5e5fe70d8159a9a4874ffee519bac3e8cd32732dccc69b25437c037dfa15372278bcef9e30b989c429ae5da915d7
+EBUILD jabberd2-2.6.1.ebuild 5351 BLAKE2B c00ae4feb859365b3885ec830f2f8ab3862b2ece42ca827714d0f1c90f6ed5f7d837c91a024147f0da787473bc8b60463ef2fdf0cd263a69470828467c4b14b7 SHA512 ff81099795ba1b2e9c7a78054851317cd8d3c987d78f584b08aa0cd51cf133476a939973057142f6325cd797af1d0958cf0bdb1d8e9572d8246eb0f75bfb7871
 MISC metadata.xml 518 BLAKE2B d86b5ae0a12af23bc24ef841c9968ce8d5dee646412fd9240610403b9700bda781a8cb09cc2ecf0707c70b318a9a79f83e7891da45d27b8b202b1ad133d63a4a SHA512 bd66d981f192750c15e96c89c80dd6fa6f88dec6893dae286f71f8e569dfa117b01df0008d1a9995ed5f635c09824c70ae48127c4cb4570f8d5cd0939071b2df
diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
deleted file mode 100644
index d320b9d1f349..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index a6f932ccb481..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/jabberd2-2.3.4-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild
deleted file mode 100644
index 1c60a6353293..000000000000
--- a/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# 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
deleted file mode 100644
index de2059dd8a06..000000000000
--- a/net-im/jabberd2/jabberd2-2.5.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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
index cf3d63e5a4cb..cc3915cf4b4a 100644
--- a/net-im/jabberd2/jabberd2-2.6.1.ebuild
+++ b/net-im/jabberd2/jabberd2-2.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools db-use eutils flag-o-matic pam
+inherit autotools db-use eutils flag-o-matic pam systemd
 
 DESCRIPTION="Open Source Jabber Server"
 HOMEPAGE="http://jabberd2.org"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/ja
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+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 )"
 
@@ -136,7 +136,9 @@ src_configure() {
 src_install() {
 	local i
 
-	default
+	# Fix systemd unit files installation path, bug #626026
+	emake systemddir="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
+	einstalldocs
 	prune_libtool_files --modules
 
 	keepdir /var/spool/jabber/{fs,db}
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index 99c062bc92e2..a94349efdd5a 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,3 +1,6 @@
-DIST openmittsu-0.9.2.109.tar.xz 1314888 SHA256 cf012e36ce157023082c8efa04ce6d4521ac16044334647c860a07b2ff94ea35 SHA512 ad70ff7c3ceedcf1d6711468152199742533b8f42abbae5ce52f3e29882ae6aea566e8a39258a3d3676a91774e144a70d91967b31e4634f23d527f14325d0a5b WHIRLPOOL f0843eaa35507374a69977c0e023c060f47448d72ea77c3f640b2b5e1ddd87dff756c31c3827c043107af798b5abb58287b07dba8c841be57167d1e8787b1a24
+AUX openmittsu-0.9.9.48-disable-googletest.patch 3112 BLAKE2B 3b606abb46eb9756ade71d033a5b145854402079bfb9fca50e08f17a87a7888dee89d1ec54f168080914608be2223d3872793464c8a974653284fcadce320ae1 SHA512 bb6d159ba3ee3e7626f732060014b3d208cc6c91d1a7395feb40011b58a3c0b2b46d57bff8c00d34604a495709a72652b4b02196389f832f24a9144dd9c0e14e
+DIST openmittsu-0.9.2.109.tar.xz 1314888 BLAKE2B 2c3b2e3e333d2e4ee2cf591fdaffc1b9e7b3b99d45093295ae9246e65b414124ad7a3e04ae558a1bd54c8704b3cf0858cbc53e6f30870b96a491fd1a9f8f7272 SHA512 ad70ff7c3ceedcf1d6711468152199742533b8f42abbae5ce52f3e29882ae6aea566e8a39258a3d3676a91774e144a70d91967b31e4634f23d527f14325d0a5b
+DIST openmittsu-0.9.9.48.tar.xz 2026628 BLAKE2B eafd2bc537a22b140e01e14da363d3943e24b86754a090fd1ed2ac80f1030e1a2fb30ee8a5395c6c9a143d5922354ac67e3376a94c34f670f8cbcfddc27da112 SHA512 e24ec8e0792df13e781080fe42934035f74b82be62a8ce4913175a13ee3acbead069d169871405f4312927165a7049291d009c7f968b088bdbb3e294f9ef2443
 EBUILD openmittsu-0.9.2.109.ebuild 1340 BLAKE2B 899e98067787aabcfa3290c6183d71f1306f6a2939354c48faaaa65c68720713914473514386449f4aae11be3aec5fcf0b4b73c2b1ab317838ebf102526697b9 SHA512 9d5feaeb148e279fd373cff6e5957055e91aea5b1cfb0b426afcdf6dfd391514a17711e58cd90ed3105f9bbd9203be5c32f93dfc77ff28149ee8ca660b9d7751
+EBUILD openmittsu-0.9.9.48.ebuild 1421 BLAKE2B c73a4fc1044489a11556de6bdd1271aea12a2c81e74a3dce35b04bb37e5743613617739a0983665ea719b7c43260e4583333c9aa9239c01d0547f73ed4d3e0d0 SHA512 32ba61e2e722882a882b17a6333329b9219c9ca61e7631e4333ded39be00f1224a72585bc38b7ab01c730c8878e36d88d48bb0f5bc8ffea8489b82a53d3db417
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch b/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
new file mode 100644
index 000000000000..ceb162d5e6b1
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
@@ -0,0 +1,79 @@
+Disable googletest for now, in order to avoid accessing the network
+at configure time.
+
+--- openmittsu-0.9.9.48-orig/CMakeLists.txt
++++ openmittsu-0.9.9.48/CMakeLists.txt
+@@ -212,28 +212,6 @@
+ # Add the binary dir include directory
+ include_directories("${PROJECT_BINARY_DIR}/include")
+ 
+-##########################################################
+-#
+-# Google Testing Framework
+-#
+-##########################################################
+-# Download and unpack googletest at configure time
+-configure_file("${PROJECT_SOURCE_DIR}/cmake/GoogleTest.cmake.in" googletest-download/CMakeLists.txt)
+-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+-  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
+-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+-  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
+- 
+-# Prevent GoogleTest from overriding our compiler/linker options
+-# when building with Visual Studio
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+- 
+-# Add googletest directly to our build. This adds
+-# the following targets: gtest, gtest_main, gmock
+-# and gmock_main
+-add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
+-                 "${CMAKE_BINARY_DIR}/googletest-build" EXCLUDE_FROM_ALL)
+- 
+ 
+ # Main Sources
+ file(GLOB OPENMITTSU_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
+@@ -399,24 +377,17 @@
+ 
+ add_executable(openMittsuVersionInfo ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_HEADERS} ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_SOURCES_CPP} ${OPENMITTSU_HEADERS_GENERATED} ${OPENMITTSU_SOURCES_GENERATED})
+ 
+-add_executable(openMittsuTests ${OPENMITTSU_TEST_MAIN_FILE} ${OPENMITTSU_TEST_FILES}
+-	${OPENMITTSU_RESOURCESOURCES}
+-)
+-
+ if (MSVC)
+ 	set_target_properties(openMittsu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+ endif(MSVC)
+ 
+ # Add target link dependencies
+-target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES} gtest)
++target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES})
+ target_link_libraries(openMittsu ${LIBQRENCODE_LIBRARY})
+ 
+-add_dependencies(openMittsuTests gtest)
+-
+ # Use the required modules from Qt 5.
+ target_link_libraries(openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
+ target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
+-target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
+ target_link_libraries(openMittsuVersionInfo Qt5::Core)
+ 
+ # Link against libc++abi if requested.
+@@ -424,7 +395,6 @@
+ 	target_link_libraries(openMittsu "c++abi")
+ 	target_link_libraries(openMittsuCore "c++abi")
+ 	target_link_libraries(openMittsuVersionInfo "c++abi")
+-	target_link_libraries(openMittsuTests "c++abi")
+ endif(OPENMITTSU_LINK_LIBCXXABI)
+ 
+ # Targets, CPACK...
+@@ -438,10 +408,6 @@
+    RUNTIME
+    DESTINATION bin
+    COMPONENT installComponent)
+-install(TARGETS openMittsuTests
+-   RUNTIME
+-   DESTINATION bin
+-   COMPONENT installComponent)
+    
+ if (MSVC)
+ 	set(OPENMITTSU_WINDEPLOYQT_EXE "${Qt5Core_DIR}/../../../bin/windeployqt.exe")
diff --git a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild b/net-im/openmittsu/openmittsu-0.9.9.48.ebuild
new file mode 100644
index 000000000000..241dd833295c
--- /dev/null
+++ b/net-im/openmittsu/openmittsu-0.9.9.48.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+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-db/qt5-sqlcipher
+	>=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}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-disable-googletest.patch
+)
+
+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/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index a1e474443a8d..9ce05d9cd3b6 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,3 @@
-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 BLAKE2B 21b7c0f6386f47efa778862e6388164bcfd015cb5ce80646fd0cd73955be7de47b337d513e3a7cc637096b119589a943e70cb44cf1390dc1288d6eac9d05243f SHA512 2e8cb9616010aa713d0b7b77abb94b19b876aead22665a58621cd00d927fb2c0ea9c3443be352e04763e7436adc37dee73f47d330242cab5d2334ded442180c9
-EBUILD skypeforlinux-5.5.0.1.ebuild 3615 BLAKE2B 53a8e2b85a072b80dd0275968be5007f9e6ce1799a015cadd431586ad3ac992462b49422d71417eb39db24a53001f6b7d5a81730bc158e8aa657f8dfd1b65a63 SHA512 b83858622d06584dff1f5a73384e79ae1e27c06764a7bcb76e29866a00d7efc410c1dd58ab56228b1072a444a17845b11c7bbb8e25d12b2b01e2687cb868cf51
+DIST skypeforlinux_8.11.0.4-1.x86_64.rpm 94517788 BLAKE2B 5cec1184c566822dab55a2e01424400d46c9894fe77c0031c59063359c50b017f485ee1505db961fa4dacce9c1bd2634bbabd88b6b03925c4cff80d7a7d9b408 SHA512 580183fb278b12974e28be10cdb13925048e4692ac12e5f1abab219ede12b0ec8567d49e58e2c3a7b4d4bcfc56e3ec1cb91117c0056d86dca7d9f1e2ec363b3e
+EBUILD skypeforlinux-8.11.0.4.ebuild 3688 BLAKE2B 322fcfdb6cdcd715a7d32d35b6fcd3b590642b830bdf92e61ec0ff3de430018c666a2266162f94225285e5d293918c36b810d12d7886c966e68adc8c4282cafd SHA512 75c9b9adf6c9451639528faba26ecb120b6c672772dddf7392d9a2d13786f78018d46e7f2b0fad14a8d3c73c946a750e54c482c32b6d8df3ebd7a5bc71356a0a
 MISC metadata.xml 795 BLAKE2B da666b2ac257898116bb8fcf60bf27947b2261f8f718e6bd9cdf3e2c35e38954659be9499675a425cea0f2a9309fb2ada85b54684651f25463140b7f4e89fde9 SHA512 7c97ba77885e397a00e855ffca0dd1f2aa4e1b9c5780650cac09a729ecf4cce07599179c67b86ace1d7e1cd47eafe3a397e9487b42de56e96a86ffb15947abf9
diff --git a/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild b/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild
deleted file mode 100644
index da51c705af20..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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-8.11.0.4.ebuild
index f9444b1d3cd5..21af07f5775f 100644
--- a/net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.11.0.4.ebuild
@@ -5,35 +5,36 @@ EAPI=6
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit pax-utils rpm multilib-build xdg-utils
+inherit eutils gnome2-utils 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"
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 -*"
 IUSE="pax_kernel"
 
 S="${WORKDIR}"
-QA_PREBUILT=opt/skypeforlinux/skypeforlinux
+QA_PREBUILT="*"
 RESTRICT="mirror bindist strip" #299368
 
-RDEPEND="dev-libs/atk[${MULTILIB_USEDEP}]
+RDEPEND="
+	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	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}]
+	media-libs/libv4l[${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}]
@@ -49,6 +50,8 @@ RDEPEND="dev-libs/atk[${MULTILIB_USEDEP}]
 	x11-libs/libXrandr[${MULTILIB_USEDEP}]
 	x11-libs/libXrender[${MULTILIB_USEDEP}]
 	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
 	x11-libs/pango[${MULTILIB_USEDEP}]"
 
 src_unpack() {
@@ -59,37 +62,29 @@ 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!" \
+	sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
 		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-e "/^OnlyShowIn=/d" \
 		-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
+	dodir /opt
+	cp -a usr/share/skypeforlinux "${D}"/opt || die
 
 	into /opt
 	dobin usr/bin/skypeforlinux
 
+	dodoc usr/share/skypeforlinux/*.html
 	dodoc -r usr/share/doc/skypeforlinux/.
+	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
+	dosym ${P} usr/share/doc/skypeforlinux
 
 	doicon usr/share/pixmaps/skypeforlinux.png
 
+	# compat symlink for the autostart desktop file
+	dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
+
 	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
@@ -98,7 +93,8 @@ src_install() {
 	domenu usr/share/applications/skypeforlinux.desktop
 
 	if use pax_kernel; then
-		pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
 		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"
@@ -110,9 +106,11 @@ src_install() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
index 7829535f25b2..5c7dcd0f5e6e 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -2,4 +2,4 @@ AUX vacuum-1.2.4-gcc6-not-string-literals.patch 3213 BLAKE2B 7f617c04e85a8bd4788
 DIST vacuum-1.2.5.tar.gz 2242073 SHA256 3237933f68884fb5b3422ad0fc97083b40a7aae9d8c105a23720c09599ffe5da SHA512 85e36ed312beb59b667f376d45511f3c9414ba8165746cc1da15992eac4716995aa01da505a2f2dd58c8d64822f25c9106691be26a534e01a21f0201049300fc WHIRLPOOL 474930024e8a3a7d501f4dc48ec0919c2dfc73021fb4fee589de5a9986f3598442dbc74bb08d8364223f8c637fb68341cd3b859864afff4c9bc7c8bcdcd05ff5
 EBUILD vacuum-1.2.5.ebuild 2394 BLAKE2B 6448d47aebb976e21e2c0bccfa88a20d90aff44139761c41c8e7ba0607331087c5f53dc5fc3027fea1e08072d7dc043273523ccde587a8c47f58b3470a0168c4 SHA512 2b2fa3ec5ce9eca347d88b6f6e026c269906e8b6bada05767a9c2fa645ff8ae987ccacee816ee4d7a220d5cbc537ee9d9ab026fd39fa0e80dc81f50ebbe0e143
 EBUILD vacuum-9999.ebuild 2946 BLAKE2B e164806fac9b0b996f8bafce5ebb6628621e97ad969876f2373518162c17bbf05962946fb5c5b0a87b686fb4263fb74f436e7a9ac19eaf315c4c8bc156b945e9 SHA512 d102a7f9641184bc94d7cf1a59382f9975e9e19d321fdbb41820bc727eb7ba7a2426fa55a8d556298c3d801e7f8d6e4aedbe9e7ba64faad08d55f2d0fe5cff5a
-MISC metadata.xml 4327 BLAKE2B 51b01189f57cd4d6982efb7daacb09efe3a81a4e68e4227eeddf27085288d83b05c4bd2d2e239edd88b100c79df1e8f970f8893ad9e1b2e1e7b9437923cb8294 SHA512 a70dca323c5eddf7ae1a4fd592dbb410930b09876805b8b46cbffec34184ddbfffbb4ad1e39f4c07d3ee0edc4e7fa2cc4293d6dec8aff80a3a2cd231a722162e
+MISC metadata.xml 4238 BLAKE2B 83e3ea355f12a51164e71685daa989207e8844eaad1e82524554a6b9dca337f0dc5c74c9bdbcde73487993a4841bf360fdd1bd82abd9b1a0560992e631cee954 SHA512 8d1c1bd6a474719d913be49df239722df508312cb9a992d9075677ece5dc1555bf051aee7b0b8f8f61bba6d114ed28f2be6f7746a19ba40b18a44998af9a5108
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 3f054b4c28bd..3cc79d8c7880 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/metadata.xml
@@ -5,51 +5,51 @@
 		<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>
+	<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>