From 38b3bab1ccf88fd33db317e33962f32a53a4b02d Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Tue, 21 Jun 2022 09:25:03 +0200 Subject: net-im/gajim: Force python-nbxmpp < 3 for < 1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/853235 Signed-off-by: Michał Górny --- net-im/gajim/gajim-1.3.3-r1.ebuild | 92 --------------------------------- net-im/gajim/gajim-1.3.3-r2.ebuild | 93 +++++++++++++++++++++++++++++++++ net-im/gajim/gajim-1.3.3_p2-r1.ebuild | 97 +++++++++++++++++++++++++++++++++++ net-im/gajim/gajim-1.3.3_p2.ebuild | 96 ---------------------------------- 4 files changed, 190 insertions(+), 188 deletions(-) delete mode 100644 net-im/gajim/gajim-1.3.3-r1.ebuild create mode 100644 net-im/gajim/gajim-1.3.3-r2.ebuild create mode 100644 net-im/gajim/gajim-1.3.3_p2-r1.ebuild delete mode 100644 net-im/gajim/gajim-1.3.3_p2.ebuild diff --git a/net-im/gajim/gajim-1.3.3-r1.ebuild b/net-im/gajim/gajim-1.3.3-r1.ebuild deleted file mode 100644 index d1a222c2bc02..000000000000 --- a/net-im/gajim/gajim-1.3.3-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 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 - -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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${PN}-${P}" - -COMMON_DEPEND=" - dev-libs/gobject-introspection[cairo(+)] - >=x11-libs/gtk+-3.22:3[introspection]" -DEPEND="${COMMON_DEPEND} - app-arch/unzip - 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.4[${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-r2.ebuild b/net-im/gajim/gajim-1.3.3-r2.ebuild new file mode 100644 index 000000000000..726c404f14f1 --- /dev/null +++ b/net-im/gajim/gajim-1.3.3-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) +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.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~riscv x86" +IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" +S="${WORKDIR}/${PN}-${P}" + +COMMON_DEPEND=" + dev-libs/gobject-introspection[cairo(+)] + >=x11-libs/gtk+-3.22:3[introspection]" +DEPEND="${COMMON_DEPEND} + app-arch/unzip + 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.4[${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-r1.ebuild b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild new file mode 100644 index 000000000000..9228c4d00e2f --- /dev/null +++ b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +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/_p/-}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~riscv x86" +IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" +S="${WORKDIR}/${P%_p2}" + +COMMON_DEPEND=" + dev-libs/gobject-introspection[cairo(+)] + >=x11-libs/gtk+-3.22:3[introspection]" +DEPEND="${COMMON_DEPEND} + app-arch/unzip + 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.4[${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 +} + +# tests in this release don't work, see also: +# https://dev.gajim.org/gajim/gajim/-/issues/10755 +RESTRICT="test" diff --git a/net-im/gajim/gajim-1.3.3_p2.ebuild b/net-im/gajim/gajim-1.3.3_p2.ebuild deleted file mode 100644 index 8253e660e160..000000000000 --- a/net-im/gajim/gajim-1.3.3_p2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -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/_p/-}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${P%_p2}" - -COMMON_DEPEND=" - dev-libs/gobject-introspection[cairo(+)] - >=x11-libs/gtk+-3.22:3[introspection]" -DEPEND="${COMMON_DEPEND} - app-arch/unzip - 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.4[${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 -} - -# tests in this release don't work, see also: -# https://dev.gajim.org/gajim/gajim/-/issues/10755 -RESTRICT="test" -- cgit v1.2.3-65-gdbad