gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
See also: https://github.com/gentoo/gentoo/pull/18135
Signed-off-by: Sergey Ilinykh <rion4ik@gmail.com>
Closes: https://bugs.gentoo.org/750878
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Sergey Ilinykh
2020-11-05 11:12:46 +03:00
committed by Andreas Sturmlechner
parent d83eaa9e0e
commit eb61cd2eca
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net-im/psi/metadata.xml
View File

@@ -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>

8
net-im/psi/psi-1.5.ebuild
View File

@@ -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

9
net-im/psi/psi-9999.ebuild
View File

@@ -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)
)