net-im/psi: Sort IUSE, fix (R)DEPENDs, fix USE=-doc

metadata.xml: QT -> Qt
Fix typo configuring USE=webkit

Package-Manager: Portage-2.3.6, Repoman-2.3.1

3 files changed, 35 insertions, 21 deletions

diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 952c3d3370d5..96ff15122396 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -9,7 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>Psi is a very good XMPP client that uses QT</longdescription>
+	<longdescription>Psi is a very good XMPP client that uses Qt</longdescription>
 	<use>
 		<flag name='aspell'>Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
 		<flag name='enchant'>Enable spellchecking using <pkg>app-text/enchant</pkg></flag>
diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
index b575139d37f9..aaf4448da8a0 100644
--- a/net-im/psi/psi-1.2.ebuild
+++ b/net-im/psi/psi-1.2.ebuild
@@ -10,14 +10,13 @@ inherit l10n qmake-utils
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="http://psi-im.org/"
-
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 	https://github.com/psi-im/psi-l10n/archive/1.2.tar.gz -> psi-l10n-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aspell crypt dbus debug doc enchant +hunspell ssl xscreensaver
-whiteboarding webengine webkit"
+IUSE="aspell crypt dbus debug doc enchant +hunspell ssl webengine webkit whiteboarding xscreensaver"
 
 # qconf generates not quite compatible configure scripts
 QA_CONFIGURE_OPTIONS=".*"
@@ -29,24 +28,32 @@ REQUIRED_USE="
 
 RDEPEND="
 	app-crypt/qca:2[qt5]
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
 	dev-qt/qtconcurrent:5
+	dev-qt/qtcore: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
 	sys-libs/zlib[minizip]
+	x11-libs/libX11
+	x11-libs/libxcb
 	aspell? ( app-text/aspell )
 	dbus? ( dev-qt/qtdbus:5 )
 	enchant? ( >=app-text/enchant-1.3.0 )
 	hunspell? ( app-text/hunspell:= )
-	webengine? ( >=dev-qt/qtwebengine-5.7:5[widgets] )
+	webengine? (
+		>=dev-qt/qtwebchannel-5.7:5[widgets]
+		>=dev-qt/qtwebengine-5.7:5[widgets]
+	)
 	webkit? ( dev-qt/qtwebkit:5 )
 	whiteboarding? ( dev-qt/qtsvg:5 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
@@ -54,6 +61,7 @@ PDEPEND="
 	crypt? ( app-crypt/qca[gpg] )
 	ssl? ( app-crypt/qca:2[ssl] )
 "
+
 RESTRICT="test"
 
 src_configure() {
@@ -70,7 +78,7 @@ src_configure() {
 
 	use debug && CONF+=("--debug")
 	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
-	use webkit && CONF+=("--enable-webkit" "--with-webkit=qwebkit")
+	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
 
 	econf "${CONF[@]}"
 
@@ -92,7 +100,7 @@ src_install() {
 	newdoc certs/README README.certs
 	dodoc README
 
-	local HTML_DOCS=( doc/api )
+	use doc && HTML_DOCS=( doc/api/. )
 	einstalldocs
 
 	# install translations
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index d08ddf5a62cb..13d5a8e30df8 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -20,8 +20,7 @@ EGIT_MIN_CLONE_TYPE="single"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl xscreensaver
-whiteboarding webengine webkit"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl webengine webkit whiteboarding xscreensaver"
 
 # qconf generates not quite compatible configure scripts
 QA_CONFIGURE_OPTIONS=".*"
@@ -35,13 +34,18 @@ REQUIRED_USE="
 
 RDEPEND="
 	app-crypt/qca:2[qt5]
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
 	dev-qt/qtconcurrent:5
+	dev-qt/qtcore: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
 	sys-libs/zlib[minizip]
+	x11-libs/libX11
+	x11-libs/libxcb
 	aspell? ( app-text/aspell )
 	dbus? ( dev-qt/qtdbus:5 )
 	enchant? ( >=app-text/enchant-1.3.0 )
@@ -49,23 +53,25 @@ RDEPEND="
 		sql? ( dev-qt/qtsql:5 )
 	)
 	hunspell? ( app-text/hunspell:= )
-	webengine? ( >=dev-qt/qtwebengine-5.7:5[widgets] )
+	webengine? (
+		>=dev-qt/qtwebchannel-5.7:5[widgets]
+		>=dev-qt/qtwebengine-5.7:5[widgets]
+	)
 	webkit? ( dev-qt/qtwebkit:5 )
 	whiteboarding? ( dev-qt/qtsvg:5 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	extras? (
-		>=sys-devel/qconf-2.3
-	)
+	extras? ( >=sys-devel/qconf-2.3 )
 "
 PDEPEND="
 	crypt? ( app-crypt/qca[gpg] )
 	ssl? ( app-crypt/qca:2[ssl] )
 "
+
 RESTRICT="test iconsets? ( bindist )"
 
 pkg_setup() {
@@ -146,7 +152,7 @@ src_configure() {
 
 	use debug && CONF+=("--debug")
 	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
-	use webkit && CONF+=("--enable-webkit" "--with-webkit=qwebkit")
+	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
 
 	econf "${CONF[@]}"
 
@@ -168,7 +174,7 @@ src_install() {
 	newdoc certs/README README.certs
 	dodoc README
 
-	local HTML_DOCS=( doc/api )
+	use doc && HTML_DOCS=( doc/api/. )
 	einstalldocs
 
 	# install translations