# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1513177078 -3600
# Node ID 6e91f901964d11710d8363def61568c3d0eb289b
# Parent  beac8a186972646c3e5a4d69aab21ff9faa5d664# Parent  90f4c3220d2e38e9b042d38821d808cdcea668b3
Automated merge with https://xanthippe/hg/portage

diff -r beac8a186972 -r 6e91f901964d net-im/psi-plus/Manifest
--- a/net-im/psi-plus/Manifest	Wed Dec 13 09:46:24 2017 +0100
+++ b/net-im/psi-plus/Manifest	Wed Dec 13 15:57:58 2017 +0100
@@ -1,5 +1,5 @@
 AUX qmake.patch 2010 SHA256 39824af9a7c91764f0503a61ce6b5796ae5ab8b8d9ca7fa07460ade48860dc69 SHA512 8f8aaef67c10d0c7ca1fd7c2c3123258b5b5785b7dc5eb2a2c7d8667048ec209cf61c26eb5f51c5547a7204b976103bf992c345814576191b26f7766e5162b98 WHIRLPOOL b0cf1b7596d08df27be2c9365aca67e5b1aa7b95d49051066bb814c5770c382f9b982cac7dd102eb1be325b500301dd15d818883c21ac0514c3da2f880820cdc
-DIST psi-plus-0.16.571.627.tar.gz 8364135 SHA256 1f537788d5c7af3db999b706790791716687693f0d41b66a1de75516da4c1047 SHA512 274640aac86c1b9bc43baaa8739bf9ba98f09a3f5dd083678cd74b959431250e0a07cfe7cc0fc11b38fb34d2e4bd4527bc6e534856695f991dd090516d3f7eb5 WHIRLPOOL f990909b3ac4637262b9f53cbff64172710f9af17e078b2b54b27eeed81bebf7cc37eb9cfa7bbfa0644920f6d929c62d0e83a8ca77617e0675d13cefd5fda0e8
 DIST psi-plus-0.16.584.735.tar.gz 8715118 SHA256 edcac19948db62f22aee16f360e33e09ed5f4c29bb4829a8a2503b11dd09e63a SHA512 ccf7f55e09a475caf223bdc4f90d94539228a1cfdf327d2dcc620643e329c590f22e66291e9dbc6c23067523bb0cb51758d17dc62956c456cb7c8ca407c6cf33 WHIRLPOOL 8429f4ba82b8b9261dd6cceabf4e1a362ee7299ffbe47de4de0f727db0afe3be88da8439695a165914874ab61579dde4fee4e893b6c027eefeb82cfc9a374b33
-EBUILD psi-plus-0.16.571.627.ebuild 3039 SHA256 4ae0740ee564c77e79dd7f3d906ad66bd9466839f28279c355809171bd3c010a SHA512 7fccfaca97ed90bf1129b19ad4836431386d44f14e29074127e25c68dbf40343b4c8641e9d08c4e40f2dc3dc85a1fd4a397a541a0a3447a0a6d49aedb2e9bca2 WHIRLPOOL 0f47197544e4dd0e85f3c91446fe8e82f012bc884f73eb626382fdee7264b8d419c1862c5b715ea40135a23d99a090e40f6ac3856cc336e55f592f48077915f3
+DIST psi-plus-1.2.109.tar.gz 8575286 SHA256 bc84070c07ddd3f8dc09ac01ee3c8a6f2c129e80ff35fcf1aaf0fdb3151b4d86 SHA512 fd6b41e2b50b15179da9f7c81ed39e2ad4d7dacfd50385cd5220f9357d277d42afc57dfd4ccedb18405af0b254def69458e7d6907fc286861f6d40a59b2ad83e WHIRLPOOL 7ad695fb1d6247ab8566e5ab10885ff95cf03dbeb0ea4d17fd0b877f7e1455667c901a48f8cf9802b29630e708dda26038b8a7a9cb7d025c32544af5e038004c
 EBUILD psi-plus-0.16.584.735.ebuild 2987 SHA256 2e51229a20ee38c0fff0e461f7d58c71b22ca2936069ce8d702402303241d5b3 SHA512 8911bb1f6e7f5349a579dfb50415f746bf8def20502e6a4f71fd3bc71adc96202d1bcc9792e5f146810413dfcad335ff01d510ba95800b052b94db2be4945755 WHIRLPOOL aec5793478dc47883ab5493f5f8b165b18cab359c1bb0cd601abfef1176f1c4703938fcdcdc27d31b0b0ec4ca49892d3702dc00ccc2d4573f44fe3075c6fe5cf
+EBUILD psi-plus-1.2.109.ebuild 2983 SHA256 d8b2d83d9ab9eee390c1c008bb6f7b45f7ab6c7502c7a36df162a324692a9e6c SHA512 49571b2ac2d8237dc3ea5c44ae76e20fd95bd6a04faf4b5cddae5551a773c97f6855dc536363f5870060ddd107b167bfa45b136f833133532b6f755c7b038bc0 WHIRLPOOL 35a777204b2ca57e16938a7d9c01646d2a83bd1c95e54ddbee2c89722d24c753879fa5f967c7cabd15e6293982c1806391d23d9c6db27f65a57209b56488bf28
diff -r beac8a186972 -r 6e91f901964d net-im/psi-plus/psi-plus-0.16.571.627.ebuild
--- a/net-im/psi-plus/psi-plus-0.16.571.627.ebuild	Wed Dec 13 09:46:24 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-
-EAPI=5
-
-inherit eutils l10n multilib gnome2-utils qt4-r2
-
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
-HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/"
-SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/psi-plus-snapshots-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autoreplyplugin crypt dbus debug doc jingle otrplugin plugins spell ssl xscreensaver watcherplugin whiteboarding"
-#RESTRICT="test"
-
-RDEPEND="app-arch/unzip
-	>=dev-qt/qtgui-4.7:4
-	>=app-crypt/qca-2.0.2:2[qt4(+)]
-	x11-libs/libX11
-	dbus? ( >=dev-qt/qtdbus-4.7:4 )
-	spell? ( >=app-text/enchant-1.3.0 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	whiteboarding? ( dev-qt/qtsvg:4 )
-	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/qconf
-	doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
-	jingle? ( net-im/psimedia
-	app-crypt/qca:2[ssl] )
-	ssl? ( app-crypt/qca:2[ssl] )
-	otrplugin? ( net-libs/libotr app-text/htmltidy )"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	# unable to use econf because of non-standard configure script
-	local confcmd="./configure
-		--prefix=/usr
-		--datadir=/usr/share
-		--libdir=/usr/lib64
-		--disable-growl
-		--with-qca-inc=/usr/include/QtCrypto
-		--with-qca-lib=/usr/lib64
-		$(use dbus || echo '--disable-qdbus')
-		$(use debug && echo '--debug')
-		$(use plugins && echo '--enable-plugins')
-		$(use spell || echo '--disable-aspell')
-		$(use spell || echo '--disable-enchant')
-		$(use xscreensaver || echo '--disable-xss')
-		$(use whiteboarding && echo '--enable-whiteboarding')"
-
-	echo ${confcmd}
-	${confcmd} || die "configure failed"
-	## Makefile is not always created...
-	#[[ ! -f Makefile ]] && die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-	
-	if use autoreplyplugin; then
-		cd src/plugins/generic/autoreplyplugin
-		qmake
-		make
-		cd ../../../..
-	fi
-
-	if use otrplugin; then
-		cd src/plugins/generic/otrplugin
-		qmake
-		make
-		cd ../../../..
-	fi
-	
-	if use watcherplugin; then
-		cd src/plugins/generic/watcherplugin
-		qmake
-		make
-		cd ../../../..
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	dodoc README TODO ChangeLog
-	
-	if use autoreplyplugin; then
-		cd src/plugins/generic/autoreplyplugin
-
-		local plugindir="/usr/$(get_libdir)/psi-plus/plugins"
-		dodir "${plugindir}"
-		insinto "${plugindir}"
-		doins libautoreplyplugin.so
-
-		cd ../../../..
-	fi
-
-	if use otrplugin; then
-		cd src/plugins/generic/otrplugin
-
-		local plugindir="/usr/$(get_libdir)/psi-plus/plugins"
-		dodir "${plugindir}"
-		insinto "${plugindir}"
-		doins libotrplugin.so
-
-		cd ../../../..
-	fi
-
-	if use watcherplugin; then
-		cd src/plugins/generic/watcherplugin
-
-		local plugindir="/usr/$(get_libdir)/psi-plus/plugins"
-		dodir "${plugindir}"
-		insinto "${plugindir}"
-		doins libwatcherplugin.so
-
-		cd ../../../..
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff -r beac8a186972 -r 6e91f901964d net-im/psi-plus/psi-plus-1.2.109.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/psi-plus/psi-plus-1.2.109.ebuild	Wed Dec 13 15:57:58 2017 +0100
@@ -0,0 +1,138 @@
+
+EAPI=5
+
+inherit eutils l10n multilib gnome2-utils
+
+DESCRIPTION="Qt5 Jabber client, with Licq-like interface"
+HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/"
+SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/psi-plus-snapshots-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autoreplyplugin crypt dbus debug doc jingle otrplugin spell ssl xscreensaver watcherplugin whiteboarding"
+#RESTRICT="test"
+
+RDEPEND="app-arch/unzip
+	dev-qt/qtgui:5
+	>=app-crypt/qca-2.1.3:2[qt5(+)]
+	x11-libs/libX11
+	dbus? ( dev-qt/qtdbus:5 )
+	spell? ( >=app-text/enchant-1.3.0 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	whiteboarding? ( dev-qt/qtsvg:5 )
+	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/qconf
+	doc? ( app-doc/doxygen )"
+
+PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
+	jingle? ( net-im/psimedia
+	app-crypt/qca:2[ssl] )
+	ssl? ( app-crypt/qca:2[ssl] )
+	otrplugin? ( net-libs/libotr app-text/htmltidy )"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	# unable to use econf because of non-standard configure script
+	local confcmd="./configure
+		--qtselect=5
+		--prefix=/usr
+		--datadir=/usr/share
+		--libdir=/usr/lib64
+		--disable-growl
+		--with-qca-inc=/usr/include/QtCrypto
+		--with-qca-lib=/usr/lib64
+		$(use dbus || echo '--disable-qdbus')
+		$(use debug && echo '--debug')
+		$(use spell || echo '--disable-aspell')
+		$(use spell || echo '--disable-enchant')
+		$(use xscreensaver || echo '--disable-xss')
+		$(use whiteboarding && echo '--enable-whiteboarding')"
+
+	echo ${confcmd}
+	${confcmd} || die "configure failed"
+	## Makefile is not always created...
+	#[[ ! -f Makefile ]] && die "configure failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+	
+	if use autoreplyplugin; then
+		cd src/plugins/generic/autoreplyplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+
+	if use otrplugin; then
+		cd src/plugins/generic/otrplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+	
+	if use watcherplugin; then
+		cd src/plugins/generic/watcherplugin
+		qmake
+		make
+		cd ../../../..
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	dodoc README TODO ChangeLog
+	
+	if use autoreplyplugin; then
+		cd src/plugins/generic/autoreplyplugin
+
+		local plugindir="/usr/$(get_libdir)/psi-plus/plugins"
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libautoreplyplugin.so
+
+		cd ../../../..
+	fi
+
+	if use otrplugin; then
+		cd src/plugins/generic/otrplugin
+
+		local plugindir="/usr/$(get_libdir)/psi-plus/plugins"
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libotrplugin.so
+
+		cd ../../../..
+	fi
+
+	if use watcherplugin; then
+		cd src/plugins/generic/watcherplugin
+
+		local plugindir="/usr/$(get_libdir)/psi-plus/plugins"
+		dodir "${plugindir}"
+		insinto "${plugindir}"
+		doins libwatcherplugin.so
+
+		cd ../../../..
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}