From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ECBD1139694 for ; Mon, 31 Jul 2017 21:24:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E30A1FC03F; Mon, 31 Jul 2017 21:24:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE0E11FC03F for ; Mon, 31 Jul 2017 21:24:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F5E43419D4 for ; Mon, 31 Jul 2017 21:24:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25C2774CA for ; Mon, 31 Jul 2017 21:24:25 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1501535947.925440347629e9917a75cd44f0829c856cadf28c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/psi/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/psi/metadata.xml net-im/psi/psi-1.2.ebuild net-im/psi/psi-9999.ebuild X-VCS-Directories: net-im/psi/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 925440347629e9917a75cd44f0829c856cadf28c X-VCS-Branch: master Date: Mon, 31 Jul 2017 21:24:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ab9211d9-b186-41ce-bbb8-f03a27f0bd3d X-Archives-Hash: 352ecb3a9e9ce0bb9e6a84c3f11f406a commit: 925440347629e9917a75cd44f0829c856cadf28c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 31 20:22:41 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 31 21:19:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92544034 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 net-im/psi/metadata.xml | 2 +- net-im/psi/psi-1.2.ebuild | 26 +++++++++++++++++--------- net-im/psi/psi-9999.ebuild | 28 +++++++++++++++++----------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml index 952c3d3370d..96ff1512239 100644 --- a/net-im/psi/metadata.xml +++ b/net-im/psi/metadata.xml @@ -9,7 +9,7 @@ proxy-maint@gentoo.org Proxy Maintainers - Psi is a very good XMPP client that uses QT + Psi is a very good XMPP client that uses Qt Enable spellchecking using app-text/aspell Enable spellchecking using app-text/enchant diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild index b575139d37f..aaf4448da8a 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 d08ddf5a62c..13d5a8e30df 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