gentoo resync : 25.11.2020

4 files changed, 9 insertions, 16 deletions

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 05d2792f03a5..099479e7b310 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,5 @@
 DIST psi-1.5.tar.xz 2125104 BLAKE2B ee4114749b5958c61dccc45c2562d868f30a2f4765229c904c32d54d5730e2eaa9ab03e966fa5b83aba7e31d37fafb2b194c74a72f2404f3b51815bc525c5080 SHA512 c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
 DIST psi-l10n-1.5.tar.gz 3037979 BLAKE2B a1baef1b3c86c1b0a528d4395bd6aabf99e1ec4c077d5d0358d4fd9566fcc2d929f46688c3bb2f56ad1de840fa1699f33c211fa4c7597b66ba0842cccbfbc19c SHA512 d5ed8244fbaa9fdd9a40a14ef3660085c8c9c5a18352900fa8d947fad01aea5894c23d83dc16e8ebf9fe007905ecbb8eca7dfaa4e1cf0fa160af341967886cae
-EBUILD psi-1.5.ebuild 3070 BLAKE2B b9a79fea1b390579b1edb7e5304bc08c28057df69ec70b4183d432c4a75e396fd162af130e9e9dbebee215161c28bf5f8f8ab9471fbba6efa4ed15e89659583a SHA512 52d62019d941442b57af126039bb96fb04beb6606ace9357635bb61a18bd721b1247317fdb6daba8a886bcb0b29f17d29aea6962a12606cdc49241b34c36d863
-EBUILD psi-9999.ebuild 4126 BLAKE2B d8342dad5b50dd199738d485d2feacaf5662e43751e0bb8c1f1ecd2f05f6dbf9aaf560a7657510b220f534f325c3aa64b166193302fe3b48ba9a9f516f26e54d SHA512 ecf5fc1c5728e5e3c2d13a5c6ca399c7928f4303113423a20df81a265e37de191d33ba495f20ad0f4061aab88996513f5d0f2a5730f582590d8dba388508fa42
-MISC metadata.xml 1590 BLAKE2B 62e74a8df75bc595d981c86b88e40344d76bddb46aff04aeb02f22207c8061e7b8c19d3794b6019e61790ea0aeaebed8c5dcd09a7070a7c6269f406eebaddea1 SHA512 4cac19074bd1080d9af4105adf61abfd25a7f07cc4d1581683a716bf2546450eda90347e9da0e11d012b148cec2ff35b32906a469000960e1465cb9c167855b8
+EBUILD psi-1.5.ebuild 2946 BLAKE2B eaba933f26ff8216eed3c04245ed446b3c277e211ecd35e4fd4bc8726ac0c1eabeded074ad51a786fdb594ced70b39d48f969351e3674989cb66c2151b4775d1 SHA512 7d27fb44e3332f4ea1a6a92f3ae2202b12aadc83f25b7dfe1892c4deaccfa79112b472f53b7ab857e328ec4a295aa18e524f6259f6db2e6214ac09597fa2ed8b
+EBUILD psi-9999.ebuild 4039 BLAKE2B f8d7f76e5459644ec3992f6b9bb26d6fbec8b00b4535393eac87ec3a07f0ec58e2bce342340dd3864ffa1f93bfcd8c9520f7fbcf98ea3bf0b74b5856bb195773 SHA512 27d3611f303698947bab443f1f413954e98a5d14643f2710e0153c4b689875e04b80ecf6da54ba607ac962427a3a52e963179504b4d8707828102dbc69ab8762
+MISC metadata.xml 1493 BLAKE2B 2b7be89dd49725208783dbfdbea4311212d1c9c2cc336fd204b2e3573b7bfb3aefc7dc8a459ed39b2adf09fafef12cfa36e637efa66587d2642190add9c1627a SHA512 467e544a68b3044636db1f45ff159167252ac6a3d4ceb83c520caa09d61ef430141f2719773e9c7021a36e57c8871412d6585b9c1d0834a57f576c774819f597
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index d1fdaf8e1f54..41be813c050b 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="iconsets">Install additional iconsets, some of them have no clear licensing</flag>
 		<flag name="keyring">Enable storing password in system keyring manager</flag>
 		<flag name="webengine">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebengine</pkg></flag>
-		<flag name="webkit">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebkit</pkg></flag>
 		<flag name="whiteboarding">Enable experimental interactive SVG drawing</flag>
 		<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
 	</use>
diff --git a/net-im/psi/psi-1.5.ebuild b/net-im/psi/psi-1.5.ebuild
index 1d1ed507d805..1d81d0bf29dd 100644
--- a/net-im/psi/psi-1.5.ebuild
+++ b/net-im/psi/psi-1.5.ebuild
@@ -16,11 +16,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aspell crypt dbus debug doc enchant +hunspell webengine webkit whiteboarding xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant +hunspell webengine whiteboarding xscreensaver"
 
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
-	webengine? ( !webkit )
 "
 
 BDEPEND="
@@ -50,7 +49,6 @@ DEPEND="
 		dev-qt/qtwebchannel:5
 		dev-qt/qtwebengine:5[widgets]
 	)
-	webkit? ( dev-qt/qtwebkit:5 )
 	whiteboarding? ( dev-qt/qtsvg:5 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 "
@@ -72,11 +70,11 @@ src_configure() {
 		$(use_enable hunspell)
 		$(use_enable xscreensaver xss)
 		$(use_enable whiteboarding)
+		$(use_enable webengine webkit)
+		$(use_with webengine webkit qtwebengine)
 	)
 
 	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
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index cd78ecbc4995..045b0c6e1837 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -20,7 +20,7 @@ EGIT_MIN_CLONE_TYPE="single"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine webkit xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine xscreensaver"
 
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
@@ -47,6 +47,7 @@ DEPEND="
 	dev-qt/qtxml:5
 	net-dns/libidn:0
 	net-libs/http-parser:=
+	net-libs/usrsctp
 	sys-libs/zlib[minizip]
 	x11-libs/libX11
 	x11-libs/libxcb
@@ -60,7 +61,6 @@ DEPEND="
 		dev-qt/qtwebengine:5[widgets]
 		net-libs/http-parser
 	)
-	webkit? ( dev-qt/qtwebkit:5 )
 "
 RDEPEND="${DEPEND}
 	dev-qt/qtimageformats
@@ -113,10 +113,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local chattype=basic
-	use webengine && chattype=webengine
-	use webkit && chattype=webkit
-
 	local mycmakeargs=(
 		-DPRODUCTION=OFF
 		-DUSE_ASPELL=$(usex aspell)
@@ -125,7 +121,7 @@ src_configure() {
 		-DUSE_DBUS=$(usex dbus)
 		-DINSTALL_PLUGINS_SDK=1
 		-DUSE_KEYCHAIN=$(usex keyring)
-		-DCHAT_TYPE=$chattype
+		-DCHAT_TYPE=$(usex webengine webengine basic)
 		-DUSE_XSS=$(usex xscreensaver)
 		-DPSI_PLUS=$(usex extras)
 	)