changeset 425:191bf2252f8f

merge
author Dirk Olmes <dirk@xanthippe.ping.de>
date Fri, 07 Oct 2016 06:01:09 +0200
parents 8ec6a5cbdf3c (diff) cb4eebd00e17 (current diff)
children b8e61c5ba142
files app-emulation/docker-compose-bin/Manifest app-emulation/docker-compose-bin/docker-compose-bin-1.5.0.ebuild
diffstat 6 files changed, 140 insertions(+), 560 deletions(-) [+]
line wrap: on
line diff
--- a/net-im/psi-plus/Manifest	Thu Oct 06 17:03:01 2016 +0200
+++ b/net-im/psi-plus/Manifest	Fri Oct 07 06:01:09 2016 +0200
@@ -1,11 +1,5 @@
 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
-DIST psi-plus-0.16.556.565.tar.gz 8352906 SHA256 802bf7829680c7672845ae56328bbe1fc9ee205badd4f443ebd24131912bfd53 SHA512 7756001d9dc60c676bb22a75dca49d3925a4404ca85b2498c259c42669881cb3afd5b6dc3c9ed15fdc32c0378c5c623b3599e5f7c56daab256c39048670ac448 WHIRLPOOL 7130519b6d1edda30878ad433180d308768423bd9ba803affbe0636dba9e885280ea3c7d773525395c6db3392a529b989ab228c751d9f1488ea2fd2004490774
 DIST psi-plus-0.16.559.575.tar.gz 8335124 SHA256 457c5f20dc4ddb79a1e0cb368bf8f544332f203b7aead8b306690a874586dd44 SHA512 0038005cdb5b283eb65c82767d5f7bb80577cb38af3c732679b5d1ee5b2204f138da9a77fa54820289dccc94180ca84ea3f7f7ec829e9be72688304613a394db WHIRLPOOL 8638f47d8335e3f9f6d98645282f27679886c6d0b54ccdeb884dcf80ea59f274aafe7215c67247cc23d9d63c5601306881393be9a186a012a60933074ceae75b
-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
-EBUILD psi-plus-0.16.556.565.ebuild 3049 SHA256 2c406686404c7c1bf80723cb24d124dd67c2f2cb76a64f39b4eeefa68db65d0d SHA512 f4f0b83eb3c5f61555df2e4fb522853df421efe7ce9a1d27a8e0c7d917f3f51e94b1c2b8fb469b4a0229ad593a1924bc6299bcba52e38d61e7d6f7bd60a2f043 WHIRLPOOL d711c6472d9f0f2a757f6184dab954f737e841378e361ec6ea31bb17f41bdf4fdb5aaa33e2ad384c9a228538173334fb7bd0d4a76c16430b97f7fe25a666cc71
+DIST psi-plus-0.16.564.585.tar.gz 8343677 SHA256 7fe8fb686984c2fd3fabe4568e6fbdf0550af5a2733da4741069e12f5a7abb73 SHA512 2163ee0be10a1210c6f368a5662b5c9afc482b0cefa0ff36dd6b56424f65e33d83c8ad72b4ba57eccb9a37559226be64bee88e9c9a352b1233dffdf00f851839 WHIRLPOOL 7e3067bbcd19bc8b51bd8b196e9628a436cdd4b7b04fb13f64c65dd9e3dc852042947a6052860e2c4bcb63b3ff4ef746d8dedc42b29234da8c887bbd87d349ef
 EBUILD psi-plus-0.16.559.575.ebuild 3048 SHA256 6b330fbd4d91c2a5547e014e3761027d8c14667b308e33de9e0c5028c4d53e1f SHA512 41b927c7180675685235134e5ff1b73a8196d0f777f8cf948545b67c387730ac5245d76d59c7572116540d6149c3cd5c677186e2570a064af971536bd57da790 WHIRLPOOL d7390b90688a90480514b97e80dc59db7beaef7f2e873fed2f89699b5af82165f4284e4547d8da85e76b1eae9e167831799ca4a599527f5015f43d166f5ccae0
+EBUILD psi-plus-0.16.564.585.ebuild 3048 SHA256 6b330fbd4d91c2a5547e014e3761027d8c14667b308e33de9e0c5028c4d53e1f SHA512 41b927c7180675685235134e5ff1b73a8196d0f777f8cf948545b67c387730ac5245d76d59c7572116540d6149c3cd5c677186e2570a064af971536bd57da790 WHIRLPOOL d7390b90688a90480514b97e80dc59db7beaef7f2e873fed2f89699b5af82165f4284e4547d8da85e76b1eae9e167831799ca4a599527f5015f43d166f5ccae0
--- a/net-im/psi-plus/psi-plus-0.16.457.ebuild	Thu Oct 06 17:03:01 2016 +0200
+++ /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"
-
-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
-}
--- a/net-im/psi-plus/psi-plus-0.16.475.ebuild	Thu Oct 06 17:03:01 2016 +0200
+++ /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"
-
-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
-}
--- a/net-im/psi-plus/psi-plus-0.16.545.535.ebuild	Thu Oct 06 17:03:01 2016 +0200
+++ /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"
-
-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
-}
--- a/net-im/psi-plus/psi-plus-0.16.556.565.ebuild	Thu Oct 06 17:03:01 2016 +0200
+++ /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[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
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/psi-plus/psi-plus-0.16.564.585.ebuild	Fri Oct 07 06:01:09 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 -> ${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[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/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
+}