# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1461126212 -7200
# Node ID 16edb596364b75de9e382f74e821eeed98777fb7
# Parent  cb454e927ad1645b7291db991c96118bbb76139d# Parent  06486d4a9de763698485562b9456e550fb122ccc
Automated merge with https://xanthippe/hg/portage

diff -r cb454e927ad1 -r 16edb596364b net-im/psi-plus/Manifest
--- a/net-im/psi-plus/Manifest	Mon Jan 11 17:16:49 2016 +0100
+++ b/net-im/psi-plus/Manifest	Wed Apr 20 06:23:32 2016 +0200
@@ -1,5 +1,7 @@
 AUX qmake.patch 2010 SHA256 39824af9a7c91764f0503a61ce6b5796ae5ab8b8d9ca7fa07460ade48860dc69 SHA512 8f8aaef67c10d0c7ca1fd7c2c3123258b5b5785b7dc5eb2a2c7d8667048ec209cf61c26eb5f51c5547a7204b976103bf992c345814576191b26f7766e5162b98 WHIRLPOOL b0cf1b7596d08df27be2c9365aca67e5b1aa7b95d49051066bb814c5770c382f9b982cac7dd102eb1be325b500301dd15d818883c21ac0514c3da2f880820cdc
 DIST 0.16.457.tar.gz 8260942 SHA256 78b46bfcb9146447662165d91ff815d50e55a30026772a5f32c2af6be7715648 SHA512 27c8de43fd2aee637fc2165e6f1fbd830a0b7c4cef928bdaf9fbbc9cb78bee27b66c97a6432bd396ee522fbd15972459b9cb608011a9949873f6ef25a4ed6fbd WHIRLPOOL 5e5a3acd913ee19da8e5d627e2c5305148e8a9e886fe3e923aefa3d544c60a509d7e3944c413913f5e2b3db9ac534c0a15de55b663b0696b943aad8f8ea7ff78
 DIST 0.16.475.tar.gz 8268190 SHA256 d20f79845da742a0711c76834e4c3199648d032bf49267fe28c2f1a2b494adb7 SHA512 9b54b8c862923eae0af5078a4449a86098416534595467be868c63654e73e98434bf0f0455a768007c7199df3e13c07960d2bf225fc63189bfa051c96ff71bfa WHIRLPOOL 8a469404fc1f1643bc1799ea6a8ed77d867aaaeaef30852b0fdd96a853d3bab5e028ba9973196425c41ab7e92c891348fd419858a976a8de2d11c4758b208f0a
+DIST 0.16.545.535.tar.gz 8346284 SHA256 673290a049b5efd7976b262f6bcf5a9f3d07cc7fcf483ba58969a4534c6c0aea SHA512 8eb8e6c47a2e1875e7f595a89bd1fd4a2bc33f5f7b030203848f557068dcac8d203c11b8ba301d1181a49fbc2bc9325eacb535a7e49cfa8ef0bf338348a9dfde WHIRLPOOL c1e6cb5072ced9d9e80140402e64b333ad1df5f5cdefb392ccbed1400ceb04fb9d071373e12f9ae435095e61871466d5ca62dc32963496524d65b29da8a19e09
 EBUILD psi-plus-0.16.457.ebuild 3034 SHA256 40c3fe7f7fd647257237abe8bdce9a25157831d46cbed27cc59ee6d1e5a0c604 SHA512 1be230e00f79ae60e14acf56688857845af8e6e35d9bd3872018935964f9c8291fa9a41f347e2b6653ddc94b8eb8a26713831b7bf102f99a1d3748aa64024fc0 WHIRLPOOL 1977ec48f7e0931b9f445ba707cb321d0c12ca26a901406d320cff6075d80518c441461c73d6458e56c283ded928853f8c24bc318757f691e8078cdcfb9ca09b
 EBUILD psi-plus-0.16.475.ebuild 3034 SHA256 40c3fe7f7fd647257237abe8bdce9a25157831d46cbed27cc59ee6d1e5a0c604 SHA512 1be230e00f79ae60e14acf56688857845af8e6e35d9bd3872018935964f9c8291fa9a41f347e2b6653ddc94b8eb8a26713831b7bf102f99a1d3748aa64024fc0 WHIRLPOOL 1977ec48f7e0931b9f445ba707cb321d0c12ca26a901406d320cff6075d80518c441461c73d6458e56c283ded928853f8c24bc318757f691e8078cdcfb9ca09b
+EBUILD psi-plus-0.16.545.535.ebuild 3034 SHA256 40c3fe7f7fd647257237abe8bdce9a25157831d46cbed27cc59ee6d1e5a0c604 SHA512 1be230e00f79ae60e14acf56688857845af8e6e35d9bd3872018935964f9c8291fa9a41f347e2b6653ddc94b8eb8a26713831b7bf102f99a1d3748aa64024fc0 WHIRLPOOL 1977ec48f7e0931b9f445ba707cb321d0c12ca26a901406d320cff6075d80518c441461c73d6458e56c283ded928853f8c24bc318757f691e8078cdcfb9ca09b
diff -r cb454e927ad1 -r 16edb596364b net-im/psi-plus/psi-plus-0.16.545.535.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/psi-plus/psi-plus-0.16.545.535.ebuild	Wed Apr 20 06:23:32 2016 +0200
@@ -0,0 +1,138 @@
+
+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"
+
+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[openssl] )
+	ssl? ( app-crypt/qca:2[openssl] )
+	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/qca2
+		--with-qca-lib=/usr/lib64/qca2
+		$(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
+}