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

2024-03-05 Thread Andreas Sturmlechner
commit: e826717a0b19573e40a74c6cccf3f0b6fe88bdee
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar  4 20:59:38 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar  5 09:56:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e826717a

net-im/psi: Add app-crypt/qca[qt5(+)] USEdep

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/{psi-1.5-r1.ebuild => psi-1.5-r2.ebuild} | 2 +-
 net-im/psi/psi-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/psi-1.5-r1.ebuild b/net-im/psi/psi-1.5-r2.ebuild
similarity index 99%
rename from net-im/psi/psi-1.5-r1.ebuild
rename to net-im/psi/psi-1.5-r2.ebuild
index c0ab4c6ce05c..2d7af1d75ec5 100644
--- a/net-im/psi/psi-1.5-r1.ebuild
+++ b/net-im/psi/psi-1.5-r2.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
doc? ( app-text/doxygen[dot] )
 "
 DEPEND="
-   app-crypt/qca:2[ssl]
+   app-crypt/qca:2[qt5(+),ssl]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index a0f835e50ba7..6feefa2675ff 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
extras? ( >=dev-build/qconf-2.4 )
 "
 DEPEND="
-   app-crypt/qca:2[ssl]
+   app-crypt/qca:2[qt5(+),ssl]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5



[gentoo-commits] repo/gentoo:master commit in: net-im/psi/, net-im/psimedia/, profiles/updates/, dev-build/qconf/, ...

2024-01-17 Thread Michał Górny
commit: 2a669a90ef23015afd8008e70bc5d39cf0994e1e
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 17 15:08:43 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 17 17:14:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a669a90

Move {sys-devel → dev-build}/qconf

Signed-off-by: Michał Górny  gentoo.org>

 {sys-devel => dev-build}/qconf/Manifest | 0
 {sys-devel => dev-build}/qconf/metadata.xml | 0
 {sys-devel => dev-build}/qconf/qconf-2.5.ebuild | 2 +-
 net-im/psi/psi-.ebuild  | 2 +-
 net-im/psimedia/psimedia-.ebuild| 4 ++--
 profiles/updates/1Q-2024| 1 +
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys-devel/qconf/Manifest b/dev-build/qconf/Manifest
similarity index 100%
rename from sys-devel/qconf/Manifest
rename to dev-build/qconf/Manifest

diff --git a/sys-devel/qconf/metadata.xml b/dev-build/qconf/metadata.xml
similarity index 100%
rename from sys-devel/qconf/metadata.xml
rename to dev-build/qconf/metadata.xml

diff --git a/sys-devel/qconf/qconf-2.5.ebuild b/dev-build/qconf/qconf-2.5.ebuild
similarity index 95%
rename from sys-devel/qconf/qconf-2.5.ebuild
rename to dev-build/qconf/qconf-2.5.ebuild
index ca303a7e0854..9da668afb0f6 100644
--- a/sys-devel/qconf/qconf-2.5.ebuild
+++ b/dev-build/qconf/qconf-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index f458f22d6ddc..a0f835e50ba7 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
doc? ( app-text/doxygen[dot] )
-   extras? ( >=sys-devel/qconf-2.4 )
+   extras? ( >=dev-build/qconf-2.4 )
 "
 DEPEND="
app-crypt/qca:2[ssl]

diff --git a/net-im/psimedia/psimedia-.ebuild 
b/net-im/psimedia/psimedia-.ebuild
index 1dc21a73f501..7b5e885b9d42 100644
--- a/net-im/psimedia/psimedia-.ebuild
+++ b/net-im/psimedia/psimedia-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="extras"
 
-BDEPEND="sys-devel/qconf"
+BDEPEND="dev-build/qconf"
 DEPEND="
dev-libs/glib
dev-qt/qtcore:5

diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index 6ae2105e8f47..b658165fa318 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -47,3 +47,4 @@ move dev-util/netsurf-buildsystem 
dev-build/netsurf-buildsystem
 move dev-util/tup dev-build/tup
 move sys-devel/cons dev-build/cons
 move dev-util/scons dev-build/scons
+move sys-devel/qconf dev-build/qconf



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

2023-05-30 Thread Andreas Sturmlechner
commit: f597a59c638d33dc6c05e8b1b9b39f180fdfd940
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 30 19:28:38 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 30 19:32:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f597a59c

net-im/psi: Add dev-libs/qtkeychain[qt5(+)] USEdep

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/psi-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 4d4fbb81991e..08babf271fb0 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ DEPEND="
dbus? ( dev-qt/qtdbus:5 )
enchant? ( app-text/enchant:2 )
hunspell? ( app-text/hunspell:= )
-   keyring? ( dev-libs/qtkeychain:= )
+   keyring? ( dev-libs/qtkeychain:=[qt5(+)] )
webengine? (
dev-qt/qtwebchannel:5
dev-qt/qtwebengine:5[widgets]



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

2022-09-21 Thread Agostino Sarubbo
commit: 7837abd0da1b178915e152630f5d6f8ec299dd30
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 21 12:26:55 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 21 12:26:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7837abd0

net-im/psi: Stabilize 1.5-r1 x86, #872038

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-im/psi/psi-1.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/psi/psi-1.5-r1.ebuild b/net-im/psi/psi-1.5-r1.ebuild
index 71a1adab9f0b..4845d29a519e 100644
--- a/net-im/psi/psi-1.5-r1.ebuild
+++ b/net-im/psi/psi-1.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aspell crypt dbus debug doc enchant +hunspell webengine whiteboarding 
xscreensaver"
 
 REQUIRED_USE="



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

2022-09-21 Thread Agostino Sarubbo
commit: bb64aa81e8f02661969e9f19ba0a38cccadeba89
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 21 12:22:38 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 21 12:22:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb64aa81

net-im/psi: Stabilize 1.5-r1 amd64, #872038

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-im/psi/psi-1.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/psi/psi-1.5-r1.ebuild b/net-im/psi/psi-1.5-r1.ebuild
index 68f516fd6100..71a1adab9f0b 100644
--- a/net-im/psi/psi-1.5-r1.ebuild
+++ b/net-im/psi/psi-1.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="aspell crypt dbus debug doc enchant +hunspell webengine whiteboarding 
xscreensaver"
 
 REQUIRED_USE="



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

2022-09-20 Thread Florian Schmaus
commit: d51dd3c9b2cf5f3a983763484936276e24832af1
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Sep 20 09:30:58 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Sep 20 11:35:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d51dd3c9

net-im/psi: add 'dot' USE flag to graphviz dep

Closes: https://bugs.gentoo.org/872017
Signed-off-by: Florian Schmaus  gentoo.org>

 net-im/psi/{psi-1.5.ebuild => psi-1.5-r1.ebuild} | 4 ++--
 net-im/psi/psi-.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-im/psi/psi-1.5.ebuild b/net-im/psi/psi-1.5-r1.ebuild
similarity index 97%
rename from net-im/psi/psi-1.5.ebuild
rename to net-im/psi/psi-1.5-r1.ebuild
index 51720b881c72..68f516fd6100 100644
--- a/net-im/psi/psi-1.5.ebuild
+++ b/net-im/psi/psi-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ REQUIRED_USE="
 BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
-   doc? ( app-doc/doxygen )
+   doc? ( app-doc/doxygen[dot] )
 "
 DEPEND="
app-crypt/qca:2[ssl]

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 6dc0701912e8..4d4fbb81991e 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ REQUIRED_USE="
 BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
-   doc? ( app-doc/doxygen )
+   doc? ( app-doc/doxygen[dot] )
extras? ( >=sys-devel/qconf-2.4 )
 "
 DEPEND="



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

2022-06-27 Thread Ulrich Müller
commit: aa865cf5c5ac17e56e7d4e63b645231f6b741717
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Mon Jun 27 17:18:12 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun 27 17:38:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa865cf5

net-im/psi: add license all-rights-reserved with USE=iconsets

Signed-off-by: Sergei Ilinykh  gmail.com>
Closes: https://bugs.gentoo.org/511462
Signed-off-by: Ulrich Müller  gentoo.org>

 net-im/psi/psi-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 64f2fd8a4875..6dc0701912e8 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="${PSI_URI}/${PN}.git"
 PSI_LANGS_URI="${PSI_URI}/psi-l10n.git"
 PSI_PLUS_LANGS_URI="${PSI_PLUS_URI}/psi-plus-l10n.git"
 EGIT_MIN_CLONE_TYPE="single"
-LICENSE="GPL-2"
+LICENSE="GPL-2 iconsets? ( all-rights-reserved )"
 SLOT="0"
 KEYWORDS=""
 IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring 
webengine xscreensaver"



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

2021-07-04 Thread Ulrich Müller
commit: 4a2cccd997eae9a9e72f2ffe138cc0549296e741
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jul  3 15:46:06 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul  4 14:02:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2cccd9

net-im/psi: Update from l10n.eclass to plocale.eclass

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 net-im/psi/psi-1.5.ebuild  | 6 +++---
 net-im/psi/psi-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-im/psi/psi-1.5.ebuild b/net-im/psi/psi-1.5.ebuild
index 1d81d0bf29d..51720b881c7 100644
--- a/net-im/psi/psi-1.5.ebuild
+++ b/net-im/psi/psi-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n qmake-utils xdg
+inherit plocale qmake-utils xdg
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="https://psi-im.org;
@@ -110,7 +110,7 @@ src_install() {
"${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease 
${1} failed"
doins "translations/${PN}_${1}.qm"
}
-   l10n_for_each_locale_do install_locale
+   plocale_for_each_locale install_locale
 }
 
 pkg_postinst() {

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 045b0c6e183..64f2fd8a487 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 PLOCALES="be bg ca cs de el en eo es et fa fi fr he hu it ja kk mk nl pl pt_BR 
pt ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit git-r3 cmake l10n qmake-utils xdg
+inherit git-r3 cmake plocale qmake-utils xdg
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="https://psi-im.org;
@@ -154,7 +154,7 @@ src_install() {
"${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease 
${1} failed"
doins "translations/${PN}_${1}.qm"
}
-   l10n_for_each_locale_do install_locale
+   plocale_for_each_locale install_locale
 }
 
 pkg_postinst() {



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

2020-11-18 Thread Andreas Sturmlechner
commit: eb61cd2eca07362b6856b9b0b0dec88298ac52ca
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Thu Nov  5 08:12:46 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 18 22:34:30 2020 +
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  gmail.com>
Closes: https://bugs.gentoo.org/750878
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/metadata.xml| 1 -
 net-im/psi/psi-1.5.ebuild  | 8 +++-
 net-im/psi/psi-.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 @@
Install additional iconsets, some of them 
have no clear licensing
Enable storing password in system keyring 
manager
Enable themed, html-based chatlogs using 
dev-qt/qtwebengine
-   Enable themed, html-based chatlogs using 
dev-qt/qtwebkit
Enable experimental interactive SVG 
drawing
Use X screensaver protocol extension 
to monitor idle/active status based on mouse/keyboard events


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-.ebuild b/net-im/psi/psi-.ebuild
index fa92f8bd568..045b0c6e183 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.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)
)



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

2020-11-04 Thread Joonas Niilola
commit: 9450338c61aa60ef9d5be4c7b5a1a6e319689e4f
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Tue Nov  3 21:29:15 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov  4 13:39:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9450338c

net-im/psi: added dep on net-libs/usrsctp for live version

Closes: https://bugs.gentoo.org/752447
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergey Ilinykh  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18116
Signed-off-by: Joonas Niilola  gentoo.org>

 net-im/psi/psi-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index cd78ecbc499..fa92f8bd568 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -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



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

2020-09-19 Thread Andreas Sturmlechner
commit: ed4c66a2aa540626dc7f0f85c80018cf5f98e331
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 19 20:34:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 19 20:39:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4c66a2

net-im/psi: Drop 1.4

Closes: https://bugs.gentoo.org/740648
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/Manifest   |   2 -
 net-im/psi/psi-1.4.ebuild | 118 --
 2 files changed, 120 deletions(-)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 2a7bb547a72..b3710868303 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,4 +1,2 @@
-DIST psi-1.4.tar.xz 2119840 BLAKE2B 
28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8
 SHA512 
9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
 DIST psi-1.5.tar.xz 2125104 BLAKE2B 
ee4114749b5958c61dccc45c2562d868f30a2f4765229c904c32d54d5730e2eaa9ab03e966fa5b83aba7e31d37fafb2b194c74a72f2404f3b51815bc525c5080
 SHA512 
c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
-DIST psi-l10n-1.4.tar.gz 3037957 BLAKE2B 
2f61c60ee5bc323323ae98ab2eee7d2afec9462850f038fe72816810ef572e4a71a3647f83e09bf948485f56dfbc8dd3bea0a24f6258b13f08867319ca65deea
 SHA512 
ef87a12dd992adcfe5fdc4e88c1d33d6fcd77b2554963e1563cee7ba650d096c3b074795a1a9e650945b1dc46a4936f9520ecd864559b1531cb31763399c258d
 DIST psi-l10n-1.5.tar.gz 3037979 BLAKE2B 
a1baef1b3c86c1b0a528d4395bd6aabf99e1ec4c077d5d0358d4fd9566fcc2d929f46688c3bb2f56ad1de840fa1699f33c211fa4c7597b66ba0842cccbfbc19c
 SHA512 
d5ed8244fbaa9fdd9a40a14ef3660085c8c9c5a18352900fa8d947fad01aea5894c23d83dc16e8ebf9fe007905ecbb8eca7dfaa4e1cf0fa160af341967886cae

diff --git a/net-im/psi/psi-1.4.ebuild b/net-im/psi/psi-1.4.ebuild
deleted file mode 100644
index 9db7e130e00..000
--- a/net-im/psi/psi-1.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit l10n qmake-utils xdg
-
-DESCRIPTION="Qt XMPP client"
-HOMEPAGE="https://psi-im.org;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-   https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> 
psi-l10n-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aspell crypt dbus debug doc enchant +hunspell webengine webkit 
whiteboarding xscreensaver"
-
-REQUIRED_USE="
-   ?? ( aspell enchant hunspell )
-   webengine? ( !webkit )
-"
-
-RDEPEND="
-   app-crypt/qca:2[ssl]
-   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:0
-   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:0 )
-   hunspell? ( app-text/hunspell:= )
-   webengine? (
-   dev-qt/qtwebchannel:5
-   dev-qt/qtwebengine:5[widgets]
-   )
-   webkit? ( dev-qt/qtwebkit:5 )
-   whiteboarding? ( dev-qt/qtsvg:5 )
-   xscreensaver? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test"
-
-src_configure() {
-   CONF=(
-   --prefix="${EPREFIX}"/usr
-   --libdir="${EPREFIX}"/usr/$(get_libdir)
-   --no-separate-debug-info
-   --qtdir="$(qt5_get_bindir)/.."
-   $(use_enable aspell)
-   $(use_enable dbus qdbus)
-   $(use_enable enchant)
-   $(use_enable hunspell)
-   $(use_enable xscreensaver xss)
-   $(use_enable whiteboarding)
-   )
-
-   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
-   # future qconf versions.
-   ./configure "${CONF[@]}" || die "configure failed"
-
-   eqmake5 psi.pro
-}
-
-src_compile() {
-   emake
-   use doc && emake -C doc api_public
-}
-
-src_install() {
-   emake INSTALL_ROOT="${D}" install
-
-   # this way the docs will be installed in 

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

2020-09-07 Thread Andreas Sturmlechner
commit: 9fcc47ca9669c5a2b2fa8013b65e8dfbc44580be
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Sun Sep  6 14:00:30 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Sep  7 08:56:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fcc47ca

net-im/psi: added 1.5 version

Package-Manager: Portage-3.0.5, Repoman-2.3.23
Signed-off-by: Sergey Ilinykh  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17438
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/Manifest   |   2 +
 net-im/psi/psi-1.5.ebuild | 121 ++
 2 files changed, 123 insertions(+)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index f46215ca370..2a7bb547a72 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,2 +1,4 @@
 DIST psi-1.4.tar.xz 2119840 BLAKE2B 
28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8
 SHA512 
9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
+DIST psi-1.5.tar.xz 2125104 BLAKE2B 
ee4114749b5958c61dccc45c2562d868f30a2f4765229c904c32d54d5730e2eaa9ab03e966fa5b83aba7e31d37fafb2b194c74a72f2404f3b51815bc525c5080
 SHA512 
c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
 DIST psi-l10n-1.4.tar.gz 3037957 BLAKE2B 
2f61c60ee5bc323323ae98ab2eee7d2afec9462850f038fe72816810ef572e4a71a3647f83e09bf948485f56dfbc8dd3bea0a24f6258b13f08867319ca65deea
 SHA512 
ef87a12dd992adcfe5fdc4e88c1d33d6fcd77b2554963e1563cee7ba650d096c3b074795a1a9e650945b1dc46a4936f9520ecd864559b1531cb31763399c258d
+DIST psi-l10n-1.5.tar.gz 3037979 BLAKE2B 
a1baef1b3c86c1b0a528d4395bd6aabf99e1ec4c077d5d0358d4fd9566fcc2d929f46688c3bb2f56ad1de840fa1699f33c211fa4c7597b66ba0842cccbfbc19c
 SHA512 
d5ed8244fbaa9fdd9a40a14ef3660085c8c9c5a18352900fa8d947fad01aea5894c23d83dc16e8ebf9fe007905ecbb8eca7dfaa4e1cf0fa160af341967886cae

diff --git a/net-im/psi/psi-1.5.ebuild b/net-im/psi/psi-1.5.ebuild
new file mode 100644
index 000..1d1ed507d80
--- /dev/null
+++ b/net-im/psi/psi-1.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils xdg
+
+DESCRIPTION="Qt XMPP client"
+HOMEPAGE="https://psi-im.org;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+   https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> 
psi-l10n-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aspell crypt dbus debug doc enchant +hunspell webengine webkit 
whiteboarding xscreensaver"
+
+REQUIRED_USE="
+   ?? ( aspell enchant hunspell )
+   webengine? ( !webkit )
+"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )
+"
+DEPEND="
+   app-crypt/qca:2[ssl]
+   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:0
+   sys-libs/zlib[minizip]
+   x11-libs/libX11
+   x11-libs/libxcb
+   aspell? ( app-text/aspell )
+   dbus? ( dev-qt/qtdbus:5 )
+   enchant? ( app-text/enchant:2 )
+   hunspell? ( app-text/hunspell:= )
+   webengine? (
+   dev-qt/qtwebchannel:5
+   dev-qt/qtwebengine:5[widgets]
+   )
+   webkit? ( dev-qt/qtwebkit:5 )
+   whiteboarding? ( dev-qt/qtsvg:5 )
+   xscreensaver? ( x11-libs/libXScrnSaver )
+"
+RDEPEND="${DEPEND}
+   dev-qt/qtimageformats
+"
+
+RESTRICT="test"
+
+src_configure() {
+   CONF=(
+   --prefix="${EPREFIX}"/usr
+   --libdir="${EPREFIX}"/usr/$(get_libdir)
+   --no-separate-debug-info
+   --qtdir="$(qt5_get_bindir)/.."
+   $(use_enable aspell)
+   $(use_enable dbus qdbus)
+   $(use_enable enchant)
+   $(use_enable hunspell)
+   $(use_enable xscreensaver xss)
+   $(use_enable whiteboarding)
+   )
+
+   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
+   # future qconf versions.
+   ./configure "${CONF[@]}" || die "configure failed"
+
+   eqmake5 psi.pro
+}
+
+src_compile() {
+   emake
+   use doc && emake -C doc api_public
+}
+
+src_install() {
+   

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

2020-04-21 Thread Joonas Niilola
commit: 5100e3b4eab1c3bbc1adf492ec20bca7f82f1add
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Sat Apr 18 20:56:23 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Apr 21 08:17:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5100e3b4

net-im/psi: added cmake flag to compile with detailed version

Signed-off-by: Sergey Ilinykh  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15402
Signed-off-by: Joonas Niilola  gentoo.org>

 net-im/psi/psi-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 6e6329011f1..cd78ecbc499 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -118,6 +118,7 @@ src_configure() {
use webkit && chattype=webkit
 
local mycmakeargs=(
+   -DPRODUCTION=OFF
-DUSE_ASPELL=$(usex aspell)
-DUSE_ENCHANT=$(usex enchant)
-DUSE_HUNSPELL=$(usex hunspell)



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

2020-04-01 Thread Joonas Niilola
commit: 18794280dcebda90476ca1c4caf6bcd11d666d87
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Sun Mar 29 21:47:22 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr  1 14:37:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18794280

net-im/psi: make qtdbus optional in -

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Sergey Ilinykh  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15164
Signed-off-by: Joonas Niilola  gentoo.org>

 net-im/psi/psi-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 0b3fa1a7270..6e6329011f1 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -20,7 +20,7 @@ EGIT_MIN_CLONE_TYPE="single"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt debug doc enchant extras +hunspell iconsets keyring 
webengine webkit xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring 
webengine webkit xscreensaver"
 
 REQUIRED_USE="
?? ( aspell enchant hunspell )
@@ -37,7 +37,6 @@ DEPEND="
app-crypt/qca:2[ssl]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
-   dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
@@ -52,6 +51,7 @@ DEPEND="
x11-libs/libX11
x11-libs/libxcb
aspell? ( app-text/aspell )
+   dbus? ( dev-qt/qtdbus:5 )
enchant? ( app-text/enchant:2 )
hunspell? ( app-text/hunspell:= )
keyring? ( dev-libs/qtkeychain:= )
@@ -121,6 +121,7 @@ src_configure() {
-DUSE_ASPELL=$(usex aspell)
-DUSE_ENCHANT=$(usex enchant)
-DUSE_HUNSPELL=$(usex hunspell)
+   -DUSE_DBUS=$(usex dbus)
-DINSTALL_PLUGINS_SDK=1
-DUSE_KEYCHAIN=$(usex keyring)
-DCHAT_TYPE=$chattype



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

2020-03-19 Thread Andreas Sturmlechner
commit: d6caf8ecbd0734edbabd4e471c00709d5f12f816
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Wed Mar 18 20:53:36 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 19 11:40:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6caf8ec

net-im/psi: add net-libs/http-parser dependency

Signed-off-by: Sergey Ilinykh  gmail.com>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Closes: https://github.com/gentoo/gentoo/pull/15007
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/psi-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 429334fabc9..0b3fa1a7270 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -47,6 +47,7 @@ DEPEND="
dev-qt/qtx11extras:5
dev-qt/qtxml:5
net-dns/libidn:0
+   net-libs/http-parser:=
sys-libs/zlib[minizip]
x11-libs/libX11
x11-libs/libxcb



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

2020-03-16 Thread Andreas Sturmlechner
commit: e14316111a4a11e4f782f4fc7f00929401ccce28
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Sat Mar 14 12:26:44 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 16 21:26:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1431611

net-im/psi: sync with upstream

Signed-off-by: Sergey Ilinykh  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14952
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/metadata.xml| 25 +++--
 net-im/psi/psi-.ebuild | 92 --
 2 files changed, 46 insertions(+), 71 deletions(-)

diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 96ff1512239..d1fdaf8e1f5 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd;>
 

@@ -9,17 +9,20 @@
proxy-ma...@gentoo.org
Proxy Maintainers

-   Psi is a very good XMPP client that uses 
Qt
+   
+   Psi is a multi-platform XMPP client based on Qt and supports a 
wide range of XMPP extensions. It is extremely configurable and extendable with 
plugins.
+   

-   Enable spellchecking using 
app-text/aspell
-   Enable spellchecking using 
app-text/enchant
-   Enable Psi+ patcheset
-   Enable spellchecking using 
app-text/hunspell
-   Install additional iconsets, some of them 
has not clear licensing
-   Enable psi-new-history extras patch
-   Use dev-qt/qtwebengine 
instead of dev-qt/qtwebkit
-   Enable themed, html-based chatlogs
-   Enable experimental interactive SVG 
drawing
+   Enable spellchecking using 
app-text/aspell
+   Enable spellchecking using 
app-text/enchant
+   Enable Psi+ patchset
+   Enable spellchecking using 
app-text/hunspell
+   Install additional iconsets, some of them 
have no clear licensing
+   Enable storing password in system keyring 
manager
+   Enable themed, html-based chatlogs using 
dev-qt/qtwebengine
+   Enable themed, html-based chatlogs using 
dev-qt/qtwebkit
+   Enable experimental interactive SVG 
drawing
+   Use X screensaver protocol extension 
to monitor idle/active status based on mouse/keyboard events


psi-im/psi

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index e1a2ea1f572..429334fabc9 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALES="be bg ca cs de el en eo es et fa fi fr he hu it ja kk mk nl pl pt_BR 
pt ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n git-r3 qmake-utils xdg
+inherit git-r3 cmake l10n qmake-utils xdg
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="https://psi-im.org;
@@ -20,13 +20,11 @@ EGIT_MIN_CLONE_TYPE="single"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql 
webengine webkit whiteboarding xscreensaver"
+IUSE="aspell crypt debug doc enchant extras +hunspell iconsets keyring 
webengine webkit xscreensaver"
 
 REQUIRED_USE="
?? ( aspell enchant hunspell )
iconsets? ( extras )
-   sql? ( extras )
-   webengine? ( !webkit )
 "
 
 BDEPEND="
@@ -39,10 +37,12 @@ DEPEND="
app-crypt/qca:2[ssl]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
+   dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5[sqlite]
+   dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
dev-qt/qtxml:5
@@ -51,20 +51,19 @@ DEPEND="
x11-libs/libX11
x11-libs/libxcb
aspell? ( app-text/aspell )
-   dbus? ( dev-qt/qtdbus:5 )
-   enchant? ( >=app-text/enchant-1.3.0:0 )
+   enchant? ( app-text/enchant:2 )
hunspell? ( app-text/hunspell:= )
+   keyring? ( dev-libs/qtkeychain:= )
webengine? (
dev-qt/qtwebchannel:5
dev-qt/qtwebengine:5[widgets]
net-libs/http-parser
)
webkit? ( dev-qt/qtwebkit:5 )
-   whiteboarding? ( dev-qt/qtsvg:5 )
-   xscreensaver? ( x11-libs/libXScrnSaver )
 "
 RDEPEND="${DEPEND}
dev-qt/qtimageformats
+   crypt? ( app-crypt/qca[gpg] )
 "
 
 RESTRICT="test iconsets? ( bindist )"
@@ -83,6 +82,8 @@ pkg_setup() {
ewarn "and has not clear licensing."
ewarn "Possibly this build is not redistributable in 
some countries."
fi
+
+   EGIT_REPO_URI="${PSI_PLUS_URI}/${MY_PN}-snapshots.git"
fi
 }

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

2020-02-02 Thread Mart Raudsepp
commit: 72b581e0762a4f986f1b73c415e65b2694d6f42f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Feb  2 19:17:31 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Feb  2 19:34:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72b581e0

net-im/psi: lock enchant dep to SLOT=0

It checks only for enchant.pc, but not the parallel-installable
enchant-2 versions (just the early ones that had enchant.pc still,
but changed ABI). Appears to be the case in current  clone
as well.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-im/psi/psi-1.4.ebuild  | 4 ++--
 net-im/psi/psi-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-im/psi/psi-1.4.ebuild b/net-im/psi/psi-1.4.ebuild
index ac7520c15da..9db7e130e00 100644
--- a/net-im/psi/psi-1.4.ebuild
+++ b/net-im/psi/psi-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ RDEPEND="
x11-libs/libxcb
aspell? ( app-text/aspell )
dbus? ( dev-qt/qtdbus:5 )
-   enchant? ( >=app-text/enchant-1.3.0 )
+   enchant? ( >=app-text/enchant-1.3.0:0 )
hunspell? ( app-text/hunspell:= )
webengine? (
dev-qt/qtwebchannel:5

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 24d8d574291..e1a2ea1f572 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,7 +52,7 @@ DEPEND="
x11-libs/libxcb
aspell? ( app-text/aspell )
dbus? ( dev-qt/qtdbus:5 )
-   enchant? ( >=app-text/enchant-1.3.0 )
+   enchant? ( >=app-text/enchant-1.3.0:0 )
hunspell? ( app-text/hunspell:= )
webengine? (
dev-qt/qtwebchannel:5



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

2019-03-30 Thread Andreas Sturmlechner
commit: ede371b0d6d44bc3fdf0a52ded2e53ba3a292cde
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 30 09:16:41 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 30 09:58:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ede371b0

net-im/psi: Switch to xdg.eclass

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/psi-1.4.ebuild  | 12 +++-
 net-im/psi/psi-.ebuild | 12 +++-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/net-im/psi/psi-1.4.ebuild b/net-im/psi/psi-1.4.ebuild
index c32424e600c..ac7520c15da 100644
--- a/net-im/psi/psi-1.4.ebuild
+++ b/net-im/psi/psi-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n qmake-utils gnome2-utils xdg-utils
+inherit l10n qmake-utils xdg
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="https://psi-im.org;
@@ -113,12 +113,6 @@ src_install() {
 }
 
 pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
+   xdg_pkg_postinst
einfo "For GPG support make sure app-crypt/qca is compiled with gpg USE 
flag."
 }
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
-}

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 504d2fa256f..4c1e85949f6 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n git-r3 qmake-utils gnome2-utils xdg-utils
+inherit l10n git-r3 qmake-utils xdg
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="https://psi-im.org;
@@ -189,12 +189,6 @@ src_install() {
 }
 
 pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
+   xdg_pkg_postinst
einfo "For GPG support make sure app-crypt/qca is compiled with gpg USE 
flag."
 }
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
-}



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

2019-03-30 Thread Andreas Sturmlechner
commit: 9beed400f557ea287c84d2d21b2d0e948b3cf21c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 30 09:23:19 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 30 09:58:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9beed400

net-im/psi: EAPI-7 bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/psi-.ebuild | 24 +++-
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 4c1e85949f6..24d8d574291 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
@@ -29,7 +29,13 @@ REQUIRED_USE="
webengine? ( !webkit )
 "
 
-RDEPEND="
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )
+   extras? ( >=sys-devel/qconf-2.4 )
+"
+DEPEND="
app-crypt/qca:2[ssl]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -57,13 +63,7 @@ RDEPEND="
whiteboarding? ( dev-qt/qtsvg:5 )
xscreensaver? ( x11-libs/libXScrnSaver )
 "
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )
-   extras? ( >=sys-devel/qconf-2.4 )
-"
-PDEPEND="
+RDEPEND="${DEPEND}
dev-qt/qtimageformats
 "
 
@@ -73,14 +73,12 @@ pkg_setup() {
MY_PN=psi
if use extras; then
MY_PN=psi-plus
-   echo
ewarn "You're about to build patched version of Psi called 
Psi+."
ewarn "It has new nice features not yet included to Psi."
ewarn "Take a look at homepage for more info: 
http://psi-plus.com/;
-   echo
 
if use iconsets; then
-   echo
+   ewarn
ewarn "Some artwork is from open source projects, but 
some is provided 'as-is'"
ewarn "and has not clear licensing."
ewarn "Possibly this build is not redistributable in 
some countries."
@@ -168,7 +166,7 @@ src_install() {
emake INSTALL_ROOT="${D}" install
 
# this way the docs will be installed in the standard gentoo dir
-   rm "${ED}"/usr/share/${MY_PN}/{COPYING,README.html} || die "Installed 
file set seems to be changed by upstream"
+   rm "${ED}"/usr/share/${MY_PN}/{COPYING,README.html} || die "doc files 
set seems to have changed"
newdoc iconsets/roster/README README.roster
newdoc iconsets/system/README README.system
newdoc certs/README README.certs



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

2018-11-13 Thread Andreas Sturmlechner
commit: f4a9121d33f7840aad61e232b9cf8971403ac30f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 13 11:24:48 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 13 11:32:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a9121d

net-im/psi: Fix psi-l10n Manifest

Tarball respun (?).

Closes: https://bugs.gentoo.org/671048
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index b34f42685fd..f46215ca370 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,2 +1,2 @@
 DIST psi-1.4.tar.xz 2119840 BLAKE2B 
28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8
 SHA512 
9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
-DIST psi-l10n-1.4.tar.gz 2991451 BLAKE2B 
628aaa1b8e3a31f958ed355edce4a6495085b6d978cd611bcb3b00af0d6e6b0d893cafde3d9a8253279645e6fb6a056fe5e701ac36c68bf9fed642b026a2642c
 SHA512 
53dcec52493319e28c473e2e7765341b10451e390c317bb13b8c8d165e9cef4eb1099a87910dacfc9444a8f9df029a98e380ab8f4529c6d2830734328b834915
+DIST psi-l10n-1.4.tar.gz 3037957 BLAKE2B 
2f61c60ee5bc323323ae98ab2eee7d2afec9462850f038fe72816810ef572e4a71a3647f83e09bf948485f56dfbc8dd3bea0a24f6258b13f08867319ca65deea
 SHA512 
ef87a12dd992adcfe5fdc4e88c1d33d6fcd77b2554963e1563cee7ba650d096c3b074795a1a9e650945b1dc46a4936f9520ecd864559b1531cb31763399c258d



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

2018-11-04 Thread Andreas Sturmlechner
commit: 632066f854f558e60b3b60a0a7f8efe39493cf8d
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Fri Nov  2 20:48:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov  4 20:33:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632066f8

net-im/psi-: updated according to upstream changes

Signed-off-by: Sergey Ilinykh  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/psi-.ebuild | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 6e5d6038e68..504d2fa256f 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.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 sql ssl 
webengine webkit whiteboarding xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql 
webengine webkit whiteboarding xscreensaver"
 
 REQUIRED_USE="
?? ( aspell enchant hunspell )
@@ -30,29 +30,28 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-   app-crypt/qca:2[qt5(+)]
+   app-crypt/qca:2[ssl]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
+   dev-qt/qtsql:5[sqlite]
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
dev-qt/qtxml:5
-   net-dns/libidn
+   net-dns/libidn:0
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 )
-   extras? (
-   sql? ( dev-qt/qtsql:5 )
-   )
hunspell? ( app-text/hunspell:= )
webengine? (
dev-qt/qtwebchannel:5
dev-qt/qtwebengine:5[widgets]
+   net-libs/http-parser
)
webkit? ( dev-qt/qtwebkit:5 )
whiteboarding? ( dev-qt/qtsvg:5 )
@@ -65,8 +64,7 @@ DEPEND="${RDEPEND}
extras? ( >=sys-devel/qconf-2.4 )
 "
 PDEPEND="
-   crypt? ( app-crypt/qca[gpg] )
-   ssl? ( app-crypt/qca:2[ssl] )
+   dev-qt/qtimageformats
 "
 
 RESTRICT="test iconsets? ( bindist )"
@@ -170,11 +168,11 @@ src_install() {
emake INSTALL_ROOT="${D}" install
 
# this way the docs will be installed in the standard gentoo dir
-   rm "${ED}"/usr/share/${MY_PN}/{COPYING,README} || die "Installed file 
set seems to be changed by upstream"
+   rm "${ED}"/usr/share/${MY_PN}/{COPYING,README.html} || die "Installed 
file set seems to be changed by upstream"
newdoc iconsets/roster/README README.roster
newdoc iconsets/system/README README.system
newdoc certs/README README.certs
-   dodoc README
+   dodoc README.html
 
use doc && HTML_DOCS=( doc/api/. )
einstalldocs
@@ -193,6 +191,7 @@ src_install() {
 pkg_postinst() {
gnome2_icon_cache_update
xdg_desktop_database_update
+   einfo "For GPG support make sure app-crypt/qca is compiled with gpg USE 
flag."
 }
 
 pkg_postrm() {



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

2018-11-04 Thread Andreas Sturmlechner
commit: 519bf48e2f03e1c17c1319d256bbb09e113f2dc8
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Fri Nov  2 20:48:23 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov  4 20:33:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519bf48e

net-im/psi: removed broken/outdated 1.3 version

Signed-off-by: Sergey Ilinykh  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/psi-1.3-r1.ebuild | 125 ---
 1 file changed, 125 deletions(-)

diff --git a/net-im/psi/psi-1.3-r1.ebuild b/net-im/psi/psi-1.3-r1.ebuild
deleted file mode 100644
index ed3aa9cca4b..000
--- a/net-im/psi/psi-1.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit l10n qmake-utils xdg-utils
-
-DESCRIPTION="Qt XMPP client"
-HOMEPAGE="https://psi-im.org;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-   https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> 
psi-l10n-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aspell crypt dbus debug doc enchant +hunspell ssl webengine webkit 
whiteboarding xscreensaver"
-
-# qconf generates not quite compatible configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-REQUIRED_USE="
-   ?? ( aspell enchant hunspell )
-   webengine? ( !webkit )
-"
-
-RDEPEND="
-   app-crypt/qca:2[qt5(+)]
-   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/qtwebchannel-5.7:5
-   >=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:5
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )
-"
-PDEPEND="
-   crypt? ( app-crypt/qca[gpg] )
-   ssl? ( app-crypt/qca:2[ssl] )
-"
-
-RESTRICT="test"
-
-src_configure() {
-   CONF=(
-   --no-separate-debug-info
-   --qtdir="$(qt5_get_bindir)/.."
-   $(use_enable aspell)
-   $(use_enable dbus qdbus)
-   $(use_enable enchant)
-   $(use_enable hunspell)
-   $(use_enable xscreensaver xss)
-   $(use_enable whiteboarding)
-   )
-
-   use debug && CONF+=("--debug")
-   use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
-   use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
-
-   econf "${CONF[@]}"
-
-   eqmake5 psi.pro
-}
-
-src_compile() {
-   emake
-   use doc && emake -C doc api_public
-}
-
-src_install() {
-   emake INSTALL_ROOT="${D}" install
-
-   # this way the docs will be installed in the standard gentoo dir
-   rm "${ED}"/usr/share/psi/{COPYING,README} || die "Installed file set 
seems to be changed by upstream"
-   newdoc iconsets/roster/README README.roster
-   newdoc iconsets/system/README README.system
-   newdoc certs/README README.certs
-   dodoc README
-
-   use doc && HTML_DOCS=( doc/api/. )
-   einstalldocs
-
-   # install translations
-   local mylrelease="$(qt5_get_bindir)"/lrelease
-   cd "${WORKDIR}/psi-l10n-${PV}" || die
-   insinto /usr/share/psi
-   install_locale() {
-   "${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease 
${1} failed"
-   doins "translations/${PN}_${1}.qm"
-   }
-   l10n_for_each_locale_do install_locale
-}
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-}



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

2018-11-04 Thread Andreas Sturmlechner
commit: 9fe9ff4461f87d1fb042ac7d0b3c330453958e6f
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Fri Nov  2 20:47:23 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov  4 20:33:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe9ff44

net-im/psi: 1.4 version bump

Signed-off-by: Sergey Ilinykh  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10323
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-im/psi/Manifest   |   4 +-
 net-im/psi/psi-1.4.ebuild | 124 ++
 2 files changed, 126 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 4b829442f0f..b34f42685fd 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,2 +1,2 @@
-DIST psi-1.3.tar.xz 2143076 BLAKE2B 
88b930d06c3a42519d9500148bd8a4300917d3db8b11cd45eb36e3a340f46c0776f3d8d5d5ddbf15f7ff78e3da89f011b19e2b7e8ccf973bb20fa6407cdfcd24
 SHA512 
b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe
-DIST psi-l10n-1.3.tar.gz 2991441 BLAKE2B 
78fac27c069c097189b01594320aa139af5e66baf57de7e9fe58bd216281ba201d14737fcf5b3fe669ad706ae32dfb1d3d2d15801d212bcc02b4aefe41116d52
 SHA512 
22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090
+DIST psi-1.4.tar.xz 2119840 BLAKE2B 
28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8
 SHA512 
9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
+DIST psi-l10n-1.4.tar.gz 2991451 BLAKE2B 
628aaa1b8e3a31f958ed355edce4a6495085b6d978cd611bcb3b00af0d6e6b0d893cafde3d9a8253279645e6fb6a056fe5e701ac36c68bf9fed642b026a2642c
 SHA512 
53dcec52493319e28c473e2e7765341b10451e390c317bb13b8c8d165e9cef4eb1099a87910dacfc9444a8f9df029a98e380ab8f4529c6d2830734328b834915

diff --git a/net-im/psi/psi-1.4.ebuild b/net-im/psi/psi-1.4.ebuild
new file mode 100644
index 000..c32424e600c
--- /dev/null
+++ b/net-im/psi/psi-1.4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="Qt XMPP client"
+HOMEPAGE="https://psi-im.org;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+   https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> 
psi-l10n-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aspell crypt dbus debug doc enchant +hunspell webengine webkit 
whiteboarding xscreensaver"
+
+REQUIRED_USE="
+   ?? ( aspell enchant hunspell )
+   webengine? ( !webkit )
+"
+
+RDEPEND="
+   app-crypt/qca:2[ssl]
+   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:0
+   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/qtwebchannel:5
+   dev-qt/qtwebengine:5[widgets]
+   )
+   webkit? ( dev-qt/qtwebkit:5 )
+   whiteboarding? ( dev-qt/qtsvg:5 )
+   xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test"
+
+src_configure() {
+   CONF=(
+   --prefix="${EPREFIX}"/usr
+   --libdir="${EPREFIX}"/usr/$(get_libdir)
+   --no-separate-debug-info
+   --qtdir="$(qt5_get_bindir)/.."
+   $(use_enable aspell)
+   $(use_enable dbus qdbus)
+   $(use_enable enchant)
+   $(use_enable hunspell)
+   $(use_enable xscreensaver xss)
+   $(use_enable whiteboarding)
+   )
+
+   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
+   # future qconf versions.
+   ./configure "${CONF[@]}" || die "configure failed"
+
+   eqmake5 psi.pro
+}
+
+src_compile() {
+   emake
+   use doc && emake -C doc api_public
+}
+
+src_install() {
+   emake INSTALL_ROOT="${D}" install
+
+ 

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

2018-05-16 Thread Mikle Kolyada
commit: 04479b7e73ab9071e416e5f90dbc0a245c02acd6
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed May 16 14:49:46 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May 16 22:05:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04479b7e

net-im/psi: use HTTPS

Closes: https://github.com/gentoo/gentoo/pull/8433

 net-im/psi/psi-1.3-r1.ebuild | 2 +-
 net-im/psi/psi-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/psi-1.3-r1.ebuild b/net-im/psi/psi-1.3-r1.ebuild
index 83b51354079..ed3aa9cca4b 100644
--- a/net-im/psi/psi-1.3-r1.ebuild
+++ b/net-im/psi/psi-1.3-r1.ebuild
@@ -9,7 +9,7 @@ PLOCALE_BACKUP="en"
 inherit l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt XMPP client"
-HOMEPAGE="http://psi-im.org/;
+HOMEPAGE="https://psi-im.org;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> 
psi-l10n-${PV}.tar.gz"
 

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 59adb230419..6e5d6038e68 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -9,7 +9,7 @@ PLOCALE_BACKUP="en"
 inherit l10n git-r3 qmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Qt XMPP client"
-HOMEPAGE="http://psi-im.org/;
+HOMEPAGE="https://psi-im.org;
 
 PSI_URI="https://github.com/psi-im;
 PSI_PLUS_URI="https://github.com/psi-plus;



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

2018-03-22 Thread Andreas Sturmlechner
commit: 8e9b5b0fa2d83f4af3a572d5baaf29341aa6534b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 22 11:13:04 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 22 12:16:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9b5b0f

net-im/psi: Prepare for app-crypt/qca w/o USE=qt5

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-im/psi/{psi-1.3.ebuild => psi-1.3-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/psi-1.3.ebuild b/net-im/psi/psi-1.3-r1.ebuild
similarity index 97%
rename from net-im/psi/psi-1.3.ebuild
rename to net-im/psi/psi-1.3-r1.ebuild
index 3d47e6fece4..83b51354079 100644
--- a/net-im/psi/psi-1.3.ebuild
+++ b/net-im/psi/psi-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-   app-crypt/qca:2[qt5]
+   app-crypt/qca:2[qt5(+)]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5



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

2018-03-22 Thread Andreas Sturmlechner
commit: ad7b8bee5dcf274c5a6ecfaac645f36dc34661b6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 22 11:13:20 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 22 12:16:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7b8bee

net-im/psi: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-im/psi/Manifest   |   2 -
 net-im/psi/psi-1.2.ebuild | 126 --
 2 files changed, 128 deletions(-)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 16ee33c8b1f..4b829442f0f 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,4 +1,2 @@
-DIST psi-1.2.tar.xz 2138940 BLAKE2B 
6b562f1674b01976700e60384e5f7dceffacc825b4ccfebc8015594c82ff3ade583c6520a914b7d4ae02b5771432bc990f94cd6ebe121c749aae7995053cf150
 SHA512 
a486f6ee910cc17157849a68aa724608ddbeed319511646f6973a0789da192ec0fed7899024ad169c5b0e604372025dad7a58bacd223723d35ea490ec7f00b20
 DIST psi-1.3.tar.xz 2143076 BLAKE2B 
88b930d06c3a42519d9500148bd8a4300917d3db8b11cd45eb36e3a340f46c0776f3d8d5d5ddbf15f7ff78e3da89f011b19e2b7e8ccf973bb20fa6407cdfcd24
 SHA512 
b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe
-DIST psi-l10n-1.2.tar.gz 2992381 BLAKE2B 
abe25db86780ef436241bf71597e13e1223bc72c3de8a57b75697140933c27248e446ae870887f186a44b891c780daa868f05975a7c66a2c9f8ac1b67927965c
 SHA512 
946b86d12e76fe9a44f1adc154140a02f3d575e57b5f67c8d95472241c6d4510d1b4be81d8914d5670b15ea8ad1b836aa63fc62c3de94e0091b39e2fb234a130
 DIST psi-l10n-1.3.tar.gz 2991441 BLAKE2B 
78fac27c069c097189b01594320aa139af5e66baf57de7e9fe58bd216281ba201d14737fcf5b3fe669ad706ae32dfb1d3d2d15801d212bcc02b4aefe41116d52
 SHA512 
22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090

diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
deleted file mode 100644
index 92f7233fa5a..000
--- a/net-im/psi/psi-1.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit l10n qmake-utils xdg-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 webengine webkit 
whiteboarding xscreensaver"
-
-# qconf generates not quite compatible configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-REQUIRED_USE="
-   ?? ( aspell enchant hunspell )
-   webengine? ( !webkit )
-"
-
-RDEPEND="
-   app-crypt/qca:2[qt5]
-   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/qtwebchannel-5.7:5
-   >=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:5
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )
-"
-PDEPEND="
-   crypt? ( app-crypt/qca[gpg] )
-   ssl? ( app-crypt/qca:2[ssl] )
-"
-
-RESTRICT="test"
-
-src_configure() {
-   CONF=(
-   --no-separate-debug-info
-   --qtdir="$(qt5_get_bindir)/.."
-   $(use_enable aspell)
-   $(use_enable dbus qdbus)
-   $(use_enable enchant)
-   $(use_enable hunspell)
-   $(use_enable xscreensaver xss)
-   $(use_enable whiteboarding)
-   )
-
-   use debug && CONF+=("--debug")
-   use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
-   use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
-
-   econf "${CONF[@]}"
-
-   eqmake5 psi.pro
-}
-
-src_compile() {
-   emake
-   use doc && emake -C doc api_public
-}
-
-src_install() {
-   emake INSTALL_ROOT="${D}" install
-
-   # this way the docs will be installed in the standard gentoo dir
-   rm "${ED}"/usr/share/psi/{COPYING,README} || die "Installed file set 
seems to be changed by upstream"
-   newdoc iconsets/roster/README README.roster
-   newdoc iconsets/system/README 

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

2018-03-03 Thread Michał Górny
commit: 15309264e4ec6211fc6471512e6c787f44653d86
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Fri Dec 22 07:47:05 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar  3 13:19:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15309264

net-im/psi: qconf dependency raised to 2.4

to fix compatibility with Qt-5.10

Also changed desktop icons cache regeneration.

Closes: https://bugs.gentoo.org/630466
Closes: https://github.com/gentoo/gentoo/pull/6597
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-im/psi/psi-.ebuild | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index e6240c96afa..59adb230419 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n git-r3 qmake-utils xdg-utils
+inherit l10n git-r3 qmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="http://psi-im.org/;
@@ -22,9 +22,6 @@ SLOT="0"
 KEYWORDS=""
 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=".*"
-
 REQUIRED_USE="
?? ( aspell enchant hunspell )
iconsets? ( extras )
@@ -65,7 +62,7 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
virtual/pkgconfig
doc? ( app-doc/doxygen )
-   extras? ( >=sys-devel/qconf-2.3 )
+   extras? ( >=sys-devel/qconf-2.4 )
 "
 PDEPEND="
crypt? ( app-crypt/qca[gpg] )
@@ -140,6 +137,8 @@ src_prepare() {
 
 src_configure() {
CONF=(
+   --prefix="${EPREFIX}"/usr
+   --libdir="${EPREFIX}"/usr/$(get_libdir)
--no-separate-debug-info
--qtdir="$(qt5_get_bindir)/.."
$(use_enable aspell)
@@ -154,7 +153,10 @@ src_configure() {
use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
 
-   econf "${CONF[@]}"
+   # 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
+   # future qconf versions.
+   ./configure "${CONF[@]}" || die "configure failed"
 
eqmake5 psi.pro
 }
@@ -188,12 +190,12 @@ src_install() {
l10n_for_each_locale_do install_locale
 }
 
-pkg_postinst(){
-   xdg_mimeinfo_database_update
+pkg_postinst() {
+   gnome2_icon_cache_update
xdg_desktop_database_update
 }
 
 pkg_postrm() {
+   gnome2_icon_cache_update
xdg_desktop_database_update
-   xdg_mimeinfo_database_update
 }



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

2018-02-22 Thread Andreas Sturmlechner
commit: a1690aa30fc461e841889f86a40143aa61847307
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 22 13:12:19 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 18:27:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1690aa3

net-im/psi: Relax app-crypt/qca qt5-usedep

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-im/psi/psi-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 20f9be17efa..e6240c96afa 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-   app-crypt/qca:2[qt5]
+   app-crypt/qca:2[qt5(+)]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -54,8 +54,8 @@ RDEPEND="
)
hunspell? ( app-text/hunspell:= )
webengine? (
-   >=dev-qt/qtwebchannel-5.7:5
-   >=dev-qt/qtwebengine-5.7:5[widgets]
+   dev-qt/qtwebchannel:5
+   dev-qt/qtwebengine:5[widgets]
)
webkit? ( dev-qt/qtwebkit:5 )
whiteboarding? ( dev-qt/qtsvg:5 )



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

2017-09-24 Thread Andreas Sturmlechner
commit: 667a418874b6d0182913da37cbf97f07ef84cdfc
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Sun Sep 24 10:38:30 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 24 11:57:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667a4188

net-im/psi: 1.3 version bump and cache fixes

Added calls to update icons/desktop cache on install/uninstall.

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5782

 net-im/psi/Manifest   |  2 ++
 net-im/psi/psi-1.2.ebuild | 13 -
 net-im/psi/{psi-1.2.ebuild => psi-1.3.ebuild} | 14 --
 net-im/psi/psi-.ebuild| 12 +++-
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 4890f31fdc4..3db78776f9e 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,2 +1,4 @@
 DIST psi-1.2.tar.xz 2138940 SHA256 
16ce1b767d40453032cd5d9ad5a9d4c6dba43989acc9a09538da3f74b7c614f5 SHA512 
a486f6ee910cc17157849a68aa724608ddbeed319511646f6973a0789da192ec0fed7899024ad169c5b0e604372025dad7a58bacd223723d35ea490ec7f00b20
 WHIRLPOOL 
2a0f37067a085b3ce93864905367fa56584666bee6697bdae8f4eedd74cdf15f7be9eee85ba23440cb39a11e384e5ce7218a408042203fe70b398058a69b7867
+DIST psi-1.3.tar.xz 2143076 SHA256 
59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b SHA512 
b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe
 WHIRLPOOL 
4fdccf0b730e86a2b44c417ffdb83e0f5acab714e8a00badfed6b3095159a10c11bd8ab1a5656172e12920ff72e20178eca93257974d538152cff7cf49424e47
 DIST psi-l10n-1.2.tar.gz 2992381 SHA256 
8a16c2d67c0aafbaa296fe06cd6b7de5f32683487b10245b10e8baae63b8f789 SHA512 
946b86d12e76fe9a44f1adc154140a02f3d575e57b5f67c8d95472241c6d4510d1b4be81d8914d5670b15ea8ad1b836aa63fc62c3de94e0091b39e2fb234a130
 WHIRLPOOL 
6cd52e0dcd76f7df3137055de9d9e4518b1adfb8d6f03e9af59e0a49b01933c400d15671b252ea529543eab8f14aae34be8432c43bb28d9233f57833c0517718
+DIST psi-l10n-1.3.tar.gz 2991441 SHA256 
122fb6e45e511fe96d8a84beb86e8e6fcb11500f468f9e97b52fddf193041378 SHA512 
22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090
 WHIRLPOOL 
6aa0b6bbba0feceda1ca38bcff0166d3e6e0ed2b81bfd15bdfeabfac29411f114fbc7a6c27650a7e00f5b89bd53ef47763fd7013cd3cd9233a01612181e7b4c8

diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
index 322c0c6e284..92f7233fa5a 100644
--- a/net-im/psi/psi-1.2.ebuild
+++ b/net-im/psi/psi-1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n qmake-utils
+inherit l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="http://psi-im.org/;
@@ -113,3 +113,14 @@ src_install() {
}
l10n_for_each_locale_do install_locale
 }
+
+pkg_postinst()
+{
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+}

diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.3.ebuild
similarity index 90%
copy from net-im/psi/psi-1.2.ebuild
copy to net-im/psi/psi-1.3.ebuild
index 322c0c6e284..3d47e6fece4 100644
--- a/net-im/psi/psi-1.2.ebuild
+++ b/net-im/psi/psi-1.3.ebuild
@@ -6,12 +6,12 @@ EAPI=6
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n qmake-utils
+inherit l10n qmake-utils xdg-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"
+   https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> 
psi-l10n-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -113,3 +113,13 @@ src_install() {
}
l10n_for_each_locale_do install_locale
 }
+
+pkg_postinst() {
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
+}

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 56868b48352..20f9be17efa 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n git-r3 qmake-utils
+inherit l10n git-r3 qmake-utils xdg-utils
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="http://psi-im.org/;
@@ -187,3 +187,13 @@ src_install() {
}
l10n_for_each_locale_do install_locale
 }
+
+pkg_postinst(){
+   

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

2017-08-02 Thread Andreas Sturmlechner
commit: f5008d2db6e6b253a5bf489b4660e3d2892b8603
Author: Rion  gmail  com>
AuthorDate: Tue Aug  1 18:17:03 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  2 06:31:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5008d2d

net-im/psi: fixed wrong path to new history patch

Closes: https://github.com/gentoo/gentoo/pull/5268

 net-im/psi/psi-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 4e97fcbcbc1..56868b48352 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -126,7 +126,7 @@ src_prepare() {
fi
 
eapply "${WORKDIR}/psi-plus/patches"/*.diff
-   use sql && eapply "${PATCHES_DIR}/dev/psi-new-history.patch"
+   use sql && eapply 
"${WORKDIR}/psi-plus/patches/dev/psi-new-history.patch"
 
vergen="${WORKDIR}/psi-plus/admin/psi-plus-nightly-version"
features="$(use webkit && echo '--webkit') $(use webengine && 
echo '--webengine') $(use sql && echo '--sql')"



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

2017-07-31 Thread Andreas Sturmlechner
commit: b6dd5349d481634e89c1952c0c3430a5cdf9db4d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 31 22:09:48 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 31 22:19:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6dd5349

net-im/psi: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-im/psi/Manifest   |  14 ---
 net-im/psi/files/psi-0.14-drop-debug-cflags.patch |  35 --
 net-im/psi/files/psi-0.15-qconf-2.patch   |  87 ---
 net-im/psi/psi-0.15.ebuild| 130 --
 4 files changed, 266 deletions(-)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 0657c8710cb..4890f31fdc4 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,16 +1,2 @@
-DIST psi-0.15.tar.bz2 1984777 SHA256 
593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6 SHA512 
17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a
 WHIRLPOOL 
6a8953fe22342dca7347af78da3ea80d5a61a14caa6d62d6910b81730b07b76f156d8d5e1331b2a96dabe5a261353da7af565d999bc7246c25d0d88e010fd983
-DIST psi-0.15_be.qm 255759 SHA256 
0e9dbd9e4e738c8fcdd098dde4a17042600b35346a26d2176caa85f6253b6eb6 SHA512 
90d623abe9f031af83185fc76d35d5ac390cd726490c6722bdf9ea5b1a6e0179aca650c230280a6390cc121d0e18cb9e2bd1bfd75d9e817eb4e8584d844ed3ad
 WHIRLPOOL 
f9d531127f861e5a07659f71433a12cd1d8ad6b805efb83e2d94d219c1e718a28f1390d7025122cdc94d563de99f8f245f4c8ab0297f622ad5712cc6eb4b9667
-DIST psi-0.15_cs.qm 242386 SHA256 
d579a7059466c11d4264d8197188a9be49b82e2af35405053ea772c0edea6718 SHA512 
46eb273794a99045702f52e10aae2122dfd3db5a49bf68b27e36bf8a1443d8dfbdbcdf550dd0ac3e3ff3014e52010682880f7e883f0d1a0d41d8a678d1e16f2f
 WHIRLPOOL 
d2ae4a6045ea1072045032a726927439fe57ae8dfad813f718dd230b36a794945e0600ad1a55f0ac74d73a0d0be4ccf9ffecc5ec9e289ccef5d28566535fbe31
-DIST psi-0.15_de.qm 261756 SHA256 
a9470932306466bd41bf08975b2b36eba0c56a8f265d998700f0e929ff345bae SHA512 
3e81826215a784f1f58e633bd0fb4c0322370aa0f9c24d18ee38ff1b8a8e85e833e26349806922d1435b99433ee3296c4432a99c5fd8effc383308e168866cb0
 WHIRLPOOL 
77b7bbe300e450e53dff8a3175e21a8bae6f80ec0524c85599c37ed091c344cbbc63f829ea880f2b3e4c04e2cd06e9cf768ab0a674b9fb79e6c85b1a89290550
-DIST psi-0.15_fr.qm 269774 SHA256 
733ec88f9bfbb30e6b21358b233e39319d3ea64223b211566ce1a0b8fe370d1c SHA512 
109036baa476ad55cffd2c8109d6e99b91894eb6807ef394ea945973418af0c32641b705da172026a762e041c93b0412f61793fe6858a6c7af44bfec9c13dd1f
 WHIRLPOOL 
b51228b2ae93671aae676a0ee7519b290b6edb738f0ca8789b48a4d5b92ee8b32f99675c5f64cf5575a2d4cbbd5ea50e0001f3e06081914fc5a3d003f6f082c0
-DIST psi-0.15_it.qm 257779 SHA256 
16d17cc5578f0ef6e8b2ac8dc433e7e050255014d41f2a56651f968829d2a991 SHA512 
0cff1398248f7a4802f883cb912e46f27782556e675cc742af4c257910d029237849ce2cb49413f6464b7808296ea2079e5be6d5eb98b39d0dccb8e93d8d89a4
 WHIRLPOOL 
5e02f342f31518197477055293ae6c4e7c51931c5f985b1d46dadf7b6ef3fcb0a9af4ffe1766d7aeadab82e4f3a45b563cd88cabecf8ef49ebef3e5b56d1d3d6
-DIST psi-0.15_ja.qm 195566 SHA256 
e77209493428ae06581e91435eb05ff96f442b60481dbd1a0a1d340e7ba5afc9 SHA512 
e34abc4a64832cd7b4d5292a9de3d4a6e58742aa4f3fc2c0ebe60ee14e89bd8ab37b2706ea3faab6b6e7108f4bfcf7c220aae018710fa041930f23efc410ae43
 WHIRLPOOL 
df8acef571d5686f8947e5a92ba4b4ad78cf64cae5ec205ad85c3fb926b18738ac779c30ff51dadc67853a20ffbfc827022adceef4ecdb2271955889658378fd
-DIST psi-0.15_pl.qm 258292 SHA256 
abb03e2ef132a343991bdc7b437fe38d24ae77a2ad39500202d645408b919f40 SHA512 
8f7b5012a9d68ef50f53e4b8e3671f1cd78eb30f9a464d99225f6f5d3abeb5cea1e941255d7f8729f664d016b89cf42ceb9bd18e3a7b0d68bd4d62954abc6cb0
 WHIRLPOOL 
1e9c8637b6753286c159dc73d80326fc2ecaf70a5e1bf92c569aeb74192bbd63e7e0e35e69f518f11599cd5828168b2e0a6280f770f9189c811fbe8a9480237f
-DIST psi-0.15_pt_BR.qm 254917 SHA256 
b85d2355ebe32cd38ff091fce0444e4fc584c8a6e59c215d820dcc57fd99e3d4 SHA512 
c138b1506d60bc2934dea8f06a34dc2f81c2d7cf8a5c35d95b3bd28a0a77a58f4d7e74d2bf13c55f49bd824d7c262087d14c8fcb9e341a42a966fd782d34a394
 WHIRLPOOL 
c710deaa983f772233d39c719b6b65c929533f816b03745337ecbaff3bd69599b721d82748d81612c53e08ede1e03bb6984619823d1c0c2b0a08d2d230b52d79
-DIST psi-0.15_ru.qm 241491 SHA256 
24fd952eb457ee20778f8fa2d7486521ec00571743aa1df51ad63ceb6f368527 SHA512 
876695f2501661554a865873f11ad7a466ce96e4b3f896c7b3c1e049647d9968e88f9ea893d4aace8837d4387a936973b2fd36e1034b6856d45bd73088446176
 WHIRLPOOL 
cb18bd74ed3eec6071531c468cdc972e448ad34f79f092c981a13a24f05f2100ec3660dce59033a439733eb0a35dde6cb14c2506b96c16f9ff78e1c4af3527fc
-DIST psi-0.15_sl.qm 248478 SHA256 
5be33716a12b297d609ec7493f9da21a23b3ab89303dc6be62a2240c0992adec SHA512 
5aa316f05441524b16803a78f394b7e823c2019fb2828dc83b0cdab1b8eb0d8da2b8f3496aa34381bcea17bb7225a67582ff3f5321011bce4dae499aafdf76d6
 WHIRLPOOL 

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

2017-07-31 Thread Andreas Sturmlechner
commit: 6e33d5103d8bb1eaba137961a24dcdbad08e9653
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 31 21:56:12 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 31 21:56:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e33d510

net-im/psi: Fix copy-paste error

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-im/psi/psi-1.2.ebuild  | 2 +-
 net-im/psi/psi-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
index aaf4448da8a..322c0c6e284 100644
--- a/net-im/psi/psi-1.2.ebuild
+++ b/net-im/psi/psi-1.2.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
enchant? ( >=app-text/enchant-1.3.0 )
hunspell? ( app-text/hunspell:= )
webengine? (
-   >=dev-qt/qtwebchannel-5.7:5[widgets]
+   >=dev-qt/qtwebchannel-5.7:5
>=dev-qt/qtwebengine-5.7:5[widgets]
)
webkit? ( dev-qt/qtwebkit:5 )

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 13d5a8e30df..4e97fcbcbc1 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
)
hunspell? ( app-text/hunspell:= )
webengine? (
-   >=dev-qt/qtwebchannel-5.7:5[widgets]
+   >=dev-qt/qtwebchannel-5.7:5
>=dev-qt/qtwebengine-5.7:5[widgets]
)
webkit? ( dev-qt/qtwebkit:5 )



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

2017-07-31 Thread Andreas Sturmlechner
commit: e32db49b7a035c6794acab427c762a83a1ceaec9
Author: Sergey Ilinykh  gmail  com>
AuthorDate: Mon Jul 31 19:29:40 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 31 21:19:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32db49b

net-im/psi: 1.2 version bump, switch to Qt5

Gentoo-bug: 511462, 532170, 564446, 620772, 626216

Closes: https://github.com/gentoo/gentoo/pull/5219

 net-im/psi/Manifest|   2 +
 net-im/psi/metadata.xml|  27 --
 net-im/psi/psi-1.2.ebuild  | 107 ++
 net-im/psi/psi-.ebuild | 222 -
 4 files changed, 224 insertions(+), 134 deletions(-)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index edd5f48f055..0657c8710cb 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -12,3 +12,5 @@ DIST psi-0.15_sl.qm 248478 SHA256 
5be33716a12b297d609ec7493f9da21a23b3ab89303dc6
 DIST psi-0.15_sv.qm 246214 SHA256 
fc5822011ada2b7452c9d15baf74c90e1a58e05536e9a7cc1d81e163f44d3ca2 SHA512 
b8dd5e7692512af5ec302b5fee562feb68292988160d1c9e4fac951562bd8b30bc1f67f4d39bbd437eee84b14f6aefd83a8666f0e77d02b539d65e89aee7c1aa
 WHIRLPOOL 
6078437c20881babb731d8915952b40d415e5cc01ab7431be1930fbe887289988abc7ef9a76e09254ad8519146bd94633eba69872bee7cdb504dfc3237f1c1d0
 DIST psi-0.15_ur_PK.qm 244903 SHA256 
0101370007c9ce735c50dd9bf6dfd8680c5cd562a3213b960ee507367582b3e6 SHA512 
df0786f1b625ecc3144bb9be0ce51558ae45901213405997b5f8ea3c791c64328b049a48a1b88372f7b0cb5bde3b795b306ad16847d91933eedc233f8dea8bc2
 WHIRLPOOL 
3dc2f807d5e1dce36609854e9360d9521a7fe36d61161a2c0cf195bf58e21a4efa9b8d977a6503f41588d8befb06ca678e6e629168c93f0ab90f0ec42ffe98a5
 DIST psi-0.15_zh_TW.qm 171993 SHA256 
a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 
69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871
 WHIRLPOOL 
2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344
+DIST psi-1.2.tar.xz 2138940 SHA256 
16ce1b767d40453032cd5d9ad5a9d4c6dba43989acc9a09538da3f74b7c614f5 SHA512 
a486f6ee910cc17157849a68aa724608ddbeed319511646f6973a0789da192ec0fed7899024ad169c5b0e604372025dad7a58bacd223723d35ea490ec7f00b20
 WHIRLPOOL 
2a0f37067a085b3ce93864905367fa56584666bee6697bdae8f4eedd74cdf15f7be9eee85ba23440cb39a11e384e5ce7218a408042203fe70b398058a69b7867
+DIST psi-l10n-1.2.tar.gz 2992381 SHA256 
8a16c2d67c0aafbaa296fe06cd6b7de5f32683487b10245b10e8baae63b8f789 SHA512 
946b86d12e76fe9a44f1adc154140a02f3d575e57b5f67c8d95472241c6d4510d1b4be81d8914d5670b15ea8ad1b836aa63fc62c3de94e0091b39e2fb234a130
 WHIRLPOOL 
6cd52e0dcd76f7df3137055de9d9e4518b1adfb8d6f03e9af59e0a49b01933c400d15671b252ea529543eab8f14aae34be8432c43bb28d9233f57833c0517718

diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index ca58cd3e904..952c3d3370d 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,16 +1,25 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   Psi is a very good jabber client that uses 
QT
+   
+   rion...@gmail.com
+   Sergey Ilinykh
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   Psi is a very good XMPP client that uses 
QT

-   Use enchant spell engine instead of 
aspell
-   Enables extra non official patches
-   Install additional iconsets, some of them 
has not clear licensing
-   Enable plugins support
-   Disable some non critical timers for 
much less CPU usage
-   Enable experimental interactive SVG 
drawing
-   Use X screensaver protocol extension 
to monitor idle/active status based on mouse/keyboard events
+   Enable spellchecking using 
app-text/aspell
+   Enable spellchecking using 
app-text/enchant
+   Enable Psi+ patcheset
+   Enable spellchecking using 
app-text/hunspell
+   Install additional iconsets, some of them 
has not clear licensing
+   Enable psi-new-history extras patch
+   Use dev-qt/qtwebengine 
instead of dev-qt/qtwebkit
+   Enable themed, html-based chatlogs
+   Enable experimental interactive SVG 
drawing


psi-im/psi

diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
new file mode 100644
index 000..b575139d37f
--- /dev/null
+++ b/net-im/psi/psi-1.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR 
ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="Qt XMPP client"

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

2017-07-31 Thread Andreas Sturmlechner
commit: 925440347629e9917a75cd44f0829c856cadf28c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 31 20:22:41 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 31 21:19:07 2017 +
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-.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-ma...@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-.ebuild b/net-im/psi/psi-.ebuild
index d08ddf5a62c..13d5a8e30df 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.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:= )
-   

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

2017-07-30 Thread Michał Górny
commit: d79134c430b6c733f495438634681ae882d21895
Author: David Hicks  hicks  id  au>
AuthorDate: Sat Jul 29 18:01:12 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 30 09:44:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79134c4

net-im/psi: use HTTPS for GitHub

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-im/psi/psi-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index e7d0af90aaf..11222802e66 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -5,12 +5,12 @@ EAPI="4"
 
 LANGS="be bg ca cs de en eo es et fi fr hu it ja mk nl pl pt pt_BR ru sk sl 
sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 
-EGIT_REPO_URI="git://github.com/psi-im/psi.git"
+EGIT_REPO_URI="https://github.com/psi-im/${PN}.git;
 EGIT_HAS_SUBMODULES=1
-LANGS_REPO_URI="git://github.com/psi-plus/psi-plus-l10n.git"
+LANGS_REPO_URI="https://github.com/psi-plus/psi-plus-l10n.git;
 
-PSI_PLUS_URI="git://github.com/psi-plus/main.git"
-PSI_PLUS_RESOURCES_URI="git://github.com/psi-plus/resources.git"
+PSI_PLUS_URI="https://github.com/psi-plus/main.git;
+PSI_PLUS_RESOURCES_URI="https://github.com/psi-plus/resources.git;
 
 inherit eutils gnome2-utils qt4-r2 multilib git-2 subversion
 



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

2017-06-04 Thread Michael Palimaka
commit: 598ab5f31af84629cd34b77cec223caf8fe718f4
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun  4 07:09:11 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun  4 07:09:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598ab5f3

net-im/psi: remove webkit USE flag

The webkit USE flag requires dev-qt/qtwebkit:4 which is ancient and will not
see further security updates.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-im/psi/metadata.xml| 1 -
 net-im/psi/psi-.ebuild | 7 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 218ba04c101..ca58cd3e904 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -9,7 +9,6 @@
Install additional iconsets, some of them 
has not clear licensing
Enable plugins support
Disable some non critical timers for 
much less CPU usage
-   Enable chatlog rendering using webkit
Enable experimental interactive SVG 
drawing
Use X screensaver protocol extension 
to monitor idle/active status based on mouse/keyboard events


diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index 822e6d9a614..e7d0af90aaf 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -20,13 +20,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="crypt dbus debug doc enchant extras jingle iconsets spell ssl 
xscreensaver powersave
-plugins whiteboarding webkit"
+plugins whiteboarding"
 
 REQUIRED_USE="
iconsets? ( extras )
plugins? ( extras )
powersave? ( extras )
-   webkit? ( extras )
 "
 
 RDEPEND="
@@ -37,7 +36,6 @@ RDEPEND="
>=sys-libs/zlib-1.2.5.1-r2[minizip]
x11-libs/libX11
dbus? ( dev-qt/qtdbus:4 )
-   extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
spell? (
enchant? ( >=app-text/enchant-1.3.0 )
!enchant? ( app-text/aspell )
@@ -148,7 +146,6 @@ src_configure() {
use xscreensaver || myconf+=" --disable-xss"
if use extras; then
use plugins && myconf+=" --enable-plugins"
-   use webkit && myconf+=" --enable-webkit"
fi
 
einfo "./configure ${myconf}"



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

2017-03-26 Thread Andreas Sturmlechner
commit: 42f9dec3f816d75bed4b4a0421f93f00452924cd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 26 09:40:13 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 26 09:40:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f9dec3

net-im/psi: Configure with --no-separate-debug-info

Gentoo-bug: 575668

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-im/psi/psi-0.15.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 2c60b4f0e87..7f771ecfb55 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -64,6 +64,7 @@ src_configure() {
--prefix=/usr
--qtdir=/usr
--disable-growl
+   --no-separate-debug-info
$(use dbus || echo '--disable-qdbus')
$(use debug && echo '--debug')
$(use spell || echo '--disable-aspell')



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

2017-03-26 Thread Andreas Sturmlechner
commit: 21c97726630815a43c1d60684baf7a1eca674853
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 26 09:45:18 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 26 09:45:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c97726

net-im/psi: metadata.xml fix upstream, indentation

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-im/psi/metadata.xml | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 198e9603b41..76be332734e 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,19 +1,19 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  Psi is a very good jabber client that uses 
QT
-  
-Use enchant spell engine instead of aspell
-Enables extra non official patches
-Install additional iconsets, some of them has not 
clear licensing
-Enable plugins support
-Disable some non critical timers for much less CPU 
usage
-Enable chatlog rendering using webkit
-Enable experimental interactive SVG 
drawing
-Use X screensaver protocol extension to monitor 
idle/active status based on mouse/keyboard events
-  
-  
-psi
-  
+   
+   Psi is a very good jabber client that uses 
QT
+   
+   Use enchant spell engine instead of 
aspell
+   Enables extra non official patches
+   Install additional iconsets, some of them 
has not clear licensing
+   Enable plugins support
+   Disable some non critical timers for 
much less CPU usage
+   Enable chatlog rendering using webkit
+   Enable experimental interactive SVG 
drawing
+   Use X screensaver protocol extension 
to monitor idle/active status based on mouse/keyboard events
+   
+   
+   psi-im/psi
+   
 



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

2017-03-26 Thread Andreas Sturmlechner
commit: c61e8ac69f13196253142b90d46346c28c57c67f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 26 09:20:39 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 26 09:24:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61e8ac6

net-im/psi: Fix configure w/ >=qconf-2.0

Thanks-to: Rion  gmail.com>
Gentoo-bug: 607644

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-im/psi/files/psi-0.15-qconf-2.patch | 87 +
 net-im/psi/psi-0.15.ebuild  |  3 +-
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/net-im/psi/files/psi-0.15-qconf-2.patch 
b/net-im/psi/files/psi-0.15-qconf-2.patch
new file mode 100644
index 000..fb62e66f726
--- /dev/null
+++ b/net-im/psi/files/psi-0.15-qconf-2.patch
@@ -0,0 +1,87 @@
+--- a/qcm/recursiveprl.qcm
 a/qcm/recursiveprl.qcm
+@@ -39,10 +39,11 @@ public:
+   return false;
+   }
+ 
++  QFileInfo fi(qc_getenv("QC_COMMAND"));
+   QStringList args;
+   args += "-prl";
+   args += "-r";
+-  args += qc_getenv("QC_PROFILE");
++  args += fi.dir().filePath(qc_getenv("QC_PROFILE"));
+   if(conf->doCommand(conf->qmake_path, args) != 0)
+   {
+   success = false;
+@@ -91,9 +92,9 @@ public:
+   if(!conf->DEFINES.isEmpty())
+   str += "DEFINES += " + conf->DEFINES + '\n';
+   if(!conf->INCLUDEPATH.isEmpty())
+-  str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';
++  str += "INCLUDEPATH += " + conf->escapedIncludes() + 
'\n';
+   if(!conf->LIBS.isEmpty())
+-  str += "LIBS += " + conf->LIBS + '\n';
++  str += "LIBS += " + conf->escapedLibs() + '\n';
+   if(!conf->extra.isEmpty())
+   str += conf->extra;
+   str += '\n';
+--- a/qcm/zlib.qcm 
 a/qcm/zlib.qcm 
+@@ -21,6 +21,8 @@ public:
+   QStringList incs;
+   QString version, libs, other;
+   QString s;
++
++
+ 
+   if(!conf->findPkgConfig("zlib", VersionAny, "", , 
, , )) {
+ 
+@@ -33,21 +35,37 @@ public:
+   if(!conf->findHeader("zlib.h", QStringList(), 
))
+   return false;
+   }
+-  incs.append(s.replace("\\\", "\\\"));
+ 
+-  s = conf->getenv("QC_WITH_ZLIB_LIB");
+-  if(!s.isEmpty()) {
+-  if(!conf->checkLibrary(s, "z"))
+-  return false;
+-  }
+-  else {
+-  if(!conf->findLibrary("z", ))
+-  return false;
++  QStringList libNames = QStringList() << "z";
++  QString libName;
++#ifdef Q_OS_WIN
++  libNames << (qc_buildmode_debug? "zlibd" : "zlib");
++#endif
++  for (;;) {
++  s = conf->getenv("QC_WITH_ZLIB_LIB");
++  if(!s.isEmpty()) {
++  foreach (const QString l, libNames)
++  if(conf->checkLibrary(s, l)) {
++  libName = l;
++  break;
++  }
++  } else {
++  foreach (const QString l, libNames)
++  if(conf->findLibrary(l, )) {
++  libName = l;
++  break;
++  }
++  }
++
++  if(!libName.isEmpty())
++  break;
++
++  return false;
+   }
+   if (!s.isEmpty()) {
+-  libs = QString("-L%1 -lz").arg(s.replace("\\\", 
"\\\"));
++  libs = QString("-L%1 -l%2").arg(s, libName);
+   } else {
+-  libs = s.isEmpty()? "-lz" : QString("-L%1 
-lz").arg(s);
++  libs = s.isEmpty()? QString("-l")+libName : 
QString("-L%1 -l%2").arg(s, libName);
+   }
+   }
+ 

diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 17f983d8341..2c60b4f0e87 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 

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

2017-03-05 Thread Göktürk Yüksek
commit: 23ee390123a3150c28d6602ce0f5343b7adb74ba
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Mon Mar  6 01:37:46 2017 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon Mar  6 01:51:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ee3901

net-im/psi: remove unresponsive proxied maintainer

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 net-im/psi/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 5c7539d5bf7..198e9603b41 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,14 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-nik...@gmx.us
-Nikoli
-  
-  
-proxy-ma...@gentoo.org
-Proxy Maintainers
-  
+  
   Psi is a very good jabber client that uses 
QT
   
 Use enchant spell engine instead of aspell



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

2016-10-28 Thread Michael Palimaka
commit: a868fa75f475f6a2d42730e8b9420479ca577f98
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Oct 28 14:33:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct 28 14:35:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a868fa75

net-im/psi: drop ppc64 to testing

Package-Manager: portage-2.3.2

 net-im/psi/psi-0.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index e3adc45..8fd8d70 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ done
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding"
 RESTRICT="test"
 



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

2016-03-23 Thread Sergey Popov
commit: 00b451406b6e59577f1dc467ab75ccc6d7644b3c
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Mar 23 13:30:21 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Mar 23 13:31:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b45140

net-im/psi: require Qt4 version of sys-devel/qconf

Package-Manager: portage-2.2.28

 net-im/psi/psi-0.15.ebuild | 2 +-
 net-im/psi/psi-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index a92903d..e3adc45 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
xscreensaver? ( x11-libs/libXScrnSaver )
 "
 DEPEND="${RDEPEND}
-   sys-devel/qconf
+   sys-devel/qconf[qt4(+)]
doc? ( app-doc/doxygen )
 "
 PDEPEND="

diff --git a/net-im/psi/psi-.ebuild b/net-im/psi/psi-.ebuild
index df2f26f..a54aea8 100644
--- a/net-im/psi/psi-.ebuild
+++ b/net-im/psi/psi-.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
extras? (
${SUBVERSION_DEPEND}
-   sys-devel/qconf
+   sys-devel/qconf[qt4(+)]
)
doc? ( app-doc/doxygen )
virtual/pkgconfig



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

2015-10-09 Thread Michael Palimaka
commit: 41370b8a0a71e06d09487d321b8e45b0eeb80c63
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct  8 15:05:51 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct  9 12:40:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41370b8a

net-im/psi: remove old

Package-Manager: portage-2.2.20.1

 net-im/psi/Manifest   |   4 -
 net-im/psi/files/psi-0.14-input-validation.patch  | 257 
 net-im/psi/files/psi-0.14-minizip-detection.patch | 284 --
 net-im/psi/files/psi-0.14-qt-compat.patch |  40 ---
 net-im/psi/psi-0.14-r4.ebuild | 171 -
 5 files changed, 756 deletions(-)

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 266581a..edd5f48 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,3 @@
-DIST psi-0.14.tar.bz2 2168801 SHA256 
aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0 SHA512 
c68e5384afa1a40f1eb5622aa73dd9b1a7902d77b49cad26ac65bf495d688aff17376a738a98e3ff48d3d154abb3a20aad170b95e35bebd1d4e360268746ab3d
 WHIRLPOOL 
95c577c295fad5e4cd54717c34ea2269156be82c480931cce1f140853eaa24be9bf9635d7c192b5da62acc85c145bb61980e00433466a42481ce9a0c3ce8d4da
-DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 SHA256 
27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2 SHA512 
5700534afc8f32843c5c56a678aff710edb6619ae4c6c92763c70553221e0078b881f25aa47a6752cfa58582fe617e797bdff32db3071b91521a5ce7f70bdbc9
 WHIRLPOOL 
79703d1e8a053ab9c0dd09088b26d4adee85d50d69436bff66475860b2bccda675ec5924b22b074fcebaee7cd56a58966a94e9a59f8468015f967eb701bb858a
 DIST psi-0.15.tar.bz2 1984777 SHA256 
593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6 SHA512 
17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a
 WHIRLPOOL 
6a8953fe22342dca7347af78da3ea80d5a61a14caa6d62d6910b81730b07b76f156d8d5e1331b2a96dabe5a261353da7af565d999bc7246c25d0d88e010fd983
 DIST psi-0.15_be.qm 255759 SHA256 
0e9dbd9e4e738c8fcdd098dde4a17042600b35346a26d2176caa85f6253b6eb6 SHA512 
90d623abe9f031af83185fc76d35d5ac390cd726490c6722bdf9ea5b1a6e0179aca650c230280a6390cc121d0e18cb9e2bd1bfd75d9e817eb4e8584d844ed3ad
 WHIRLPOOL 
f9d531127f861e5a07659f71433a12cd1d8ad6b805efb83e2d94d219c1e718a28f1390d7025122cdc94d563de99f8f245f4c8ab0297f622ad5712cc6eb4b9667
 DIST psi-0.15_cs.qm 242386 SHA256 
d579a7059466c11d4264d8197188a9be49b82e2af35405053ea772c0edea6718 SHA512 
46eb273794a99045702f52e10aae2122dfd3db5a49bf68b27e36bf8a1443d8dfbdbcdf550dd0ac3e3ff3014e52010682880f7e883f0d1a0d41d8a678d1e16f2f
 WHIRLPOOL 
d2ae4a6045ea1072045032a726927439fe57ae8dfad813f718dd230b36a794945e0600ad1a55f0ac74d73a0d0be4ccf9ffecc5ec9e289ccef5d28566535fbe31
@@ -14,5 +12,3 @@ DIST psi-0.15_sl.qm 248478 SHA256 
5be33716a12b297d609ec7493f9da21a23b3ab89303dc6
 DIST psi-0.15_sv.qm 246214 SHA256 
fc5822011ada2b7452c9d15baf74c90e1a58e05536e9a7cc1d81e163f44d3ca2 SHA512 
b8dd5e7692512af5ec302b5fee562feb68292988160d1c9e4fac951562bd8b30bc1f67f4d39bbd437eee84b14f6aefd83a8666f0e77d02b539d65e89aee7c1aa
 WHIRLPOOL 
6078437c20881babb731d8915952b40d415e5cc01ab7431be1930fbe887289988abc7ef9a76e09254ad8519146bd94633eba69872bee7cdb504dfc3237f1c1d0
 DIST psi-0.15_ur_PK.qm 244903 SHA256 
0101370007c9ce735c50dd9bf6dfd8680c5cd562a3213b960ee507367582b3e6 SHA512 
df0786f1b625ecc3144bb9be0ce51558ae45901213405997b5f8ea3c791c64328b049a48a1b88372f7b0cb5bde3b795b306ad16847d91933eedc233f8dea8bc2
 WHIRLPOOL 
3dc2f807d5e1dce36609854e9360d9521a7fe36d61161a2c0cf195bf58e21a4efa9b8d977a6503f41588d8befb06ca678e6e629168c93f0ab90f0ec42ffe98a5
 DIST psi-0.15_zh_TW.qm 171993 SHA256 
a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 
69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871
 WHIRLPOOL 
2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344
-DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 
1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 
b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc
 WHIRLPOOL 
a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759
-DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 
a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 
6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78
 WHIRLPOOL 
9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40

diff --git a/net-im/psi/files/psi-0.14-input-validation.patch 
b/net-im/psi/files/psi-0.14-input-validation.patch
deleted file 

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

2015-09-14 Thread Jeroen Roovers
commit: deee3ed52e28472cd9290f4579af5bc718e7af94
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Sep 15 04:34:58 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Sep 15 04:35:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deee3ed5

net-im/psi: Stable for PPC64 (bug #26).

Package-Manager: portage-2.2.20.1

 net-im/psi/psi-0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 372a13d..a92903d 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -18,7 +18,7 @@ done
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding"
 RESTRICT="test"
 



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

2015-09-06 Thread Agostino Sarubbo
commit: d6f79547c8d3f45a3247783404422e3c167cd576
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Sep  6 13:23:22 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Sep  6 13:23:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f79547

net-im/psi: ppc stable wrt bug #26

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 net-im/psi/psi-0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 25521bd..372a13d 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -18,7 +18,7 @@ done
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding"
 RESTRICT="test"
 



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

2015-08-21 Thread Jeroen Roovers
commit: 172939c359244b9d2bf3848f96cb60015eec01da
Author: Jeroen Roovers jer AT gentoo DOT org
AuthorDate: Sat Aug 22 05:04:59 2015 +
Commit: Jeroen Roovers jer AT gentoo DOT org
CommitDate: Sat Aug 22 05:06:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=172939c3

net-im/psi: Stable for HPPA (bug #26).

Package-Manager: portage-2.2.20.1

 net-im/psi/psi-0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 57c82bc..25521bd 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -18,7 +18,7 @@ done
 
 LICENSE=GPL-2
 SLOT=0
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd
 IUSE=crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding
 RESTRICT=test