gentoo new year resync : 01.01.2021

17 files changed, 20 insertions, 218 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index cda40f58e0ad..bd82821f8621 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 30b271fa2cc2..487ecbc6c7c8 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,6 +1,6 @@
 DIST dino-0.1.0.tar.gz 441638 BLAKE2B 08f332d38af866eed1049fae7d0e207da5a3486fdaf07eb5327e7abf614ac4adc130fd8f2d9465d6cb248ecfe4b809e022a69c72df5879d98719d24635771b33 SHA512 b63bf87dbf7f728f038f22d0dba34770a06d7eb1be2ec249293ff876e16c151165add895ff3cb20a3216c3581d20e10634d454ee8b024b895012efb34f9d7de8
 DIST dino-0.2.0.tar.gz 514257 BLAKE2B a4536372a806fa60e157a6492381b0204f33041b113dc26dfd4d494c86c96e5b94e928c400fde3198e481aecbfc79d0358979d4a20c550e35f762b3520e2f7c0 SHA512 296576f91d45a4dd8c548a7ca5b47bcaf847f6ff0f8e5dbafaa4eb49a2d4f1ed7e2bbfac94f1b32e22f5ec61b23748ac76b12bb4ceb710889aff166953ca7a2e
 EBUILD dino-0.1.0.ebuild 1597 BLAKE2B ddcce77114ef37406b2c31eec69eb8d38a7cd476c150f0c9305aabcb9afd2e5c6f46d6310a78a8811d0c04f98b154638982cc354eb03d1667d136bbb7bc782c9 SHA512 c67877d9465cd93175f6d591fde849cc6667c84ba0000848f5a40a1233583c1d59afbb90f82584d478e85a2b2a30788898062af77cd6dbaa3b5ff960b08120c5
-EBUILD dino-0.2.0.ebuild 1817 BLAKE2B b7ad5c532f0903cf7d10bcd074fd21d03d53e45fc9e6bbc451043b72ac94e1b5bfdfa9673abe2f476ef9ba68ee053f36036d30528ad84178b79a797b18a57122 SHA512 7776ff0776e00efa5a343a324246ab7d734cd99a34656608d56d3091bb6796955a042e489de6182f8d516891e4177d5007b24718d57230f192516f6cb6b852dc
+EBUILD dino-0.2.0.ebuild 1815 BLAKE2B 2bac790b5fa98c59ef5f51a9929fcb4f61a45dbfeb944a41285577746fbe451343e085def64d1337ece3d629cb57b735688ed57b73ecc65ca3feff11dc2bd0b8 SHA512 4d6a1211c7c5c4118ca536cddf736e6682bb8001769added6f434a0d4c1cb5255369e0fab7c070c440c694fc8d41ded3842a664b1cc6471a47e87d1a26c50d21
 EBUILD dino-9999.ebuild 1817 BLAKE2B b7ad5c532f0903cf7d10bcd074fd21d03d53e45fc9e6bbc451043b72ac94e1b5bfdfa9673abe2f476ef9ba68ee053f36036d30528ad84178b79a797b18a57122 SHA512 7776ff0776e00efa5a343a324246ab7d734cd99a34656608d56d3091bb6796955a042e489de6182f8d516891e4177d5007b24718d57230f192516f6cb6b852dc
 MISC metadata.xml 641 BLAKE2B 31f6c748c2bfe6279a574bf88b94caf476e1769159bdefc2fe4c35095d4e46cb30d6ad232f84cc614f83d1d319004398947fe65f0f9d1fc80dbdeef9497942de SHA512 a1b16eca16c3b7df169db8c7f8a2670cf97fab0c2913dad3ece312aa4e90429944148438b9d2bfd01661912ecffd950104b8324e83b691243841f810e6105ad5
diff --git a/net-im/dino/dino-0.2.0.ebuild b/net-im/dino/dino-0.2.0.ebuild
index 87038c75d2fd..55024c67c5cf 100644
--- a/net-im/dino/dino-0.2.0.ebuild
+++ b/net-im/dino/dino-0.2.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="${MY_REPO_URI}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 6f6d7eca301b..656b5a87cdba 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.7.15_amd64.deb 69147310 BLAKE2B 499c9ed94aad4b6934588a58c31e80eca0cbf1fed8701e0a190ef7cbb27474c848667cf3b842047d495f220881fa36f00890bf33f2bc9ceb12134470f585b5a4 SHA512 02e47d9930ed65d9fc3e35ce02ecb913a0825a126040ab28cb6c8a261a68490d344baec4011fd04bc83ad7b421e359f9b9cde895227bb9f411f846104f6c518a
-EBUILD element-desktop-bin-1.7.15.ebuild 1756 BLAKE2B 38263e9a6b73cb8c4137e14971a5ef4812e3122cdcb0dd6f7908824f052b1c4f198ea987d5528eba089193976ce6212f0aca498e227d6206247b9d0e95102322 SHA512 8889e14c06b17da6af08ddbb01cef5208a14d1cfcf796587aa1a78374994de7a61f1770a0b485f04db6ce839ea9052d19c318ca1b07e00ff15fa4eeeb88415f3
+DIST element-desktop_1.7.16_amd64.deb 69195686 BLAKE2B 76336e2f19def401b3472022e40741853a0ffdd180fe8161fae4cb9e8c687742bc41ce0e74eec19f125c5c2f135f0ceba838ae88c2aace65ad665cf832fc8858 SHA512 ae02a2fb9b55d7a424d8e9a2c74476802bef5afef04779cd8e6651bdf1a95f0c5fed04a292f5d72c82c12e88db65d0f5a613c309542a77de22a1195bf5ec4471
+EBUILD element-desktop-bin-1.7.16.ebuild 1756 BLAKE2B 38263e9a6b73cb8c4137e14971a5ef4812e3122cdcb0dd6f7908824f052b1c4f198ea987d5528eba089193976ce6212f0aca498e227d6206247b9d0e95102322 SHA512 8889e14c06b17da6af08ddbb01cef5208a14d1cfcf796587aa1a78374994de7a61f1770a0b485f04db6ce839ea9052d19c318ca1b07e00ff15fa4eeeb88415f3
 MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.15.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.16.ebuild
index 78456abd5728..78456abd5728 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.15.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.16.ebuild
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index cb7ad7f55231..e138534718b2 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,7 +1,4 @@
-DIST poezio-0.12.tar.gz 585750 BLAKE2B d79cab965b39a9ea191c763e1560bedbf46e3107e1b301a651103caf8f9e63b8465925ea01ac4e2e6b747b66cf5d4be8cabd8be80a069fe4eafcf331c7daada8 SHA512 6249daf23c6f4c1b25a9de686abaa62076e1eac7566da0a174ae3a82e3a53b7f2a86145d20d587a7ee43c8b679d90cb381d5afbfc7860459c5a497e97af32ff4
 DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
-EBUILD poezio-0.12.ebuild 1153 BLAKE2B 0720504412ee0fad379247625cc32805f856c6094e644d15038ef6bfe58384c6275594942da07f72b4f40f0af0d087b20dfd03965cec31fa0e9583af4886d082 SHA512 579f39195c6178f5e15979ecdb4b6264422d2e75c336831291ced8c9dff27d34384b9a235bc7206ad30958da27d06d2b638e21e0a8ff3ae7bca704ff10c03f8d
 EBUILD poezio-0.13.1-r1.ebuild 1161 BLAKE2B 5c42e0e85f21fa5f5ab39cbfaca6f21aaf9de4ac61e09bd343663a263d0c0a9ff37a27f8a0a6962fa7173f78fdfb628d67d4a8581353df2b81cf28b4a0d35cf4 SHA512 a6625b4fedefb3413c5b465909aef2ecc367f67129c010cf9f862222b74df3beabb42aa024ab0f536efb63cece51b5dda02e237f82b7858e36dcc6889cd69d42
-EBUILD poezio-0.13.1.ebuild 1128 BLAKE2B 131412633aeb89905e905d262862b4a9f65afb3f80f8e7106fccabe9dd26c82f8376f124b921df216191969e705173b0fdf972d7604f1b906aa846abe020cc10 SHA512 695f47cbdf6b889bf7ef6587f12cf7c06288a880f338d82fdf3a2de76637a7a5c5345a74f3ca0a505b2c0d48f5bafc4d75b2baddc1a28e48227295136baa968f
 EBUILD poezio-9999.ebuild 1161 BLAKE2B f0d80d98f10e133038c23578d3ba37d0b5a7b2f489413767554181fc52f709796e9c9d3df1e91c2a176a8a0e15ec0899a23586a193528890547cccd78973e354 SHA512 a61e2738d03662435d88bcb643b5537d3e96f4ca2d50a95fb27004f5e4e110304fe771ed5127f0fc35da029a0a4dcf15a4fd7730bc7638b11603c6bdba4a07b5
 MISC metadata.xml 320 BLAKE2B 38b85fd661f7ca7a79c83a1070753f1049b7de9049f2d233f32d77ddd2a8cf72cfc8e3b7b27065a5583d6c631a6af0aa3ca70b907ca9c2a2e92f85471da542b2 SHA512 874c300be76a1b931ddebfb8867563696884267891a09e0879e1ceb0f581536ab9acacccb104e9609aef5c61c55e05ebd87d867d332141be9d52cea246dad09c
diff --git a/net-im/poezio/poezio-0.12.ebuild b/net-im/poezio/poezio-0.12.ebuild
deleted file mode 100644
index 435612e4aec7..000000000000
--- a/net-im/poezio/poezio-0.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
-HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://git.poez.io/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/slixmpp[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOC_CONTENTS="
-Install these optional runtime dependencies for additional features.
-* dev-python/potr for OTR encryption support.
-* dev-python/pyinotify for screen autoaway plugin support.
-"
-DISABLE_AUTOFORMATTING=true
-
-src_prepare() {
-	default
-	# Delete unmaintained plugin which requires an excessive external dep
-	rm plugins/mpd_client.py || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-im/poezio/poezio-0.13.1.ebuild b/net-im/poezio/poezio-0.13.1.ebuild
deleted file mode 100644
index 21339aa6804b..000000000000
--- a/net-im/poezio/poezio-0.13.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
-HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/slixmpp-1.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOC_CONTENTS="
-Install these optional runtime dependencies for additional features.
-* dev-python/pyinotify for screen autoaway plugin support.
-"
-DISABLE_AUTOFORMATTING=true
-
-src_prepare() {
-	default
-	# Delete unmaintained plugin which requires an excessive external dep
-	rm plugins/mpd_client.py || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-im/sendxmpp/Manifest b/net-im/sendxmpp/Manifest
index 0d443e0d6994..f2c7648a0ca4 100644
--- a/net-im/sendxmpp/Manifest
+++ b/net-im/sendxmpp/Manifest
@@ -1,3 +1,3 @@
 DIST sendxmpp-1.24.tar.gz 9657 BLAKE2B c1dbf65c031d7178b996b4309cab149038774c40aa903185d99f1cf26c9a803b623d5a72e3991e30c929b9f236d7cfe2e2828e92b1f135e7e791e001d58142e1 SHA512 349aac46ad4e13836f797f953d1acb33014d66de2bebed4961bcd981b765b5f0014bd2291a7355f0f8e80db522e3e843088fe08c0a21d4dda360dc2834db4842
-EBUILD sendxmpp-1.24.ebuild 488 BLAKE2B f8aaaf3c921ff0a07cfe698d3549bb833666d4226df077bffd1d909c14f8d81bdec0d22065e99b176f900cdb68bbf41c689958120c060abe0f2dc6d2d0c858a1 SHA512 ddb864346011fa5814c23fabb432aa467ec450d1114a099dd06259665e929cbd91658d4755e8f331064ba326d3099a594f369a0c4825b547ffbcb0ff4fd237ab
+EBUILD sendxmpp-1.24.ebuild 489 BLAKE2B 610f72ed8dd85aabc0ea557daa8715db2c098b9f37094ed1dfd3f1da9de4235941f825f787df46e2902bf8ebca11044ef0572988a8ead7e08f01192492e79fc0 SHA512 de4330df45856ca79e2f7afc972f53e92878e07704b751c361d9521500212edf810c2974a8e1b0f97b027c69a801e721ee5ecec09e5813719ab622ef9dfac49e
 MISC metadata.xml 246 BLAKE2B 113c4d0217bba0bce6df81f39bc20882e47ed9dded43fb367e2c6c545fe1092ddea56d00d6e8d4f80cd751804f0206bb486795ee4ab592a85bc8937a879e7650 SHA512 b64c7aae46e2d47987372d30818221d17e5635606a61a1f87737bd3820e9db37d6ad91a470fdeac55fe42c85d3e86f3c28e81d45bc7a0d5440f8c6d5f52bd28d
diff --git a/net-im/sendxmpp/sendxmpp-1.24.ebuild b/net-im/sendxmpp/sendxmpp-1.24.ebuild
index bdd1e66033ab..29dad73f0f51 100644
--- a/net-im/sendxmpp/sendxmpp-1.24.ebuild
+++ b/net-im/sendxmpp/sendxmpp-1.24.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Net-XMPP
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 5c8fdc42422d..6baa47655ede 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,3 @@
-DIST skypeforlinux_8.67.0.87-1.x86_64.rpm 113618026 BLAKE2B e6b69afba83848b25f1e3d9588f6b9950e28a21ec5d99aa3f6ee2438b66f03e80bf106424d5f970a273276e7d588e8e55adf1012e3839076ffcbf834c5649b03 SHA512 936ba0b3d8811ce1d308bb63708a63ccdea3c5765c0631248d32cd4bfffe8ee7cc98744aaffb3ed13bdb7433d7a81cfe8e2f769c60dd232a5924681a17c5bf94
 DIST skypeforlinux_8.67.0.96-1.x86_64.rpm 113616838 BLAKE2B aecf6d8f24836d2d6ef23b80b79796cbe5e309af862eac5e8caa0436e6cc8f10de5fd6337901c70a4b5b5c6cc3d7d15f6b0225b86187db800c8374762adf0313 SHA512 8d1c35026bbe90a2492f3ac88cc8fb2f098258050cf263121a06b9c9e048bda18774582d669d9a9177d8cfcaaa66a615b206587e74b371ef80b089dfecbb9a2e
-EBUILD skypeforlinux-8.67.0.87.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 EBUILD skypeforlinux-8.67.0.96.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.67.0.87.ebuild b/net-im/skypeforlinux/skypeforlinux-8.67.0.87.ebuild
deleted file mode 100644
index c2755ee5b06c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.67.0.87.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit chromium-2 desktop pax-utils rpm multilib-build xdg
-
-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 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"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-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}]
-	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]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${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/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-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!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${ED}"/opt || die
-
-	# remove chrome-sandbox binary, users should use kernel namespaces
-	# https://bugs.gentoo.org/692692#c18
-	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
-
-	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 ${PF} 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
-
-	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-}
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 28aaeee8d6b3..89d2aa966275 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -3,6 +3,6 @@ AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8
 AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12
 DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r101.ebuild 4209 BLAKE2B 1ea12e41d23960c801c7cc1cb1c40756e96d6d390fdba842722b980f108ffde9983ddd19c42d90e2a33fc9d9b6400281ca4fd07b1e67ff6afdb5358bc6e92494 SHA512 ed7171dd6dd363e0fa96a1a222902737e5c86af6db6fe27dd8d9bd2c99ef8c245dccd8aeef17e6ff6d37fc6407e9fab66551d7d52c028c280910db37a33e71ae
+EBUILD swift-4.0.2-r102.ebuild 4218 BLAKE2B 83383c34373c3639b5fcb25abf72454de80fd0cfc7ffe651f53ac9989a6c3638ee8304cc858cee1904ef09380b059031cce4c91791bcd51a7c874a2ccc587fce SHA512 8342c45619e529c60b8c5dc54d262123162bd968f46380fe8170db955c4ed8a584b86504ce9736044ffc8c324c6fee9cb55c9c6470344c7dbe55a345a303a4f1
 EBUILD swift-4.0.2-r4.ebuild 4658 BLAKE2B 468c37828f1d27097846b64fe22107b77e9f90ce169fc6faf6ece26d66c6792a84b264e086f4f9730e7f39a4e14438f37a295e1a42803507200e809251976370 SHA512 681f9e8d9dcff75952128dd7eca37a15b6936f2c2b0961a465134a0e0a62fe0e8c9a1feac205c9d044ea60bc6177c3cb49870be6f6f3dc4017b4d95d8965704d
 MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r101.ebuild b/net-im/swift/swift-4.0.2-r102.ebuild
index ec9222bf927d..00166ea98235 100644
--- a/net-im/swift/swift-4.0.2-r101.ebuild
+++ b/net-im/swift/swift-4.0.2-r102.ebuild
@@ -60,8 +60,8 @@ PATCHES=(
 )
 
 pkg_setup() {
-	lua-single_pkg_setup
 	python-any-r1_pkg_setup
+	use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -137,9 +137,6 @@ src_configure() {
 		libnatpmp_force_bundled="false"
 		link="$(tc-getCXX)"
 		linkflags="${LDFLAGS}"
-		$(usex lua "lua_includedir=$(lua_get_include_dir)" '')
-		$(usex lua "lua_libdir=${EPREFIX}/usr/$(get_libdir)" '')
-		$(usex lua "lua_libname=$(basename -s '.so' $(lua_get_shared_lib))" '')
 		max_jobs="no"
 		optimize="no"
 		qt="${T}/qt"
@@ -159,6 +156,14 @@ src_configure() {
 		valgrind="no"
 		zlib_bundled_enable="false"
 	)
+
+	if use lua; then
+		MYSCONS+=(
+			lua_includedir="$(lua_get_include_dir)"
+			lua_libdir="${EPREFIX}/usr/$(get_libdir)"
+			lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
+		)
+	fi
 }
 
 src_compile() {
diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
index f6b9fba757f1..c04f44827ba3 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -1,4 +1,4 @@
 DIST vacuum-im-1.3.0.20180105-Alpha.tar.gz 2658247 BLAKE2B 823984f49687805c8e859984d6dfc9afcbdff864eef2f81825562dca11281286d5e736a986ed40e10bb915b7ee4f972dba10b073ea738cd8153f887c74b89f1b SHA512 83d830494c272145c3ad923ebb2897a8ab6323a301bdd0fc2b972f84b246e2de4eff29a93d92da97ed4deb6018c52e38e6fc5941c54722e1c37de207bca0c687
-EBUILD vacuum-1.3.0_pre20180105.ebuild 3114 BLAKE2B 2985d8610dd5c6131be1ee32c04a7d35cfc9816dde0cf7bd94eb351c25470287a263e90dc65e2d7efa1183649f731291e09e0eb6c7ad3949e03fd6ffa65e73c7 SHA512 51eff110897062bf05cdfa2ac080bc97e29b6416514a278bf7c110a5a8abac076f8944a126677c37f3d6c8edb21122fe58d2d6b07fe426467b85abab30a651c4
-EBUILD vacuum-9999.ebuild 2951 BLAKE2B c47d8203f106e137113fbaa085a4fb5965a27c63f004973cc4be603047978b6dd7528dbd95ee8caf0b7a83987757a7799ec8763d3f7eef1875c36b75773abec2 SHA512 779aa707585a3d42d4779d835669e4d85214bd82554b51cddc6d3190736b20760e0be8b3a91505d9bbf801e7c657287b00f5d47a2e3bad290463341262d89dd8
+EBUILD vacuum-1.3.0_pre20180105.ebuild 3147 BLAKE2B 0f8dc6e7229f4813be597deed3bd8719d87014f47ee74c67ff45e38d118656d04a2ae1bfa777323faa4bf40495f46188c1bc824e2388bc9f0cf03ab7deffd25b SHA512 b1fdf8727804458c995a655b5eb82ef3225ddd130a3252be876d640ac711d9b4cb10caa6eb930d018e161fb8a45a218f49447f33222f7495b4310637284ee475
+EBUILD vacuum-9999.ebuild 2984 BLAKE2B 7db70d4d5392fc4320d28d79d69c0f4e4f68b6d5ebebf260c7d9aeb203eafe640b926ad6ed12e6218d0d723b2255df8151e1cbda24b8fc6b7f6399d7bf52132d SHA512 6287d3fbd8f4bf5660b31c0b4446e3e4ef3855511945b8054cc82b815389963efc8a92c62ef898a998103b33a3c912bfc3cb42d1bfb1382b22634cce92bcd45c
 MISC metadata.xml 4393 BLAKE2B 1e7ca7fd2e9a6d9280380a3a4b1d3c4eb779a248f3d50c2f8e0760fdd76d7d87ce9f113d29f3e2bdd4f5f8b8468907bbf306bb8485f76bf1e76376b23f019ef0 SHA512 446e38db0ce8ce1c7a62f2b9ee03a701d75a6df16e62f6e70dd829d1a6973bc601c51859f1e9929e3da430494ea47afbbe6fddde794d86850205159cd88d468d
diff --git a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
index 7da48efb53a4..85da7fd6fcb5 100644
--- a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
+++ b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
@@ -88,6 +88,7 @@ src_configure() {
 		-DLANGS="$(l10n_get_locales)"
 		-DINSTALL_DOCS=OFF
 		-DFORCE_BUNDLED_MINIZIP=OFF
+		-DPLUGIN_adiummessagestyle=OFF
 		-DPLUGIN_statistics=OFF
 		-DPLUGIN_spellchecker=$(usex spell)
 	)
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index a5e9347a9baf..0e61fe56e22d 100644
--- a/net-im/vacuum/vacuum-9999.ebuild
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -80,6 +80,7 @@ src_configure() {
 		-DLANGS="$(l10n_get_locales)"
 		-DINSTALL_DOCS=OFF
 		-DFORCE_BUNDLED_MINIZIP=OFF
+		-DPLUGIN_adiummessagestyle=OFF
 		-DPLUGIN_statistics=OFF
 		-DPLUGIN_spellchecker=$(usex spell)
 	)