gentoo resync : 05.04.2019

3 files changed, 19 insertions, 33 deletions

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 44fb448cafff..6cdaae1e779d 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,5 @@
 DIST psi-1.4.tar.xz 2119840 BLAKE2B 28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8 SHA512 9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
 DIST psi-l10n-1.4.tar.gz 3037957 BLAKE2B 2f61c60ee5bc323323ae98ab2eee7d2afec9462850f038fe72816810ef572e4a71a3647f83e09bf948485f56dfbc8dd3bea0a24f6258b13f08867319ca65deea SHA512 ef87a12dd992adcfe5fdc4e88c1d33d6fcd77b2554963e1563cee7ba650d096c3b074795a1a9e650945b1dc46a4936f9520ecd864559b1531cb31763399c258d
-EBUILD psi-1.4.ebuild 3174 BLAKE2B c98876b7b46bfaef1da575b4477ed74e543c6edcc4ae465ef861fa34b474f628a39dfe44d7d39a05dc4e1084b0dc644b4422f6d089f8cc6b00688304368f5de1 SHA512 8c3f9c3c43bf0dbfa5c62928bb56647b47f02529f65c08ed6bcf75c55e6c6d71bfb09128e15dabe9ebf821a1885ce09d313d3da58ea2f6a7d83e962012812b10
-EBUILD psi-9999.ebuild 5334 BLAKE2B b074edeaa990a023e7f5a08a03b64dc4a91c182f280d9cae2a17505900d370b1bce240118d287ee1133f2ea3a6b09f9eb3210c97664a0cfbfbf122ca5c40dd4c SHA512 eb64cc21008a6fa0f581dca80bf48b9083d448053e5ecaddc42b82bd556c6c862997c84610b669dc3c91e398bc68340c30fc6134418ea2923f0c70ce70ffdcb7
+EBUILD psi-1.4.ebuild 3042 BLAKE2B dc14c2929a26ba1fb44453c33c4f05667a9fb0750e05defdc46664aa597935017285a93fa86d643dc0a5abe17fdb74e84c789a52eb49b0c451b69c8f20ec2387 SHA512 9ee4ea98c3d8012db582ca048113374485c47c89c7a7b1cf692d667656ea6460c6685ed921ddc524f39108eb4273b9897adfcaaae76a1d4130bb382db3567493
+EBUILD psi-9999.ebuild 5173 BLAKE2B 87ff6c7737e03cfab27752ab2b2905ca85169c0be5947969784b48bcd6c2867c82018a65527f80cbff383b6a6dd6315358bbe1864692b3d8838ff6a0f9d66473 SHA512 afdb592293b65257308615076996ea379107a3c0027c36bbe3c4b812d7280b77e40e8801b118e6d1ae47969cf1da9ed00318ca9ac9ed158153545dff9ec9737a
 MISC metadata.xml 1295 BLAKE2B ea05ae35834f7b2dc0660e725671303d1494342dbe68ee7be23a689f60974f4f750cb3569827e5fd86c2f4c4aa809555c90567a32fd6a6e0398b90fc139f35eb SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820
diff --git a/net-im/psi/psi-1.4.ebuild b/net-im/psi/psi-1.4.ebuild
index c32424e600c8..ac7520c15da3 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-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 504d2fa256f1..24d8d574291e 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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"
 
-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"
@@ -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
@@ -189,12 +187,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
-}