# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1584841221 -3600
# Node ID 43d28a985b5c0206339ae9e05e3f0fd0ecddc123
# Parent  f3ea3b7c6ace8c4248152bfaf05c0bfd10b0ab18# Parent  36906ed82d4a3ce24bdd626ad136e4e02d32e743
Automated merge with https://localhost/hg/portage

diff -r 36906ed82d4a -r 43d28a985b5c app-editors/visual-studio-code/Manifest
--- a/app-editors/visual-studio-code/Manifest	Sun Mar 22 02:38:34 2020 +0100
+++ b/app-editors/visual-studio-code/Manifest	Sun Mar 22 02:40:21 2020 +0100
@@ -1,6 +1,8 @@
 AUX visual-studio-code.desktop 219 BLAKE2B 76da7de95bb06cab2feaef664aee550b9ea68b58ecf3a9affa82fa11e1aeb8e754498cf1aa0b2dc18030fc2d800173c4b7ffd9c17dc0dc9de012fafd631d0060 SHA512 97b81eb1461225f5fef1187709387679d081e377897660e825a6ea356753b2c95e690552e5e75d76371126551786f36a43cd141b06c3cde436ccfb4a75347b03
 AUX visual-studio-code.png 30538 BLAKE2B 16cf4c0e8f6c59451e38049b2531b08cfac9c0ef570b0f4c28c16a51ebfa81e95db2c5286dd4c1ddb0fa535858f3373cff2f76a21a2859321cd80529c2d6ef52 SHA512 fabb74b9ab860d8003798ea85db2a3c79c1b683897acc5b580884a8946fa060276f8cdf459a9fb5fd9a560094b250838a3dfa2e5e5f8032601a155466dffa160
-DIST visual-studio-code-1.29.1-amd64.tar.gz 64558323 BLAKE2B ff4a160e0ded30d5996a96df301f0847d3f44f701fb1d53e98bccf44fb35ca65e3c603b5ccee6827dfb3379ccdc1c9b660cd853a9cf6d955d352109156fa9eff SHA512 efbea554e3306069cadf4256180cbd2059511b64d69aa28254960b2794602c3e5966b7dcb0a49e6c93692c96c89b4902532a414229493dd99788287cb93eb60a
-DIST visual-studio-code-1.30.2-amd64.tar.gz 64974797 BLAKE2B 289dd69fac033b33bd4579c70481e802b97588d5ceb6db09043577c842f15af02c4bb600cb255d59bb4742810ff23f69f97360f76195953e14d4a12198a24b6e SHA512 3d9d9cdb4129c0a32a15a39337ccfe1f215870cda65f81616d9e5ae17dcadbee3a5afa118c96d26513dd215c5eb49e81bbc1ea4af46e0a02790d712c96fa96d1
-EBUILD visual-studio-code-1.29.1.ebuild 1441 BLAKE2B 412bb6077988e2f3c24088ccd37b8c900e3ca8be4fb21a53224ae2d71668de0de32c81020177b197c0cc24ea943aac4668f44324b1eebdae91a5b2870dfa0191 SHA512 523414b04da0a38e44b3f2afe0490f79d7abc48478d0a6f5e5d0c4cebec19d0fc7fec0d37968c960f901cac8031d14326f1a234fb459b392b4973bed7b0938cd
-EBUILD visual-studio-code-1.30.2.ebuild 1441 BLAKE2B 412bb6077988e2f3c24088ccd37b8c900e3ca8be4fb21a53224ae2d71668de0de32c81020177b197c0cc24ea943aac4668f44324b1eebdae91a5b2870dfa0191 SHA512 523414b04da0a38e44b3f2afe0490f79d7abc48478d0a6f5e5d0c4cebec19d0fc7fec0d37968c960f901cac8031d14326f1a234fb459b392b4973bed7b0938cd
+DIST visual-studio-code-1.31.1-amd64.tar.gz 67903381 BLAKE2B d836f4fe88cb88166067178881f0e43fe67e4d591c3e778a100e10e9a04bd90d1e6fcc8c404f1d1f479fb1c76cbbedacbb74c4bdb4e4d5fe60544e09af538bb0 SHA512 d5276d9b2e70ff399529dc4ddb8b4079f05b608b06024d8bd94b8c942697ed7b85012b8bb91b546f662465e4a502a5458d19e40a2154f2358f314efb637ba02f
+DIST visual-studio-code-1.32.3-amd64.tar.gz 68078974 BLAKE2B b6178a09e2d6f2e8e776869cc5d1e10bb3fd66185e2f32d970bdb60ab44b72cacb87b258a71c81ea835a108699a491f84699cce9fa028b7067394395510978ec SHA512 d91faef02d03a695323c55ea9ebae5e43af689c54418bad6f98cc9ee6a31cd75aca7e0ff34f0d24d7f4557ecc6e7d90d81146d22d4a2312b8c03206f9af71874
+DIST visual-studio-code-1.33.0-amd64.tar.gz 68367968 BLAKE2B ce4daaef9ee12e48c7f26ae5e8746ebcdeb02307fb72cda63f748ec7266e6b4638d36ce036cd29e08510f6138decba9b642774529b762411ba14123044274a90 SHA512 88e066550141fa51c0f06a1c5445822f8759176d010c96e86d84cffc98e1f71e3903abfb780cdde676b16b3f5686063b84f51a9e46095bd6a2d22c90d4240dcd
+EBUILD visual-studio-code-1.31.1.ebuild 1441 BLAKE2B 412bb6077988e2f3c24088ccd37b8c900e3ca8be4fb21a53224ae2d71668de0de32c81020177b197c0cc24ea943aac4668f44324b1eebdae91a5b2870dfa0191 SHA512 523414b04da0a38e44b3f2afe0490f79d7abc48478d0a6f5e5d0c4cebec19d0fc7fec0d37968c960f901cac8031d14326f1a234fb459b392b4973bed7b0938cd
+EBUILD visual-studio-code-1.32.3.ebuild 1441 BLAKE2B 412bb6077988e2f3c24088ccd37b8c900e3ca8be4fb21a53224ae2d71668de0de32c81020177b197c0cc24ea943aac4668f44324b1eebdae91a5b2870dfa0191 SHA512 523414b04da0a38e44b3f2afe0490f79d7abc48478d0a6f5e5d0c4cebec19d0fc7fec0d37968c960f901cac8031d14326f1a234fb459b392b4973bed7b0938cd
+EBUILD visual-studio-code-1.33.0.ebuild 1367 BLAKE2B 7a309bbcb43974c2c41168b2918f27f1be27744c5f43805c73be3a903965e40f3d08b06c11024bd18c86ba167b8a4020ee29f3260d4f61c6710de13df77016d1 SHA512 a6063d27413ee739447ddeae2e796f9bf0ebe4af0bb99e2dc08c04942b99785f8d1b0e000781baaebdf0e8ae4d1d5a52104d5266af08feb05b98821670e06822
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/visual-studio-code/visual-studio-code-1.29.1.ebuild
--- a/app-editors/visual-studio-code/visual-studio-code-1.29.1.ebuild	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
-SRC_URI="
-	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	"
-RESTRICT="mirror strip bindist"
-
-LICENSE="EULA MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=media-libs/libpng-1.2.46
-	>=x11-libs/gtk+-2.24.8-r1:2
-	x11-libs/cairo
-	gnome-base/gconf
-	x11-libs/libXtst
-"
-
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	x11-libs/libnotify
-	x11-libs/libXScrnSaver
-	app-crypt/libsecret[crypt]
-"
-
-QA_PRESTRIPPED="opt/${PN}/code"
-QA_PREBUILT="opt/${PN}/code"
-
-pkg_setup(){
-	S="${WORKDIR}/VSCode-linux-x64"
-}
-
-src_install(){
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
-	doicon ${FILESDIR}/${PN}.png
-	fperms +x "/opt/${PN}/code"
-	fperms +x "/opt/${PN}/bin/code"
-	fperms +x "/opt/${PN}/libnode.so"
-	#fperms +x "/opt/${PN}/resources/app/node_modules/vscode-ripgrep/bin/rg"
-	insinto "/usr/share/licenses/${PN}"
-	newins "resources/app/LICENSE.txt" "LICENSE"
-}
-
-pkg_postinst(){
-	elog "You may install some additional utils, so check them in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-}
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/visual-studio-code/visual-studio-code-1.30.2.ebuild
--- a/app-editors/visual-studio-code/visual-studio-code-1.30.2.ebuild	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
-SRC_URI="
-	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	"
-RESTRICT="mirror strip bindist"
-
-LICENSE="EULA MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=media-libs/libpng-1.2.46
-	>=x11-libs/gtk+-2.24.8-r1:2
-	x11-libs/cairo
-	gnome-base/gconf
-	x11-libs/libXtst
-"
-
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	x11-libs/libnotify
-	x11-libs/libXScrnSaver
-	app-crypt/libsecret[crypt]
-"
-
-QA_PRESTRIPPED="opt/${PN}/code"
-QA_PREBUILT="opt/${PN}/code"
-
-pkg_setup(){
-	S="${WORKDIR}/VSCode-linux-x64"
-}
-
-src_install(){
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
-	doicon ${FILESDIR}/${PN}.png
-	fperms +x "/opt/${PN}/code"
-	fperms +x "/opt/${PN}/bin/code"
-	fperms +x "/opt/${PN}/libnode.so"
-	#fperms +x "/opt/${PN}/resources/app/node_modules/vscode-ripgrep/bin/rg"
-	insinto "/usr/share/licenses/${PN}"
-	newins "resources/app/LICENSE.txt" "LICENSE"
-}
-
-pkg_postinst(){
-	elog "You may install some additional utils, so check them in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-}
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/visual-studio-code/visual-studio-code-1.31.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/visual-studio-code/visual-studio-code-1.31.1.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
+SRC_URI="
+	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	"
+RESTRICT="mirror strip bindist"
+
+LICENSE="EULA MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=media-libs/libpng-1.2.46
+	>=x11-libs/gtk+-2.24.8-r1:2
+	x11-libs/cairo
+	gnome-base/gconf
+	x11-libs/libXtst
+"
+
+RDEPEND="
+	${DEPEND}
+	>=net-print/cups-2.0.0
+	x11-libs/libnotify
+	x11-libs/libXScrnSaver
+	app-crypt/libsecret[crypt]
+"
+
+QA_PRESTRIPPED="opt/${PN}/code"
+QA_PREBUILT="opt/${PN}/code"
+
+pkg_setup(){
+	S="${WORKDIR}/VSCode-linux-x64"
+}
+
+src_install(){
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
+	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
+	doicon ${FILESDIR}/${PN}.png
+	fperms +x "/opt/${PN}/code"
+	fperms +x "/opt/${PN}/bin/code"
+	fperms +x "/opt/${PN}/libnode.so"
+	#fperms +x "/opt/${PN}/resources/app/node_modules/vscode-ripgrep/bin/rg"
+	insinto "/usr/share/licenses/${PN}"
+	newins "resources/app/LICENSE.txt" "LICENSE"
+}
+
+pkg_postinst(){
+	elog "You may install some additional utils, so check them in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/visual-studio-code/visual-studio-code-1.32.3.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/visual-studio-code/visual-studio-code-1.32.3.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
+SRC_URI="
+	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	"
+RESTRICT="mirror strip bindist"
+
+LICENSE="EULA MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=media-libs/libpng-1.2.46
+	>=x11-libs/gtk+-2.24.8-r1:2
+	x11-libs/cairo
+	gnome-base/gconf
+	x11-libs/libXtst
+"
+
+RDEPEND="
+	${DEPEND}
+	>=net-print/cups-2.0.0
+	x11-libs/libnotify
+	x11-libs/libXScrnSaver
+	app-crypt/libsecret[crypt]
+"
+
+QA_PRESTRIPPED="opt/${PN}/code"
+QA_PREBUILT="opt/${PN}/code"
+
+pkg_setup(){
+	S="${WORKDIR}/VSCode-linux-x64"
+}
+
+src_install(){
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
+	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
+	doicon ${FILESDIR}/${PN}.png
+	fperms +x "/opt/${PN}/code"
+	fperms +x "/opt/${PN}/bin/code"
+	fperms +x "/opt/${PN}/libnode.so"
+	#fperms +x "/opt/${PN}/resources/app/node_modules/vscode-ripgrep/bin/rg"
+	insinto "/usr/share/licenses/${PN}"
+	newins "resources/app/LICENSE.txt" "LICENSE"
+}
+
+pkg_postinst(){
+	elog "You may install some additional utils, so check them in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/visual-studio-code/visual-studio-code-1.33.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/visual-studio-code/visual-studio-code-1.33.0.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
+SRC_URI="
+	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	"
+RESTRICT="mirror strip bindist"
+
+LICENSE="EULA MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=media-libs/libpng-1.2.46
+	>=x11-libs/gtk+-2.24.8-r1:2
+	x11-libs/cairo
+	gnome-base/gconf
+	x11-libs/libXtst
+"
+
+RDEPEND="
+	${DEPEND}
+	>=net-print/cups-2.0.0
+	x11-libs/libnotify
+	x11-libs/libXScrnSaver
+	app-crypt/libsecret[crypt]
+"
+
+QA_PRESTRIPPED="opt/${PN}/code"
+QA_PREBUILT="opt/${PN}/code"
+
+pkg_setup(){
+	S="${WORKDIR}/VSCode-linux-x64"
+}
+
+src_install(){
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
+	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
+	doicon ${FILESDIR}/${PN}.png
+	fperms +x "/opt/${PN}/code"
+	fperms +x "/opt/${PN}/bin/code"
+	fperms +x "/opt/${PN}/libnode.so"
+	insinto "/usr/share/licenses/${PN}"
+	newins "resources/app/LICENSE.rtf" "LICENSE"
+}
+
+pkg_postinst(){
+	elog "You may install some additional utils, so check them in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/vscodium/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/vscodium/Manifest	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,11 @@
+AUX vscodium.desktop 219 BLAKE2B 76da7de95bb06cab2feaef664aee550b9ea68b58ecf3a9affa82fa11e1aeb8e754498cf1aa0b2dc18030fc2d800173c4b7ffd9c17dc0dc9de012fafd631d0060 SHA512 97b81eb1461225f5fef1187709387679d081e377897660e825a6ea356753b2c95e690552e5e75d76371126551786f36a43cd141b06c3cde436ccfb4a75347b03
+AUX vscodium.png 20146 BLAKE2B 992d0bcfc250ae3e6ab25b9f6270ddfe03168973844763fab254c6bbe9f069aea3bb08a3f004a7be6209066501cc642e319b07e5916df528003d85df7fa8dbe0 SHA512 2bbc1044aa83a7be4acf099e8c196833b6cada6febe2bd49c1e6001f08cac631795814c909e6349d691cf69f45c6076d7a991e6068d5695093340720c5a436b0
+DIST vscodium-1.42.0-x64.tar.gz 83258776 BLAKE2B dd910935cbd0ce341271f40c06c7e178213dcb705d589393ef74ca9635ec7406c2f5482286843fe8c9949c45cfac03b9ce258b3a4a0757759410a4b379df7216 SHA512 8b31690b1344fd24ac22f7fe867a1f85216026ea52fe595b02cb6e66d9328125cef6cd3e94736beb45e4471034fe2ac80b2ac5540efd981896231e1e17472f0f
+DIST vscodium-1.42.1-x64.tar.gz 83257052 BLAKE2B 5c6d7b029d120ad6a8701f6fa82c5cc12bc16c9a2243623c01fedf7b9d7e93946017cd4c3cde8a54a0fbeec0347af7128de56040e8292fcfa9d4025e77445ced SHA512 4751f4e1589c81878b2e5248cb413967403d1ac42316235d85b668dbc440bee3ff13d2ba5072d255e9e3f4db8477afb66a181a90fe410cf8513ea7f112bf0718
+DIST vscodium-1.43.0-x64.tar.gz 90559327 BLAKE2B 0b7c9758f459b41bb1c2b8b824662e57fb416494ec675c9aee96d21944e6809e078d4271968a75996a8e99479b06fbcfb754080dc2e2f689a3ca5d18951a46b6 SHA512 fe56d297b57930bb24db1da57f26ec970827d5bae42cf367763e7e3678e771193fd2153ab7b68bf6a5120ce5cb6c5b2f0d57947b7c74caada9a0e9c48da2101b
+DIST vscodium-1.43.1-x64.tar.gz 90573907 BLAKE2B 929c844727d92f24f3d374f14dc68c49ef53c12d79085596f0e647c60a3d867cf3afe2ed5decb95ebe15957779c1bf61d35a68a1c83690f321be9b02d7bf934f SHA512 4abfdb0daff664a3017c8eade69b94196ddb7925fb328dde1d356f6a32578fe83b44fea4ef8e9e824ed726ae6a4ae87c3103197df5093342a226dc96bccdde5c
+EBUILD vscodium-1.42.0.ebuild 1396 BLAKE2B 491b49e34fa0c96db0c37734877f8bedefcae249fdae1659b86a98593a683bac378927423c276e3d9cc54805915a0d22325b692e259a97e8715d513d1aca2a7c SHA512 804b60fb1c8b54cc5fff14d6f77fc0a02c774245cde5aab1ad65727f7572a294d6a2c158771351123b7de2df052c8c46636746eb619ef67589ce9904fa465976
+EBUILD vscodium-1.42.1.ebuild 1396 BLAKE2B 491b49e34fa0c96db0c37734877f8bedefcae249fdae1659b86a98593a683bac378927423c276e3d9cc54805915a0d22325b692e259a97e8715d513d1aca2a7c SHA512 804b60fb1c8b54cc5fff14d6f77fc0a02c774245cde5aab1ad65727f7572a294d6a2c158771351123b7de2df052c8c46636746eb619ef67589ce9904fa465976
+EBUILD vscodium-1.43.0.ebuild 1396 BLAKE2B 491b49e34fa0c96db0c37734877f8bedefcae249fdae1659b86a98593a683bac378927423c276e3d9cc54805915a0d22325b692e259a97e8715d513d1aca2a7c SHA512 804b60fb1c8b54cc5fff14d6f77fc0a02c774245cde5aab1ad65727f7572a294d6a2c158771351123b7de2df052c8c46636746eb619ef67589ce9904fa465976
+EBUILD vscodium-1.43.1.ebuild 1396 BLAKE2B 491b49e34fa0c96db0c37734877f8bedefcae249fdae1659b86a98593a683bac378927423c276e3d9cc54805915a0d22325b692e259a97e8715d513d1aca2a7c SHA512 804b60fb1c8b54cc5fff14d6f77fc0a02c774245cde5aab1ad65727f7572a294d6a2c158771351123b7de2df052c8c46636746eb619ef67589ce9904fa465976
+MISC metadata.xml 362 BLAKE2B 39630aa08acc184fded8fff0b33271414fa85821700f5b6666eb14ff207a4c924e035c04c2d819daf960770c032879e2fe5cdb0040a10721495060432cad54a1 SHA512 145a66637ab9dd8cd6c2424673f1e775d850a49b0cccf3b8108b1f54489989f5ba9aab6d29e7bd931e5b70517226ae7a22c7486273ea90c314abdea67593c55c
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/vscodium/files/vscodium.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/vscodium/files/vscodium.desktop	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Visual Studio Code
+Type=Application
+Comment=Multiplatform Visual Studio Code from Microsoft
+Exec=visual-studio-code %F
+TryExec=visual-studio-code
+Icon=visual-studio-code
+Categories=Development;IDE;
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/vscodium/files/vscodium.png
Binary file app-editors/vscodium/files/vscodium.png has changed
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/vscodium/metadata.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/vscodium/metadata.xml	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wolvie@gmail.com</email>
+		<name>Thomas Andrade</name>
+		<description>wolvie Overlay</description>
+	</maintainer>
+	<use>
+		<flag name="libsecret">Enable libsecret support</flag>
+	</use>
+</pkgmetadata>
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/vscodium/vscodium-1.42.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/vscodium/vscodium-1.42.0.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-x64.tar.gz )"
+RESTRICT="mirror strip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libsecret"
+
+DEPEND="
+	>=media-libs/libpng-1.2.46:0
+	>=x11-libs/gtk+-3.0:3
+	x11-libs/cairo
+	x11-libs/libXtst
+"
+
+RDEPEND="
+	${DEPEND}
+	>=net-print/cups-2.0.0
+	x11-libs/libnotify
+	x11-libs/libXScrnSaver
+	dev-libs/nss
+	libsecret? ( app-crypt/libsecret[crypt] )
+"
+
+QA_PRESTRIPPED="opt/${PN}/code"
+
+S="${WORKDIR}"
+
+src_install(){
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	dosym "../../opt/${PN}/bin/codium" "/usr/bin/${PN}"
+	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
+	doicon "${FILESDIR}/${PN}.png"
+	fperms +x "/opt/${PN}/codium"
+	fperms +x "/opt/${PN}/bin/codium"
+	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+	fperms +x "/opt/${PN}/resources/app/extensions/git/dist/askpass.sh"
+	insinto "/usr/share/licenses/${PN}"
+}
+
+pkg_postinst(){
+	elog "You may install some additional utils, so check them in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/vscodium/vscodium-1.42.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/vscodium/vscodium-1.42.1.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-x64.tar.gz )"
+RESTRICT="mirror strip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libsecret"
+
+DEPEND="
+	>=media-libs/libpng-1.2.46:0
+	>=x11-libs/gtk+-3.0:3
+	x11-libs/cairo
+	x11-libs/libXtst
+"
+
+RDEPEND="
+	${DEPEND}
+	>=net-print/cups-2.0.0
+	x11-libs/libnotify
+	x11-libs/libXScrnSaver
+	dev-libs/nss
+	libsecret? ( app-crypt/libsecret[crypt] )
+"
+
+QA_PRESTRIPPED="opt/${PN}/code"
+
+S="${WORKDIR}"
+
+src_install(){
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	dosym "../../opt/${PN}/bin/codium" "/usr/bin/${PN}"
+	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
+	doicon "${FILESDIR}/${PN}.png"
+	fperms +x "/opt/${PN}/codium"
+	fperms +x "/opt/${PN}/bin/codium"
+	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+	fperms +x "/opt/${PN}/resources/app/extensions/git/dist/askpass.sh"
+	insinto "/usr/share/licenses/${PN}"
+}
+
+pkg_postinst(){
+	elog "You may install some additional utils, so check them in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/vscodium/vscodium-1.43.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/vscodium/vscodium-1.43.0.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-x64.tar.gz )"
+RESTRICT="mirror strip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libsecret"
+
+DEPEND="
+	>=media-libs/libpng-1.2.46:0
+	>=x11-libs/gtk+-3.0:3
+	x11-libs/cairo
+	x11-libs/libXtst
+"
+
+RDEPEND="
+	${DEPEND}
+	>=net-print/cups-2.0.0
+	x11-libs/libnotify
+	x11-libs/libXScrnSaver
+	dev-libs/nss
+	libsecret? ( app-crypt/libsecret[crypt] )
+"
+
+QA_PRESTRIPPED="opt/${PN}/code"
+
+S="${WORKDIR}"
+
+src_install(){
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	dosym "../../opt/${PN}/bin/codium" "/usr/bin/${PN}"
+	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
+	doicon "${FILESDIR}/${PN}.png"
+	fperms +x "/opt/${PN}/codium"
+	fperms +x "/opt/${PN}/bin/codium"
+	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+	fperms +x "/opt/${PN}/resources/app/extensions/git/dist/askpass.sh"
+	insinto "/usr/share/licenses/${PN}"
+}
+
+pkg_postinst(){
+	elog "You may install some additional utils, so check them in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff -r 36906ed82d4a -r 43d28a985b5c app-editors/vscodium/vscodium-1.43.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-editors/vscodium/vscodium-1.43.1.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-x64.tar.gz )"
+RESTRICT="mirror strip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libsecret"
+
+DEPEND="
+	>=media-libs/libpng-1.2.46:0
+	>=x11-libs/gtk+-3.0:3
+	x11-libs/cairo
+	x11-libs/libXtst
+"
+
+RDEPEND="
+	${DEPEND}
+	>=net-print/cups-2.0.0
+	x11-libs/libnotify
+	x11-libs/libXScrnSaver
+	dev-libs/nss
+	libsecret? ( app-crypt/libsecret[crypt] )
+"
+
+QA_PRESTRIPPED="opt/${PN}/code"
+
+S="${WORKDIR}"
+
+src_install(){
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	dosym "../../opt/${PN}/bin/codium" "/usr/bin/${PN}"
+	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
+	doicon "${FILESDIR}/${PN}.png"
+	fperms +x "/opt/${PN}/codium"
+	fperms +x "/opt/${PN}/bin/codium"
+	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+	fperms +x "/opt/${PN}/resources/app/extensions/git/dist/askpass.sh"
+	insinto "/usr/share/licenses/${PN}"
+}
+
+pkg_postinst(){
+	elog "You may install some additional utils, so check them in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff -r 36906ed82d4a -r 43d28a985b5c dev-java/maven/Manifest
--- a/dev-java/maven/Manifest	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-AUX maven 5108 SHA256 ddce53375271fd6e9515350083fd4c97ae86213e5bdb9984faf770ccdac1ff10 SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b WHIRLPOOL 6f281693bcf3201e9aa245494dd4dec6b623adf19bf89a44461eadb27e6747c590cebe7c73b5f16b77f5eaa04991236ce6820cd0e5980d7e109f110338c6045c
-DIST apache-maven-3.3.3-bin.tar.gz 8042383 SHA256 3a8dc4a12ab9f3607a1a2097bbab0150c947ad6719d8f1bb6d5b47d0fb0c4779 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5 WHIRLPOOL a3bbce5c92878dbf58f9e63a18cefbb8de90fa4d91ec6ac60cee01b684891a9f757ece5f62659b7838ea347e0d27b8801c10b0e4bf1384446607b60d46a1bf9e
-DIST apache-maven-3.3.9-bin.tar.gz 8491533 SHA256 6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0 WHIRLPOOL a17d87711a925d502bb05d09166708b50304942aace82a6ed69dd9f73938590f1cf488eb4b9fb10f94250d804e6342d264f6a9407218fe9b38c242c06375b28b
-EBUILD maven-3.3.3.ebuild 1220 SHA256 58f3f6637a427d35ae09541d4ce6e899be102132682b80ebe84246c8391007c4 SHA512 086c7f0f6170a33c8655265106f36ed844059c33f77becba65db3428f4f2a335eb1b6cdcc460a5ec83594890c79516392a54c1464602df4f12e48fc51659a034 WHIRLPOOL 0262778af51326666228410356f4185354b683260baa34fbec1d691ebf1af55abc5ac90efc7f2bd851ca88860da61df0c2a44465274ed72de02520be720c4ed5
-EBUILD maven-3.3.9.ebuild 1220 SHA256 58f3f6637a427d35ae09541d4ce6e899be102132682b80ebe84246c8391007c4 SHA512 086c7f0f6170a33c8655265106f36ed844059c33f77becba65db3428f4f2a335eb1b6cdcc460a5ec83594890c79516392a54c1464602df4f12e48fc51659a034 WHIRLPOOL 0262778af51326666228410356f4185354b683260baa34fbec1d691ebf1af55abc5ac90efc7f2bd851ca88860da61df0c2a44465274ed72de02520be720c4ed5
diff -r 36906ed82d4a -r 43d28a985b5c dev-java/maven/files/maven
--- a/dev-java/maven/files/maven	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-#  Copyright 2001-2004 The Apache Software Foundation.
-#  
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#  
-#       http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-# ----------------------------------------------------------------------------
-
-#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
-#   reserved.
-
-FOREHEAD_VERSION=1.0-beta-5
-
-if [ -z "$MAVEN_OPTS" ] ; then
-  MAVEN_OPTS="-Xmx256m"
-fi
-
-if [ -f "$HOME/.mavenrc" ] ; then
-  . "$HOME/.mavenrc"
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  Darwin*) darwin=true 
-           if [ -z "$JAVA_VERSION" ] ; then
-             JAVA_VERSION="CurrentJDK"
-           else
-             echo "Using Java version: $JAVA_VERSION"
-           fi
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
-           fi
-           ;;
-esac
-
-  # try a couple ways to find MAVEN_HOME
-
-  if [ -z ${MAVEN_HOME} ] && [ -d /opt/maven ] ; then
-    MAVEN_HOME=/opt/maven
-  fi
-
-  if [ -z ${MAVEN_HOME} ] && [ -d "$HOME/maven" ] ; then
-    MAVEN_HOME="$HOME/maven"
-  fi
-
-  # try to load from env.d file
-  if [ -z ${MAVEN_HOME} ] && [ -f /etc/env.d/25maven ]; then
-  	MAVEN_HOME=$(source /etc/env.d/25maven; echo ${MAVEN_HOME})
-  fi
-
- # try to figure it out from how this script was invoked
-  if [ -z ${MAVEN_HOME} ]; then
-    ## resolve links - $0 may be a link to maven's home
-    PRG=$0
-    progname=`basename $0`
-    saveddir=`pwd`
-
-    # need this for relative symlinks
-    cd `dirname $PRG`
-
-    while [ -h "$PRG" ] ; do
-      ls=`ls -ld "$PRG"`
-      link=`expr "$ls" : '.*-> \(.*\)$'`
-      if expr "$link" : '.*/.*' > /dev/null; then
-        PRG="$link"
-      else
-        PRG="`dirname $PRG`/$link"
-      fi
-    done
-
-    MAVEN_HOME=`dirname "$PRG"`/..
-
-    # make it fully qualified
-    MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-
-    cd $saveddir
-  fi
-
-[ -z "${MAVEN_HOME}" ] && exit "Was unable to determine MAVEN_HOME"
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$MAVEN_HOME" ] &&
-    MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
-  [ -n "$MAVEN_HOME_LOCAL" ] &&
-    MAVEN_HOME_LOCAL=`cygpath --unix "$MAVEN_HOME_LOCAL"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=java
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-  echo "  If build fails because sun.* classes could not be found"
-  echo "  you will need to set the JAVA_HOME environment variable"
-  echo "  to the installation directory of java."
-fi
-
-MAVEN_ENDORSED="${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$MAVEN_HOME" ] &&
-    MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
-  [ -n "$MAVEN_HOME_LOCAL" ] &&
-    MAVEN_HOME_LOCAL=`cygpath --path --windows "$MAVEN_HOME_LOCAL"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$HOME" ] &&
-    HOME=`cygpath --path --windows "$HOME"`
-  [ -n "$MAVEN_ENDORSED" ] &&
-    MAVEN_ENDORSED=`cygpath --path --windows "$MAVEN_ENDORSED"`
-fi
-
-# For Darwin, use classes.jar for TOOLS_JAR
-TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
-if $darwin; then
-  TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Classes/classes.jar"
-fi
-
-MAIN_CLASS=com.werken.forehead.Forehead
-if [ -n "$MAVEN_HOME_LOCAL" ]; then
-  MAVEN_OPTS="$MAVEN_OPTS -Dmaven.home.local=${MAVEN_HOME_LOCAL}" 
-fi
-  
-"$JAVACMD" \
-  $MAVEN_OPTS \
-  -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-  -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
-  "-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
-  -classpath "${MAVEN_HOME}/lib/forehead-${FOREHEAD_VERSION}.jar" \
-  "-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf"  \
-  "-Dtools.jar=$TOOLS_JAR" \
-  "-Dmaven.home=${MAVEN_HOME}" \
-  $MAIN_CLASS "$@"
-
diff -r 36906ed82d4a -r 43d28a985b5c dev-java/maven/maven-3.3.3.ebuild
--- a/dev-java/maven/maven-3.3.3.ebuild	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="amd64 x86"
-
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
-
-RDEPEND=">=virtual/jdk-1.7
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -fv "${S}"/bin/*.bat "${S}"/bin/*.cmd || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff -r 36906ed82d4a -r 43d28a985b5c dev-java/maven/maven-3.3.9.ebuild
--- a/dev-java/maven/maven-3.3.9.ebuild	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="amd64 x86"
-
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
-
-RDEPEND=">=virtual/jdk-1.7
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -fv "${S}"/bin/*.bat "${S}"/bin/*.cmd || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff -r 36906ed82d4a -r 43d28a985b5c dev-java/openjdk-bin/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/openjdk-bin/Manifest	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,3 @@
+AUX openjdk-bin-12.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
+DIST OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz 207650938 BLAKE2B 84344ab2bee9b42adda388fd862aab15249938d4fa7a72f19a3aa5b9fba138074efed529f79c3fa56c790a29dc22ea3e250a5554410641142fe2b3374c17e137 SHA512 49776f851edbd6037220d00839abed8c1cc4120e2cea29828c7704e2fed1cac508b2c008360b25d5b4797a51952b86aee50c44541e52af9ab9d9c2d4373589b4
+EBUILD openjdk-bin-12.0.2_p10.ebuild 2719 BLAKE2B fa3bc2d29ead40bae119d5922547684d0612ac117557d3ad99dff2b8359fd847e0a86002f12f362b6bbd5db2033a3d4e4f5c18331c53acbf6e0930b16d716b3d SHA512 94f78bd9968083bcbaf72e990ce8f4071183e406c6f98fad0702845cb4f3c720a15fb088e390a70c97659e462b86993190565198e32f31d8c56f03aebde10b38
diff -r 36906ed82d4a -r 43d28a985b5c dev-java/openjdk-bin/files/openjdk-bin-12.env.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/openjdk-bin/files/openjdk-bin-12.env.sh	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff -r 36906ed82d4a -r 43d28a985b5c dev-java/openjdk-bin/openjdk-bin-12.0.2_p10.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/openjdk-bin/openjdk-bin-12.0.2_p10.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff -r 36906ed82d4a -r 43d28a985b5c dev-util/visualvm-bin/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/visualvm-bin/Manifest	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,4 @@
+DIST visualvm_143.zip 15610933 BLAKE2B 73cf445418565de42fa5b4957cb8f24f45c32839fa4027a7ed28cb9c0b7f504a0fbe1af2c2d9d337373f15640acbfe59d466e4595c2ab1d47e2bd0aed2e99f6c SHA512 86a7a6a90e04404d06aae027c69192ec5f53796474341cd9ad7ec0138d4ff4c082f67681d6723b1d0b3a38c0503026af95f8b504531e40e32ae84404596545ea
+DIST visualvm_20.zip 17302092 BLAKE2B 49d5ea28318cac1174bddbd6909aebf2ce3b860d76b6cc9be52e3620dfaf1bd0ff58dc966317860775a11300263be6fe3f06b822bfcb3cefc41b4207ac2ff4b6 SHA512 497d38bddcadca2b8ba6974f3f0b9d7bfde004ba0cfe0ea1cbaa7e749e26fb1e68ba4a312943490ad9cf187e90402aafa11ec7ffc315b04a57cee827ca969fd7
+EBUILD visualvm-bin-1.4.3.ebuild 834 BLAKE2B 21a667d10110cf6e1192af9a17682c002b36de3dfe032ba5cc052c3259a70865b1b3b79ec1756ea33c1912cf5f966ce2531c2ffafb3b2b1bf2f9d78b84df2820 SHA512 e55e53ef0d7408bddeefe8e22778f9dec7a2baefe9ef2c09237e80aa0bc8839a02f81b29737bb19b9300fd646fa1754d7bdb1769654a1a2436da982402f0a9d7
+EBUILD visualvm-bin-2.0.ebuild 718 BLAKE2B 4ac94b8a9cfbe8ad788a7dbf75a648acb462f95b98eb982cd15ec847b48affd77c4ee126c6fb6a224d6bd439114ed072c31ef2ddd21012f79fb9be7c83657f39 SHA512 881eb3e1c848c27cb44cefa2064f8a0a4615a09b4dc7d4b610bbac094178d0b9044b4be20c97af825e7352d5c962984c32c9885d0e1abd77d9e6f3391ee40800
diff -r 36906ed82d4a -r 43d28a985b5c dev-util/visualvm-bin/visualvm-bin-1.4.3.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/visualvm-bin/visualvm-bin-1.4.3.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+MY_PV="${PV//\./}"
+SRC_URI="https://github.com/visualvm/visualvm.src/releases/download/${PV}/visualvm_${MY_PV}.zip"
+S="${WORKDIR}/visualvm_${MY_PV}"
+
+SLOT="0"
+KEYWORDS="amd64"
+
+src_prepare() {
+	default
+
+	# Remove unneeded binaries
+	rm bin/*.exe
+	rm -rv platform/lib/*.{dll,exe} \
+		platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find profiler/lib/deployed/jdk1? -mindepth 1 \
+		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+}
+
+src_install() {
+	local DEST_DIR="/opt/${PN}-${PV}"
+
+	exeinto ${DEST_DIR}/bin
+	doexe bin/visualvm
+
+	insinto ${DEST_DIR}
+	doins -r etc platform profiler visualvm
+}
diff -r 36906ed82d4a -r 43d28a985b5c dev-util/visualvm-bin/visualvm-bin-2.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/visualvm-bin/visualvm-bin-2.0.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+MY_PV="${PV//\./}"
+SRC_URI="https://github.com/visualvm/visualvm.src/releases/download/${PV}/visualvm_${MY_PV}.zip"
+S="${WORKDIR}/visualvm_${MY_PV}"
+
+SLOT="0"
+KEYWORDS="amd64"
+
+src_prepare() {
+	default
+
+	# Remove unneeded binaries
+	rm bin/*.exe
+	rm -rv platform/lib/*.{dll,exe} \
+		platform/modules/lib/{amd64/*.dll,i386,x86} || die
+}
+
+src_install() {
+	local DEST_DIR="/opt/${PN}-${PV}"
+
+	exeinto ${DEST_DIR}/bin
+	doexe bin/visualvm
+
+	insinto ${DEST_DIR}
+	doins -r etc platform visualvm
+}
diff -r 36906ed82d4a -r 43d28a985b5c net-im/psi-plus/Manifest
--- a/net-im/psi-plus/Manifest	Sun Mar 22 02:38:34 2020 +0100
+++ b/net-im/psi-plus/Manifest	Sun Mar 22 02:40:21 2020 +0100
@@ -1,3 +1,5 @@
 AUX qmake.patch 2010 BLAKE2B 824db6d67e8c7a80d320631f9f148f8903b42ff4ee8cd4403f4ee60e7ee66b5003504f0841563d74e36aaee63b5261ea3b9f35365624e07e85eff8253acbc848 SHA512 8f8aaef67c10d0c7ca1fd7c2c3123258b5b5785b7dc5eb2a2c7d8667048ec209cf61c26eb5f51c5547a7204b976103bf992c345814576191b26f7766e5162b98
-DIST psi-plus-1.2.109.tar.gz 8575286 BLAKE2B 431ab89cbc898c932113a7ed2942a712684b039b422ce80fce74a45385e49860b96303ac0e72a32dc4f8d564cbf0bd9a0718cdc46e319ab34875b79109dc5359 SHA512 fd6b41e2b50b15179da9f7c81ed39e2ad4d7dacfd50385cd5220f9357d277d42afc57dfd4ccedb18405af0b254def69458e7d6907fc286861f6d40a59b2ad83e
-EBUILD psi-plus-1.2.109.ebuild 2998 BLAKE2B 1d26e4562a71d2c99ccd4a033e9d3c012219ae41699cca33a344af6115767906f6f8e8f828fbe94f61c8a4759fe4966f518f9411920b60c67136d436dd526622 SHA512 5e8a2dad33c19ac3f726afdf2ed60bf02871333010d2641490ebd1bd4f349ff03ea22f97b7a85997ec3c061c95664e3948be24be202e1fe5f63784dc8cafa68b
+DIST psi-plus-1.4.574.tar.gz 9012361 BLAKE2B deb4d460ea548d7c1145b0f8df90ddd303ebc55c9b7a20d33475f9a1925e858a4de06ace6692aa9616d48f76cf2b4f681122319dc730fc33333fe125ac073ce2 SHA512 eb37f8658a7231afc47a6d0670dea6d4d247ed9d938f815d8676ecb8b9805c9e2ac1870df09a53437268c343657f30588f635ec5b78104b1aa8bf7f35b35df0e
+DIST psi-plus-1.4.924.tar.gz 9087620 BLAKE2B 0430607d59dd7e4977b55f2705d6f80783f1a93ecbc8b8f3a1dc6b12a384bbbaa2d4efba241021579c40772a8615158ad98e49ffcd5094712bee07e057fdfb3a SHA512 ebd503508664a225748425680c5030d88e9a33b3ef0d5c772eaec7bd00a868840ff41dadc25d9aea42902347877bc564a99ff2d28a7909e5cf66d2f94d36c3c1
+EBUILD psi-plus-1.4.574.ebuild 2988 BLAKE2B becf46b72a4e0b63050e963d3a7cf847d829322caf8378fb521fa083c0cd55b6faec3c0ff5c000640804108296e6f39ab5562b69518eeddedfcbad3a5be476b5 SHA512 0f578e1e811abbcccabbf1393a37e9b030a5c12b0cf9bf1a1e173c784fb9a5bdd0dc73efde10b0d3e53ea9eb3c492b7e2b4296fcabcd9a650662525671d4952a
+EBUILD psi-plus-1.4.924.ebuild 4226 BLAKE2B 697d8839792307baa7255e315449bebb66efe3b1868bfefd2c24c97f1c62ec84827c25d862a0296d1880bef2b2e67fc025f3d2588364fbd144f8b1083d835fca SHA512 b38ae6c051a8f15b54eb46298807d391b393d986e5cccfdad56488e3921dd89184aaf5b71b88c6daf9454e943ebbb229f894f16997edc66f1bb5763c0d4a3911
diff -r 36906ed82d4a -r 43d28a985b5c net-im/psi-plus/psi-plus-1.2.109.ebuild
--- a/net-im/psi-plus/psi-plus-1.2.109.ebuild	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-
-EAPI=5
-
-inherit eutils l10n multilib gnome2-utils
-
-DESCRIPTION="Qt5 Jabber client, with Licq-like interface"
-HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/"
-SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/psi-plus-snapshots-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autoreplyplugin crypt dbus debug doc jingle otrplugin spell ssl xscreensaver watcherplugin whiteboarding"
-#RESTRICT="test"
-
-RDEPEND="app-arch/unzip
-	dev-qt/qtgui:5
-	>=app-crypt/qca-2.1.3:2[qt5(+)]
-	x11-libs/libX11
-	dbus? ( dev-qt/qtdbus:5 )
-	spell? ( >=app-text/enchant-1.3.0 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	whiteboarding? ( dev-qt/qtsvg:5 )
-	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/qconf
-	doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
-	jingle? ( net-im/psimedia
-	app-crypt/qca:2[ssl] )
-	ssl? ( app-crypt/qca:2[ssl] )
-	otrplugin? ( net-libs/libotr app-text/htmltidy )"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	# unable to use econf because of non-standard configure script
-	local confcmd="./configure
-		--qtselect=5
-		--prefix=/usr
-		--datadir=/usr/share
-		--libdir=/usr/lib64
-		--disable-growl
-		--with-qca-inc=/usr/include/QtCrypto
-		--with-qca-lib=/usr/lib64
-		$(use dbus || echo '--disable-qdbus')
-		$(use debug && echo '--debug')
-		$(use spell || echo '--disable-aspell')
-		$(use spell || echo '--disable-enchant')
-		$(use xscreensaver || echo '--disable-xss')
-		$(use whiteboarding && echo '--enable-whiteboarding')"
-
-	echo ${confcmd}
-	${confcmd} || die "configure failed"
-	## Makefile is not always created...
-	#[[ ! -f Makefile ]] && die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-	
-	if use autoreplyplugin; then
-		cd src/plugins/generic/autoreplyplugin
-		qmake
-		make
-		cd ../../../..
-	fi
-
-	if use otrplugin; then
-		cd src/plugins/generic/otrplugin
-		qmake
-		make
-		cd ../../../..
-	fi
-	
-	if use watcherplugin; then
-		cd src/plugins/generic/watcherplugin
-		qmake
-		make
-		cd ../../../..
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	dodoc README TODO ChangeLog
-	
-	local plugindir="/usr/share/psi-plus/plugins"
-	if use autoreplyplugin; then
-		cd src/plugins/generic/autoreplyplugin
-
-		strip --strip-unneeded libautoreplyplugin.so
-
-		dodir "${plugindir}"
-		insinto "${plugindir}"
-		doins libautoreplyplugin.so
-
-		cd ../../../..
-	fi
-
-	if use otrplugin; then
-		cd src/plugins/generic/otrplugin
-
-		strip --strip-unneeded libotrplugin.so
-
-		dodir "${plugindir}"
-		insinto "${plugindir}"
-		doins libotrplugin.so
-
-		cd ../../../..
-	fi
-
-	if use watcherplugin; then
-		cd src/plugins/generic/watcherplugin
-
-		strip --strip-unneeded libwatcherplugin.so
-
-		dodir "${plugindir}"
-		insinto "${plugindir}"
-		doins libwatcherplugin.so
-
-		cd ../../../..
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff -r 36906ed82d4a -r 43d28a985b5c net-im/psi-plus/psi-plus-1.4.574.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/psi-plus/psi-plus-1.4.574.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,142 @@
+
+EAPI=5
+
+inherit eutils l10n multilib gnome2-utils
+
+DESCRIPTION="Qt5 Jabber client, with Licq-like interface"
+HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/"
+SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/psi-plus-snapshots-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autoreplyplugin crypt dbus debug doc jingle otrplugin spell ssl xscreensaver watcherplugin whiteboarding"
+#RESTRICT="test"
+
+RDEPEND="app-arch/unzip
+	dev-qt/qtgui:5
+	>=app-crypt/qca-2.1.3:2[qt5(+)]
+	x11-libs/libX11
+	dbus? ( dev-qt/qtdbus:5 )
+	spell? ( >=app-text/enchant-1.3.0 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	whiteboarding? ( dev-qt/qtsvg:5 )
+	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/qconf
+	doc? ( app-doc/doxygen )"
+
+PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
+	jingle? ( net-im/psimedia
+	app-crypt/qca:2[ssl] )
+	ssl? ( app-crypt/qca:2[ssl] )
+	otrplugin? ( net-libs/libotr app-text/htmltidy )"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	# unable to use econf because of non-standard configure script
+	local confcmd="./configure
+		--qtselect=5
+		--prefix=/usr
+		--datadir=/usr/share
+		--libdir=/usr/lib64
+		--disable-growl
+		--with-qca-inc=/usr/include/QtCrypto
+		--with-qca-lib=/usr/lib64
+		$(use dbus || echo '--disable-qdbus')
+		$(use debug && echo '--debug')
+		$(use spell || echo '--disable-aspell')
+		$(use spell || echo '--disable-enchant')
+		$(use xscreensaver || echo '--disable-xss')
+		$(use whiteboarding && echo '--enable-whiteboarding')"
+
+	echo ${confcmd}
+	${confcmd} || die "configure failed"
+	## Makefile is not always created...
+	#[[ ! -f Makefile ]] && die "configure failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+	
+	if use autoreplyplugin; then
+		cd src/plugins/generic/autoreplyplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+
+	if use otrplugin; then
+		cd src/plugins/generic/otrplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+	
+	if use watcherplugin; then
+		cd src/plugins/generic/watcherplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	dodoc README TODO
+	
+	local plugindir="/usr/share/psi-plus/plugins"
+	if use autoreplyplugin; then
+		cd src/plugins/generic/autoreplyplugin
+
+		strip --strip-unneeded libautoreplyplugin.so
+
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libautoreplyplugin.so
+
+		cd ../../../..
+	fi
+
+	if use otrplugin; then
+		cd src/plugins/generic/otrplugin
+
+		strip --strip-unneeded libotrplugin.so
+
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libotrplugin.so
+
+		cd ../../../..
+	fi
+
+	if use watcherplugin; then
+		cd src/plugins/generic/watcherplugin
+
+		strip --strip-unneeded libwatcherplugin.so
+
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libwatcherplugin.so
+
+		cd ../../../..
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff -r 36906ed82d4a -r 43d28a985b5c net-im/psi-plus/psi-plus-1.4.924.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/psi-plus/psi-plus-1.4.924.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,192 @@
+
+EAPI=7
+
+#inherit eutils l10n multilib gnome2-utils
+inherit l10n qmake-utils xdg
+
+DESCRIPTION="Qt5 Jabber client, with Licq-like interface"
+HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/"
+SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/psi-plus-snapshots-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aspell autoreplyplugin crypt debug doc enchant hunspell jingle keychain omemo otrplugin spell ssl xscreensaver watcherplugin webkit +webengine whiteboarding"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+DEPEND="
+	app-crypt/qca:2[ssl]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	net-dns/libidn:0
+	net-libs/http-parser
+	sys-libs/zlib[minizip]
+	x11-libs/libX11
+	x11-libs/libxcb
+	aspell? ( app-text/aspell )
+	enchant? ( >=app-text/enchant-1.3.0 )
+	hunspell? ( app-text/hunspell:= )
+	keychain? ( dev-libs/qtkeychain )
+	omemo? ( net-libs/libsignal-protocol-c )
+	otrplugin? ( net-libs/libotr app-text/htmltidy )
+	webengine? (
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+	)
+	webkit? ( dev-qt/qtwebkit:5 )
+	whiteboarding? ( dev-qt/qtsvg:5 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"	
+
+RDEPEND="${DEPEND}
+	dev-qt/qtimageformats
+"
+
+src_configure() {
+	CONF=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--no-separate-debug-info
+		--qtdir="$(qt5_get_bindir)/.."
+		$(use_enable aspell)
+		$(use_enable enchant)
+		$(use_enable hunspell)
+		$(use_enable keychain)
+		$(use_enable xscreensaver xss)
+		$(use_enable whiteboarding)
+	)
+
+	use debug && CONF+=("--debug")
+	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
+	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
+
+	# This may generate warnings if passed option already matches with default.
+	# Just ignore them. It's how qconf-based configure works and will be fixed in
+	# future qconf versions.
+	./configure "${CONF[@]}" || die "configure failed"
+
+	eqmake5 psi.pro
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc api_public
+	
+	if use autoreplyplugin; then
+		cd src/plugins/generic/autoreplyplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+
+	if use otrplugin; then
+		cd src/plugins/generic/otrplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+
+	if use omemo; then
+		cd src/plugins/generic/omemoplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+	
+	if use watcherplugin; then
+		cd src/plugins/generic/watcherplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# this way the docs will be installed in the standard gentoo dir
+	rm "${ED}"/usr/share/${PN}/{COPYING,README.html} || die "doc files set seems to have changed"
+	newdoc iconsets/roster/README README.roster
+	newdoc iconsets/system/README README.system
+	newdoc certs/README README.certs
+	dodoc README.html
+	
+	use doc && HTML_DOCS=( doc/api/. )
+	einstalldocs
+
+	# install translations
+#	local mylrelease="$(qt5_get_bindir)"/lrelease
+#	cd "${WORKDIR}/${PN}/psi-l10n" || die
+#	insinto /usr/share/${PN}
+#	install_locale() {
+#		"${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed"
+#		doins "translations/${PN}_${1}.qm"
+#	}
+#	l10n_for_each_locale_do install_locale
+
+	local plugindir="/usr/share/psi-plus/plugins"
+	if use autoreplyplugin; then
+		cd src/plugins/generic/autoreplyplugin
+
+		strip --strip-unneeded libautoreplyplugin.so
+
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libautoreplyplugin.so
+
+		cd ../../../..
+	fi
+
+	if use otrplugin; then
+		cd src/plugins/generic/otrplugin
+
+		strip --strip-unneeded libotrplugin.so
+
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libotrplugin.so
+
+		cd ../../../..
+	fi
+
+	if use omemo; then
+		cd src/plugins/generic/omemoplugin
+
+		strip --strip-unneeded libomemoplugin.so
+
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libomemoplugin.so
+
+		cd ../../../..
+	fi
+
+	if use watcherplugin; then
+		cd src/plugins/generic/watcherplugin
+
+		strip --strip-unneeded libwatcherplugin.so
+
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libwatcherplugin.so
+
+		cd ../../../..
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/icaclient/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/icaclient/Manifest	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,8 @@
+AUX 10ICAClient 61 BLAKE2B e2da5a69886dba37e8ccc9a4212cff2504a73a9a9da3c6f22f5ffe58e6661afce2858e224bbfdfde48e76b4cde4c0822da9b7ef39c357a3a3730a98d1f775c26 SHA512 a1eb61dcd636aab9770561d141241ae214870341ed85129e385509350cddb8f559eccbafd6832d000283d1a8ef0d7faf42910c76013d3cf97c8d4f036cd48957
+AUX configmgr.desktop 191 BLAKE2B 891069f75757cbe800053ee89e59c8eda2ce161a79a91def6895d3ce6b004b75395c167e88adb361a1f4ea5ff9b7a6b23a250a3d5a70c6fe4b875cc23a8ba8ff SHA512 ccb45da870e68e090ceb454ae4ef317e8834d2d0764ee3494dc3252b039be413ae27a27142040a130f2bcdd5a88d12bf598a432d31e0aa40581a5b682519aa96
+AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a2187be7598398c25d5e66dfaad932b893eea5b0d9d2a5b89d58b04e63811bfa03887da92d44c78b5cb0fc1 SHA512 53939f018a453b0cf40731af36ad55545f517a66d011dac2ccf0cf3f318f63f026e632e951b7c55e15d5f1841f23d0ad8ab4bc5adfb1ea92c9cb720c14af0261
+AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
+AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
+AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
+DIST linuxx64-19.10.0.15.tar.gz 102164402 BLAKE2B d432c0addc7dc01f371dbede8125d134c82b985b359afa9d91c23b4916976f19513e6b72bac969526879ff6f3de56ab1898f729123274af93273526138553653 SHA512 0244e09bbb4b7f1c53170127215a94b87754ab633d75100e8af4777d3013344c3a06f6ec3080e9c77bd5bf54b117ac520ff04aa349e9b291cb041b06903da71b
+EBUILD icaclient-19.10.0.15.ebuild 4493 BLAKE2B f797c8bff45a66ed7334f3b20240573b8894ed9689c676a17595b3e4fcfcde0209751c6922471c266f4d378975a91ca7ce16d29ad7380069491bca914a0b84c7 SHA512 93eb70cee1e33b776903cca71bacf4a256bd33faebfe464fbd81cca4fc68b9057fce5bd949bcd6e5c78d78a0bd1ba856a04a809fe4fe59b86ed4b3ff60c65d2c
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/icaclient/files/10ICAClient
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/icaclient/files/10ICAClient	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,2 @@
+ROOTPATH=/opt/Citrix/ICAClient
+ICAROOT=/opt/Citrix/ICAClient
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/icaclient/files/configmgr.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/icaclient/files/configmgr.desktop	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Citrix Receiver (configmgr)
+Categories=Network;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=configmgr
+Exec=configmgr
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/icaclient/files/conncenter.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/icaclient/files/conncenter.desktop	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Citrix Receiver (conncenter)
+Categories=Network;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=conncenter
+Exec=conncenter
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/icaclient/files/new_store.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/icaclient/files/new_store.desktop	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Add Citrix Store
+MimeType=application/vnd.citrix.receiver.configure;
+Categories=Network;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=new_store
+Exec=new_store %f
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/icaclient/files/selfservice.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/icaclient/files/selfservice.desktop	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Citrix Receiver
+Categories=Network;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=selfservice
+Exec=selfservice
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/icaclient/files/wfica.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/icaclient/files/wfica.desktop	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Citrix Receiver Engine
+StartupWMClass=Wfica
+NoDisplay=true
+Categories=Network;
+MimeType=application/x-ica;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=wfica
+Exec=wfica
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/icaclient/icaclient-19.10.0.15.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/icaclient/icaclient-19.10.0.15.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,199 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils inherit required for make_wrapper call
+inherit desktop eutils multilib xdg-utils
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	net-misc/curl
+	sys-libs/e2fsprogs-libs
+	sys-libs/zlib
+	virtual/krb5
+	virtual/jpeg:0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+DEPEND=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/workspace-app/"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+
+	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
+src_prepare() {
+	default
+	rm lib/UIDialogLibWebKit.so || die
+}
+
+src_install() {
+	local bin tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libAnalyticsInterfacePd.so libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	doins config/* config/.* nls/en/*.ini
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	local lang LANGCODES=( en )
+	use l10n_de && LANGCODES+=( de )
+	use l10n_es && LANGCODES+=( es )
+	use l10n_fr && LANGCODES+=( fr )
+	use l10n_ja && LANGCODES+=( ja )
+	use l10n_zh-CN && LANGCODES+=( zh_CN )
+
+	for lang in ${LANGCODES[@]} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	exeinto "${ICAROOT}"/util
+	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so,webcontainer,ctxwebhelper,ctx_rehash,ctx_app_bind}
+	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
+
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+		> "${ED}"/etc/revdep-rebuild/70icaclient
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/ike/Manifest
--- a/net-misc/ike/Manifest	Sun Mar 22 02:38:34 2020 +0100
+++ b/net-misc/ike/Manifest	Sun Mar 22 02:40:21 2020 +0100
@@ -1,3 +1,4 @@
 AUX iked 243 BLAKE2B e455e506f58ce99c600e782e0cb12130365beeccd3dad2758ccf0885b99bb340b95854683eb12e7e0d735ada9ed39631fe36136b09d8ca2fb9dd992b43d5fa47 SHA512 3bd066ca386f2f956b7d11d551e1f071e9c90d107511b4ab6012470bd1f460e325dc5ea86f896558fc662b99bee31e61b21139d641418f5e6cc77a7cc3135021
 DIST ike-2.2.1-release.tgz 843761 BLAKE2B bb43ee14be229015f2ad296c1dfda5ba11a3ba3d836abf3fd6a77dbe2fa445e0242ffa12b801a1e1eaa9609f7e2a07496104ed3ae03032723f0dd41a8a3f1ab8 SHA512 9eb4e8b8aa778b00a098531efc5761a53f39dbb13164e452e0c610e83fc5f23c28360b5baee6e60e0133450291dc0097dfd878a05ac86b5f93d504530411b5ce
-EBUILD ike-2.2.1-r2.ebuild 1070 BLAKE2B 1f2f236ce8756c16a53e51e02ca2232031fbb6a416d7af31b561ac455c8a6ba2d0773474b59ab3c0762034729c9d824afdbd17ba896836e7e1c09a8197342356 SHA512 c95751b3c16875346cf7c396a38059c11eaf0809e2855b924d59f9553dc4d11ef237fb8092dac6aacfc8f1f884feaddb1cd00d174cce9e6e8453cc6feec9b374
+EBUILD ike-2.2.1-r3.ebuild 1129 BLAKE2B f0eb5c097a978526766bc47e8bdb77f74cf7ba87c5acb235913462e5903533f42d99e7389a34aff5cded8c0cd2149dc656284bf34ff7b91361cccfecb5d9bcde SHA512 b189a4e9228734e9897ce7fb1685accebee43b90c9c8a62caade6ae87b87e9f04140f6665f076555707655925b327b3667b25ce3b5805938f775ed7d574b517d
+EBUILD ike-2.2.1-r4.ebuild 1146 BLAKE2B 837be647da3faf763f2dbb0412c76b5ad18ad2787f1b389f565b67cab7062d00418233a762b6293096426ed4c7607857ba8d02c62f65be06fb0274ab96d008c7 SHA512 17da05a7b7d5e2951c5f2886549802ff6466592d565b9a40a0221b075d3442b714bf15c44fb316ded6752c3279c72f53e59aea9232cc08e0dac4af254d31b279
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/ike/ike-2.2.1-r2.ebuild
--- a/net-misc/ike/ike-2.2.1-r2.ebuild	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD="1"
-inherit cmake-utils linux-info versionator
-
-MY_PV=$(replace_version_separator 3 '-' ${PV/rc})
-MY_P=${PN}-${PV}-release
-
-DESCRIPTION="Shrew soft VPN Client"
-HOMEPAGE="http://www.shrew.net/"
-SRC_URI="https://www.shrew.net/download/${PN}/${MY_P}.tgz"
-
-LICENSE="shrew"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap nat qt4"
-
-COMMON_DEPEND="dev-libs/libedit
-	dev-libs/openssl
-	qt4? ( dev-qt/qtcore:4 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake
-	>=sys-devel/bison-2.3
-	sys-devel/flex"
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="CONTRIB.TXT README.TXT TODO.TXT"
-
-CONFIG_CHECK="INET_XFRM_MODE_TRANSPORT INET_XFRM_MODE_TUNNEL"
-
-S="${WORKDIR}/${PN}"
-
-src_configure(){
-	mycmakeargs+=( $(cmake-utils_use ldap LDAP)
-		$(cmake-utils_use nat NATT)
-		$(cmake-utils_use qt4 QTGUI)
-		"-DMANDIR=/usr/share/man")
-
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doinitd ${FILESDIR}/iked || die
-}
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/ike/ike-2.2.1-r3.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/ike/ike-2.2.1-r3.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="1"
+inherit cmake-utils linux-info versionator
+
+MY_PV=$(replace_version_separator 3 '-' ${PV/rc})
+MY_P=${PN}-${PV}-release
+
+DESCRIPTION="Shrew soft VPN Client"
+HOMEPAGE="http://www.shrew.net/"
+SRC_URI="https://www.shrew.net/download/${PN}/${MY_P}.tgz"
+
+LICENSE="shrew"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap nat qt4"
+
+COMMON_DEPEND="dev-libs/libedit
+	dev-libs/openssl
+	qt4? ( dev-qt/qtcore )
+	ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/cmake
+	>=sys-devel/bison-2.3
+	sys-devel/flex"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="CONTRIB.TXT README.TXT TODO.TXT"
+
+CONFIG_CHECK="INET_XFRM_MODE_TRANSPORT INET_XFRM_MODE_TUNNEL"
+
+S="${WORKDIR}/${PN}"
+
+src_configure(){
+	mycmakeargs+=( -DLDAP=$(usex ldap)
+		-DNATT=$(usex nat)
+		-DQTGUI=$(usex qt4)
+		"-DMANDIR=/usr/share/man")
+
+	cmake-utils_src_configure
+}
+
+src_install(){
+	cmake-utils_src_install
+	# multilib strict fix
+	mv "${ED}/usr/lib" "${ED}/usr/$(get_libdir)" || die "mv failed"
+	doinitd ${FILESDIR}/iked || die
+}
diff -r 36906ed82d4a -r 43d28a985b5c net-misc/ike/ike-2.2.1-r4.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/ike/ike-2.2.1-r4.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD="1"
+inherit cmake-utils git-r3 linux-info
+
+DESCRIPTION="Shrew soft VPN Client"
+HOMEPAGE="http://www.shrew.net/"
+
+#EGIT_REPO_URI="https://github.com/yrro/${PN}"
+#EGIT_OVERRIDE_COMMIT_YRRO_IKE="c3560d24bfe020a27ed886fd987b45387b213f0c"
+EGIT_REPO_URI="https://github.com/dpolitis/shrew.net-vpn-openssl1.1.1"
+
+LICENSE="shrew"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap nat qt4"
+
+COMMON_DEPEND="dev-libs/libedit
+	dev-libs/openssl
+	qt4? ( dev-qt/qtcore )
+	ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/cmake
+	>=sys-devel/bison-2.3
+	sys-devel/flex"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="CONTRIB.TXT README.TXT TODO.TXT"
+
+CONFIG_CHECK="INET_XFRM_TUNNEL"
+
+S="${WORKDIR}/${P}"
+
+src_configure(){
+	mycmakeargs+=( -DLDAP=$(usex ldap)
+		-DNATT=$(usex nat)
+		-DQTGUI=$(usex qt4)
+		"-DMANDIR=/usr/share/man")
+
+	cmake-utils_src_configure
+}
+
+src_install(){
+	cmake-utils_src_install
+	# multilib strict fix
+	mv "${ED}/usr/lib" "${ED}/usr/$(get_libdir)" || die "mv failed"
+	doinitd ${FILESDIR}/iked || die
+}
diff -r 36906ed82d4a -r 43d28a985b5c net-wireless/blueman/Manifest
--- a/net-wireless/blueman/Manifest	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-AUX blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch 8045 BLAKE2B 06877bed35a6917b2a2c79f360e9e45db815a01a0fc544582bd06307aa9a573f2437743000916cde864f846840649e6a91ff0a8b26ad97113801aeed16c5fbab SHA512 b06158f9a0958b22575600de700976f6e6bd68d703a8cfaa062a4be0f4c4a76dc1d2a5257f5ebc431b17e1b5bcdc0220260023558d4c850d2a45746887e3f651
-DIST blueman-2.0.4.tar.xz 1951988 BLAKE2B f359a24447a8d9f446e7e28b16f34756a43ee6dd9e714267611355421ef511ea96c75d1739b6d0308fb24dd95979a99feb571fa194cae1cd7a382d57c30df2e4 SHA512 98dbe0ac706cf8d33ada6e520c0952fbb930aaa4ec62e35e989f60880287634c2ee947a47b4883063a0aabf27069210774432416278b190b1ca5e1c93d42f614
-EBUILD blueman-2.0.4.ebuild 2662 BLAKE2B c23bbad69c1e88f20c091f737f00805f0f5fe52a79bd4096b10c0042e506ca2387851b1371ca66ba7de6525281939bfc4ee8ed22488baeb06568c478de473cde SHA512 ca883b27311ad51dc851a9379827f7ef074793f8801cbc1fde5e9c606f1049425a5e58366a7a1746451b194bb9c8ce670f6862d32047847e9b48c81b460606ac
diff -r 36906ed82d4a -r 43d28a985b5c net-wireless/blueman/blueman-2.0.4.ebuild
--- a/net-wireless/blueman/blueman-2.0.4.ebuild	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit gnome2-utils linux-info python-single-r1
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio thunar"
-
-COMMON_DEPEND="
-	dev-python/pygobject:3
-	>=net-wireless/bluez-4.61:=
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/faenza-icon-theme
-		x11-themes/gnome-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-dns/avahi[autoipd]
-		net-firewall/iptables
-		sys-apps/net-tools
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio[bluetooth] )
-	thunar? ( xfce-base/thunar )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-2.0-set-codeset-for-gettext-to-UTF-8-always.patch"
-	)
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-runtime-deps-check \
-		--disable-static \
-		$(use_enable policykit polkit) \
-		$(use_enable nls) \
-		$(use_enable thunar thunar-sendto)
-}
-
-src_install() {
-	default
-
-	python_fix_shebang "${D}"
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-
-	use appindicator || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/applet/AppIndicator.py* || die; }
-	use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff -r 36906ed82d4a -r 43d28a985b5c net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
--- a/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch	Sun Mar 22 02:38:34 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,219 +0,0 @@
-From aebfe594584e7c5cca30062d643618fc2ab8144b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 1 Mar 2015 23:08:02 +0100
-Subject: [PATCH] set codeset for gettext to utf-8
-
----
- apps/blueman-adapters                |  2 ++
- apps/blueman-assistant               |  2 ++
- apps/blueman-manager                 |  2 ++
- apps/blueman-sendto                  |  2 ++
- apps/blueman-services                |  2 ++
- blueman/gui/GsmSettings.py           |  2 ++
- blueman/gui/applet/PluginDialog.py   |  4 +++-
- blueman/plugins/applet/NetUsage.py   |  3 ++-
- blueman/plugins/services/Network.py  |  3 ++-
- blueman/plugins/services/Transfer.py |  2 ++
- 11 files changed, 29 insertions(+), 6 deletions(-)
-
-diff --git a/apps/blueman-adapters b/apps/blueman-adapters
-index a961480..3759ba8 100755
---- a/apps/blueman-adapters
-+++ b/apps/blueman-adapters
-@@ -6,6 +6,7 @@ from gi.repository import Pango
- import os.path
- import sys
- import signal
-+from locale import bind_textdomain_codeset
- 
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -36,6 +37,7 @@ class BluemanAdapters:
- 
-         builder = Gtk.Builder()
-         builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         builder.add_from_file(UI_PATH + "/adapters.ui")
-         self.dialog = builder.get_object("dialog")
- 
-diff --git a/apps/blueman-assistant b/apps/blueman-assistant
-index 7d96ec7..c322256 100755
---- a/apps/blueman-assistant
-+++ b/apps/blueman-assistant
-@@ -16,6 +16,7 @@ import random
- import signal
- import dbus.glib
- from optparse import OptionParser
-+from locale import bind_textdomain_codeset
- 
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -62,6 +63,7 @@ class Assistant:
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/assistant.ui")
-         self.assistant = self.Builder.get_object("assistant")
-         self.assistant.set_title(_("Bluetooth Assistant"))
-diff --git a/apps/blueman-manager b/apps/blueman-manager
-index 666f16c..af23015 100755
---- a/apps/blueman-manager
-+++ b/apps/blueman-manager
-@@ -8,6 +8,7 @@ from dbus.mainloop.glib import DBusGMainLoop
- from blueman.Constants import *
- import gi
- gi.require_version("Gtk", "3.0")
-+from locale import bind_textdomain_codeset
- from gi.repository import Gtk
- from gi.repository import GObject
- from blueman.bluez.BlueZInterface import BlueZInterface
-@@ -46,6 +47,7 @@ class Blueman:
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/manager-main.ui")
- 
-         self.window = self.Builder.get_object("window")
-diff --git a/apps/blueman-sendto b/apps/blueman-sendto
-index 06ad626..a7099ab 100755
---- a/apps/blueman-sendto
-+++ b/apps/blueman-sendto
-@@ -13,6 +13,7 @@ from optparse import OptionParser
- import gettext
- import urllib
- import time
-+from locale import bind_textdomain_codeset
- 
- from blueman.Constants import *
- import gi
-@@ -48,6 +49,7 @@ class Sender(GObject.GObject):
-         GObject.GObject.__init__(self)
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")
-         self.window = self.Builder.get_object("window")
- 
-diff --git a/apps/blueman-services b/apps/blueman-services
-index fb1428d..e3e708b 100755
---- a/apps/blueman-services
-+++ b/apps/blueman-services
-@@ -2,6 +2,7 @@
- 
- import os
- import sys
-+from locale import bind_textdomain_codeset
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
- if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
-@@ -29,6 +30,7 @@ class BluemanServices:
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/services.ui")
- 
-         self.Config = Config()
-diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
-index b12f77f..cc80492 100644
---- a/blueman/gui/GsmSettings.py
-+++ b/blueman/gui/GsmSettings.py
-@@ -3,6 +3,7 @@ from blueman.Functions import *
- from blueman.Constants import *
- 
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- 
- 
- class GsmSettings(Gtk.Dialog):
-@@ -13,6 +14,7 @@ class GsmSettings(Gtk.Dialog):
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/gsm-settings.ui")
- 
-         vbox = self.Builder.get_object("vbox1")
-diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py
-index 71dd742..3a1f932 100644
---- a/blueman/gui/applet/PluginDialog.py
-+++ b/blueman/gui/applet/PluginDialog.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.Functions import *
- 
-@@ -97,7 +98,8 @@ class PluginDialog(Gtk.Dialog):
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
--        self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-+        self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
- 
-         self.set_title(_("Plugins"))
-         self.props.icon_name = "blueman"
-diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
-index f6acb1f..5545112 100644
---- a/blueman/plugins/applet/NetUsage.py
-+++ b/blueman/plugins/applet/NetUsage.py
-@@ -17,7 +17,7 @@ import dbus
- import time
- import datetime
- import gettext
--
-+from locale import bind_textdomain_codeset
- 
- class MonitorBase(GObject.GObject):
-     __gsignals__ = {
-@@ -134,6 +134,7 @@ class Dialog:
-         builder = Gtk.Builder()
-         builder.add_from_file(UI_PATH + "/net-usage.ui")
-         builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
- 
-         self.dialog = builder.get_object("dialog")
-         self.dialog.connect("response", self.on_response)
-diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py
-index 278121e..e688e68 100644
---- a/blueman/plugins/services/Network.py
-+++ b/blueman/plugins/services/Network.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.Functions import have, dprint, mask_ip4_address
- from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask
-@@ -19,7 +19,8 @@ class Network(ServicePlugin):
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/services-network.ui")
-         self.widget = self.Builder.get_object("network")
- 
-         self.ignored_keys = []
-diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
-index d14d0eb..c3e71ad 100644
---- a/blueman/plugins/services/Transfer.py
-+++ b/blueman/plugins/services/Transfer.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.plugins.ServicePlugin import ServicePlugin
- 
-@@ -14,6 +15,7 @@ class Transfer(ServicePlugin):
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/services-transfer.ui")
-         self.widget = self.Builder.get_object("transfer")
- 
--- 
-2.3.1
-