[gentoo-commits] repo/gentoo:master commit in: net-im/gajim/, net-im/gajim/files/

[Mart Raudsepp]

commit:     6ec6cf8f2b5d80b8be41a92d892797ec8fd28aef
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 11:05:05 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 11:05:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec6cf8f

net-im/gajim: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-im/gajim/Manifest                              |   2 -
 ...01-Add-config-option-to-activate-XEP-0146.patch |  45 --------
 net-im/gajim/gajim-0.16.6-r1.ebuild                | 126 ---------------------
 net-im/gajim/gajim-0.16.9.ebuild                   | 125 --------------------
 net-im/gajim/metadata.xml                          |   5 -
 5 files changed, 303 deletions(-)

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 8055cbb9a9d..471c77bebd0 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,3 +1 @@
-DIST gajim-0.16.6.tar.bz2 4564505 BLAKE2B 0446d826afc782ceba4fe67d6c7173d60264ec1b5a227f0da62285ea1d083143b4895e4472c2df499de419f9a34c59d9afa1ac2348052defb100438782a3df46 SHA512 6c8c2a38429468a1e6f02aae730ff947c649960e8cc672457c1e1733ab2dad6534b1e5ac2e1c0c385e331a6ba817c6e67c1a27443632b9fd43e7ab76ad66c935
-DIST gajim-0.16.9.tar.bz2 4469275 BLAKE2B 451f09cde9d177932429b9ece900e09c58ac43b5f97cd64cf70e75d13f2261ab52ee35e02e8680c83a5d81d7574bca561532dd1327f1109b0cc872956b1a05f7 SHA512 d8ddae3826bbcd4458b016b3cf6b0472b41db4b9026b300b058d9cef403195e38423ff950fcbf6fed0cdbbb485a274905a9a5945028c4cbb24d1a38c72bf4cbb
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8

diff --git a/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch b/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
deleted file mode 100644
index 046c72c0ca2..00000000000
--- a/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 285392b27db7cb01b0566b4bda3920e6559b75e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@××××××.at>
-Date: Fri, 26 May 2017 23:10:05 +0200
-Subject: [PATCH] Add config option to activate XEP-0146 commands
-
-Some of the Commands have security implications, thats why we disable them per default
-Fixes #8378
----
- src/common/commands.py | 7 ++++---
- src/common/config.py   | 1 +
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/common/commands.py b/src/common/commands.py
-index 40d700710..46d6947f8 100644
---- a/src/common/commands.py
-+++ b/src/common/commands.py
-@@ -345,9 +345,10 @@ class ConnectionCommands:
-     def __init__(self):
-         # a list of all commands exposed: node -> command class
-         self.__commands = {}
--        for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
--        LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
--            self.__commands[cmdobj.commandnode] = cmdobj
-+        if gajim.config.get('remote_commands'):
-+            for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
-+            LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
-+                self.__commands[cmdobj.commandnode] = cmdobj
- 
-         # a list of sessions; keys are tuples (jid, sessionid, node)
-         self.__sessions = {}
-diff --git a/src/common/config.py b/src/common/config.py
-index 3884d9e1d..7c1313fc4 100644
---- a/src/common/config.py
-+++ b/src/common/config.py
-@@ -313,6 +313,7 @@ class Config:
-             'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')],
-             'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')],
-             'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
-+            'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')],
-     }, {})
- 
-     __options_per_key = {
--- 
-2.12.2
-

diff --git a/net-im/gajim/gajim-0.16.6-r1.ebuild b/net-im/gajim/gajim-0.16.6-r1.ebuild
deleted file mode 100644
index f8bda52c421..00000000000
--- a/net-im/gajim/gajim-0.16.6-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="
-	https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	gnome? ( gnome-keyring )
-	zeroconf? ( dbus )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	!>=dev-python/pyopenssl-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools
-			)
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-Add-config-option-to-activate-XEP-0146.patch" )
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}

diff --git a/net-im/gajim/gajim-0.16.9.ebuild b/net-im/gajim/gajim-0.16.9.ebuild
deleted file mode 100644
index 2285e709078..00000000000
--- a/net-im/gajim/gajim-0.16.9.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome2-utils python-r1 versionator xdg-utils
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="
-	https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="crypt dbus gnome gnome-keyring idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	gnome? ( gnome-keyring )
-	zeroconf? ( dbus )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.1[${PYTHON_USEDEP}]
-	crypt? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools
-			)
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}

diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index 007a414c6fa..67b5f800350 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -18,10 +18,5 @@
     <flag name="spell">Spellchecking of composed messages</flag>
     <flag name="upnp">Ability to request your router to forward port for file transfer</flag>
     <flag name="webp">Support WebP avatars</flag>
-    <flag name="zeroconf">Serverless chatting with autodetected clients in a local network</flag>
-
-    <flag name="idle">Enable idle module</flag>
-    <flag name="srv">SRV capabilities</flag>
-    <flag name="xhtml">Enable XHTML support</flag>
   </use>
 </pkgmetadata>