gentoo resync : 16.09.2020

5 files changed, 7 insertions, 183 deletions

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index d1d24cb612f3..11401b6406eb 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,8 +1,5 @@
-DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-DIST gajim-1.2.0.tar.gz 9605006 BLAKE2B b68e801fedf89d14e8831a52f952fa3937b8f8ed0423a0289d5c665b50244db8db9d91dd24203e446d691e26843dd75dbf0de2b1b183cc0a8fb178bc7632c500 SHA512 e73802dd1172c1fa38be10e6fb5d605109dacf0491516b15111ccd05389309af217e8af68440a1333b8a636c9ff425dec6d4461296ba47f1bb6dbb3000b02fd0
 DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
-EBUILD gajim-1.1.3-r1.ebuild 2457 BLAKE2B ffdea9fa425f2ae97e718ccc58cc13c95a908b0ff8019df5fc9b82b0b4be522d872b83ada56c1070165f81e20cb0a26df5b70abf0ca54c202cb0796f6c9d5986 SHA512 025c1ff713a2e975dd4c2c334d033fac30d0e4de9d778eeff0dc071d70a871777d5798497394963e49277fc9c529fc3c15e3b14a6f946daa39650c9e88d15125
-EBUILD gajim-1.1.3-r2.ebuild 2222 BLAKE2B 62d8baa9c3fb0fbb76b665244d692d10f4be65468cd9c2e5f5ff8abd5a04b72142f4b6bb3f39498c8d7f4685d084208ca1a5a3d84977d8ce1873e0427222bade SHA512 57e2256a177a3238bd4a21634ee30b43559c9b2326905d97740b0408070a950c098fb715d8ae453860279900a5f9ad368af069b9437678d7d96b16153fc1077e
-EBUILD gajim-1.2.0.ebuild 2289 BLAKE2B 697f393348f18c9a48155a0fe42ee87bc19cf4c8277c8c0c3652765329f9f3cee8846afd6f4252d5e52db5bc21e710284bd18140bc9d3c50ecd6cd7467dc9f9f SHA512 50d2408e1af48557666e5f0389e55376c7fe9ff91aba795727f4e6934b47eee1ef37d72280fa21b36b86a0494d769dd8002d2581d99b2a252d30692724e7a00a
+DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
 EBUILD gajim-1.2.1.ebuild 2356 BLAKE2B 6f3ffb655c1945e7c00b95579acb87075e98e9122a01294a94d917d3318756fec5536ce77250bd972d3e63b075d8e298a57769535a214713fc46571b7501c686 SHA512 3d449b3f14fe84981afce8d310ac64afd9fe642e7619d29768ba63f982b41e1a5097d10f7564e355e3bf62b40c155090be17f874fa619800405c1ed8022b2a07
-MISC metadata.xml 985 BLAKE2B ef02d7f96bcdc15c013e15ee79e3bb4dc591dd9697139f7331ca0bc065d2adfb2e6c2808f8c32d16dee433a1b03d4639f371a69e1d0870d498db55443ff3f713 SHA512 de8eba51dc79776b19e4122d6da16073c577c70dbe5b05dcbf7aa32a4c0b109c5b9cf222313aada405227f27ba8014c38baa73acfb0951691fbbcad1503801f5
+EBUILD gajim-1.2.2.ebuild 2360 BLAKE2B 1edc40a383758eb41bfed434ddf491d33adbb1d0c888f9e6d83de581d2c1c7f6923cb867f438bae3581e3fbec82117ca950ea6b7c4e7a621b8e49a6b420fbeb0 SHA512 0b053dd513c843ddb200ca2ce44c6ee2b314cc5754d453500b61d090ee23db15d01e99fb7277af94bad9a4a5dc1eb0bd9e94455807f80be835f09e0baf828569
+MISC metadata.xml 787 BLAKE2B addb4c1ccffe612899495903543df528872a87ab0128459e34fdca346fa7c8c3fe45f27cba541baae9971eba00d282d77f88d964de5ebde47181a8d417d0ef60 SHA512 5425930f8c15ba0a4f9fb13eab27f11b6874453732b1fec601cf1811a796431ee7feaff62c7967f3ac1dfa4009b9acd5de1d0f42ef28543444e7cb887088be09
diff --git a/net-im/gajim/gajim-1.1.3-r1.ebuild b/net-im/gajim/gajim-1.1.3-r1.ebuild
deleted file mode 100644
index 5f4b1383a6cb..000000000000
--- a/net-im/gajim/gajim-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_MULTI_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-nbxmpp-0.6.9[${PYTHON_MULTI_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssutils-1.0.2[${PYTHON_MULTI_USEDEP}]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		networkmanager? ( net-misc/networkmanager[introspection] )
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-RESTRICT="test"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.1.3-r2.ebuild b/net-im/gajim/gajim-1.1.3-r2.ebuild
deleted file mode 100644
index 12ae00b4857c..000000000000
--- a/net-im/gajim/gajim-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-0.6.9[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.2.0.ebuild b/net-im/gajim/gajim-1.2.2.ebuild
index 9dd5e08d83cc..60719dd066e4 100644
--- a/net-im/gajim/gajim-1.2.0.ebuild
+++ b/net-im/gajim/gajim-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="sqlite,xml"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -36,13 +36,15 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-1.0.2[${PYTHON_USEDEP}]
 		x11-libs/libXScrnSaver
 		app-crypt/libsecret[crypt,introspection]
 		dev-python/keyring[${PYTHON_USEDEP}]
 		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
 		dev-python/css-parser[${PYTHON_USEDEP}]
 		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup[introspection]
+		media-libs/gsound[introspection]
 		crypt? (
 			dev-python/pycryptodome[${PYTHON_USEDEP}]
 			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index bd95a0793560..d4e7cc8f23d5 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -4,14 +4,10 @@
   <maintainer type="person">
     <email>hanno@gentoo.org</email>
   </maintainer>
-  <longdescription>
-    A fully featured and easy to use GTK+ Jabber client written in PyGTK.
-  </longdescription>
   <use>
     <flag name="crypt">End to end encryption and GPG encryption</flag>
     <flag name="geolocation">Sharing your location</flag>
     <flag name="jingle">Audio and video calls</flag>
-    <flag name="networkmanager">Network lose detection using NetworkManager</flag>
     <flag name="remote">Controling Gajim instance from command line with gajim-remote</flag>
     <flag name="rst">Generating XHTML output from RST code</flag>
     <flag name="spell">Spellchecking of composed messages</flag>