From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-im/gajim/Manifest | 7 +- .../files/gajim-1.3.2-fix-historymanager.diff | 44 ---------- net-im/gajim/gajim-1.3.1_p2.ebuild | 88 -------------------- net-im/gajim/gajim-1.3.2.ebuild | 97 ---------------------- net-im/gajim/gajim-1.3.3_p2.ebuild | 2 +- 5 files changed, 2 insertions(+), 236 deletions(-) delete mode 100644 net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff delete mode 100644 net-im/gajim/gajim-1.3.1_p2.ebuild delete mode 100644 net-im/gajim/gajim-1.3.2.ebuild (limited to 'net-im/gajim') diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index f371187e67ae..26207d10a649 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -1,10 +1,5 @@ -AUX gajim-1.3.2-fix-historymanager.diff 1315 BLAKE2B b3520b7730f3b408759003498963fe6dd77bb0b4b313a3cf49ce4f77fde99763ee0c8616c839aed6edfe2e47a5aa992b7c71f1e3b9ba5e8bb04599137e6fb90c SHA512 5708f62c7f3903ff8b01808d955e51930281dc1e9d818897681e5368464b191b2c24f76a82ad015711e60b59504c43db21db5f54fa684f6d78b48acfa961e5b6 -DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642 -DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267 DIST gajim-1.3.3-2.tar.gz 9578053 BLAKE2B de41eb488480c1e9267a7e64c33dcc225ba68348fad51fe2f114199972a0fc998ae2c6efba1ea48ecb17b819509c1b45745e98e41f99f2e4afd4a4c1daff4865 SHA512 e7a2564710ffdf0b971d005f8b84c60d72c471727be2bd1b75e564f70a25101a4eb44603fc9f98163bc12a5049dc876f50cdaf8eb5b7d596203c986e55de7442 DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2 -EBUILD gajim-1.3.1_p2.ebuild 2393 BLAKE2B 29e9137608241890d52a59ce27beec4f38f9789e66627c7d03d8646614149adeaaa1ea728a59b6ee62f3fe3b6b9eacc63f186b779abd29d6dc1687dedf373837 SHA512 809c01bfb5cd847ebdfa087877695be7d644ace122e546df1e47c1b2b848a02029dd42fd2735ec00b575f4822d4c8a755836afabfd0e8109e88854dd4b72c747 -EBUILD gajim-1.3.2.ebuild 2680 BLAKE2B 7c42ef6db2251790a159475c9ad6235f2329c700316cee4487b008546467bac85ab1efc206bfe5cfa93ec0fca63bba0b88337905a6c6dc0cb2dca69c78452eb5 SHA512 e5a9fef65f8415d8510888a2d4bac393115cb969d246f23eb0504891979f5e53e305e11d7456121fc89c240d80ae10323eb00595800d4b4708e15c016d8ff78a EBUILD gajim-1.3.3-r1.ebuild 2541 BLAKE2B c4d185df1a12b66b1681f3450762e05307617b13806fa3c76c92d80295e380981ec73dbb7ea651ba15a9312774cec47e48efb5000beeef914d68a27f27fbde71 SHA512 29b94079bee802fe34f715cfe2af55b9da830b79319accbbd8128e830e286411e218d62bc1f12e1dcd627f92858f4d157052399d352957891ff3a1b1f2766635 -EBUILD gajim-1.3.3_p2.ebuild 2663 BLAKE2B c163b948091a3d01da10f4425b057f8df80a8a652ba6e6b41ac37dcbb89edcbc6eade8f4fbe37ab5fd04503a0fc87a46ce5553d06eed118f62eecab78494c561 SHA512 3385376818f1c587cea0d717ff4c5b18b76566cc3b74a33c6aa8bd18d46f7679ead8db67409ca69a802e42b8f90f8d4919270c76612e3a7e0de2697ef5dc0814 +EBUILD gajim-1.3.3_p2.ebuild 2661 BLAKE2B e5eeb4021ff5fdcc130d0ea6cf6e8d179ac812b77fa1fa27ba3660678a00dbf186c5ccba2b9c39fcda92f3ee013b7804fbf674c145a786c6ea67c884f91e5946 SHA512 06839c49ae22f50038a7ea57749a25664ffea68d6d652145be40df6549a04dd08c19989a1635863cd44440ac1c88d9ad5385e3066af6f40cbc867264b91b88f7 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134 diff --git a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff deleted file mode 100644 index 04428d3acbe5..000000000000 --- a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/gajim/history_manager.py b/gajim/history_manager.py -index 1598ea46b385951710a9298093f491dd29e5e6f8..3e767840295f5404687ec6bb298fbdc4e369b4ca 100644 ---- a/gajim/history_manager.py -+++ b/gajim/history_manager.py -@@ -55,7 +55,6 @@ - from gajim.common.const import JIDConstant - from gajim.common.const import KindConstant - from gajim.common.const import ShowConstant --from gajim.common.settings import Settings - - - def is_standalone(): -@@ -76,6 +75,8 @@ def init_gtk(): - if is_standalone(): - init_gtk() - -+ from gajim.common.settings import Settings -+ - try: - shortargs = 'hvsc:l:p:' - longargs = 'help verbose separate config-path= loglevel= profile=' -@@ -100,6 +101,8 @@ def init_gtk(): - app.settings = Settings() - app.settings.init() - app.load_css_config() -+else: -+ from gajim.common.settings import Settings - - from gajim.common import helpers - from gajim.gui.dialogs import ErrorDialog -diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py -index 41274dfd4447a89b6ea33bdd36538212e4d28d8c..6ad2d734b5bcc093e1d2e8e627cfbd3a0653b53e 100644 ---- a/test/unit/test_gui_interface.py -+++ b/test/unit/test_gui_interface.py -@@ -3,6 +3,9 @@ - ''' - import unittest - -+import gajim.gui -+gajim.gui.init('gtk') -+ - from test import lib - lib.setup_env() - diff --git a/net-im/gajim/gajim-1.3.1_p2.ebuild b/net-im/gajim/gajim-1.3.1_p2.ebuild deleted file mode 100644 index 01fcfbf62a29..000000000000 --- a/net-im/gajim/gajim-1.3.1_p2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="sqlite,xml" -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -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)/${PN}-${PV/_p/-}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+crypt geolocation jingle remote rst +spell upnp +webp" -S="${WORKDIR}/${PN}-${PV/_p2/}" - -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[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-2.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}] ) - 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.3.2.ebuild b/net-im/gajim/gajim-1.3.2.ebuild deleted file mode 100644 index 3786de899854..000000000000 --- a/net-im/gajim/gajim-1.3.2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="sqlite,xml" -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -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.gz" - -# See https://dev.gajim.org/gajim/gajim/-/merge_requests/761 -PATCHES=( "${FILESDIR}/gajim-1.3.2-fix-historymanager.diff" ) - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${P}" - -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[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-2.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}] ) - 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 - media-plugins/gst-plugins-gtk - ) - omemo? ( - dev-python/python-axolotl[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - ) - 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.3.3_p2.ebuild b/net-im/gajim/gajim-1.3.3_p2.ebuild index e58f75e2f5cd..346c1c0f0693 100644 --- a/net-im/gajim/gajim-1.3.3_p2.ebuild +++ b/net-im/gajim/gajim-1.3.3_p2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" S="${WORKDIR}/${P%_p2}" -- cgit v1.2.3