gentoo resync : 06.08.2019

4 files changed, 17 insertions, 9 deletions

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index c7b411a5e66e..90ae40642e8d 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,6 @@
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-EBUILD gajim-1.0.3-r1.ebuild 2175 BLAKE2B 8b4edb274123a0d6df82ee6776762e21848c47969c67a2d4b6bf9cbc863b2a479df6511959d932c8ebe25e2fe34d076a6dc5390c0f9ab1e30548552ebd5ed1b7 SHA512 3bb95be0156d410949d6237a5084c0e2b4d9b79a1742df8bf10d9f6b349864df9c2813116999ff688a1dd206df5703d52615d79a3e0350b3eeb7bbb3f6ab087b
-EBUILD gajim-1.0.3.ebuild 2173 BLAKE2B 2040e327866a96f479ea97d79975a7394ed4958505ffe02969f27b8e7a28e8f0a57aa3064b7ec6ae99485f287bc9b76f2956f608a01cbf0d80d4ae96a97d572a SHA512 b413d58eddec79a358b4407d40ae7808730e5f7a8b59c9eabcbad822aec7c8a7c114c966ef8640f3fda3ba16a172d8d48cbbaf7bed7e2015b3b7573dc8ecafba
-EBUILD gajim-1.1.3.ebuild 2217 BLAKE2B cab09e9b550f0b5b39b1b7c39bfc84a013010d1fbb8fc1cd1e1bf4a49438438882b4406d9b27fb7e2f2e104d99f27825da4e7c7b9c7b3d35f5db6fd0280617df SHA512 240ba8a69ab9a0e4ede62d9cab9046a4a8226e1a5971e700e0609537ff20bbfe32f226f5d8ceddbb514b3f6a8f322a7c33196ecc7e58d84916941ce80cd60f6a
+EBUILD gajim-1.0.3-r1.ebuild 2158 BLAKE2B 678fcfcf7ceb61710fb6c442a5afc243666a7d9181984196a0764b5eced18fabf9701a2678b6176da34939a613b8e861472c1c655bce4a1040b43dcbd5bf06ae SHA512 6b19f4c29d0e40e1b433208b22bd4ea1695a4914258979c79ddefe0c36ff04bbd3678a420fcecd362c36d638aa91e2dcfe0bac5ab86557ed62ed9a686fc66a9a
+EBUILD gajim-1.0.3.ebuild 2156 BLAKE2B 67ffce69962eb4ad091b54dcfaaebcf5fb0a2efb138b033382dad0312fa4132797244a6a74dd98cededb0e1cc429a27c3c0a4056a588ce00b34d239278bf2cd8 SHA512 edccfee6c5019fe6c25f9ae2a4bebc3486b5c64097e7bf06e7628534638f30034636378ca7c977d3d04ceeaefe408281a40a5f88fb0b4bc133e3fdfe974f0049
+EBUILD gajim-1.1.3.ebuild 2304 BLAKE2B a3d88e26614a3c78529e3e3185a38e3c0b623ab419f0d8e1192b41a66e4081e528aecc3d9dcdb0b8ff13d66b9a6037317cb2725c4097d7d3f33f85563e0fa95d SHA512 915b895a22147387ceda12e5cf0d193a15757d1d2f6ad70e2c249ea20e4844f7e9c278915e4edaa2cebafcc65b81f9fdc5b635e774482a6e29a68b1edd034e9c
 MISC metadata.xml 1061 BLAKE2B d7e37cec9e291addde0d1c18b155afdadee1225270c7f34f8a916f45ad828353f677f87e6de49994ba14af8cc4773689d7f629f991326e94a43ff36fa9c9b981 SHA512 f9eb4f8a033ca5cca7a2de4a43e98346cf446a20a9257ea95b37d9a6be6051224d55b32272167946c2cbef370cd3c1ddc3b27ce6b8794823d1e9ca9b5ebcac44
diff --git a/net-im/gajim/gajim-1.0.3-r1.ebuild b/net-im/gajim/gajim-1.0.3-r1.ebuild
index a59f5e9ad7f9..0ea841d01b32 100644
--- a/net-im/gajim/gajim-1.0.3-r1.ebuild
+++ b/net-im/gajim/gajim-1.0.3-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	dev-libs/gobject-introspection[cairo]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild
index 719d5ddebbd1..0727b7f841e2 100644
--- a/net-im/gajim/gajim-1.0.3.ebuild
+++ b/net-im/gajim/gajim-1.0.3.ebuild
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	dev-libs/gobject-introspection[cairo]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
diff --git a/net-im/gajim/gajim-1.1.3.ebuild b/net-im/gajim/gajim-1.1.3.ebuild
index 1548f5c281dd..54f26a180bee 100644
--- a/net-im/gajim/gajim-1.1.3.ebuild
+++ b/net-im/gajim/gajim-1.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite,xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit gnome2-utils distutils-r1 xdg-utils
+inherit distutils-r1 xdg-utils
 
 DESCRIPTION="Jabber client written in PyGTK"
 HOMEPAGE="https://www.gajim.org/"
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	dev-libs/gobject-introspection[cairo]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
@@ -67,12 +67,20 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }