[gentoo-commits] repo/gentoo:master commit in: net-im/psi/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     eb61cd2eca07362b6856b9b0b0dec88298ac52ca
Author:     Sergey Ilinykh <rion4ik <AT> gmail <DOT> com>
AuthorDate: Thu Nov  5 08:12:46 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 22:34:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb61cd2e

net-im/psi: drop webkit. keep just webengine

See also: https://github.com/gentoo/gentoo/pull/18135
Signed-off-by: Sergey Ilinykh <rion4ik <AT> gmail.com>
Closes: https://bugs.gentoo.org/750878
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-im/psi/metadata.xml    | 1 -
 net-im/psi/psi-1.5.ebuild  | 8 +++-----
 net-im/psi/psi-9999.ebuild | 9 ++-------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index d1fdaf8e1f5..41be813c050 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 1d1ed507d80..1d81d0bf29d 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 fa92f8bd568..045b0c6e183 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 )
@@ -61,7 +61,6 @@ DEPEND="
 		dev-qt/qtwebengine:5[widgets]
 		net-libs/http-parser
 	)
-	webkit? ( dev-qt/qtwebkit:5 )
 "
 RDEPEND="${DEPEND}
 	dev-qt/qtimageformats
@@ -114,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)
@@ -126,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)
 	)