gentoo resync : 23.03.2018

3 files changed, 3 insertions, 132 deletions

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index a132eaaf9b29..5c33b9806cbe 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,8 +1,5 @@
-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
-EBUILD psi-1.2.ebuild 2975 BLAKE2B fe293d11aa6ab9068aede5a9eccf40c2ba2f120e5b4f65cbd8734221508b0257519c9f168e595e8782b10f74a98122a9fe0b0ce1218bae2a388b3772afb4e7a8 SHA512 910c5eff50e0dd3150f4c61342586bb38cfe5936b497ec8349694eae469d9d28364af78c5d1c7624ae615c1fb5db09c2f6f6dab4662372545c47e9c5700767aa
-EBUILD psi-1.3.ebuild 2977 BLAKE2B 58d14bc4f5cb2899503c30ab335521e88f006e538c0173d09c56eb62cc5429dd4dc1d25d30c87badf95b0d348f7deefc79bf62fcb62ffb9112e10e578316885f SHA512 c31f84f1172757b8ef18b23665c449c544239bf2a8134bd69d8bf05b7cee49c74ba96564ed0ef070a7772ba5e9fe11fe6ccf7c98e3cc90e5d54a9ebf6dfbf228
+EBUILD psi-1.3-r1.ebuild 2980 BLAKE2B 02adbb3d013feb7ac3898d95acc1e96b96d4028fcb61308e7f359ecad0c646e9e49688690bc14a4f096e05435e603b28032a7db68fcb339379fcac687d24deb4 SHA512 1a5c67c797b64d0d8d3f4d2024e8db8592c16dba14392f2b80b9fa48249dec7a089f163724aee91744d05fd2d0c80ad67ba79917392b9ec9d5a5cd4d76e6bb56
 EBUILD psi-9999.ebuild 5281 BLAKE2B 7c3245c293b96bdcc262040e242db34a24a62add923022e8058a2a7f8908b0c600c037dcb73a17cc4b453ed86f4dbf2f29b5388d40f4f0cb5df22e376cac1239 SHA512 c7f24708c70c90e06e6004e147448d27fde78cc31b78c063e6ef691475c833c6f8d8e2abd4a43ec42c1693f38e1d72901f0ad8d056d607cdf7c52ab129ffbe26
 MISC metadata.xml 1295 BLAKE2B ea05ae35834f7b2dc0660e725671303d1494342dbe68ee7be23a689f60974f4f750cb3569827e5fd86c2f4c4aa809555c90567a32fd6a6e0398b90fc139f35eb SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820
diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
deleted file mode 100644
index 92f7233fa5a6..000000000000
--- 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 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
-}
diff --git a/net-im/psi/psi-1.3.ebuild b/net-im/psi/psi-1.3-r1.ebuild
index 3d47e6fece4d..83b513540792 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