gentoo resync : 18.12.2017

4 files changed, 20 insertions, 11 deletions

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index c623893f72f0..d304d45a439c 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,7 +1,8 @@
 AUX 0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch 2104 BLAKE2B 5108a1d471b78b5d5ca66d2979d286013457c014adb37e58514c2997dd1d5a3f131c9dee46a9dce3011701e802c23d40d0e0ccac0d2a473e10b5b321b504b681 SHA512 a9b8c351633aafcc881a4949e72e0ecd89314a93a3a011dad643ff0a64f208654961218e7d7e69af4ae76824d7de88dec3a572cc08aa6338bafa672ef07e4434
 DIST gajim-0.16.6.tar.bz2 4564505 BLAKE2B 0446d826afc782ceba4fe67d6c7173d60264ec1b5a227f0da62285ea1d083143b4895e4472c2df499de419f9a34c59d9afa1ac2348052defb100438782a3df46 SHA512 6c8c2a38429468a1e6f02aae730ff947c649960e8cc672457c1e1733ab2dad6534b1e5ac2e1c0c385e331a6ba817c6e67c1a27443632b9fd43e7ab76ad66c935
 DIST gajim-0.16.8.tar.bz2 4465521 BLAKE2B f3612465ab139c8e8e6101ca6fbaefce93fe2fac0929cb15ae5174b10b195319181cff3c65f3dbe39d09ea79d1c222cf82434ffea946dabd9fc2645a8b889aa9 SHA512 702917f5b81a5009177ad305a65398c3f8fc95e4666dbfb33ef569a7c2a494a8ea7c48133a1f8000337381b29fc63b917103e05f64686affaaedb8aa155ac0e0
-EBUILD gajim-0.16.6-r1.ebuild 2973 BLAKE2B a9e98b90780e1b6899cab9cc9312d2f2a5972a2dbbc884280aac60cee4973cb70853df6c2226af63fc4f5f065a679aa931ce54a9b80b8180ca44f8e33ac0f668 SHA512 b69079d0e8ea27b3bb604d5d68c45863aefe5a8a10378a12faa0bcb9156c98a957755c77cbcd2db97b08f55c3184aa843c484fe9e4b1e170bbf4dc256f7a116b
-EBUILD gajim-0.16.8-r1.ebuild 2945 BLAKE2B 83ebb4d44f03304bbb82d401bd1b61d525b01468e691004cbfda02d78e1dff488fd2d2ef74e644078de4f7fa8c42240df31c38d5d5518a9a4fd653a0c741def1 SHA512 e944d639f5c8aad11febb9d4b55c1ea88b10bcbd4fd19c1ae2db62dbf3fc063242de44c4c21b1b94f9aad218483497be5eff57ce81127d75f4e1938d58e33324
-EBUILD gajim-0.16.8.ebuild 2822 BLAKE2B 3c1532c38db565e267c617f367bafc40cc77c85b7bf887ff5b10fc76248abaa1fca0458c04b5af3bc1238f14ffa26d7dac74ef2826e30931faccd1a91bbf6388 SHA512 75f17adbfb158bae17fb6a1ca8ca032018274dd338ae77fc273cc1fb65c41ae5d7ff5a01c2895387b88bf77567af61659d5d13af12aa8b7134f47c159814c2f7
+DIST gajim-0.16.9.tar.bz2 4469275 BLAKE2B 451f09cde9d177932429b9ece900e09c58ac43b5f97cd64cf70e75d13f2261ab52ee35e02e8680c83a5d81d7574bca561532dd1327f1109b0cc872956b1a05f7 SHA512 d8ddae3826bbcd4458b016b3cf6b0472b41db4b9026b300b058d9cef403195e38423ff950fcbf6fed0cdbbb485a274905a9a5945028c4cbb24d1a38c72bf4cbb
+EBUILD gajim-0.16.6-r1.ebuild 3023 BLAKE2B b4060e49dc3bc7d1fd7354c01028023509209bc6112efebb3add0e1919b85263ede3d42c22c607419f8371bf7fdb03d36c3f15d281806bdb5bfe5606a3fc7316 SHA512 fd8a2095ab8a2b1691a2434e6b56713f4a960adb61cda2ec5bc437eb1a55e6abebcc685eb004f92fe1c3e23dd9527b6a76ce1ddf9db53eddb03b0793818e96f4
+EBUILD gajim-0.16.8-r1.ebuild 2995 BLAKE2B cda6c9bc9156a86ffc1d677c575d4851f381268e158acdf9edfcf7d656c1b06cf8ff88c2117b44439bf9eb7ce37db94fe6f913278b34c9c4ecc1a834f3bedb00 SHA512 bb8d868ed200a5ae66b076909e7e0eab5c383e81dd5bf499945842b3981ef5db2d7e1d4d4172e190f3d4b9d41e32ab5c479e3be2442dfdb8be658b7c24cb0d0a
+EBUILD gajim-0.16.9.ebuild 2945 BLAKE2B c5f8b1a7fbdfb518b1ebdf4912729a5ad9e02ac1bcbf79580729b7d3dd30daf5caba3865e9c94f2c6412ae7801785c5278741d394a0f286aa78a5c09586bed2d SHA512 91549ec50d10b92aaf6e5b0ddc8de496042c20d4669482df3c9a3d8680aa27b9952f001656b5953a8213ef1e6a17572ecbdc674bc08bb092fb4692411571cff9
 MISC metadata.xml 498 BLAKE2B c86a12d54b4eaed630cc03515a7574c3c311cf6e9420c9e0e20b11777e0f0f23246b52832fc882c700f9311cf1502b8ddc1187828a32e2fba334da686a932607 SHA512 f275f9e7d3f4661dd2272a4e2664598f93bf68f008705168a191dacbceca64f0d3c357234a325dbbbc8d8f851ef642f3e5619c30671c71ff9b8b939ed7e6231c
diff --git a/net-im/gajim/gajim-0.16.6-r1.ebuild b/net-im/gajim/gajim-0.16.6-r1.ebuild
index 6b89f29de4a7..3659853fb462 100644
--- a/net-im/gajim/gajim-0.16.6-r1.ebuild
+++ b/net-im/gajim/gajim-0.16.6-r1.ebuild
@@ -41,6 +41,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	!>=dev-python/pyopenssl-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
 	crypt? (
 		app-crypt/gnupg
diff --git a/net-im/gajim/gajim-0.16.8-r1.ebuild b/net-im/gajim/gajim-0.16.8-r1.ebuild
index f9965310b5b1..41717a20041c 100644
--- a/net-im/gajim/gajim-0.16.8-r1.ebuild
+++ b/net-im/gajim/gajim-0.16.8-r1.ebuild
@@ -41,6 +41,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	!>=dev-python/pyopenssl-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/python-nbxmpp-0.5.6[${PYTHON_USEDEP}]
 	crypt? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
 	dbus? (
diff --git a/net-im/gajim/gajim-0.16.8.ebuild b/net-im/gajim/gajim-0.16.9.ebuild
index d23fd2187375..462c6802b3d5 100644
--- a/net-im/gajim/gajim-0.16.8.ebuild
+++ b/net-im/gajim/gajim-0.16.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite,xml"
 
 AUTOTOOLS_AUTORECONF=true
 
-inherit autotools-utils python-r1 versionator
+inherit autotools-utils gnome2-utils python-r1 versionator xdg-utils
 
 MY_PV=${PV/_/-}
 MY_P="${PN}-${MY_PV}"
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
+IUSE="crypt dbus gnome gnome-keyring idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -41,11 +41,8 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.6[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
+	>=dev-python/python-nbxmpp-0.6.1[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
 	dbus? (
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-libs/dbus-glib
@@ -59,7 +56,6 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
 	idle? ( x11-libs/libXScrnSaver )
 	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
 	networkmanager? (
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 			net-misc/networkmanager
@@ -117,3 +113,13 @@ src_install() {
 	}
 	python_foreach_impl installation
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}