Gentoo Archives: gentoo-commits

From: "Hanno Böck" <hanno@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/gajim/, net-im/gajim/files/
Date: Sat, 05 Mar 2022 11:05:16
Message-Id: 1646478297.4cf577c73fc89c64cd405687fcd482fba1ddcebc.hanno@gentoo
1 commit: 4cf577c73fc89c64cd405687fcd482fba1ddcebc
2 Author: Hanno Böck <hanno <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 5 11:04:57 2022 +0000
4 Commit: Hanno Böck <hanno <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 5 11:04:57 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf577c7
7
8 net-im/gajim: Cleanup old versions
9
10 Bug: https://bugs.gentoo.org/817791
11 Signed-off-by: Hanno Böck <hanno <AT> gentoo.org>
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13
14 net-im/gajim/Manifest | 2 -
15 .../files/gajim-1.3.2-fix-historymanager.diff | 44 ----------
16 net-im/gajim/gajim-1.3.1_p2.ebuild | 88 --------------------
17 net-im/gajim/gajim-1.3.2.ebuild | 97 ----------------------
18 4 files changed, 231 deletions(-)
19
20 diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
21 index 8b8ba77c5bf6..5fc3fb278111 100644
22 --- a/net-im/gajim/Manifest
23 +++ b/net-im/gajim/Manifest
24 @@ -1,4 +1,2 @@
25 -DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
26 -DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267
27 DIST gajim-1.3.3-2.tar.gz 9578053 BLAKE2B de41eb488480c1e9267a7e64c33dcc225ba68348fad51fe2f114199972a0fc998ae2c6efba1ea48ecb17b819509c1b45745e98e41f99f2e4afd4a4c1daff4865 SHA512 e7a2564710ffdf0b971d005f8b84c60d72c471727be2bd1b75e564f70a25101a4eb44603fc9f98163bc12a5049dc876f50cdaf8eb5b7d596203c986e55de7442
28 DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2
29
30 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
31 deleted file mode 100644
32 index 04428d3acbe5..000000000000
33 --- a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
34 +++ /dev/null
35 @@ -1,44 +0,0 @@
36 -diff --git a/gajim/history_manager.py b/gajim/history_manager.py
37 -index 1598ea46b385951710a9298093f491dd29e5e6f8..3e767840295f5404687ec6bb298fbdc4e369b4ca 100644
38 ---- a/gajim/history_manager.py
39 -+++ b/gajim/history_manager.py
40 -@@ -55,7 +55,6 @@
41 - from gajim.common.const import JIDConstant
42 - from gajim.common.const import KindConstant
43 - from gajim.common.const import ShowConstant
44 --from gajim.common.settings import Settings
45 -
46 -
47 - def is_standalone():
48 -@@ -76,6 +75,8 @@ def init_gtk():
49 - if is_standalone():
50 - init_gtk()
51 -
52 -+ from gajim.common.settings import Settings
53 -+
54 - try:
55 - shortargs = 'hvsc:l:p:'
56 - longargs = 'help verbose separate config-path= loglevel= profile='
57 -@@ -100,6 +101,8 @@ def init_gtk():
58 - app.settings = Settings()
59 - app.settings.init()
60 - app.load_css_config()
61 -+else:
62 -+ from gajim.common.settings import Settings
63 -
64 - from gajim.common import helpers
65 - from gajim.gui.dialogs import ErrorDialog
66 -diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py
67 -index 41274dfd4447a89b6ea33bdd36538212e4d28d8c..6ad2d734b5bcc093e1d2e8e627cfbd3a0653b53e 100644
68 ---- a/test/unit/test_gui_interface.py
69 -+++ b/test/unit/test_gui_interface.py
70 -@@ -3,6 +3,9 @@
71 - '''
72 - import unittest
73 -
74 -+import gajim.gui
75 -+gajim.gui.init('gtk')
76 -+
77 - from test import lib
78 - lib.setup_env()
79 -
80
81 diff --git a/net-im/gajim/gajim-1.3.1_p2.ebuild b/net-im/gajim/gajim-1.3.1_p2.ebuild
82 deleted file mode 100644
83 index 01fcfbf62a29..000000000000
84 --- a/net-im/gajim/gajim-1.3.1_p2.ebuild
85 +++ /dev/null
86 @@ -1,88 +0,0 @@
87 -# Copyright 1999-2021 Gentoo Authors
88 -# Distributed under the terms of the GNU General Public License v2
89 -
90 -EAPI=7
91 -
92 -PYTHON_COMPAT=( python3_{7,8,9} )
93 -PYTHON_REQ_USE="sqlite,xml"
94 -DISTUTILS_SINGLE_IMPL=1
95 -DISTUTILS_USE_SETUPTOOLS=rdepend
96 -
97 -inherit distutils-r1 xdg-utils
98 -
99 -DESCRIPTION="Jabber client written in PyGTK"
100 -HOMEPAGE="https://gajim.org/"
101 -SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${PN}-${PV/_p/-}.tar.gz"
102 -
103 -LICENSE="GPL-3"
104 -SLOT="0"
105 -KEYWORDS="amd64 x86"
106 -IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
107 -S="${WORKDIR}/${PN}-${PV/_p2/}"
108 -
109 -COMMON_DEPEND="
110 - dev-libs/gobject-introspection[cairo(+)]
111 - >=x11-libs/gtk+-3.22:3[introspection]"
112 -DEPEND="${COMMON_DEPEND}
113 - app-arch/unzip
114 - >=dev-util/intltool-0.40.1
115 - virtual/pkgconfig
116 - >=sys-devel/gettext-0.17-r1"
117 -RDEPEND="${COMMON_DEPEND}
118 - $(python_gen_cond_dep '
119 - dev-python/idna[${PYTHON_USEDEP}]
120 - dev-python/precis-i18n[${PYTHON_USEDEP}]
121 - dev-python/pyasn1[${PYTHON_USEDEP}]
122 - dev-python/pycairo[${PYTHON_USEDEP}]
123 - dev-python/pycurl[${PYTHON_USEDEP}]
124 - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
125 - dev-python/pyopenssl[${PYTHON_USEDEP}]
126 - >=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
127 - x11-libs/libXScrnSaver
128 - app-crypt/libsecret[crypt,introspection]
129 - dev-python/keyring[${PYTHON_USEDEP}]
130 - >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
131 - dev-python/css-parser[${PYTHON_USEDEP}]
132 - dev-python/packaging[${PYTHON_USEDEP}]
133 - net-libs/libsoup[introspection]
134 - media-libs/gsound[introspection]
135 - crypt? (
136 - dev-python/pycryptodome[${PYTHON_USEDEP}]
137 - >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
138 - geolocation? ( app-misc/geoclue[introspection] )
139 - jingle? (
140 - net-libs/farstream:0.2[introspection]
141 - media-libs/gstreamer:1.0[introspection]
142 - media-libs/gst-plugins-base:1.0[introspection]
143 - media-libs/gst-plugins-ugly:1.0
144 - )
145 - remote? (
146 - >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
147 - sys-apps/dbus[X]
148 - )
149 - rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
150 - spell? (
151 - app-text/gspell[introspection]
152 - app-text/hunspell
153 - )
154 - upnp? ( net-libs/gupnp-igd[introspection] )
155 - webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
156 - ')"
157 -
158 -src_install() {
159 - distutils-r1_src_install
160 -
161 - # avoid precompressed man pages
162 - rm -r "${D}/usr/share/man"
163 - doman data/*.1
164 -}
165 -
166 -pkg_postinst() {
167 - xdg_icon_cache_update
168 - xdg_desktop_database_update
169 -}
170 -
171 -pkg_postrm() {
172 - xdg_icon_cache_update
173 - xdg_desktop_database_update
174 -}
175
176 diff --git a/net-im/gajim/gajim-1.3.2.ebuild b/net-im/gajim/gajim-1.3.2.ebuild
177 deleted file mode 100644
178 index 3786de899854..000000000000
179 --- a/net-im/gajim/gajim-1.3.2.ebuild
180 +++ /dev/null
181 @@ -1,97 +0,0 @@
182 -# Copyright 1999-2021 Gentoo Authors
183 -# Distributed under the terms of the GNU General Public License v2
184 -
185 -EAPI=7
186 -
187 -PYTHON_COMPAT=( python3_{7,8,9} )
188 -PYTHON_REQ_USE="sqlite,xml"
189 -DISTUTILS_SINGLE_IMPL=1
190 -DISTUTILS_USE_SETUPTOOLS=rdepend
191 -
192 -inherit distutils-r1 xdg-utils
193 -
194 -DESCRIPTION="Jabber client written in PyGTK"
195 -HOMEPAGE="https://gajim.org/"
196 -SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
197 -
198 -# See https://dev.gajim.org/gajim/gajim/-/merge_requests/761
199 -PATCHES=( "${FILESDIR}/gajim-1.3.2-fix-historymanager.diff" )
200 -
201 -LICENSE="GPL-3"
202 -SLOT="0"
203 -KEYWORDS="~amd64 ~x86"
204 -IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
205 -S="${WORKDIR}/${P}"
206 -
207 -COMMON_DEPEND="
208 - dev-libs/gobject-introspection[cairo(+)]
209 - >=x11-libs/gtk+-3.22:3[introspection]"
210 -DEPEND="${COMMON_DEPEND}
211 - app-arch/unzip
212 - >=dev-util/intltool-0.40.1
213 - virtual/pkgconfig
214 - >=sys-devel/gettext-0.17-r1"
215 -RDEPEND="${COMMON_DEPEND}
216 - $(python_gen_cond_dep '
217 - dev-python/idna[${PYTHON_USEDEP}]
218 - dev-python/precis-i18n[${PYTHON_USEDEP}]
219 - dev-python/pyasn1[${PYTHON_USEDEP}]
220 - dev-python/pycairo[${PYTHON_USEDEP}]
221 - dev-python/pycurl[${PYTHON_USEDEP}]
222 - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
223 - dev-python/pyopenssl[${PYTHON_USEDEP}]
224 - >=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
225 - x11-libs/libXScrnSaver
226 - app-crypt/libsecret[crypt,introspection]
227 - dev-python/keyring[${PYTHON_USEDEP}]
228 - >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
229 - dev-python/css-parser[${PYTHON_USEDEP}]
230 - dev-python/packaging[${PYTHON_USEDEP}]
231 - net-libs/libsoup[introspection]
232 - media-libs/gsound[introspection]
233 - crypt? (
234 - dev-python/pycryptodome[${PYTHON_USEDEP}]
235 - >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
236 - geolocation? ( app-misc/geoclue[introspection] )
237 - jingle? (
238 - net-libs/farstream:0.2[introspection]
239 - media-libs/gstreamer:1.0[introspection]
240 - media-libs/gst-plugins-base:1.0[introspection]
241 - media-libs/gst-plugins-ugly:1.0
242 - media-plugins/gst-plugins-gtk
243 - )
244 - omemo? (
245 - dev-python/python-axolotl[${PYTHON_USEDEP}]
246 - dev-python/qrcode[${PYTHON_USEDEP}]
247 - dev-python/cryptography[${PYTHON_USEDEP}]
248 - )
249 - remote? (
250 - >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
251 - sys-apps/dbus[X]
252 - )
253 - rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
254 - spell? (
255 - app-text/gspell[introspection]
256 - app-text/hunspell
257 - )
258 - upnp? ( net-libs/gupnp-igd[introspection] )
259 - webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
260 - ')"
261 -
262 -src_install() {
263 - distutils-r1_src_install
264 -
265 - # avoid precompressed man pages
266 - rm -r "${D}/usr/share/man"
267 - doman data/*.1
268 -}
269 -
270 -pkg_postinst() {
271 - xdg_icon_cache_update
272 - xdg_desktop_database_update
273 -}
274 -
275 -pkg_postrm() {
276 - xdg_icon_cache_update
277 - xdg_desktop_database_update
278 -}