gentoo resync : 30.09.2018

19 files changed, 252 insertions, 214 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index f376cba91ab2..9bf69d1fc9ff 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/hangups/Manifest b/net-im/hangups/Manifest
deleted file mode 100644
index 12e6c256bf4e..000000000000
--- a/net-im/hangups/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX unpin-dependencies.patch 1165 BLAKE2B 77ea9649a56a4170dfce53ac457812157f8aa11f7ac8c1b8e2396b2770cd3ae0c8627c30a9c98e4da41de35c68ae2b74e65afc7a11b4d8436637cbe862f09e45 SHA512 590a419d2bf83d5892519cfcd1f9464168d047d84a8a184480cbc1dad8542330bf268d89d618af3fbfe565bda89fa9bbbc1c22a53dbf52e041c0afabf91d839d
-EBUILD hangups-9999.ebuild 1348 BLAKE2B 78d1dbf38106097ee5fb5fa3e811ae64bf6a1a6850ee180a8c0b05839f26b85903829fc7fcee3fb6f47c33a3ace00bfe22998354c144a48ff27d2e1b59a44b3c SHA512 2a18cb7e3047f8f69b05e016d27417b94bab1afdb4179aec64c586dcb2d85dacd0172b4b06240caeb126fa482dde2fe00ec80acf2c65326577e0993352c2a3cb
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/net-im/hangups/files/unpin-dependencies.patch b/net-im/hangups/files/unpin-dependencies.patch
deleted file mode 100644
index 37c8795cdd8d..000000000000
--- a/net-im/hangups/files/unpin-dependencies.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 6566dc8bf4dd..000000000000
--- a/net-im/hangups/hangups-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-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.org/project/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
deleted file mode 100644
index c36c37139fad..000000000000
--- a/net-im/hangups/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/mcabber/Manifest b/net-im/mcabber/Manifest
index 059587637caa..f292ce8ed710 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,6 +1,8 @@
+AUX README.gentoo 692 BLAKE2B ff09452aa3712dcdcd575bdf12b6bffd32f142e1b75a392c394af9131d029bedb66193dc767b5d0a3fbcc0e14852e7c63951a6189f43a68986e9f6d8f524d07d SHA512 e55fe538eb677f638ce343cb3e54314c50c923b9b0e5077e5a82bbe9d8c68dcfe3ae6975821147fd3322d2d6a74669fa58435a772e55d3b27601a80a964e3e31
 DIST mcabber-1.0.5.tar.bz2 605483 BLAKE2B 557ec5f4db6d2dab41fdb3110a165867d354f98f11c3d4ded34abe6b8fed5a895dd0e948bad94ca1694f61f398535f4d7701ddfd9d77a79c89cc9e0b54f587d0 SHA512 81b67899245902f495af7b44a5a0d710db69da731a00fb9ed84bdc0f88d5dc662f340817b1eaa843802c95105846234743eba52117f18bf12dd37a0da61d414d
 DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
 EBUILD mcabber-1.0.5.ebuild 3283 BLAKE2B f74e6bf2aee41fb4756cdb4b12890adf3552e4447ff9df4f555ccfffdb85833c8e0fc57a55fa9db55ce6037efef16e7d98b52c00ddfa937e842b0112faf2eee7 SHA512 2db587bce1cf262276b7e109e6594ba7bf102594c95dde94fc36a9a140410b6eb71771bef913e98c7d245cf31dc328021f02ea8d01e3c51ffc15a3198f5473ea
+EBUILD mcabber-1.1.0-r1.ebuild 2368 BLAKE2B 9939ed9e6917c345fd2d8381eb25e657d782769496b6fd45ff3ff033d32af451d3883ad12d56fd4c654518d5de3d52fa03ac5cb20dbe3b69134b75767a3a8079 SHA512 a6cf985eaed60adb87dd2b76b15cc989a20a223873458bc7a254cf5195b416e10615b7a6a71dd2c64320d3de2611bc904ba73cb17cbe0ee2a8e26427039b0f29
 EBUILD mcabber-1.1.0.ebuild 3285 BLAKE2B 07a9712f85075fe021f6585b07674f2b71e8b7eb5a10965c7f979ad5138b0093685e4b2115ee25590cc5e4fd584d78b05ae9dc6c648457885eeed407b9aa94ff SHA512 9b7791a3de2553605c91ba30e04f57580cc88d19b2fd20ce6d2486fd85cc96ff3993c12ceb015af1615273f4d1cd8795a1ca16bb7f24268e4ddf7bb54dfba5b8
-EBUILD mcabber-9999.ebuild 3138 BLAKE2B 513c61fd6f6eb5b9187d90985541dde50f6be5d15b708430bb7a36e4474a37f6568169074d25575a326b6375da07c2ab05744691aaa2288683c4263a9e4f9544 SHA512 888e91b54c4344e9c38096eec5c5aeb0de924c5d5a883d79427dc9cf5fd628310a4d8fdf712342572bd2ac89411825f793c26513bf4784a8b1cacc53dfea91e0
+EBUILD mcabber-9999.ebuild 2368 BLAKE2B 9939ed9e6917c345fd2d8381eb25e657d782769496b6fd45ff3ff033d32af451d3883ad12d56fd4c654518d5de3d52fa03ac5cb20dbe3b69134b75767a3a8079 SHA512 a6cf985eaed60adb87dd2b76b15cc989a20a223873458bc7a254cf5195b416e10615b7a6a71dd2c64320d3de2611bc904ba73cb17cbe0ee2a8e26427039b0f29
 MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6
diff --git a/net-im/mcabber/files/README.gentoo b/net-im/mcabber/files/README.gentoo
new file mode 100644
index 000000000000..dc394e6e5a4a
--- /dev/null
+++ b/net-im/mcabber/files/README.gentoo
@@ -0,0 +1,17 @@
+MCabber requires you to create a subdirectory .mcabber in your home
+directory and to place a configuration file there.
+An example mcabberrc was installed as part of the documentation.
+To create a new mcabberrc based on the example mcabberrc, execute the
+following commands:
+
+  mkdir -p ~/.mcabber
+  bzcat /usr/share/doc/mcabber*/mcabberrc.example.bz2 > ~/.mcabber/mcabberrc
+
+Then edit ~/.mcabber/mcabberrc with your favorite editor.
+
+See the CONFIGURATION FILE and FILES sections of the mcabber
+manual page (section 1) for more information.
+
+MCabber supports PGP encryption of messages. See README_PGP.txt for details.
+
+Check out /usr/share/mcabber/ for contributed themes and event scripts.
diff --git a/net-im/mcabber/mcabber-1.1.0-r1.ebuild b/net-im/mcabber/mcabber-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..2f8476b1c214
--- /dev/null
+++ b/net-im/mcabber/mcabber-1.1.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
+	EHG_CHECKOUT_DIR="${WORKDIR}"
+	EHG_BOOTSTRAP="autogen.sh"
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="aspell crypt idn otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when L10N var is set
+for i in ${LANGS}; do
+	IUSE="${IUSE} l10n_${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
+	net-libs/libnsl:0=
+	sys-libs/ncurses:0=
+	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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() {
+	econf \
+		--enable-modules \
+		$(use_enable crypt gpgme) \
+		$(use_enable otr) \
+		$(use_enable aspell) \
+		$(use_enable spell enchant) \
+		$(use_with idn libidn)
+}
+
+src_install() {
+	default
+
+	# clean unneeded language documentation
+	for i in ${LANGS}; do
+		use l10n_${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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
index ed7b028ed100..2f8476b1c214 100644
--- a/net-im/mcabber/mcabber-9999.ebuild
+++ b/net-im/mcabber/mcabber-9999.ebuild
@@ -1,22 +1,28 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit flag-o-matic autotools-utils mercurial
+inherit flag-o-matic readme.gentoo-r1
 
 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}"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
+	EHG_CHECKOUT_DIR="${WORKDIR}"
+	EHG_BOOTSTRAP="autogen.sh"
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 
-IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+IUSE="aspell crypt idn otr spell ssl vim-syntax"
 
 LANGS="cs de fr it nl pl ru uk"
 # localized help versions are installed only, when L10N var is set
@@ -28,7 +34,7 @@ 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  )
+	idn? ( net-dns/libidn:= )
 	spell? ( app-text/enchant )
 	dev-libs/glib:2
 	net-libs/libnsl:0=
@@ -37,9 +43,6 @@ RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
 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() {
@@ -49,19 +52,17 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myeconfargs=(
+	econf \
+		--enable-modules \
 		$(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
+	default
 
 	# clean unneeded language documentation
 	for i in ${LANGS}; do
@@ -89,27 +90,10 @@ src_install() {
 		insinto /usr/share/vim/vimfiles/ftdetect
 		doins mcabber_log-ftdetect.vim
 	fi
+
+	readme.gentoo_create_doc
 }
 
 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
+	readme.gentoo_print_elog
 }
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index dca7997bf6e5..2aa18d7380c4 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -10,5 +10,6 @@ EBUILD openfire-4.1.0.ebuild 2875 BLAKE2B 6cb7b4da9c43e66bc2520ccbb9c520af2b7071
 EBUILD openfire-4.1.4.ebuild 2877 BLAKE2B ff6480b34681afe96e3c69dd099dda70b19635a6a1298a998d0895898663fdcfb630417198d5014eaa72144dc0996dd8d0f927bf8d49e3ce5e34ca6fc17a95de SHA512 fbf36088c9e99e7b86a1a1e37a7a0f4213a370407ddd94f230af373e8e33126e68ad72532ecaa17560586ab479609c2db911506b7fdf4e947041bccd30047583
 EBUILD openfire-4.1.5.ebuild 2877 BLAKE2B ff6480b34681afe96e3c69dd099dda70b19635a6a1298a998d0895898663fdcfb630417198d5014eaa72144dc0996dd8d0f927bf8d49e3ce5e34ca6fc17a95de SHA512 fbf36088c9e99e7b86a1a1e37a7a0f4213a370407ddd94f230af373e8e33126e68ad72532ecaa17560586ab479609c2db911506b7fdf4e947041bccd30047583
 EBUILD openfire-4.2.2.ebuild 2877 BLAKE2B 19b2278da0c1a57499b62c6a329c7c1d01563e73842be2012fa8aab5880daaa8c68e6133dcc707b73375966a4e064577266c14ac6593b24961463e474d9a552c SHA512 1a38c942abd5aeb3fcb011ed21a2383d14ccffa9be6d8a834ac33d9952088e7f06bb194d0c0888897f8d4cc30255fd03ba588070f1543ac6dc7257a4639c23aa
+EBUILD openfire-4.2.3-r1.ebuild 2345 BLAKE2B bc79ff8ab445e0f5d956bab9d99a289c410928c45b61e3bf6e438f1bc338fc1014866b9e434d2db10d1c3c3e3860816389f86715bf7fbb433d4e0d2e63506e4b SHA512 2748a0b5702f9689af20770f17a9c5498d976c76de1f833487e2d22b4ef47f16137d128777f22406c40398bf8abb2181556f8736fdd5402b04e4a8e0af0a0d22
 EBUILD openfire-4.2.3.ebuild 2349 BLAKE2B 8097d183be7508fee0086a78644c238b87698f1b3ca3902e5b7caf4102103a98bdeee80d33fc367d1c4faebf38e5e35da6a486543884e143d2481a2fe22458ac SHA512 dbd52c2f47add0453c487085e008836aaf37b36e7d20350ca9cc70dd22874880087b30111dc741e09dac0463d3d55c4fcecb143e6127b571d0041de291a8c694
 MISC metadata.xml 462 BLAKE2B 7229da017ec6ea3c83be2faa7672b89392acc44c9df5cfab3536e593f3267371954de62d547b976e2bf7fb5ea176ea647436ca4969ed9c9f8b3d70c54e710d60 SHA512 dcac14fdaac6da7b164c1a5083b162909aa6cf6834087e0d0f7ae02f7fada74731eb3979790ab7831bd834c301caf44a7d9e593b51c9fcafbcfd921ebf993dd3
diff --git a/net-im/openfire/openfire-4.2.3-r1.ebuild b/net-im/openfire/openfire-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..ea631de1f712
--- /dev/null
+++ b/net-im/openfire/openfire-4.2.3-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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() {
+	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
+
+	fowners -R jabber:jabber /opt/openfire
+}
+
+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
+}
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index d6de8635d62a..d226b2a940d0 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -7,5 +7,5 @@ DIST pidgin-2.12.0.tar.bz2 9270704 BLAKE2B d12b84c4ff94e4dec67bf5e13607510a4ccd5
 DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
 EBUILD pidgin-2.12.0.ebuild 7505 BLAKE2B 39b377538424788b9b48168c30f651d3cb48ccf860d1d973d5de16b1141bac7108e7b1cbc65d5803f25b6370f57f6ad6cc83b6b90b68060c536b67c2c1f320b1 SHA512 984d41160dbc18272dd1bffc99aee0d756722f5c8a0d666cac21d99cfe5cb642481e20f62cd5c43454049194797bb60dd92697fa28c1036d6accc0f73fe70704
-EBUILD pidgin-2.13.0.ebuild 7706 BLAKE2B 13d184e138c74523974292e1b16896a110059ba0ba70c1de40e5d49f4dff429945ad538ae4e3b6cd5bc3d3d5422f1188aa45df9bf040b33d1dfe332976370465 SHA512 018b214acf5cdd252dba95ec01bfaa491f2a1f58169ec3783a2c583ec25f81cca01b1c6f4da209834a66987e7f66eada70792427b0baafa68dfc1d3994ad8de4
+EBUILD pidgin-2.13.0.ebuild 7705 BLAKE2B 01b831b9354885c248c70cedd3c4a6babc3f856079c3a44d2c164372e9c97c56b73f1d38a7b14516f12b9b57e4695a1c587bacb2e1cbe3621ed0dc8c81a50640 SHA512 df8206480f955179dd76ab5a9c10aa7ec6f3c29e65017ca16db861526ac992d661aa3c83b11d2709185874a7ced06edaa6f0f147e872e0f84b121c379c87a460
 MISC metadata.xml 1480 BLAKE2B 09a69fc87ec34ef69c1862ba62eefabdde0cc806e47e005d2e13cfd639c6cd0d7f7ec6ac5e9a9d2b438c29d98caaf613b472e41ede2cef93de303da15c553e43 SHA512 de9430a267c6d93ec7a922f7ee447e36c2008cc37931896513398ae3f32af7e2a08ebb2ff7f9fb254c7facbf1ee5a4959e562e2fccd6bd85595f3d9b1d0e1e00
diff --git a/net-im/pidgin/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0.ebuild
index 8354b85d820f..10ae284c57bc 100644
--- a/net-im/pidgin/pidgin-2.13.0.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~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"
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 0a2ce8e6f159..ffb5eabe3004 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.16.1_amd64.deb 70133768 BLAKE2B b647b7ee63422650fc1807469acfce04d901e4bcc1e4157ba528227afbc55376efbf48ad12fd21e671c9630366ed65c781f508f9f704adad096141abe3ee4aa2 SHA512 8d26b71f5b4f7c2e003dbbb8c83ffd7dbce416a65456b4fec4d03023e526175a574a690f2fbe2d82d5fcb9273abc8be2e2f98711c0f845b68779fe8079b18ce5
-EBUILD signal-desktop-bin-1.16.1.ebuild 1334 BLAKE2B 572306ec311b442b509edbf4fc50aafc3e4886388199130ac2a243f5a82e6df730ab368b45802cc21adda6e4c2ac904b8e9c3eca4ccb720016fd1d3bf5170cdd SHA512 4abc6e0a00a17f01ed16543d7163f13204231310f05444c51fe685c1f8a24e273ffc0a3531354d7e558d639fe313e3ded98e73debdae8d3e965c3c80f107803e
+DIST signal-desktop_1.16.2_amd64.deb 72168974 BLAKE2B 2b55f94c9c66b8b19560c4fc95f20d25e44a02862335e9600a0065fa9b068a582560cb067af68a3f7825339485ef2687321d89d6cf0df308f9210561fea99266 SHA512 50cb5e7ef72ee344e09a38015b0eef87e373214202b68fa2db3809d97b1782b5e8d86d7d8adf0d38460a39ad1e1ed1ef9f50c569238af8112ce0fc5c3d28b236
+EBUILD signal-desktop-bin-1.16.2.ebuild 1360 BLAKE2B ecd87ec34c6aa4ab4a3d1fd4a749b54c3edf77619ca76af40f387277c854de6bebb109968a2fcb50108f457790c5f3f05ddd652f6358cedc7836476974a1f258 SHA512 e6087f261b262e2a8fbd5310bdc60a0b77786475ce5cd2eeeaeb62c50a732300866de8655d2060485cd0db9fc02e6dbafab80bc841b7cb6349189099fdebd02e
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.16.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.16.2.ebuild
index 66fde796fe74..e9c70cc55979 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.16.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.16.2.ebuild
@@ -36,11 +36,12 @@ src_prepare(){
 	default
 	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
 		-i usr/share/applications/signal-desktop.desktop || die
+	unpack usr/share/doc/signal-desktop/changelog.gz
 }
 
 src_install() {
 	insinto /
-	dodoc -r usr/share/doc/signal-desktop/.
+	dodoc changelog
 	doins -r opt
 	insinto /usr/share
 	doins -r usr/share/applications
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index ba13a79a6e62..79f33154c36e 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,12 +1,10 @@
-AUX telegram-desktop-bin 222 BLAKE2B dc8af6a58e9841c9b3aae86286fb072e13f911f451e9f3718fb3dad9787616ba732d415091e8ebd56fef5ecd7bd4cf18e5a6897c18e2be1b8170d4df3f95c985 SHA512 28477ac203e31244d738f9698cf825821ead39dd2bb67a795155a0516cb0302b2e6c8e666754e4f37c91ed3227cc21bcfb09994334d158056b62f9482c4dacdd
 AUX telegram-desktop-bin-r1 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-1.3.10.tar.gz 17167027 BLAKE2B b1748abbfaa08ab22d26707b1b5be7e31dc804869a5ac5cf91bba823787758cd180d9cc41a96eb12787bf445aa6729d66df3aa4ad9acd338500c72da7725211d SHA512 91833405de4d68c6e791fbe3a6ed45926227bc8f7131ffcd2e048e38f8f74419050745a3a56dee926c708e187d9ae985d2efa564ad16fc75f18b60f48a601011
 DIST tdesktop-1.3.14.tar.gz 17199969 BLAKE2B 996b1b8113253b12592727fcced27b26e9c9f020f8112ac2460b8c9665c3445f8e8707cc0d62c22a3452367d483a016a471119437ae3da6cea10cc3bc3ed656e SHA512 0fa0792970d4ed044ddc06f97b02d1b7de137cccba7792cc5cbbfbce0d3ef8dbf78cfe3464d3f846c2d6285a9d7db2f40cc4ff76b4ef7138f238ac9045cd2931
-DIST tsetup.1.3.10.tar.xz 34424588 BLAKE2B c71fda6091d402809fd6989dc6f79c5d43df15e910b939350406233c143e1c8964e67c116d84844aeb54f4a4d6103962281d013507be91b74c58e094b550d5dc SHA512 432d9177e65a461d64f7ccd48745de09cfb2f8d864ba7bf46949e9edd20a5859fcb26491de9053b4823e429a204215daba7399426daaedccf263ffc671697ffa
+DIST tdesktop-1.4.0.tar.gz 17318129 BLAKE2B bd77ac1c20aeb3e760294f32d8649d49740ef97aae37fabc90aee8207e87109812ce824e25b028785f4ab6fc932ed2e727022cf40a61a189e9f90eb056b0e19a SHA512 4eb123dc34edd3a47848abac66ca7c07a6bf9cf0658a9e904797ae52324f3cdcef3de9a63983f4003652c36087d4ab2e0a9fbf6c6c95b424fd68a65bd77ecadf
 DIST tsetup.1.3.14.tar.xz 34544980 BLAKE2B 3a0ec56d3e49fb47484c959006126a39ed41da6d58706a51808207c0d285a06d72954a17754e7b166468e924f549d08200355f5c83ca68b9fe535304fcb12e34 SHA512 b880782ead5acc40c81d62028e88b5565f6740bc044cdd1eb2e701854d2c5c23ecd2c6d68f7a3b00d8e85d2ad89b1cdf1e7b65b691b2178ea9556cd9b852a726
-DIST tsetup32.1.3.10.tar.xz 36904652 BLAKE2B 42904f09d4ce26f6d930028f81b7891dfab5ba7d780eace2e70f92752f69612eed6519ccf2ecb0420bd5bfb9f4c999476899df17abf41eca5d4b666bdb7fea9f SHA512 223db27115723cb011f4709ce39fe99228171986a954984a678065d780894d5845ab9bd90541a9cadc7ca6abd01f123ecd53491cd02c235f78615172f40a7a27
+DIST tsetup.1.4.0.tar.xz 34811788 BLAKE2B a46e38b8d27ce764b7e9e735809a5098456368ed747e83bc16d125d80e6b772e1fb0eeee0d6b8eab937c04148b2516d5130c365dbda7e7a05571b14137b5a9c5 SHA512 c646763d66a807ade2c5d475444ce651dfd8ff488cafc4148a9e6850485fcfa8bc41d821dea1a9a6d6d5ac8f97593f5cedefa20a533d057c40e72a497afe264c
 DIST tsetup32.1.3.14.tar.xz 37060108 BLAKE2B 5fb87cab91cef06cfd585907e5a40f3099f10a91cf6226704c2f5822d9ec4459f8a65b5714a1177ce1b8c2bbc7f8030af8d82d72ec98b4fe9dd4b3fbaeb09b76 SHA512 446f7091b568b56466d9ee53343a7433335817c0589e5338010dfccb78e615745262fcae18b856c0929d045d3caa46ddace1893c2a44fdf9507c09fad3b09626
-EBUILD telegram-desktop-bin-1.3.10-r1.ebuild 1291 BLAKE2B beafdaae27e3b314ac53fd54e813f654c90f1c8d452e32a22cc25557d3e3cac830e70522c54548ab8f34aa613bf853194ea03de44f6848acce010e31201c8855 SHA512 57d47a377d349169f9ee8c3a3dcc8931b17103affc64d2219c00a4dcfa3a57c4b6ad0cef60287550aa3ebbdb1e7413e751bca80eccac6142236a0d71fb76a1f2
-EBUILD telegram-desktop-bin-1.3.10.ebuild 1310 BLAKE2B ebb7ee23b246a95d17d7f2f8ed660261a5be4b2eabf9179c853886c067a5394d582a2a61ae1c0dbed8cc8f467afe8aacee92a8e8dbace0f25458ae3c58487ff4 SHA512 0592dcd0e047c96fa2dd0c6e4387a4752b833bc9e73d407ed34bb6c3ff1c926b1119659adcb4f6d756b5807b0a86bcc58b9393c8d975e4c6dd0b9a0595c8e0fb
+DIST tsetup32.1.4.0.tar.xz 37403084 BLAKE2B dd134c49da40fb25266e0bbaf5722675eea84bf760029646f0d727f6df587a789d42d40c1de1d3f8eb6a2623e5f5e569524b618df18ea48d26e0a05a1a597310 SHA512 8700221f791fa366bedbe666f8d73ec68a216db0dd0ceef43332fd4ce075897c003b069f51946e29dc1b1574dd50fdd6abb1ed491d1c09f5952d044628656a3a
 EBUILD telegram-desktop-bin-1.3.14.ebuild 1291 BLAKE2B beafdaae27e3b314ac53fd54e813f654c90f1c8d452e32a22cc25557d3e3cac830e70522c54548ab8f34aa613bf853194ea03de44f6848acce010e31201c8855 SHA512 57d47a377d349169f9ee8c3a3dcc8931b17103affc64d2219c00a4dcfa3a57c4b6ad0cef60287550aa3ebbdb1e7413e751bca80eccac6142236a0d71fb76a1f2
+EBUILD telegram-desktop-bin-1.4.0.ebuild 1552 BLAKE2B b15d5e41ecb4b0ce7d70e124136db5c96d06e4b14f2173387446df4a241e256ff60c3f1ea548163f1eaaf83648173e40cd9cff307a6c3e7570d2e91961223e84 SHA512 82831ff5408cddb6f633b0e3345ab48781ae1ec8868c60a497e7127d4d898f27c0b02252b08fd703dcaa8d4bd4c910f79197315f2af815f2abb08f8514ba881b
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
deleted file mode 100644
index 3529333838ec..000000000000
--- a/net-im/telegram-desktop-bin/files/telegram-desktop-bin
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# this wrapper disables the auto-updater of telegram-desktop
-# This program is licensed under the same license as telegram-desktop
-
-exec /usr/lib/telegram-desktop-bin/bin/telegram-desktop-bin -externalupdater $@
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10.ebuild
deleted file mode 100644
index ab0574289241..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop 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/lib/${PN}/bin/${PN}"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=sys-apps/dbus-1.4.20
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	into /usr/lib/${PN}
-	newbin "${S}/Telegram" ${PN}
-	into /usr
-	newbin  "${FILESDIR}"/${PN} "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/telegram-desktop-bin/telegram-desktop-bin-1.3.10-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0.ebuild
index 8b7d2c549cd7..e0cfb12960a6 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10-r1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0.ebuild
@@ -51,6 +51,11 @@ pkg_preinst() {
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_icon_cache_update
+	einfo
+	einfo "Previous versions of ${PN} have created "
+	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
+	einfo "conflict with the one shipped by portage and should be removed"
+	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
 }
 
 pkg_postrm() {